Datasets:

tiginamaria

/

bug-localization

like 2

quarkusio/quarkus/16793/16754

quarkusio

quarkus

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

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

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

fixes

404 error from resources declared in javax.ws.rs.core.Application#getClasses

I'm trying to upgrade to **1.13.2.Final** and use the ability to limit the JAX-RS resources introduced by [this](https://github.com/quarkusio/quarkus/pull/14207) feature, but the declared resources in the overriden ``javax.ws.rs.core.Application#getClasses`` method return 404 error. If i do not override ``getClasses`` (or return an empty set, which as far as i understand is equivalent), the endpoints work as expected. #### To Reproduce You can use [this](https://github.com/blxbrgld/jaxrs-application) sample. ``/api/test`` is the endpoint that returns the 404 error.

71230a1cc10fef7299bbb1393e2d2c6056e80f88

ae36b2ed429ec2d5fe70deb410abae8a07231bb5

https://github.com/quarkusio/quarkus/compare/71230a1cc10fef7299bbb1393e2d2c6056e80f88...ae36b2ed429ec2d5fe70deb410abae8a07231bb5

diff --git a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java index cf5e28f75f0..c149679b7ab 100755 --- a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java +++ b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java @@ -13,6 +13,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.BiFunction; @@ -236,7 +237,8 @@ public void build( final Collection<AnnotationInstance> allPaths; if (filterClasses) { allPaths = paths.stream().filter( - annotationInstance -> keepEnclosingClass(allowedClasses, excludedClasses, annotationInstance)) + annotationInstance -> keepAnnotation(beanArchiveIndexBuildItem.getIndex(), allowedClasses, excludedClasses, + annotationInstance)) .collect(Collectors.toList()); } else { allPaths = new ArrayList<>(paths); @@ -889,21 +891,32 @@ private static Set<String> getExcludedClasses(List<BuildTimeConditionBuildItem> } /** - * @param allowedClasses the classes returned by the methods {@link Application#getClasses()} and - * {@link Application#getSingletons()} to keep. - * @param excludedClasses the classes that have been annotated wih unsuccessful build time conditions and that + * @param index the Jandex index view from which the class information is extracted. + * @param allowedClasses the classes to keep provided by the methods {@link Application#getClasses()} and + * {@link Application#getSingletons()}. + * @param excludedClasses the classes that have been annotated with unsuccessful build time conditions and that * need to be excluded from the list of paths. - * @param annotationInstance the annotation instance from which the enclosing class will be extracted. - * @return {@code true} if the enclosing class of the annotation is part of the allowed classes if not empty - * or if is not part of the excluded classes, {@code false} otherwise. + * @param annotationInstance the annotation instance to test. + * @return {@code true} if the enclosing class of the annotation is a concrete class and is part of the allowed + * classes, or is an interface and at least one concrete implementation is included, or is an abstract class + * and at least one concrete sub class is included, or is not part of the excluded classes, {@code false} otherwise. */ - private static boolean keepEnclosingClass(Set<String> allowedClasses, Set<String> excludedClasses, + private static boolean keepAnnotation(IndexView index, Set<String> allowedClasses, Set<String> excludedClasses, AnnotationInstance annotationInstance) { - final String className = JandexUtil.getEnclosingClass(annotationInstance).toString(); + final ClassInfo classInfo = JandexUtil.getEnclosingClass(annotationInstance); + final String className = classInfo.toString(); if (allowedClasses.isEmpty()) { // No allowed classes have been set, meaning that only excluded classes have been provided. // Keep the enclosing class only if not excluded return !excludedClasses.contains(className); + } else if (Modifier.isAbstract(classInfo.flags())) { + // Only keep the annotation if a concrete implementation or a sub class has been included + return (Modifier.isInterface(classInfo.flags()) ? index.getAllKnownImplementors(classInfo.name()) + : index.getAllKnownSubclasses(classInfo.name())) + .stream() + .filter(clazz -> !Modifier.isAbstract(clazz.flags())) + .map(Objects::toString) + .anyMatch(allowedClasses::contains); } return allowedClasses.contains(className); } diff --git a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java index a8613bd142b..e00eb8b9058 100644 --- a/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java +++ b/extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.java @@ -38,7 +38,10 @@ class ApplicationTest { static QuarkusUnitTest runner = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClasses( - ResourceTest1.class, ResourceTest2.class, ResponseFilter1.class, ResponseFilter2.class, + IResourceTest.class, ResourceInheritedInterfaceTest.class, + AResourceTest.class, ResourceInheritedClassTest.class, + ResourceTest1.class, ResourceTest2.class, + ResponseFilter1.class, ResponseFilter2.class, ResponseFilter3.class, ResponseFilter4.class, ResponseFilter5.class, ResponseFilter6.class, Feature1.class, Feature2.class, DynamicFeature1.class, DynamicFeature2.class, ExceptionMapper1.class, ExceptionMapper2.class, AppTest.class)); @@ -76,6 +79,79 @@ void should_not_call_ok_of_resource_2() { .statusCode(Response.Status.SERVICE_UNAVAILABLE.getStatusCode()); } + @DisplayName("Should access to path inherited from an interface") + @Test + void should_call_inherited_from_interface() { + when() + .get("/rt-i/ok") + .then() + .statusCode(Response.Status.OK.getStatusCode()) + .body(Matchers.is("ok-i")); + } + + @DisplayName("Should access to path inherited from a class where method is implemented") + @Test + void should_call_inherited_from_class_implemented() { + when() + .get("/rt-a/ok-1") + .then() + .statusCode(Response.Status.OK.getStatusCode()) + .body(Matchers.is("ok-a-1")); + } + + @DisplayName("Should access to path inherited from a class where method is overridden") + @Test + void should_call_inherited_from_class_overridden() { + when() + .get("/rt-a/ok-2") + .then() + .statusCode(Response.Status.OK.getStatusCode()) + .body(Matchers.is("ok-a-2")); + } + + @Path("rt-i") + public interface IResourceTest { + + @GET + @Path("ok") + String ok(); + } + + public static class ResourceInheritedInterfaceTest implements IResourceTest { + + @Override + public String ok() { + return "ok-i"; + } + } + + @Path("rt-a") + public abstract static class AResourceTest { + + @GET + @Path("ok-1") + public abstract String ok1(); + + @GET + @Path("ok-2") + public String ok2() { + return "ok-a"; + } + } + + public static class ResourceInheritedClassTest extends AResourceTest { + + @Override + public String ok1() { + return "ok-a-1"; + } + + @Override + public String ok2() { + return "ok-a-2"; + } + } + @Path("rt-1") public static class ResourceTest1 { @@ -224,6 +300,7 @@ public static class AppTest extends Application { public Set<Class<?>> getClasses() { return new HashSet<>( Arrays.asList( + ResourceInheritedInterfaceTest.class, ResourceInheritedClassTest.class, ResourceTest1.class, Feature1.class, ExceptionMapper1.class)); }

['extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java', 'extensions/resteasy-classic/resteasy/deployment/src/test/java/io/quarkus/resteasy/test/root/ApplicationTest.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/16777/16429

quarkusio

quarkus

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

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

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

fixes

gradle quarkusBuild has error : SRCFG00035: Failed to load resource

Since upgrading from to 1.13.x, run below command ``` ./gradlew quarkusBuild -Dquarkus.package.type=uber-jar -Dorg.gradle.jvmargs=-Xmx256m ``` Gradle made a error: SRCFG00035: Failed to load resource, full stacktrace is: ``` > Task :processResources > Task :classes start copy some files... > Task :inspectClassesForKotlinIC > Task :jar > Task :quarkusBuild building quarkus jar > Task :quarkusBuild FAILED FAILURE: Build failed with an exception. * What went wrong: Execution failed for task ':quarkusBuild'. > java.lang.IllegalStateException: SRCFG00035: Failed to load resource * Try: Run with --stacktrace option to get the stack trace. Run with --info or --debug option to get more log output. Run with --scan to get full insights. ``` My system jdk version : ``` openjdk 11.0.10 2021-01-19 OpenJDK Runtime Environment 18.9 (build 11.0.10+9) OpenJDK 64-Bit Server VM 18.9 (build 11.0.10+9, mixed mode, sharing) ``` when I use `adoptjdk15-openj9` or downgrade quarkus version to `1.12.2.Final`, it' all fine.

82477c6476ccf4aa8facdf49f776cb09e185a4be

814be9658b46085868ec887f845eb7d8e7d00a62

https://github.com/quarkusio/quarkus/compare/82477c6476ccf4aa8facdf49f776cb09e185a4be...814be9658b46085868ec887f845eb7d8e7d00a62

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.java index f5ac2de74bf..e605e035d9a 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.java @@ -3,6 +3,7 @@ import java.io.IOException; import java.net.URI; import java.net.URL; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.List; @@ -48,7 +49,9 @@ protected ConfigSource loadConfigSource(final URL url, final int ordinal) throws @Override public List<ConfigSource> getConfigSources(final ClassLoader classLoader) { - return loadConfigSources("config/application.properties", classLoader); + return loadConfigSources( + Paths.get(System.getProperty("user.dir"), "config", "application.properties").toUri().toString(), + classLoader); } @Override diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java index 96c0d87fa16..8f9ba413581 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java @@ -1,7 +1,6 @@ package io.quarkus.runtime.configuration; import static io.smallrye.config.AbstractLocationConfigSourceFactory.SMALLRYE_LOCATIONS; -import static io.smallrye.config.DotEnvConfigSourceProvider.dotEnvSources; import static io.smallrye.config.ProfileConfigSourceInterceptor.SMALLRYE_PROFILE; import static io.smallrye.config.ProfileConfigSourceInterceptor.SMALLRYE_PROFILE_PARENT; import static io.smallrye.config.PropertiesConfigSourceProvider.classPathSources; @@ -10,6 +9,7 @@ import java.io.IOException; import java.net.URL; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -100,7 +100,9 @@ public OptionalInt getPriority() { builder.addDefaultInterceptors(); if (runTime) { builder.addDefaultSources(); - builder.withSources(dotEnvSources(classLoader)); + builder.withSources( + new DotEnvConfigSourceProvider(Paths.get(System.getProperty("user.dir"), ".env").toUri().toString()) + .getConfigSources(classLoader)); } else { final List<ConfigSource> sources = new ArrayList<>(); sources.addAll(classPathSources(META_INF_MICROPROFILE_CONFIG_PROPERTIES, classLoader)); @@ -190,7 +192,7 @@ public String getName() { */ static class BuildTimeDotEnvConfigSourceProvider extends DotEnvConfigSourceProvider { public BuildTimeDotEnvConfigSourceProvider() { - super(); + super(Paths.get(System.getProperty("user.dir"), ".env").toUri().toString()); } public BuildTimeDotEnvConfigSourceProvider(final String location) {

['core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigUtils.java', 'core/runtime/src/main/java/io/quarkus/runtime/configuration/ApplicationPropertiesConfigSourceLoader.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/16766/16765

quarkusio

quarkus

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

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

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

fix

kafka-client : Detected a MBean server in the image heap

## Describe the bug In some cases, org.apache.kafka.common.metrics.JmxReporter.reconfigure is called, implying the usage of MBean server. Native executable can not be build. ### Expected behavior All methods accessing to MBeanServer shall be substituted. ### Actual behavior reconfigure method is causing this kind of error during native build : `Error: Detected a MBean server in the image heap. This is currently not supported, but could be changed in the future. Management beans are registered in many global caches that would need to be cleared and properly re-built at image build time. Class of disallowed object: com.sun.jmx.mbeanserver.JmxMBeanServer To see how this object got instantiated use --trace-object-instantiation=com.sun.jmx.mbeanserver.JmxMBeanServer. The object was probably created by a class initializer and is reachable from a static field. You can request class initialization at image runtime by using the option --initialize-at-run-time=<class-name>. Or you can write your own initialization methods and call them explicitly from your main entry point. Trace: Object was reached by indexing into array constant java.lang.Object[]@fde425e reached by reading field java.util.ArrayList.elementData of constant java.util.ArrayList@1a67ab17 reached by scanning method javax.management.MBeanServerFactory.addMBeanServer(MBeanServerFactory.java:418) Call path from entry point to javax.management.MBeanServerFactory.addMBeanServer(MBeanServer): at javax.management.MBeanServerFactory.addMBeanServer(MBeanServerFactory.java:418) at javax.management.MBeanServerFactory.createMBeanServer(MBeanServerFactory.java:232) at javax.management.MBeanServerFactory.createMBeanServer(MBeanServerFactory.java:192) at com.oracle.svm.core.jdk.management.ManagementSupport.getPlatformMBeanServer(ManagementSupport.java:250) at com.oracle.svm.core.jdk.management.Target_java_lang_management_ManagementFactory.getPlatformMBeanServer(Target_java_lang_management_ManagementFactory.java:45) at org.apache.kafka.common.metrics.JmxReporter.reregister(JmxReporter.java:227) at org.apache.kafka.common.metrics.JmxReporter.lambda$reconfigure$1(JmxReporter.java:113) at org.apache.kafka.common.metrics.JmxReporter$$Lambda$1649/0x00000007c2ad1840.accept(Unknown Source) ` ## To Reproduce Stacktrace is incomplete and not easily reproductible. ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Linux XXX 5.8.0-50-generic #56~20.04.1-Ubuntu SMP Mon Apr 12 21:46:35 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "11.0.10" 2021-01-19 OpenJDK Runtime Environment AdoptOpenJDK (build 11.0.10+9) OpenJDK 64-Bit Server VM AdoptOpenJDK (build 11.0.10+9, mixed mode) ### GraalVM version (if different from Java) Using quarkus.native.container-build ### Quarkus version or git rev 1.13.2 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /home/gla/.sdkman/candidates/maven/current Java version: 11.0.10, vendor: AdoptOpenJDK, runtime: /home/gla/.sdkman/candidates/java/11.0.10.hs-adpt Default locale: fr_FR, platform encoding: UTF-8 OS name: "linux", version: "5.8.0-50-generic", arch: "amd64", family: "unix"

65b88195f8efe5746e3a88f06fbc0176496be4b7

4c926d19865c832e959a850ac05614a2002aec72

https://github.com/quarkusio/quarkus/compare/65b88195f8efe5746e3a88f06fbc0176496be4b7...4c926d19865c832e959a850ac05614a2002aec72

diff --git a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java index 8dbe699c096..e29267a9e71 100644 --- a/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java +++ b/extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.java @@ -5,6 +5,7 @@ import java.lang.invoke.MethodHandle; import java.util.List; +import java.util.Map; import java.util.function.BooleanSupplier; import org.apache.kafka.common.metrics.JmxReporter; @@ -91,6 +92,11 @@ public static synchronized void unregisterAppInfo(String prefix, String id, Metr @TargetClass(value = JmxReporter.class) final class JMXReporting { + @Substitute + public void reconfigure(Map<String, ?> configs) { + + } + @Substitute public void init(List<KafkaMetric> metrics) {

['extensions/kafka-client/runtime/src/main/java/io/quarkus/kafka/client/runtime/graal/SubstituteSnappy.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/16672/16661

quarkusio

quarkus

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

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

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

close

QuarkusGenerateCode gradle task is not incremental

## Describe the bug When running `quarkusBuild` or `quarkusDev`, it triggers `quarkusGenerateCode` task. This tasks is always ran, even when no change happen. ### Expected behavior The task should be `UP-TO-DATE`, if no changes happen to ### Actual behavior The task always is always ran ## To Reproduce Steps to reproduce the behavior: 1. Create a simple project 2. run `./gradlew quarkusBuild` multiple times, it never will be `UP-TO-DATE`.

6ddda1f2d13205de9670e940bdb4aabb3e706e3b

b11b716787b586b35cf72c42b2ff84670a0d8eb7

https://github.com/quarkusio/quarkus/compare/6ddda1f2d13205de9670e940bdb4aabb3e706e3b...b11b716787b586b35cf72c42b2ff84670a0d8eb7

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index b8dee8f1741..f61804ee4a8 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -153,11 +153,9 @@ public void execute(Task test) { compileJavaTask.getOptions().setAnnotationProcessorPath(annotationProcessorConfig); compileJavaTask.dependsOn(quarkusGenerateCode); - quarkusGenerateCode.setSourceRegistrar(compileJavaTask::source); JavaCompile compileTestJavaTask = (JavaCompile) tasks.getByName(JavaPlugin.COMPILE_TEST_JAVA_TASK_NAME); compileTestJavaTask.dependsOn(quarkusGenerateCodeTests); - quarkusGenerateCodeTests.setSourceRegistrar(compileTestJavaTask::source); Task classesTask = tasks.getByName(JavaPlugin.CLASSES_TASK_NAME); Task resourcesTask = tasks.getByName(JavaPlugin.PROCESS_RESOURCES_TASK_NAME); @@ -204,27 +202,24 @@ public void execute(Task test) { tasks.withType(Test.class).forEach(configureTestTask); tasks.withType(Test.class).whenTaskAdded(configureTestTask::accept); - sourceSets.create(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES).getOutput() + SourceSet generatedSourceSet = sourceSets.create(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES); + generatedSourceSet.getOutput() .dir(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES); - sourceSets.create(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES).getOutput() + SourceSet generatedTestSourceSet = sourceSets.create(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES); + generatedTestSourceSet.getOutput() .dir(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES); + + // Register the quarkus-generated-code + for (String provider : QuarkusGenerateCode.CODE_GENERATION_PROVIDER) { + mainSourceSet.getJava().srcDir(new File(generatedSourceSet.getJava().getOutputDir(), provider)); + testSourceSet.getJava().srcDir(new File(generatedTestSourceSet.getJava().getOutputDir(), provider)); + } + }); project.getPlugins().withId("org.jetbrains.kotlin.jvm", plugin -> { tasks.getByName("compileKotlin").dependsOn(quarkusGenerateCode); tasks.getByName("compileTestKotlin").dependsOn(quarkusGenerateCodeTests); - - // Register the quarkus-generated-code - SourceSetContainer sourceSets = project.getConvention().getPlugin(JavaPluginConvention.class) - .getSourceSets(); - SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME); - SourceSet testSourceSet = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME); - SourceSet generatedSourceSet = sourceSets.getByName(QuarkusGenerateCode.QUARKUS_GENERATED_SOURCES); - SourceSet generatedTestSourceSet = sourceSets.getByName(QuarkusGenerateCode.QUARKUS_TEST_GENERATED_SOURCES); - for (String provider : QuarkusGenerateCode.CODE_GENERATION_PROVIDER) { - mainSourceSet.getJava().srcDir(new File(generatedSourceSet.getJava().getOutputDir(), provider)); - testSourceSet.getJava().srcDir(new File(generatedTestSourceSet.getJava().getOutputDir(), provider)); - } }); } diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java index 0b1dbb5537e..6ec53119ea6 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.java @@ -1,10 +1,13 @@ package io.quarkus.gradle.tasks; +import java.io.File; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; +import java.util.HashSet; import java.util.List; import java.util.Optional; import java.util.Properties; @@ -16,6 +19,8 @@ import org.gradle.api.plugins.Convention; import org.gradle.api.plugins.JavaPluginConvention; import org.gradle.api.tasks.CompileClasspath; +import org.gradle.api.tasks.InputFiles; +import org.gradle.api.tasks.OutputDirectories; import org.gradle.api.tasks.SourceSet; import org.gradle.api.tasks.TaskAction; @@ -33,10 +38,12 @@ public class QuarkusGenerateCode extends QuarkusTask { public static final String QUARKUS_TEST_GENERATED_SOURCES = "quarkus-test-generated-sources"; // TODO dynamically load generation provider, or make them write code directly in quarkus-generated-sources public static final String[] CODE_GENERATION_PROVIDER = new String[] { "grpc", "avdl", "avpr", "avsc" }; + public static final String[] CODE_GENERATION_INPUT = new String[] { "proto", "avro" }; public static final String INIT_AND_RUN = "initAndRun"; private Set<Path> sourcesDirectories; - private Consumer<Path> sourceRegistrar; + private Consumer<Path> sourceRegistrar = (p) -> { + }; private boolean test = false; public QuarkusGenerateCode() { @@ -53,6 +60,29 @@ public FileCollection getClasspath() { return QuarkusGradleUtils.getSourceSet(getProject(), SourceSet.MAIN_SOURCE_SET_NAME).getCompileClasspath(); } + @InputFiles + public Set<File> getInputDirectory() { + Set<File> inputDirectories = new HashSet<>(); + + final String inputSourceSetName = test ? SourceSet.TEST_SOURCE_SET_NAME : SourceSet.MAIN_SOURCE_SET_NAME; + Path src = getProject().getProjectDir().toPath().resolve("src").resolve(inputSourceSetName); + + for (String input : CODE_GENERATION_INPUT) { + Path providerSrcDir = src.resolve(input); + if (Files.exists(providerSrcDir)) { + inputDirectories.add(providerSrcDir.toFile()); + } + } + + return inputDirectories; + } + + @OutputDirectories + public FileCollection getGeneratedOutputDirectory() { + final String generatedSourceSetName = test ? QUARKUS_TEST_GENERATED_SOURCES : QUARKUS_GENERATED_SOURCES; + return QuarkusGradleUtils.getSourceSet(getProject(), generatedSourceSetName).getOutput().getDirs(); + } + @TaskAction public void prepareQuarkus() { getLogger().lifecycle("preparing quarkus application"); @@ -118,10 +148,6 @@ public void setSourcesDirectories(Set<Path> sourcesDirectories) { this.sourcesDirectories = sourcesDirectories; } - public void setSourceRegistrar(Consumer<Path> sourceRegistrar) { - this.sourceRegistrar = sourceRegistrar; - } - public void setTest(boolean test) { this.test = test; } diff --git a/integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java b/integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java index da308b09bf3..251bcb0baaa 100644 --- a/integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java +++ b/integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java @@ -77,8 +77,8 @@ private void assertWorkspace(WorkspaceModule workspaceModule, File projectDir) { new File(projectDir, "build/classes/java/test")); final SourceSet sourceSourceSet = workspaceModule.getSourceSourceSet(); assertEquals(new File(projectDir, "src/main/resources"), sourceSourceSet.getResourceDirectory()); - assertEquals(1, sourceSourceSet.getSourceDirectories().size()); - assertEquals(new File(projectDir, "src/main/java"), sourceSourceSet.getSourceDirectories().iterator().next()); + assertEquals(5, sourceSourceSet.getSourceDirectories().size()); + assertThat(sourceSourceSet.getSourceDirectories()).contains(new File(projectDir, "src/main/java")); } private File getResourcesProject(String projectName) throws URISyntaxException, IOException {

['integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java', 'devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java', 'devtools/gradle/src/main/java/io/quarkus/gradle/tasks/QuarkusGenerateCode.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/16021/15821

quarkusio

quarkus

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

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

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

fixes

Quarkus Vault problem

## Describe the bug I have a small application with 2 rest endpoints and vault. Authentication method for vault is username/password After 10-15 mins running app throws exception on API calls because it try to resolve "resteasy.original.webapplicationexception.behavior" property. And when it comes to vault source it couldn't authenticate second time. Thrown exception: The current thread cannot be blocked: vert.x-eventloop-thread-8 ### Expected behavior resteasy.original.webapplicationexception.behavior has default value. shouldn't be taken from vault. vault also shouldn't throw this exception ### Actual behavior vault throws exception: ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] (vert.x-eventloop-thread-8) HTTP Request to ... failed, error id: 180723b6-de12-4517-af3d-878cd0bb010c-1: java.lang.IllegalStateException: The current thread cannot be blocked: vert.x-eventloop-thread-8 at io.smallrye.mutiny.operators.UniBlockingAwait.await(UniBlockingAwait.java:29) at io.smallrye.mutiny.groups.UniAwait.atMost(UniAwait.java:61) at io.quarkus.vault.runtime.client.VertxVaultClient.exec(VertxVaultClient.java:472) at io.quarkus.vault.runtime.client.VertxVaultClient.exec(VertxVaultClient.java:457) at io.quarkus.vault.runtime.client.VertxVaultClient.get(VertxVaultClient.java:438) at io.quarkus.vault.runtime.client.VertxVaultClient.lookupSelf(VertxVaultClient.java:213) at io.quarkus.vault.runtime.VaultAuthManager.validate(VaultAuthManager.java:107) at io.quarkus.vault.runtime.VaultAuthManager.login(VaultAuthManager.java:89) at io.quarkus.vault.runtime.VaultAuthManager.login(VaultAuthManager.java:78) at io.quarkus.vault.runtime.VaultAuthManager.getClientToken(VaultAuthManager.java:62) at io.quarkus.vault.runtime.VaultKvManager.readSecret(VaultKvManager.java:32) at io.quarkus.vault.runtime.VaultKvManager_ClientProxy.readSecret(VaultKvManager_ClientProxy.zig:222) at io.quarkus.vault.runtime.config.VaultConfigSource.fetchSecrets(VaultConfigSource.java:85) at io.quarkus.vault.runtime.config.VaultConfigSource.lambda$fetchSecrets$2(VaultConfigSource.java:81) at java.base/java.util.ArrayList.forEach(ArrayList.java:1541) at io.quarkus.vault.runtime.config.VaultConfigSource.fetchSecrets(VaultConfigSource.java:81) at io.quarkus.vault.runtime.config.VaultConfigSource.lambda$getSecretConfig$0(VaultConfigSource.java:65) at java.base/java.util.Optional.ifPresent(Optional.java:183) at io.quarkus.vault.runtime.config.VaultConfigSource.getSecretConfig(VaultConfigSource.java:65) at io.quarkus.vault.runtime.config.VaultConfigSource.getValue(VaultConfigSource.java:51) at io.smallrye.config.ConfigValueConfigSourceWrapper.getConfigValue(ConfigValueConfigSourceWrapper.java:20) at io.smallrye.config.SmallRyeConfigSourceInterceptor.getValue(SmallRyeConfigSourceInterceptor.java:26) at io.smallrye.config.SmallRyeConfigSourceInterceptorContext.proceed(SmallRyeConfigSourceInterceptorContext.java:20) at io.smallrye.config.SmallRyeConfigSourceInterceptor.getValue(SmallRyeConfigSourceInterceptor.java:27) at io.smallrye.config.SmallRyeConfigSourceInterceptorContext.proceed(SmallRyeConfigSourceInterceptorContext.java:20) at io.smallrye.config.SmallRyeConfigSourceInterceptor.getValue(SmallRyeConfigSourceInterceptor.java:27) at io.smallrye.config.SmallRyeConfigSourceInterceptorContext.proceed(SmallRyeConfigSourceInterceptorContext.java:20) at io.smallrye.config.SmallRyeConfigSourceInterceptor.getValue(SmallRyeConfigSourceInterceptor.java:27) at io.smallrye.config.SmallRyeConfigSourceInterceptorContext.proceed(SmallRyeConfigSourceInterceptorContext.java:20) at io.smallrye.config.SecretKeysConfigSourceInterceptor.getValue(SecretKeysConfigSourceInterceptor.java:22) at io.smallrye.config.SmallRyeConfigSourceInterceptorContext.proceed(SmallRyeConfigSourceInterceptorContext.java:20) at io.smallrye.config.ProfileConfigSourceInterceptor.getProfileValue(ProfileConfigSourceInterceptor.java:84) at io.smallrye.config.ProfileConfigSourceInterceptor.getValue(ProfileConfigSourceInterceptor.java:65) at io.smallrye.config.SmallRyeConfigSourceInterceptorContext.proceed(SmallRyeConfigSourceInterceptorContext.java:20) at io.smallrye.config.ExpressionConfigSourceInterceptor.getValue(ExpressionConfigSourceInterceptor.java:26) at io.smallrye.config.ExpressionConfigSourceInterceptor.getValue(ExpressionConfigSourceInterceptor.java:18) at io.smallrye.config.SmallRyeConfigSourceInterceptorContext.proceed(SmallRyeConfigSourceInterceptorContext.java:20) at io.smallrye.config.SmallRyeConfig.getConfigValue(SmallRyeConfig.java:192) at io.smallrye.config.SmallRyeConfig.getValue(SmallRyeConfig.java:149) at io.smallrye.config.SmallRyeConfig.getOptionalValue(SmallRyeConfig.java:209) at org.jboss.resteasy.microprofile.client.DefaultResponseExceptionMapper.handles(DefaultResponseExceptionMapper.java:27) at org.jboss.resteasy.microprofile.client.ExceptionMapping.filter(ExceptionMapping.java:62) at org.jboss.resteasy.client.jaxrs.internal.ClientInvocation.filterResponse(ClientInvocation.java:718) at org.jboss.resteasy.client.jaxrs.internal.ClientInvocation.invoke(ClientInvocation.java:492) at org.jboss.resteasy.client.jaxrs.internal.proxy.ClientInvoker.invokeSync(ClientInvoker.java:149) at org.jboss.resteasy.client.jaxrs.internal.proxy.ClientInvoker.invoke(ClientInvoker.java:112) at org.jboss.resteasy.client.jaxrs.internal.proxy.ClientProxy.invoke(ClientProxy.java:76) at com.sun.proxy.$Proxy77.readUserRoles(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.microprofile.client.ProxyInvocationHandler.invoke(ProxyInvocationHandler.java:147) at com.sun.proxy.$Proxy80.readUserRoles(Unknown Source) at ch.skycell.security.keycloak.SkyMindKeycloakClient_0f71c4ae6073cff1d752acbd9d4726bd23713289_Synthetic_ClientProxy.readUserRoles(SkyMindKeycloakClient_0f71c4ae6073cff1d752acbd9d4726bd23713289_Synthetic_ClientProxy.zig:131) at ch.skycell.security.rolesaugmentor.RolesAugmentor.build(RolesAugmentor.java:41) at ch.skycell.security.rolesaugmentor.RolesAugmentor.augment(RolesAugmentor.java:32) at ch.skycell.security.rolesaugmentor.RolesAugmentor_ClientProxy.augment(RolesAugmentor_ClientProxy.zig:189) at io.quarkus.security.runtime.QuarkusIdentityProviderManagerImpl.handleIdentityFromProvider(QuarkusIdentityProviderManagerImpl.java:167) at io.quarkus.security.runtime.QuarkusIdentityProviderManagerImpl.access$500(QuarkusIdentityProviderManagerImpl.java:30) at io.quarkus.security.runtime.QuarkusIdentityProviderManagerImpl$2.apply(QuarkusIdentityProviderManagerImpl.java:112) at io.quarkus.security.runtime.QuarkusIdentityProviderManagerImpl$2.apply(QuarkusIdentityProviderManagerImpl.java:109) at io.smallrye.mutiny.operators.UniOnItemTransformToUni.invokeAndSubstitute(UniOnItemTransformToUni.java:31) at io.smallrye.mutiny.operators.UniOnItemTransformToUni$2.onItem(UniOnItemTransformToUni.java:74) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$1.lambda$onItem$1(ContextPropagationUniInterceptor.java:31) at io.smallrye.context.impl.wrappers.SlowContextualExecutor.execute(SlowContextualExecutor.java:19) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$1.onItem(ContextPropagationUniInterceptor.java:31) at io.smallrye.mutiny.operators.UniSerializedSubscriber.onItem(UniSerializedSubscriber.java:85) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$1.lambda$onItem$1(ContextPropagationUniInterceptor.java:31) at io.smallrye.context.impl.wrappers.SlowContextualExecutor.execute(SlowContextualExecutor.java:19) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$1.onItem(ContextPropagationUniInterceptor.java:31) at io.smallrye.mutiny.operators.uni.builders.DefaultUniEmitter.complete(DefaultUniEmitter.java:36) at io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator$1.accept(MpJwtValidator.java:54) at io.quarkus.smallrye.jwt.runtime.auth.MpJwtValidator$1.accept(MpJwtValidator.java:49) at io.smallrye.mutiny.operators.uni.builders.UniCreateWithEmitter.subscribing(UniCreateWithEmitter.java:24) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:49) at io.smallrye.mutiny.operators.AbstractUni.subscribe(AbstractUni.java:31) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$2.lambda$subscribing$0(ContextPropagationUniInterceptor.java:47) at io.smallrye.context.impl.wrappers.SlowContextualExecutor.execute(SlowContextualExecutor.java:19) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$2.subscribing(ContextPropagationUniInterceptor.java:47) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:58) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:52) at io.smallrye.mutiny.operators.AbstractUni.subscribe(AbstractUni.java:31) at io.smallrye.mutiny.operators.UniOnItemTransformToUni.subscribing(UniOnItemTransformToUni.java:65) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:49) at io.smallrye.mutiny.operators.AbstractUni.subscribe(AbstractUni.java:31) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$2.lambda$subscribing$0(ContextPropagationUniInterceptor.java:47) at io.smallrye.context.impl.wrappers.SlowContextualExecutor.execute(SlowContextualExecutor.java:19) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$2.subscribing(ContextPropagationUniInterceptor.java:47) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:58) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:52) at io.smallrye.mutiny.operators.AbstractUni.subscribe(AbstractUni.java:31) at io.smallrye.mutiny.operators.UniMemoizeOp.subscribing(UniMemoizeOp.java:70) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:49) at io.smallrye.mutiny.operators.AbstractUni.subscribe(AbstractUni.java:31) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$2.lambda$subscribing$0(ContextPropagationUniInterceptor.java:47) at io.smallrye.context.impl.wrappers.SlowContextualExecutor.execute(SlowContextualExecutor.java:19) at io.smallrye.mutiny.context.ContextPropagationUniInterceptor$2.subscribing(ContextPropagationUniInterceptor.java:47) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:58) at io.smallrye.mutiny.operators.UniSerializedSubscriber.subscribe(UniSerializedSubscriber.java:52) at io.smallrye.mutiny.groups.UniSubscribe.withSubscriber(UniSubscribe.java:50) at io.quarkus.vertx.http.runtime.security.HttpSecurityRecorder$2.handle(HttpSecurityRecorder.java:104) at io.quarkus.vertx.http.runtime.security.HttpSecurityRecorder$2.handle(HttpSecurityRecorder.java:51) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1038) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:137) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:132) at io.quarkus.vertx.http.runtime.cors.CORSFilter.handle(CORSFilter.java:92) at io.quarkus.vertx.http.runtime.cors.CORSFilter.handle(CORSFilter.java:18) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1038) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:137) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:132) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$3.handle(VertxHttpHotReplacementSetup.java:86) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$3.handle(VertxHttpHotReplacementSetup.java:75) at io.vertx.core.impl.ContextImpl.lambda$null$0(ContextImpl.java:327) at io.vertx.core.impl.ContextImpl.executeTask(ContextImpl.java:366) at io.vertx.core.impl.EventLoopContext.lambda$executeAsync$0(EventLoopContext.java:38) at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:164) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:472) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:500) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:989) at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:834) ### Configuration ```properties quarkus.vault.url=http://url quarkus.vault.authentication.userpass.username=user quarkus.vault.authentication.userpass.password=pass quarkus.vault.kv-secret-engine-mount-path=space quarkus.vault.secret-config-kv-path=app ``` ### Quarkus 1.12.2

ff70524e983ea787126bdc797605585f0490f24e

70d565c6f9fb93fc3fe791caca5eba173345d349

https://github.com/quarkusio/quarkus/compare/ff70524e983ea787126bdc797605585f0490f24e...70d565c6f9fb93fc3fe791caca5eba173345d349

diff --git a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java index 439f467bb61..745067cd0e7 100644 --- a/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java +++ b/extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.java @@ -4,6 +4,7 @@ import static java.util.Collections.emptyMap; import static java.util.stream.Collectors.toMap; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -14,6 +15,7 @@ import io.quarkus.arc.Arc; import io.quarkus.vault.VaultKVSecretEngine; +import io.smallrye.mutiny.infrastructure.Infrastructure; public class VaultConfigSource implements ConfigSource { @@ -58,6 +60,11 @@ private Map<String, String> getSecretConfig() { return cacheEntry.getValue(); } + if (!Infrastructure.canCallerThreadBeBlocked()) { + // running in a non blocking thread, best effort to return cached values if any + return cacheEntry != null ? cacheEntry.getValue() : Collections.emptyMap(); + } + Map<String, String> properties = new HashMap<>(); try {

['extensions/vault/runtime/src/main/java/io/quarkus/vault/runtime/config/VaultConfigSource.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/15045/15032

quarkusio

quarkus

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

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

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

fixes

[Bug] Since 1.11.3 problems reading application.yaml

**Describe the bug** Quarkus wants to populate a %prod variable while it is running in %dev 1.11.2 was fine Now with 1.11.3 quarkus wants, that the env variables in %prod are valid while running in %dev **Expected behavior** Ignoring the missing environmental variable **Actual behavior** `Could not expand value mail.pw in property %prod.quarkus.mailer.password"` **To Reproduce** Link to a small reproducer (preferably a Maven project if the issue is not Gradle-specific). Or attach an archive containing the reproducer to the issue. Steps to reproduce the behavior: 1. Executing the application **Configuration** ```properties # Add your application.properties here, if applicable. mp: openapi: scan: disable: true quarkus: datasource: db-kind: postgresql hibernate-orm: database: generation: update http: root-path: /example-interface-v2/api/v2 "%dev": quarkus: datasource: jdbc: url: jdbc:postgresql://localhost:5432/TestDB password: benutzer username: benutzer hibernate-orm: database: generation: update # Duplicated code line to insert 'drop-and-create' if needed to import the import.sql log: min-level: DEBUG console: enable: true format: "%d{HH:mm:ss} %-5p [%c{2.}] (%t) %s%e%n" color: true darken: 1 json: pretty-print: true http: port: 8005 mailer: from: example@example.de host: smtp.example.de password: '' port: 465 ssl: true username: example@example.de "%test": quarkus: datasource: db-kind: h2 jdbc: url: jdbc:h2:mem:test password: example username: example hibernate-orm: database: generation: drop-and-create http: test-port: 8805 "%prod": quarkus: datasource: jdbc: url: jdbc:postgresql://${postgres.uri}:${postgres.port}/${postgres.db} password: ${postgres.password} username: ${postgres.user} http: port: 8082 mailer: from: example@example.de host: smtp.example.de password: ${mail.pw} port: 465 ssl: true username: example@example.de ``` **Screenshots** N/A **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Linux example-linux 5.8.0-43-generic #49~20.04.1-Ubuntu SMP Fri Feb 5 09:57:56 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux` - Output of `java -version`: ``` openjdk version "11.0.10" 2021-01-19 OpenJDK Runtime Environment (build 11.0.10+9-Ubuntu-0ubuntu1.20.04) OpenJDK 64-Bit Server VM (build 11.0.10+9-Ubuntu-0ubuntu1.20.04, mixed mode, sharing) ``` - Quarkus version or git rev: `1.11.3` - Build tool (ie. output of `mvnw --version` or `gradlew --version`): ``` ------------------------------------------------------------ Gradle 6.8 ------------------------------------------------------------ Build time: 2021-01-08 16:38:46 UTC Revision: b7e82460c5373e194fb478a998c4fcfe7da53a7e Kotlin: 1.4.20 Groovy: 2.5.12 Ant: Apache Ant(TM) version 1.10.9 compiled on September 27 2020 JVM: 11.0.10 (Ubuntu 11.0.10+9-Ubuntu-0ubuntu1.20.04) OS: Linux 5.8.0-43-generic amd64 ``` **Additional context** If I remove the %prod section my application runs well in %dev mode Stacktrace ``` { "timestamp": "2021-02-12T11:07:14.032+01:00", "sequence": 7490, "loggerClassName": "org.jboss.logging.Logger", "loggerName": "io.quarkus.runtime.Application", "level": "ERROR", "message": "Failed to start application (with profile dev)", "threadName": "Quarkus Main Thread", "threadId": 94, "mdc": { }, "ndc": "", "hostName": "example-linux", "processName": "example-interface-backend-v2-dev.jar", "processId": 102797, "exception": { "refId": 1, "exceptionType": "java.util.NoSuchElementException", "message": "SRCFG00011: Could not expand value mail.pw in property %prod.quarkus.mailer.password", "frames": [ { "class": "io.smallrye.config.ExpressionConfigSourceInterceptor", "method": "lambda$getValue$0", "line": 44 }, { "class": "io.smallrye.common.expression.ExpressionNode", "method": "emit", "line": 22 }, { "class": "io.smallrye.common.expression.Expression", "method": "evaluateException", "line": 56 }, { "class": "io.smallrye.common.expression.Expression", "method": "evaluate", "line": 70 }, { "class": "io.smallrye.config.ExpressionConfigSourceInterceptor", "method": "getValue", "line": 37 }, { "class": "io.smallrye.config.ExpressionConfigSourceInterceptor", "method": "getValue", "line": 18 }, { "class": "io.smallrye.config.SmallRyeConfigSourceInterceptorContext", "method": "proceed", "line": 20 }, { "class": "io.smallrye.config.SmallRyeConfig", "method": "getConfigValue", "line": 192 }, { "class": "io.quarkus.vertx.http.runtime.devmode.ConfigDescriptionsSupplier", "method": "get", "line": 44 }, { "class": "io.quarkus.vertx.http.runtime.devmode.ConfigDescriptionsSupplier", "method": "get", "line": 13 }, { "class": "io.quarkus.vertx.http.runtime.devmode.DevConsoleRecorder", "method": "addInfo", "line": 37 }, { "class": "io.quarkus.deployment.steps.DevConsoleProcessor$runtimeTemplates-308161071", "method": "deploy_9", "line": 21438 }, { "class": "io.quarkus.deployment.steps.DevConsoleProcessor$runtimeTemplates-308161071", "method": "deploy", "line": 85 }, { "class": "io.quarkus.runner.ApplicationImpl", "method": "doStart", "line": 872 }, { "class": "io.quarkus.runtime.Application", "method": "start", "line": 90 }, { "class": "io.quarkus.runtime.ApplicationLifecycleManager", "method": "run", "line": 97 }, { "class": "io.quarkus.runtime.Quarkus", "method": "run", "line": 66 }, { "class": "io.quarkus.runtime.Quarkus", "method": "run", "line": 42 }, { "class": "io.quarkus.runtime.Quarkus", "method": "run", "line": 119 }, { "class": "io.quarkus.runner.GeneratedMain", "method": "main", "line": 29 }, { "class": "jdk.internal.reflect.NativeMethodAccessorImpl", "method": "invoke0" }, { "class": "jdk.internal.reflect.NativeMethodAccessorImpl", "method": "invoke", "line": 62 }, { "class": "jdk.internal.reflect.DelegatingMethodAccessorImpl", "method": "invoke", "line": 43 }, { "class": "java.lang.reflect.Method", "method": "invoke", "line": 566 }, { "class": "io.quarkus.runner.bootstrap.StartupActionImpl$3", "method": "run", "line": 134 }, { "class": "java.lang.Thread", "method": "run", "line": 834 } ] } } ```

d3c5f118eec2aa81d73350569a3a49d2108308c4

14250e609ee561682cc5519ea56b92b7fb2c85f9

https://github.com/quarkusio/quarkus/compare/d3c5f118eec2aa81d73350569a3a49d2108308c4...14250e609ee561682cc5519ea56b92b7fb2c85f9

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.java index cc78c079960..d2306c581df 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.java @@ -1,5 +1,7 @@ package io.quarkus.vertx.http.runtime.devmode; +import static io.smallrye.config.Expressions.withoutExpansion; + import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -36,13 +38,15 @@ public List<ConfigDescription> get() { } } - for (String propertyName : current.getPropertyNames()) { - if (properties.contains(propertyName)) { - continue; - } + withoutExpansion(() -> { + for (String propertyName : current.getPropertyNames()) { + if (properties.contains(propertyName)) { + continue; + } - configDescriptions.add(new ConfigDescription(propertyName, null, null, current.getConfigValue(propertyName))); - } + configDescriptions.add(new ConfigDescription(propertyName, null, null, current.getConfigValue(propertyName))); + } + }); Collections.sort(configDescriptions); return configDescriptions;

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/devmode/ConfigDescriptionsSupplier.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/15390/15357

quarkusio

quarkus

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

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

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

fixes

RESTEasy Reactive: Chained Sub resources Result in 405 Method not allowed

Describe the bug Trying to access a chain of sub resources results in a 405 method not allowed. This works perfectly on normal resteasy. Expected behavior The sub resources should be located and called Actual behavior a 405 is returned To Reproduce git clone https://github.com/bcluap/quarkus-examples.git cd quarkus-examples/resteasy-reactive mvn clean test Configuration Nothing abnormal Screenshots Run the reproducer to see failures. Change the pom to non-reactive mode and all tests pass Environment (please complete the following information): This is not environment-specific 999-SNAPSHOT and before Additional context The project also includes another unrelated bug - uriinfo.getRequestUri.tostring has the query params duplicated

118293c6ec2f1f9897ba21f269f612eb673f94c5

01284d3d9491d89961da1b8f59e0fab53b75a4fd

https://github.com/quarkusio/quarkus/compare/118293c6ec2f1f9897ba21f269f612eb673f94c5...01284d3d9491d89961da1b8f59e0fab53b75a4fd

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java index 28a8bfc452e..3abf4d6d562 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java @@ -401,6 +401,15 @@ private boolean hasAnnotation(MethodInfo method, short paramPosition, DotName an toScan.add(classInfo); } } + //sub resources can also have just a path annotation + //if they are 'intermediate' sub resources + for (AnnotationInstance instance : index.getAnnotations(ResteasyReactiveDotNames.PATH)) { + if (instance.target().kind() == AnnotationTarget.Kind.METHOD) { + MethodInfo method = instance.target().asMethod(); + ClassInfo classInfo = method.declaringClass(); + toScan.add(classInfo); + } + } while (!toScan.isEmpty()) { ClassInfo classInfo = toScan.poll(); if (scannedResources.containsKey(classInfo.name()) ||

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.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/15576/15571

quarkusio

quarkus

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

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

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

fixes

GraphQL queries returning Collection.class are broken in native mode

Any time I attempt to perform a GraphQL query returning a `Collection<Something>` (it works correctly with `List<Something>`) against Quarkus in native mode, I get this ``` 2021-03-09 10:43:52,601 ERROR [io.sma.graphql] (vert.x-worker-thread-0) SRGQL012000: Data Fetching Error: java.lang.RuntimeException: Can not load class [java.util.Collection] at io.quarkus.smallrye.graphql.runtime.spi.QuarkusClassloadingService.loadClass(QuarkusClassloadingService.java:47) at io.smallrye.graphql.execution.datafetcher.CollectionCreator.newCollection(CollectionCreator.java:27) at io.smallrye.graphql.execution.datafetcher.helper.AbstractHelper.recursiveTransformCollection(AbstractHelper.java:203) at io.smallrye.graphql.execution.datafetcher.helper.AbstractHelper.recursiveTransform(AbstractHelper.java:72) at io.smallrye.graphql.execution.datafetcher.helper.FieldHelper.transformResponse(FieldHelper.java:32) at io.smallrye.graphql.execution.datafetcher.DefaultDataFetcher.invokeAndTransform(DefaultDataFetcher.java:39) at io.smallrye.graphql.execution.datafetcher.AbstractDataFetcher.get(AbstractDataFetcher.java:62) at graphql.execution.ExecutionStrategy.fetchField(ExecutionStrategy.java:270) at graphql.execution.ExecutionStrategy.resolveFieldWithInfo(ExecutionStrategy.java:203) at graphql.execution.AsyncExecutionStrategy.execute(AsyncExecutionStrategy.java:60) at graphql.execution.Execution.executeOperation(Execution.java:165) at graphql.execution.Execution.execute(Execution.java:104) at graphql.GraphQL.execute(GraphQL.java:557) at graphql.GraphQL.parseValidateAndExecute(GraphQL.java:482) at graphql.GraphQL.executeAsync(GraphQL.java:446) at graphql.GraphQL.execute(GraphQL.java:377) at io.smallrye.graphql.execution.ExecutionService.execute(ExecutionService.java:130) at io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLExecutionHandler.doRequest(SmallRyeGraphQLExecutionHandler.java:176) at io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLExecutionHandler.doRequest(SmallRyeGraphQLExecutionHandler.java:169) at io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLExecutionHandler.handlePost(SmallRyeGraphQLExecutionHandler.java:112) at io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLExecutionHandler.doHandle(SmallRyeGraphQLExecutionHandler.java:93) at io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLExecutionHandler.handle(SmallRyeGraphQLExecutionHandler.java:64) at io.quarkus.smallrye.graphql.runtime.SmallRyeGraphQLExecutionHandler.handle(SmallRyeGraphQLExecutionHandler.java:37) at io.vertx.ext.web.impl.BlockingHandlerDecorator.lambda$handle$0(BlockingHandlerDecorator.java:48) at io.vertx.core.impl.ContextImpl.lambda$executeBlocking$2(ContextImpl.java:313) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.lang.Thread.run(Thread.java:834) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:519) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) Caused by: java.security.PrivilegedActionException: java.lang.ClassNotFoundException: java.util.Collection at java.security.AccessController.doPrivileged(AccessController.java:122) at io.quarkus.smallrye.graphql.runtime.spi.QuarkusClassloadingService.loadClass(QuarkusClassloadingService.java:41) ... 30 more Caused by: java.lang.ClassNotFoundException: java.util.Collection at com.oracle.svm.core.hub.ClassForNameSupport.forName(ClassForNameSupport.java:60) at java.lang.Class.forName(DynamicHub.java:1260) at io.smallrye.graphql.spi.ClassloadingService.loadClass(ClassloadingService.java:66) at io.quarkus.smallrye.graphql.runtime.spi.QuarkusClassloadingService.lambda$loadClass$0(QuarkusClassloadingService.java:43) at java.security.AccessController.doPrivileged(AccessController.java:120) ... 31 more ```

4a9153a8e781b23c0fc7a13dc0eee1a57ac84a45

9397de4fc049edd113ed1a3282c96aa9e13e35f6

https://github.com/quarkusio/quarkus/compare/4a9153a8e781b23c0fc7a13dc0eee1a57ac84a45...9397de4fc049edd113ed1a3282c96aa9e13e35f6

diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java index 50a616dc55d..177613933e3 100644 --- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java @@ -268,6 +268,7 @@ private Class[] getGraphQLJavaClasses() { classes.add(graphql.schema.GraphQLSchema.class); classes.add(graphql.schema.GraphQLTypeReference.class); classes.add(List.class); + classes.add(Collection.class); return classes.toArray(new Class[] {}); } diff --git a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java index d5dcd75dab4..e3708cb98a7 100644 --- a/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java +++ b/integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java @@ -2,6 +2,7 @@ import java.time.LocalTime; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.eclipse.microprofile.config.inject.ConfigProperty; @@ -36,6 +37,13 @@ public Greetings load(Greetings greetings) { public List<Greeting> buildInOptions(@Source Greeting greeting) { List<Greeting> options = new ArrayList<>(); options.add(new Hello()); + return options; + } + + @Name("options2") + // make sure that returning Collection.class does not break native mode + public Collection<Greeting> buildInOptionsCollection(@Source Greeting greeting) { + List<Greeting> options = new ArrayList<>(); options.add(new Morning()); return options; } diff --git a/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java b/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java index fb313728f51..9ff8af8a1d9 100644 --- a/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java +++ b/integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.java @@ -22,6 +22,9 @@ void testEndpoint() { " options{\\n" + " message\\n" + " }\\n" + + " options2{\\n" + + " message\\n" + + " }\\n" + " }\\n" + " farewell:farewell{\\n" + " type\\n" +

['integration-tests/smallrye-graphql/src/main/java/io/quarkus/it/smallrye/graphql/GreetingResource.java', 'extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java', 'integration-tests/smallrye-graphql/src/test/java/io/quarkus/it/smallrye/graphql/GreetingResourceTest.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/15564/15448

quarkusio

quarkus

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

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

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

fixes

Kafka Schema Registry with basic authentication not working in native mode

**Describe the bug** When accessing schema registry in **native mode**, the basic authentication is not working and I am getting 401 unauthorized. It works good in the JVM mode In Native mode below properties are not honored. ```properties kafka.basic.auth.credentials.source=USER_INFO kafka.basic.auth.user.info=user:pass ``` stacktrace ```java 2021-03-03 18:43:05,304 ERROR [io.sma.rea.mes.kafka] (vert.x-eventloop-thread-1) SRMSG18206: Unable to write to Kafka from channel movies (topic: movies): org.apache.kafka.common.errors.InvalidConfigurationException: Unauthorized; error code: 401 ``` **Expected behavior** Schema registry with basic authentication works in native mode similar to JVM mode **Configuration** ```properties kafka.bootstrap.servers=somehost.us-east4.gcp.confluent.cloud:9092 kafka.security.protocol=SASL_SSL kafka.sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule \\ required username='secretuser' \\ password='pass'; kafka.sasl.mechanism=PLAIN kafka.acks=all kafka.schema.registry.url=https://someurl.confluent.cloud kafka.basic.auth.credentials.source=USER_INFO kafka.basic.auth.user.info=user:pass mp.messaging.outgoing.movies.connector=smallrye-kafka mp.messaging.outgoing.movies.topic=movies mp.messaging.outgoing.movies.value.serializer=io.confluent.kafka.serializers.KafkaAvroSerializer mp.messaging.outgoing.movies.schema.registry.url=${kafka.schema.registry.url} mp.messaging.outgoing.movies.specific.avro.reader=true mp.messaging.incoming.movies-from-kafka.connector=smallrye-kafka mp.messaging.incoming.movies-from-kafka.topic=movies mp.messaging.incoming.movies-from-kafka.value.deserializer=io.confluent.kafka.serializers.KafkaAvroDeserializer mp.messaging.incoming.movies-from-kafka.auto.offset.reset=earliest mp.messaging.incoming.movies-from-kafka.enable.auto.commit=false mp.messaging.incoming.movies-from-kafka.group.id=movies mp.messaging.incoming.movies-from-kafka.schema.registry.url=${kafka.schema.registry.url} mp.messaging.incoming.movies-from-kafka.specific.avro.reader=true ``` **Screenshots** (If applicable, add screenshots to help explain your problem.) **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux x64 - Output of `java -version`: Java 11 - GraalVM version (if different from Java): - Quarkus version or git rev: 1.12.0.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): mvnw **Additional context** (Add any other context about the problem here.)

557d96cedfbd8b8f7117c3bb74d650822f705b89

9a63be3aebfa1e1c6445f20f911a3cfe899568cd

https://github.com/quarkusio/quarkus/compare/557d96cedfbd8b8f7117c3bb74d650822f705b89...9a63be3aebfa1e1c6445f20f911a3cfe899568cd

diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java index 52886b8f806..93a0b67886b 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java @@ -62,6 +62,7 @@ import io.quarkus.deployment.builditem.nativeimage.NativeImageResourceBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem; import io.quarkus.deployment.pkg.NativeConfig; import io.quarkus.kafka.client.runtime.KafkaRecorder; import io.quarkus.kafka.client.runtime.KafkaRuntimeConfigProducer; @@ -117,6 +118,7 @@ void contributeClassesToIndex(BuildProducer<AdditionalIndexedClassesBuildItem> a public void build( KafkaBuildTimeConfig config, CombinedIndexBuildItem indexBuildItem, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, + BuildProducer<ServiceProviderBuildItem> serviceProviders, BuildProducer<NativeImageProxyDefinitionBuildItem> proxies, Capabilities capabilities, BuildProducer<UnremovableBeanBuildItem> beans, BuildProducer<NativeImageResourceBuildItem> nativeLibs, NativeConfig nativeConfig) { @@ -172,7 +174,7 @@ public void build( reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, "java.nio.DirectByteBuffer")); reflectiveClass.produce(new ReflectiveClassBuildItem(true, false, "sun.misc.Cleaner")); - handleAvro(reflectiveClass, proxies); + handleAvro(reflectiveClass, proxies, serviceProviders); handleOpenTracing(reflectiveClass, capabilities); handleStrimziOAuth(reflectiveClass); if (config.snappyEnabled) { @@ -253,7 +255,8 @@ private void handleStrimziOAuth(BuildProducer<ReflectiveClassBuildItem> reflecti } private void handleAvro(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, - BuildProducer<NativeImageProxyDefinitionBuildItem> proxies) { + BuildProducer<NativeImageProxyDefinitionBuildItem> proxies, + BuildProducer<ServiceProviderBuildItem> serviceProviders) { // Avro - for both Confluent and Apicurio try { Class.forName("io.confluent.kafka.serializers.KafkaAvroDeserializer", false, @@ -292,6 +295,18 @@ private void handleAvro(BuildProducer<ReflectiveClassBuildItem> reflectiveClass, //ignore, Confluent Avro is not in the classpath } + try { + Class.forName("io.confluent.kafka.schemaregistry.client.security.basicauth.BasicAuthCredentialProvider", false, + Thread.currentThread().getContextClassLoader()); + serviceProviders + .produce(new ServiceProviderBuildItem( + "io.confluent.kafka.schemaregistry.client.security.basicauth.BasicAuthCredentialProvider", + "io.confluent.kafka.schemaregistry.client.security.basicauth.SaslBasicAuthCredentialProvider", + "io.confluent.kafka.schemaregistry.client.security.basicauth.UrlBasicAuthCredentialProvider", + "io.confluent.kafka.schemaregistry.client.security.basicauth.UserInfoCredentialProvider")); + } catch (ClassNotFoundException e) { + // ignore, Confluent schema registry client not in the classpath + } try { Class.forName("io.apicurio.registry.utils.serde.AvroKafkaDeserializer", false, Thread.currentThread().getContextClassLoader());

['extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/KafkaProcessor.java']

{'.java': 1}

Java

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

Apache License 2.0

quarkusio/quarkus/15554/15551

quarkusio

quarkus

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

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

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

fix

Missing description for generated health OpenAPI responses

**Describe the bug** According to the validator https://apitools.dev/swagger-parser/online/ (and also that in the Azure API Management) the OpenAPI definition generated by the Quarkus Health extension are invalid. The API responses don't have any description. **Expected behavior** The individual API responses should each have their description. Like in this extract: ```yaml get: tags: - MicroProfile Health summary: An aggregated view of the Liveness and Readiness of this application description: Check the health of the application operationId: microprofile_health_root responses: "200": description: OK content: application/json: schema: $ref: '#/components/schemas/HealthCheckResponse' "503": description: Service Unavailable content: application/json: schema: $ref: '#/components/schemas/HealthCheckResponse' "500": description: Internal Error content: application/json: schema: $ref: '#/components/schemas/HealthCheckResponse' ``` **Actual behavior** Here is an extract of what gets generated: ```yaml get: tags: - MicroProfile Health summary: An aggregated view of the Liveness and Readiness of this application description: Check the health of the application operationId: microprofile_health_root responses: "200": content: application/json: schema: $ref: '#/components/schemas/HealthCheckResponse' "503": content: application/json: schema: $ref: '#/components/schemas/HealthCheckResponse' "500": content: application/json: schema: $ref: '#/components/schemas/HealthCheckResponse' ``` **To Reproduce** Create a project including the OpenAPI and Health extensions. **Configuration** ```properties quarkus.health.openapi.included=true ``` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: - Output of `java -version`: - GraalVM version (if different from Java): - Quarkus version or git rev: - Build tool (ie. output of `mvnw --version` or `gradlew --version`): **Additional context** To be honest I have not yet checked the specs myself, but since two tools reported errors I was assuming that they are correct.

e3f44c069c60c556ea32c5a773f6cd574c032075

8d3352559105da08d62100598be211ccb7bed668

https://github.com/quarkusio/quarkus/compare/e3f44c069c60c556ea32c5a773f6cd574c032075...8d3352559105da08d62100598be211ccb7bed668

diff --git a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.java b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.java index de652acb153..96051e54fbc 100644 --- a/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.java +++ b/extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.java @@ -125,14 +125,15 @@ private Operation createReadinessOperation() { private APIResponses createAPIResponses() { APIResponses responses = new APIResponsesImpl(); - responses.addAPIResponse("200", createAPIResponse()); - responses.addAPIResponse("503", createAPIResponse()); - responses.addAPIResponse("500", createAPIResponse()); + responses.addAPIResponse("200", createAPIResponse("OK")); + responses.addAPIResponse("503", createAPIResponse("Service Unavailable")); + responses.addAPIResponse("500", createAPIResponse("Internal Server Error")); return responses; } - private APIResponse createAPIResponse() { + private APIResponse createAPIResponse(String description) { APIResponse response = new APIResponseImpl(); + response.setDescription(description); response.setContent(createContent()); return response; }

['extensions/smallrye-health/deployment/src/main/java/io/quarkus/smallrye/health/deployment/HealthOpenAPIFilter.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/15508/15487

quarkusio

quarkus

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

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

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

fixes

OpenShift plugin not deploying the Quarkus App (Regression Issue)

**Describe the bug** This is a regression issue caused by this commit: https://github.com/quarkusio/quarkus/commit/588db63138715a4e1e2a112676ab9ece2fab36ca When using the OpenShift Quarkus extension to deploy our Quarkus app: ``` mvn package -Dquarkus.kubernetes.deploy=true ``` Then, the BuildConfig and the Build are triggered in OpenShift and when the Build instance finished, It's deleted (see the commit changes). Then, the DeploymentConfig does not trigger the application startup spite of the image stream is there. For some reason, the DeploymentConfig depends on the build instance to not be deleted. After reverting the changes in https://github.com/quarkusio/quarkus/commit/588db63138715a4e1e2a112676ab9ece2fab36ca, the Build instance is not deleted and hence everything works fine. **To Reproduce** For your Quarkus application: ``` mvn package -Dquarkus.kubernetes.deploy=true ``` The application will not be deployed into OpenShift. The same works for 1.12.0.Final and also by reverting the commit: https://github.com/quarkusio/quarkus/commit/588db63138715a4e1e2a112676ab9ece2fab36ca **Environment (please complete the following information):** - OpenShift: 4.6 - Quarkus version or git rev: 1.12.1.Final, 999-SNAPSHOT **Additional context** (Add any other context about the problem here.)

c315109f97b0698443ab949fe864bc8cb53c1838

6b7bf736e3d0241393aec9e862c3bb5750f3ff46

https://github.com/quarkusio/quarkus/compare/c315109f97b0698443ab949fe864bc8cb53c1838...6b7bf736e3d0241393aec9e862c3bb5750f3ff46

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java index 00515e0b537..59f0bc43ac1 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java @@ -1,6 +1,7 @@ package io.quarkus.kubernetes.deployment; +import static io.quarkus.kubernetes.deployment.Constants.KNATIVE; import static io.quarkus.kubernetes.deployment.Constants.KUBERNETES; import static io.quarkus.kubernetes.deployment.Constants.MINIKUBE; import static io.quarkus.kubernetes.deployment.Constants.OPENSHIFT; @@ -174,7 +175,11 @@ private DeploymentResultBuildItem deploy(DeploymentTargetEntry deploymentTarget, try (FileInputStream fis = new FileInputStream(manifest)) { KubernetesList list = Serialization.unmarshalAsList(fis); distinct(list.getItems()).forEach(i -> { - client.resource(i).inNamespace(namespace).deletingExisting().createOrReplace(); + if (KNATIVE.equals(deploymentTarget.getName().toLowerCase())) { + client.resource(i).inNamespace(namespace).deletingExisting().createOrReplace(); + } else { + client.resource(i).inNamespace(namespace).createOrReplace(); + } log.info("Applied: " + i.getKind() + " " + i.getMetadata().getName() + "."); });

['extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesDeployer.java']

{'.java': 1}

Java

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

Apache License 2.0

quarkusio/quarkus/15446/15440

quarkusio

quarkus

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

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

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

fixes

OIDC Client stopped working and fails with 500 Internal Server

**Describe the bug** Having this configuration: ``` # Security quarkus.oidc.auth-server-url=http://localhost:8180/auth/realms/test-realm quarkus.oidc.client-id=test-application-client quarkus.oidc.credentials.secret=test-application-client-secret quarkus.http.auth.permission.authenticated.paths=/* quarkus.http.auth.permission.authenticated.policy=authenticated org.eclipse.microprofile.rest.client.propagateHeaders=Authorization # OIDC Client Configuration quarkus.oidc-client.auth-server-url=http://localhost:8180/auth/realms/test-realm quarkus.oidc-client.client-id=test-application-client quarkus.oidc-client.credentials.secret=test-application-client-secret ``` And this REALM configuration for Keycloak: ``` "clients": [ { "clientId": "test-application-client", "enabled": true, "protocol": "openid-connect", "standardFlowEnabled": true, "implicitFlowEnabled": false, "directAccessGrantsEnabled": true, "serviceAccountsEnabled": true, "clientAuthenticatorType": "client-secret", "secret": "test-application-client-secret", "redirectUris": [ "*" ] } ``` When running our application, it fails with the next exception: ``` 2021-03-03 15:34:06,728 ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] (vert.x-eventloop-thread-14) HTTP Request to /rest-pong failed, error id: b24d56d4-cfff-46e3-95e2-b9739e981896-5: io.vertx.core.VertxException: Invalid url: null at io.vertx.ext.web.client.impl.WebClientBase.requestAbs(WebClientBase.java:256) at io.vertx.ext.web.client.impl.WebClientBase.requestAbs(WebClientBase.java:246) at io.vertx.ext.web.client.impl.WebClientBase.postAbs(WebClientBase.java:176) at io.vertx.mutiny.ext.web.client.WebClient.postAbs(WebClient.java:334) at io.quarkus.oidc.runtime.OidcProviderClient.getHttpResponse(OidcProviderClient.java:95) at io.quarkus.oidc.runtime.OidcProviderClient.introspectToken(OidcProviderClient.java:63) at io.quarkus.oidc.runtime.OidcProvider.introspectToken(OidcProvider.java:115) at io.quarkus.oidc.runtime.OidcIdentityProvider.introspectTokenUni(OidcIdentityProvider.java:275) at io.quarkus.oidc.runtime.OidcIdentityProvider.verifyTokenUni(OidcIdentityProvider.java:251) at io.quarkus.oidc.runtime.OidcIdentityProvider.createSecurityIdentityWithOidcServer(OidcIdentityProvider.java:122) at io.quarkus.oidc.runtime.OidcIdentityProvider.access$200(OidcIdentityProvider.java:34) at io.quarkus.oidc.runtime.OidcIdentityProvider$3.apply(OidcIdentityProvider.java:115) at io.quarkus.oidc.runtime.OidcIdentityProvider$3.apply(OidcIdentityProvider.java:109) ``` Our project was working fine before these changes were merged: https://github.com/quarkusio/quarkus/pull/14953. So, this is a regression issue. **To Reproduce** 1- git clone https://github.com/quarkus-qe/beefy-scenarios 2- cd beefy-scenarios/013-quarkus-oidc-restclient 4- mvn clean install (it needs to have built quarkus master locally) **Environment (please complete the following information):** - Quarkus version or git rev: 999-SNAPSHOT

b6fd09a619a24fedd23101d972643e7018bc7cf6

c37df00b056234d809b8eec9a30f8a3453b149c5

https://github.com/quarkusio/quarkus/compare/b6fd09a619a24fedd23101d972643e7018bc7cf6...c37df00b056234d809b8eec9a30f8a3453b149c5

diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java index e77d507217a..00c6aa56c18 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java @@ -3,6 +3,14 @@ import io.vertx.core.json.JsonObject; public class OidcConfigurationMetadata { + private static final String ISSUER = "issuer"; + private static final String TOKEN_ENDPOINT = "token_endpoint"; + private static final String INTROSPECTION_ENDPOINT = "introspection_endpoint"; + private static final String AUTHORIZATION_ENDPOINT = "authorization_endpoint"; + private static final String JWKS_ENDPOINT = "jwks_uri"; + private static final String USERINFO_ENDPOINT = "userinfo_endpoint"; + private static final String END_SESSION_ENDPOINT = "end_session_endpoint"; + private final String tokenUri; private final String introspectionUri; private final String authorizationUri; @@ -28,13 +36,13 @@ public OidcConfigurationMetadata(String tokenUri, } public OidcConfigurationMetadata(JsonObject wellKnownConfig) { - this.tokenUri = wellKnownConfig.getString("token_endpoint"); - this.introspectionUri = wellKnownConfig.getString("token_introspection_endpoint"); - this.authorizationUri = wellKnownConfig.getString("authorization_endpoint"); - this.jsonWebKeySetUri = wellKnownConfig.getString("jwks_uri"); - this.userInfoUri = wellKnownConfig.getString("userinfo_endpoint"); - this.endSessionUri = wellKnownConfig.getString("end_session_endpoint"); - this.issuer = wellKnownConfig.getString("issuer"); + this.tokenUri = wellKnownConfig.getString(TOKEN_ENDPOINT); + this.introspectionUri = wellKnownConfig.getString(INTROSPECTION_ENDPOINT); + this.authorizationUri = wellKnownConfig.getString(AUTHORIZATION_ENDPOINT); + this.jsonWebKeySetUri = wellKnownConfig.getString(JWKS_ENDPOINT); + this.userInfoUri = wellKnownConfig.getString(USERINFO_ENDPOINT); + this.endSessionUri = wellKnownConfig.getString(END_SESSION_ENDPOINT); + this.issuer = wellKnownConfig.getString(ISSUER); } public String getTokenUri() { diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java index ed943b65899..038ff30a244 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java @@ -141,10 +141,10 @@ public Uni<SecurityIdentity> apply(TokenVerificationResult result, Throwable t) tokenJson = OidcUtils.decodeJwtContent(tokenCred.getToken()); } if (tokenJson != null) { - OidcUtils.validatePrimaryJwtTokenType(resolvedContext.oidcConfig.token, tokenJson); - JsonObject rolesJson = getRolesJson(vertxContext, resolvedContext, tokenCred, tokenJson, - userInfo); try { + OidcUtils.validatePrimaryJwtTokenType(resolvedContext.oidcConfig.token, tokenJson); + JsonObject rolesJson = getRolesJson(vertxContext, resolvedContext, tokenCred, tokenJson, + userInfo); SecurityIdentity securityIdentity = validateAndCreateIdentity(vertxContext, tokenCred, resolvedContext.oidcConfig, tokenJson, rolesJson, userInfo); @@ -154,7 +154,7 @@ public Uni<SecurityIdentity> apply(TokenVerificationResult result, Throwable t) return Uni.createFrom().item(securityIdentity); } } catch (Throwable ex) { - return Uni.createFrom().failure(ex); + return Uni.createFrom().failure(new AuthenticationFailedException(ex)); } } else if (tokenCred instanceof IdTokenCredential || tokenCred instanceof AccessTokenCredential diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java index 2c1d2c69ea9..e6bb891ba32 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java @@ -160,10 +160,6 @@ private Uni<TenantConfigContext> createTenantContext(Vertx vertx, OidcTenantConf } } - final long connectionRetryCount = OidcCommonUtils.getConnectionRetryCount(oidcConfig); - if (connectionRetryCount > 1) { - LOG.infof("Connecting to IDP for up to %d times every 2 seconds", connectionRetryCount); - } return createOidcProvider(oidcConfig, tlsConfig, vertx) .onItem().transform(p -> new TenantConfigContext(p, oidcConfig)); } diff --git a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java index 9bd0f16d2a0..0d4b3e0b263 100644 --- a/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java +++ b/integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java @@ -41,7 +41,7 @@ public String discovery() { final String baseUri = ui.getBaseUriBuilder().path("oidc").build().toString(); return "{" + " \\"token_endpoint\\":" + "\\"" + baseUri + "/token\\"," + - " \\"token_introspection_endpoint\\":" + "\\"" + baseUri + "/introspect\\"," + + " \\"introspection_endpoint\\":" + "\\"" + baseUri + "/introspect\\"," + " \\"jwks_uri\\":" + "\\"" + baseUri + "/jwks\\"" + " }"; } diff --git a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.java b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.java index 405bcfdceba..a1eda7a792c 100644 --- a/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.java +++ b/integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.java @@ -41,7 +41,7 @@ public Map<String, String> start() { .withBody("{\\n" + " \\"jwks_uri\\": \\"" + server.baseUrl() + "/auth/realms/quarkus/protocol/openid-connect/certs\\",\\n" + - " \\"token_introspection_endpoint\\": \\"" + server.baseUrl() + " \\"introspection_endpoint\\": \\"" + server.baseUrl() + "/auth/realms/quarkus/protocol/openid-connect/token/introspect\\",\\n" + "\\"issuer\\" : \\"https://server.example.com\\"" + "}"))); diff --git a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java index a6e266bddf5..b5a88e6f758 100644 --- a/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java +++ b/integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java @@ -133,13 +133,21 @@ public void testDeniedAccessAdminResource() { } @Test - public void testDeniedNoBearerToken() { + public void testVerificationFailedNoBearerToken() { RestAssured.given() .when().get("/api/users/me").then() .statusCode(401); } + @Test + public void testVerificationFailedInvalidToken() { + RestAssured.given().auth().oauth2("123") + .when().get("/api/users/me").then() + .statusCode(401); + } + //see https://github.com/quarkusio/quarkus/issues/5809 + @Test @RepeatedTest(20) public void testOidcAndVertxHandler() { RestAssured.given().auth().oauth2(getAccessToken("alice"))

['extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcConfigurationMetadata.java', 'integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java', 'integration-tests/oidc-tenancy/src/main/java/io/quarkus/it/keycloak/OidcResource.java', 'extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcIdentityProvider.java', 'extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java', 'integration-tests/oidc-wiremock/src/test/java/io/quarkus/it/keycloak/KeycloakTestResource.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/15412/12355

quarkusio

quarkus

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

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

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

resolves

NullPointerException when rendering Qute templates as XML

**Describe the bug** ``` Caused by: java.lang.NullPointerException at io.quarkus.qute.runtime.TemplateProducer$InjectableTemplateInstanceImpl.templateInstance(TemplateProducer.java:168) at io.quarkus.qute.runtime.TemplateProducer$InjectableTemplateInstanceImpl.render(TemplateProducer.java:149) at micro.apps.greeting.GreetingResource.hello(GreetingResource.java:30) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:167) at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:130) at org.jboss.resteasy.core.ResourceMethodInvoker.internalInvokeOnTarget(ResourceMethodInvoker.java:638) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTargetAfterFilter(ResourceMethodInvoker.java:504) at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invokeOnTarget$2(ResourceMethodInvoker.java:454) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:364) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTarget(ResourceMethodInvoker.java:456) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:417) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:391) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:68) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:488) ... 20 more ``` **Expected behavior** Render the template **Actual behavior** NullPointerException is thrown **To Reproduce** [greeting-quarkus.zip](https://github.com/quarkusio/quarkus/files/5286885/greeting-quarkus.zip) Steps to reproduce the behavior: 1. Run `mvn quarkus:dev` in the attached project above 2. `curl http://localhost:8080/greeting` and you should see the error **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Fedora 32 - Output of `java -version`: 11 - GraalVM version (if different from Java): Not used - Quarkus version or git rev: 1.8.1.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): ``` Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /home/linuxbrew/.linuxbrew/Cellar/maven/3.6.3/libexec Java version: 11.0.8, vendor: N/A, runtime: /home/ggastald/.sdkman/candidates/java/11.0.8-open Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "5.8.7-200.fc32.x86_64", arch: "amd64", family: "unix" ```

172446c920decdf3fc32f03613a486fa63b20c35

2c14a4f97e333532a896eb2e1879444489cd4c1f

https://github.com/quarkusio/quarkus/compare/172446c920decdf3fc32f03613a486fa63b20c35...2c14a4f97e333532a896eb2e1879444489cd4c1f

diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java index ae0c4a11281..1b642f5e560 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.java @@ -84,6 +84,7 @@ import io.quarkus.devconsole.spi.DevConsoleRouteBuildItem; import io.quarkus.gizmo.ClassOutput; import io.quarkus.panache.common.deployment.PanacheEntityClassesBuildItem; +import io.quarkus.qute.CheckedTemplate; import io.quarkus.qute.Engine; import io.quarkus.qute.EngineBuilder; import io.quarkus.qute.Expression; @@ -104,7 +105,6 @@ import io.quarkus.qute.UserTagSectionHelper; import io.quarkus.qute.Variant; import io.quarkus.qute.WhenSectionHelper; -import io.quarkus.qute.api.CheckedTemplate; import io.quarkus.qute.api.ResourcePath; import io.quarkus.qute.deployment.TemplatesAnalysisBuildItem.TemplateAnalysis; import io.quarkus.qute.deployment.TypeCheckExcludeBuildItem.TypeCheck; @@ -212,10 +212,11 @@ AdditionalBeanBuildItem additionalBeans() { } @BuildStep - List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem index, + List<CheckedTemplateBuildItem> collectCheckedTemplates(BeanArchiveIndexBuildItem index, BuildProducer<BytecodeTransformerBuildItem> transformers, List<TemplatePathBuildItem> templatePaths, - List<CheckedTemplateAdapterBuildItem> templateAdaptorBuildItems) { + List<CheckedTemplateAdapterBuildItem> templateAdaptorBuildItems, + QuteConfig config) { List<CheckedTemplateBuildItem> ret = new ArrayList<>(); Map<DotName, CheckedTemplateAdapter> adaptors = new HashMap<>(); @@ -246,6 +247,20 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem checkedTemplateAnnotations.addAll(index.getIndex().getAnnotations(Names.CHECKED_TEMPLATE_OLD)); checkedTemplateAnnotations.addAll(index.getIndex().getAnnotations(Names.CHECKED_TEMPLATE)); + // Build a set of file paths for validation + Set<String> filePaths = new HashSet<String>(); + for (TemplatePathBuildItem templatePath : templatePaths) { + String path = templatePath.getPath(); + filePaths.add(path); + // Also add version without suffix from the path + // For example for "items.html" also add "items" + for (String suffix : config.suffixes) { + if (path.endsWith(suffix)) { + filePaths.add(path.substring(0, path.length() - (suffix.length() + 1))); + } + } + } + for (AnnotationInstance annotation : checkedTemplateAnnotations) { if (annotation.target().kind() != Kind.CLASS) { continue; @@ -293,7 +308,23 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem templatePath, methodInfo.declaringClass().name(), methodInfo, checkedTemplateMethod.declaringClass().name(), checkedTemplateMethod)); } - checkTemplatePath(templatePath, templatePaths, classInfo, methodInfo); + if (!filePaths.contains(templatePath)) { + List<String> startsWith = new ArrayList<>(); + for (String filePath : filePaths) { + if (filePath.startsWith(templatePath)) { + startsWith.add(filePath); + } + } + if (startsWith.isEmpty()) { + throw new TemplateException( + "No template matching the path " + templatePath + " could be found for: " + + classInfo.name() + "." + methodInfo.name()); + } else { + throw new TemplateException( + startsWith + " match the path " + templatePath + + " but the file suffix is not configured via the quarkus.qute.suffixes property"); + } + } Map<String, String> bindings = new HashMap<>(); List<Type> parameters = methodInfo.parameters(); @@ -318,26 +349,6 @@ List<CheckedTemplateBuildItem> collectTemplateTypeInfo(BeanArchiveIndexBuildItem return ret; } - private void checkTemplatePath(String templatePath, List<TemplatePathBuildItem> templatePaths, ClassInfo enclosingClass, - MethodInfo methodInfo) { - for (TemplatePathBuildItem templatePathBuildItem : templatePaths) { - // perfect match - if (templatePathBuildItem.getPath().equals(templatePath)) { - return; - } - // if our templatePath is "Foo/hello", make it match "Foo/hello.txt" - // if they're not equal and they start with our path, there must be something left after - if (templatePathBuildItem.getPath().startsWith(templatePath) - // check that we have an extension, let variant matching work later - && templatePathBuildItem.getPath().charAt(templatePath.length()) == '.') { - return; - } - } - throw new TemplateException( - "Declared template " + templatePath + " could not be found. Either add it or delete its declaration in " - + enclosingClass.name().toString('.') + "." + methodInfo.name()); - } - @BuildStep TemplatesAnalysisBuildItem analyzeTemplates(List<TemplatePathBuildItem> templatePaths, List<CheckedTemplateBuildItem> checkedTemplates, List<MessageBundleMethodBuildItem> messageBundleMethods) { @@ -1054,7 +1065,8 @@ void validateTemplateInjectionPoints(QuteConfig config, List<TemplatePathBuildIt if (name != null) { // For "@Inject Template items" we try to match "items" // For "@Location("github/pulls") Template pulls" we try to match "github/pulls" - if (filePaths.stream().noneMatch(path -> path.endsWith(name))) { + // For "@Location("foo/bar/baz.txt") Template baz" we try to match "foo/bar/baz.txt" + if (!filePaths.contains(name)) { validationErrors.produce(new ValidationErrorBuildItem( new TemplateException("No template found for " + injectionPoint.getTargetInfo()))); } diff --git a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java index 99e063bafd4..f6cf3a3dbba 100644 --- a/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java +++ b/extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java @@ -1,11 +1,13 @@ package io.quarkus.qute.resteasy.deployment; +import static org.junit.jupiter.api.Assertions.fail; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.wildfly.common.Assert; +import io.quarkus.qute.TemplateException; import io.quarkus.test.QuarkusUnitTest; public class MissingTemplateTest { @@ -15,13 +17,10 @@ public class MissingTemplateTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClass(MissingTemplateResource.class) .addAsResource("templates/MissingTemplateResource/hello.txt")) - .assertException(t -> { - t.printStackTrace(); - Assert.assertTrue(t.getMessage().contains( - "Declared template MissingTemplateResource/missingTemplate could not be found. Either add it or delete its declaration in io.quarkus.qute.resteasy.deployment.MissingTemplateResource$Templates.missingTemplate")); - }); + .setExpectedException(TemplateException.class); @Test public void emptyTest() { + fail(); } } diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java index d9f8ad56ebd..c17fda7ce45 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java @@ -1,11 +1,13 @@ package io.quarkus.resteasy.reactive.qute.deployment; +import static org.junit.jupiter.api.Assertions.fail; + import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import org.wildfly.common.Assert; +import io.quarkus.qute.TemplateException; import io.quarkus.test.QuarkusUnitTest; public class MissingTemplateTest { @@ -15,13 +17,10 @@ public class MissingTemplateTest { .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) .addClass(MissingTemplateResource.class) .addAsResource("templates/MissingTemplateResource/hello.txt")) - .assertException(t -> { - t.printStackTrace(); - Assert.assertTrue(t.getMessage().contains( - "Declared template MissingTemplateResource/missingTemplate could not be found. Either add it or delete its declaration in io.quarkus.resteasy.reactive.qute.deployment.MissingTemplateResource$Templates.missingTemplate")); - }); + .setExpectedException(TemplateException.class); @Test public void emptyTest() { + fail(); } }

['extensions/resteasy-qute/deployment/src/test/java/io/quarkus/qute/resteasy/deployment/MissingTemplateTest.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/deployment/src/test/java/io/quarkus/resteasy/reactive/qute/deployment/MissingTemplateTest.java', 'extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.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/15396/15389

quarkusio

quarkus

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

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

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

fixes

ENVs required in prod profile break dev profile but only when using the built artifact

**Describe the bug** Quarkus tries to resolve ENVs for profiles which are not active. This breaks other profiles. This only happens with the built jar. It works fine with the `quarkus:dev` plugin. Example: Empty Quarkus project with `%prod.quarkus.http.port=${HTTP_PORT}` as the only configuration in `application.properties` breaks every other profile when running from jar if `HTTP_PORT` is not exported. **Expected behavior** If `HTTP_PORT` is not set application should start fine with any profile but `prod`. `HTTP_PORT` is only required in `prod`. **Actual behavior** Quarkus tries to resolve `HTTP_PORT` regardless of the active profile and fails to start. ``` QUARKUS_PROFILE=foo java -jar target/quarkus-app/quarkus-run.jar One or more configuration errors have prevented the application from starting. The errors are: - SRCFG00011: Could not expand value HTTP_PORT in property quarkus.http.port ``` **To Reproduce** https://github.com/atamanroman/quarkus-profile-dev-prod-repro Steps to reproduce here: https://github.com/atamanroman/quarkus-profile-dev-prod-repro/blob/main/README.md **Additional context** This issue was opened after discussion in [this zulip thread](https://quarkusio.zulipchat.com/#narrow/stream/187030-users/topic/ENVs.20required.20in.20prod.20profile.20break.20dev).

dad1c1118f47c9c2bf9c4fdb55c90fef4a7bdcde

8d85f2299f4b0565fee348bed5bba5a711032a1e

https://github.com/quarkusio/quarkus/compare/dad1c1118f47c9c2bf9c4fdb55c90fef4a7bdcde...8d85f2299f4b0565fee348bed5bba5a711032a1e

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java index 109885691ee..48572a88c31 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java @@ -296,7 +296,7 @@ ReadResult run() { nameBuilder.setLength(len); } // sweep-up - for (String propertyName : config.getPropertyNames()) { + for (String propertyName : getAllProperties()) { if (propertyName.equals(ConfigSource.CONFIG_ORDINAL)) { continue; } @@ -718,6 +718,19 @@ private Converter<?> getConverter(SmallRyeConfig config, Field field, ConverterT convByType.put(valueType, converter); return converter; } + + /** + * We collect all properties from ConfigSources, because Config#getPropertyNames exclude the active profiled + * properties, meaning that the property is written in the default config source unprofiled. This may cause + * issues if we run with a different profile and fallback to defaults. + */ + private Set<String> getAllProperties() { + Set<String> properties = new HashSet<>(); + for (ConfigSource configSource : config.getConfigSources()) { + properties.addAll(configSource.getPropertyNames()); + } + return properties; + } } public static final class ReadResult { diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValues.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValuesTest.java similarity index 63% rename from extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValues.java rename to extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValuesTest.java index 9de4efe466e..b37b7083c23 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValues.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValuesTest.java @@ -15,12 +15,17 @@ import io.quarkus.test.QuarkusUnitTest; -public class ConfigDefaultValues { +public class ConfigDefaultValuesTest { @RegisterExtension static final QuarkusUnitTest TEST = new QuarkusUnitTest() .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) - .addAsResource(new StringAsset("config_ordinal=1000\\n" + - "my.prop=1234\\n"), "application.properties")); + .addAsResource(new StringAsset( + "config_ordinal=1000\\n" + + "my.prop=1234\\n" + + "%prod.my.prop=1234\\n" + + "%dev.my.prop=5678\\n" + + "%test.my.prop=1234"), + "application.properties")); @Inject Config config; @@ -38,6 +43,17 @@ void configDefaultValues() { assertEquals("1234", applicationProperties.getValue("my.prop")); } + @Test + void profileDefaultValues() { + ConfigSource defaultValues = getConfigSourceByName("PropertiesConfigSource[source=Specified default values]"); + assertNotNull(defaultValues); + assertEquals("1234", defaultValues.getValue("my.prop")); + assertEquals("1234", defaultValues.getValue("%prod.my.prop")); + assertEquals("5678", defaultValues.getValue("%dev.my.prop")); + assertEquals("1234", defaultValues.getValue("%test.my.prop")); + assertEquals("1234", config.getValue("my.prop", String.class)); + } + private ConfigSource getConfigSourceByName(String name) { for (ConfigSource configSource : config.getConfigSources()) { if (configSource.getName().contains(name)) {

['core/deployment/src/main/java/io/quarkus/deployment/configuration/BuildTimeConfigurationReader.java', 'extensions/arc/deployment/src/test/java/io/quarkus/arc/test/config/ConfigDefaultValues.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/15942/15852

quarkusio

quarkus

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

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

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

fixes

RESTEasy Reactive: UniInvoker signatures are wrong

Due to how we implement it, all its return types are `Uni<?>` instead of the more useful `Uni<R>` for methods like `<R> get(Class<R>)`, forcing users to cast the return types to the right type: ```java UniInvoker invocation = target.request().rx(UniInvoker.class); Uni<String> ret = (Uni<String>) invocation.get(String.class); ``` This is because we implemented it with: ```java public class UniInvoker extends AbstractRxInvoker<Uni<?>> {} ... public abstract class AbstractRxInvoker<T> implements RxInvoker<T> { @Override public <R> T get(Class<R> responseType) { return method("GET", responseType); } } ``` Now, for some reason the JAXRS interface is: ```java public interface RxInvoker<T> { public <R> T get(Class<R> responseType); } ``` Which is pretty useless. We could mitigate this by making `UniInvoker` generic. Or we could do like for `MultiInvoker` (for some reason this does pass the Java type system): ```java public class MultiInvoker extends AbstractRxInvoker<Multi<?>> { @SuppressWarnings("unchecked") @Override public <R> Multi<R> get(Class<R> responseType) { return (Multi<R>) super.get(responseType); } } ``` Perhaps we should do both (generify and fix the signature via that weirdly allowed covariant override)?

3a8c2eaad9f4e766bc9ef1f125103a1bf3fcf032

76409e1b274f8b0ed6710e16eac20a2efb200251

https://github.com/quarkusio/quarkus/compare/3a8c2eaad9f4e766bc9ef1f125103a1bf3fcf032...76409e1b274f8b0ed6710e16eac20a2efb200251

diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java index 335231f54d8..ab96cb7ab95 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.java @@ -3,6 +3,7 @@ import io.smallrye.mutiny.Uni; import javax.ws.rs.client.Entity; import javax.ws.rs.core.GenericType; +import javax.ws.rs.core.Response; public class UniInvoker extends AbstractRxInvoker<Uni<?>> { @@ -18,4 +19,123 @@ public <R> Uni<R> method(String name, Entity<?> entity, GenericType<R> responseT return Uni.createFrom().completionStage(invoker.method(name, entity, responseType)); } + @Override + public Uni<Response> get() { + return (Uni<Response>) super.get(); + } + + @Override + public <T> Uni<T> get(Class<T> responseType) { + return (Uni<T>) super.get(responseType); + } + + @Override + public <T> Uni<T> get(GenericType<T> responseType) { + return (Uni<T>) super.get(responseType); + } + + @Override + public Uni<Response> put(Entity<?> entity) { + return (Uni<Response>) super.put(entity); + } + + @Override + public <T> Uni<T> put(Entity<?> entity, Class<T> clazz) { + return (Uni<T>) super.put(entity, clazz); + } + + @Override + public <T> Uni<T> put(Entity<?> entity, GenericType<T> type) { + return (Uni<T>) super.put(entity, type); + } + + @Override + public Uni<Response> post(Entity<?> entity) { + return (Uni<Response>) super.post(entity); + } + + @Override + public <T> Uni<T> post(Entity<?> entity, Class<T> clazz) { + return (Uni<T>) super.post(entity, clazz); + } + + @Override + public <T> Uni<T> post(Entity<?> entity, GenericType<T> type) { + return (Uni<T>) super.post(entity, type); + } + + @Override + public Uni<Response> delete() { + return (Uni<Response>) super.delete(); + } + + @Override + public <T> Uni<T> delete(Class<T> responseType) { + return (Uni<T>) super.delete(responseType); + } + + @Override + public <T> Uni<T> delete(GenericType<T> responseType) { + return (Uni<T>) super.delete(responseType); + } + + @Override + public Uni<Response> head() { + return (Uni<Response>) super.head(); + } + + @Override + public Uni<Response> options() { + return (Uni<Response>) super.options(); + } + + @Override + public <T> Uni<T> options(Class<T> responseType) { + return (Uni<T>) super.options(responseType); + } + + @Override + public <T> Uni<T> options(GenericType<T> responseType) { + return (Uni<T>) super.options(responseType); + } + + @Override + public Uni<Response> trace() { + return (Uni<Response>) super.trace(); + } + + @Override + public <T> Uni<T> trace(Class<T> responseType) { + return (Uni<T>) super.trace(responseType); + } + + @Override + public <T> Uni<T> trace(GenericType<T> responseType) { + return (Uni<T>) super.trace(responseType); + } + + @Override + public Uni<Response> method(String name) { + return (Uni<Response>) super.method(name); + } + + @Override + public <T> Uni<T> method(String name, Class<T> responseType) { + return (Uni<T>) super.method(name, responseType); + } + + @Override + public <T> Uni<T> method(String name, GenericType<T> responseType) { + return (Uni<T>) super.method(name, responseType); + } + + @Override + public Uni<Response> method(String name, Entity<?> entity) { + return (Uni<Response>) super.method(name, entity); + } + + @Override + public <T> Uni<T> method(String name, Entity<?> entity, Class<T> responseType) { + return (Uni<T>) super.method(name, entity, responseType); + } }

['independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/UniInvoker.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/15366/15351

quarkusio

quarkus

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

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

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

fix

Blocking @ConsumeEvent only uses single worker thread since 1.11.X

### Description Greetings, while upgrading our Quarkus services from 1.10.4 to 1.11.3 we noticed that the behaviour of the Vert.x event bus significally changed. The event bus does not utilize more than one thread from the worker thread pool and the execution of multiple events is therefore not concurrent as it was prior to 1.11.X. I could not find any hints in the changelogs or the migration guide why the behaviour changed. If this new behaviour is indeed expectec, how can we handle the conccurrent execution of events if we do not want to use reactive style code? ### Expected behavior ConsumeEvent with `blocking=true` should utilize all available worker pool threads and execute events concrrently. ### Actual behavior The execution of events seems to only use a single worker thread and does not execute events concurrently. ### Example Code Bean with some long running job: ``` @Dependent public class SomeJobClass { private static final Logger LOG = Logger.getLogger(SomeJobClass.class); public void longRunningJob(String test) { LOG.info("Executing"); try { Thread.sleep(1000l); } catch (InterruptedException e) { e.printStackTrace(); } LOG.info("finished"); } } ``` The class containing the consumer: ``` @ApplicationScoped public class ConsumerClass { @Inject SomeJobClass importer; @ConsumeEvent(value = "test", blocking = true) void test(String event) { importer.longRunningJob(event); } } ``` Send 2 events: ``` @Test @DisplayName("Some Test") void testConcurrentEvents() throws InterruptedException { eventBus.send("test", "1"); eventBus.send("test", "1"); Thread.sleep(3000l); } ``` Log output with Quarkus 1.11.2.FINAL: ``` 2021-02-26 13:53:29,994 INFO [foo] (vert.x-worker-thread-0) Executing 2021-02-26 13:53:30,997 INFO [foo] (vert.x-worker-thread-0) finished 2021-02-26 13:53:30,998 INFO [foo] (vert.x-worker-thread-0) Executing 2021-02-26 13:53:32,002 INFO [foo] (vert.x-worker-thread-0) finished ``` Log output with Quarkus 1.10.5.FINAL: ``` 2021-02-26 14:02:19,345 INFO [foo] (vert.x-worker-thread-0) Executing 2021-02-26 14:02:19,345 INFO [foo] (vert.x-worker-thread-1) Executing 2021-02-26 14:02:20,349 INFO [foo] (vert.x-worker-thread-0) finished 2021-02-26 14:02:20,349 INFO [foo] (vert.x-worker-thread-1) finished ``` The logs show that the execution with version 1.11.2.FINAL was not concurrent and is using only `vert.x-worker-thread-0`.

4058da77acf5858d89dd95cb9af09053121adb9c

7ecaa92110c65cd9391c8c4e1e0b321d8139ae71

https://github.com/quarkusio/quarkus/compare/4058da77acf5858d89dd95cb9af09053121adb9c...7ecaa92110c65cd9391c8c4e1e0b321d8139ae71

diff --git a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java index 57b90701781..b5d97cbe628 100644 --- a/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java +++ b/extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java @@ -109,6 +109,13 @@ static String generateInvoker(BeanInfo bean, MethodInfo method, isBlocking.returnValue(isBlocking.load(true)); } + AnnotationValue orderedValue = consumeEvent.value("ordered"); + boolean ordered = orderedValue != null && orderedValue.asBoolean(); + if (ordered) { + MethodCreator isOrdered = invokerCreator.getMethodCreator("isOrdered", boolean.class); + isOrdered.returnValue(isOrdered.load(true)); + } + implementConstructor(bean, invokerCreator, beanField, containerField); implementInvoke(bean, method, invokerCreator, beanField.getFieldDescriptor(), containerField.getFieldDescriptor()); diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java index 0020c381a43..e9a870edb29 100644 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java +++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.java @@ -83,12 +83,19 @@ */ boolean blocking() default false; + /** + * @return {@code true} if the <em>blocking</em> consumption of the event must be ordered, meaning that the method + * won't be called concurrently. Instead it serializes all the invocations based on the event order. + * {@code ordered} must be used in conjunction with {@code blocking=true} or {@code @Blocking}. + * @see io.vertx.core.Vertx#executeBlocking(io.vertx.core.Handler, boolean, io.vertx.core.Handler) + */ + boolean ordered() default false; + /** * * @return {@code null} if it should use a default MessageCodec * @see io.quarkus.vertx.LocalEventBusCodec */ - @SuppressWarnings("rawtypes") Class<? extends MessageCodec> codec() default LocalEventBusCodec.class; } diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java index 6320aa80243..38acccc6168 100644 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java +++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java @@ -18,6 +18,10 @@ public boolean isBlocking() { return false; } + public boolean isOrdered() { + return false; + } + public void invoke(Message<Object> message) throws Exception { ManagedContext requestContext = Arc.container().requestContext(); if (requestContext.isActive()) { diff --git a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java index b340eabd863..54de1a6856f 100644 --- a/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java +++ b/extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java @@ -98,7 +98,7 @@ public void handle(Promise<Object> event) { } event.complete(); } - }, null); + }, invoker.isOrdered(), null); } else { try { invoker.invoke(m);

['extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/VertxRecorder.java', 'extensions/vertx/runtime/src/main/java/io/quarkus/vertx/runtime/EventConsumerInvoker.java', 'extensions/vertx/deployment/src/main/java/io/quarkus/vertx/deployment/EventBusConsumer.java', 'extensions/vertx/runtime/src/main/java/io/quarkus/vertx/ConsumeEvent.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/15365/15104

quarkusio

quarkus

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

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

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

close

llegalAccessError with Panache MongoDB and Gradle

**Describe the bug** Following this ticket https://github.com/quarkusio/quarkus/issues/12514 The bug has been fixed with Maven in the 1.11.0.Final but still exist if we use Gradle instead. **Expected behavior** The application should be able to access the entities with MongoDb. **Actual behavior** An exception is raised: ``` java.lang.IllegalAccessError: class org.acme.ExampleResource tried to access protected field org.acme.db.TestEntity.name ``` while the field is public. **To Reproduce** Sample repo: https://github.com/avdev4j/quarkus-mongo-gradle - Clone the repo: `git clone git@github.com:avdev4j/quarkus-mongo-gradle.git` - Run tests:` ./gradlew test` - testHelloEndpoint() will fail with the following error: <details><pre> ExampleResourceTest STANDARD_ERROR Feb 16, 2021 10:44:02 AM io.quarkus.bootstrap.runner.Timing printStartupTime INFO: Quarkus 1.11.3.Final on JVM started in 6.314s. Listening on: http://localhost:8081 Feb 16, 2021 10:44:02 AM io.quarkus.bootstrap.runner.Timing printStartupTime INFO: Profile test activated. Feb 16, 2021 10:44:02 AM io.quarkus.bootstrap.runner.Timing printStartupTime INFO: Installed features: [cdi, mongodb-client, mongodb-panache, mutiny, resteasy, smallrye-context-propagation] ExampleResourceTest > testHelloEndpoint() STANDARD_ERROR Feb 16, 2021 10:44:03 AM io.quarkus.vertx.http.runtime.QuarkusErrorHandler handle ERROR: HTTP Request to /hello failed, error id: 3986bfb1-8405-43f6-b48b-6bafe1a2689b-1 org.jboss.resteasy.spi.UnhandledException: java.lang.IllegalAccessError: class org.acme.ExampleResource tried to access protected field org.acme.db.TestEntity.name (org.acme.ExampleResource and org.acme.db.TestEntity are in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @17d70d9e) 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:218) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:519) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$invoke$4(SynchronousDispatcher.java:261) at org.jboss.resteasy.core.SynchronousDispatcher.lambda$preprocess$0(SynchronousDispatcher.java:161) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:364) at org.jboss.resteasy.core.SynchronousDispatcher.preprocess(SynchronousDispatcher.java:164) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:247) at io.quarkus.resteasy.runtime.standalone.RequestDispatcher.service(RequestDispatcher.java:73) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler.dispatch(VertxRequestHandler.java:138) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler.access$000(VertxRequestHandler.java:41) at io.quarkus.resteasy.runtime.standalone.VertxRequestHandler$1.run(VertxRequestHandler.java:93) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2415) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at org.jboss.threads.DelegatingRunnable.run(DelegatingRunnable.java:29) at org.jboss.threads.ThreadLocalResettingRunnable.run(ThreadLocalResettingRunnable.java:29) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.lang.IllegalAccessError: class org.acme.ExampleResource tried to access protected field org.acme.db.TestEntity.name (org.acme.ExampleResource and org.acme.db.TestEntity are in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @17d70d9e) at org.acme.ExampleResource.hello(ExampleResource.java:17) 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:170) at org.jboss.resteasy.core.MethodInjectorImpl.invoke(MethodInjectorImpl.java:130) at org.jboss.resteasy.core.ResourceMethodInvoker.internalInvokeOnTarget(ResourceMethodInvoker.java:643) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTargetAfterFilter(ResourceMethodInvoker.java:507) at org.jboss.resteasy.core.ResourceMethodInvoker.lambda$invokeOnTarget$2(ResourceMethodInvoker.java:457) at org.jboss.resteasy.core.interception.jaxrs.PreMatchContainerRequestContext.filter(PreMatchContainerRequestContext.java:364) at org.jboss.resteasy.core.ResourceMethodInvoker.invokeOnTarget(ResourceMethodInvoker.java:459) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:419) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:393) at org.jboss.resteasy.core.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:68) at org.jboss.resteasy.core.SynchronousDispatcher.invoke(SynchronousDispatcher.java:492) ... 15 more </pre></details> **Configuration** application.properties is empty **Screenshots** (If applicable, add screenshots to help explain your problem.) **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Darwin MacBook-Pro.local 20.3.0 Darwin Kernel Version 20.3.0: Thu Jan 21 00:07:06 PST 2021; root:xnu-7195.81.3~1/RELEASE_X86_64 x86_64` - Output of `java -version`: `openjdk version "11.0.7" 2020-04-14` - GraalVM version (if different from Java): / - Quarkus version or git rev: `1.11.3.FInal` - Build tool (ie. output of `mvnw --version` or `gradlew --version`): ``` ------------------------------------------------------------ Gradle 6.5.1 ------------------------------------------------------------ Build time: 2020-06-30 06:32:47 UTC Revision: 66bc713f7169626a7f0134bf452abde51550ea0a Kotlin: 1.3.72 Groovy: 2.5.11 Ant: Apache Ant(TM) version 1.10.7 compiled on September 1 2019 JVM: 11.0.7 (AdoptOpenJDK 11.0.7+10) OS: Mac OS X 10.16 x86_64 ``` **Additional context** (Add any other context about the problem here.) cc @danielpetisme

3c79a053c3583179845cff5f0751f886b8beb8db

de6b5b5760b06edc0f0061ebff14985ee09dad11

https://github.com/quarkusio/quarkus/compare/3c79a053c3583179845cff5f0751f886b8beb8db...de6b5b5760b06edc0f0061ebff14985ee09dad11

diff --git a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index 3d3b31f50b1..3169d956afb 100644 --- a/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -138,7 +138,14 @@ public void execute(Task test) { JavaPlugin.class, javaPlugin -> { project.afterEvaluate(this::afterEvaluate); + ConfigurationContainer configurations = project.getConfigurations(); JavaCompile compileJavaTask = (JavaCompile) tasks.getByName(JavaPlugin.COMPILE_JAVA_TASK_NAME); + + // By default, gradle looks for annotation processors in the annotationProcessor configuration. + // This configure the compile task to look for annotation processors in the compileClasspath. + compileJavaTask.getOptions().setAnnotationProcessorPath( + configurations.getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)); + compileJavaTask.dependsOn(quarkusGenerateCode); quarkusGenerateCode.setSourceRegistrar(compileJavaTask::source); @@ -171,8 +178,6 @@ public void execute(Task test) { .plus(mainSourceSet.getOutput()) .plus(testSourceSet.getOutput())); - ConfigurationContainer configurations = project.getConfigurations(); - // create a custom configuration for devmode configurations.create(DEV_MODE_CONFIGURATION_NAME).extendsFrom( configurations.getByName(JavaPlugin.COMPILE_ONLY_CONFIGURATION_NAME),

['devtools/gradle/src/main/java/io/quarkus/gradle/QuarkusPlugin.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/15212/15187

quarkusio

quarkus

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

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

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

fixes

GRPC client stream onMessage and onClose executes on different threads

When calling client grpc service method form blocking code(no matter if its blocking or async client). Stream close will be executed on worker thread, but on message event will be executed on event-loop thread. So client stream usually closed before able to reads any message **Expected behavior** OnMessage and OnClose executed in correct order **To Reproduce** https://drive.google.com/file/d/16xdsSuSV4V9pQAJt_HDYoppgqsAGOGoX/view?usp=sharing Steps to reproduce the behavior: archive contains single UT that reproduce incorrect behavior. For more details you will need to debug class `io.grpc.stub.ClientCall.BlockingResponseStream.QueuingListener` to see threads **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Linux andrii-PC 5.4.0-65-generic #73-Ubuntu SMP Mon Jan 18 17:25:17 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux - Output of `java -version`: openjdk version "11.0.9" 2020-10-20 - GraalVM version (if different from Java): OpenJDK Runtime Environment GraalVM CE 20.3.0 (build 11.0.9+10-jvmci-20.3-b06) - Quarkus version or git rev: 1.11.3 - Build tool (ie. output of `mvnw --version` or `gradlew --version`): maven 3.6.3 or gradle 6.5.1

2b56bc6c0084518ed84aa24b23dbf3ed1f1b5ec3

664c16f81528e28d4b4745efde0b6d13cbbf82e8

https://github.com/quarkusio/quarkus/compare/2b56bc6c0084518ed84aa24b23dbf3ed1f1b5ec3...664c16f81528e28d4b4745efde0b6d13cbbf82e8

diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java index d4e49736fca..f067033e631 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.java @@ -23,10 +23,19 @@ public void start(Listener<RespT> responseListener, Metadata headers) { super.start(new ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) { @Override public void onMessage(RespT message) { + runInContextIfNeed(() -> super.onMessage(message)); + } + + @Override + public void onClose(Status status, Metadata trailers) { + runInContextIfNeed(() -> super.onClose(status, trailers)); + } + + private void runInContextIfNeed(Runnable fun) { if (context != null) { - context.runOnContext(unused -> super.onMessage(message)); + context.runOnContext(unused -> fun.run()); } else { - super.onMessage(message); + fun.run(); } } }, headers);

['extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/IOThreadClientInterceptor.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/15158/15114

quarkusio

quarkus

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

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

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

fixes

RESTEasy Reactive: Sub resource Path Params more than 2 levels back are not passed correctly

Describe the bug Sub resource path params are not bound correctly in a scenario with more than two sub resource levels. E.g. if path /trees/{treeId}/branches/{branchId}/leaves/{leafId} is handled by a sub resource "LeavesResource" which uses @PathParam("treeId") and @PathParam("branchId") and @PathParam("leafId") then treeId is not injected while the other two are. Expected behavior Multiple levels should be supported. The correct behaviour is found in standard resteasy. Actual behavior The value is not injected causing difficult to track bugs. To Reproduce git clone https://github.com/bcluap/quarkus-examples.git cd quarkus-examples/resteasy-reactive mvn clean test Configuration Nothing abnormal Screenshots Run the reproducer to see failures. Change the pom to non-reactive mode and all tests pass Environment (please complete the following information): This is not environment-specific 999-SNAPSHOT and before Additional context NA

7a9b3565d196abc1f7c76bfa5cda35018f20332a

7beab6dc93bdb9f5c322b23f5218d44b546a18b9

https://github.com/quarkusio/quarkus/compare/7a9b3565d196abc1f7c76bfa5cda35018f20332a...7beab6dc93bdb9f5c322b23f5218d44b546a18b9

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java index a7f3f37a7b7..2daf58362e5 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java @@ -31,28 +31,42 @@ public class SubResourceRequestFilterTest { @Override public JavaArchive get() { JavaArchive war = ShrinkWrap.create(JavaArchive.class); - war.addClasses(RestResource.class, RestSubResource.class, SingleExecutionFilter.class); + war.addClasses(RestResource.class, RestSubResource.class, SingleExecutionFilter.class, + MiddleRestResource.class); return war; } }); @Test - public void testAbortingRequestFilter() { - RestAssured.get("/sub-resource/geo") + public void testSubResourceFilter() { + RestAssured.get("/sub-resource/Bob/Builder") .then() .header("single-filter", Matchers.equalTo("once")) - .body(Matchers.equalTo("geo")) + .body(Matchers.equalTo("Bob Builder")) .statusCode(200); } @Path("/") public static class RestResource { + @Inject + MiddleRestResource restSubResource; + + @Path("sub-resource/{first}") + public MiddleRestResource hello(String first) { + return restSubResource; + } + } + + @ApplicationScoped + @Path("/") + public static class MiddleRestResource { + @Inject RestSubResource restSubResource; - @Path("sub-resource/{name}") - public RestSubResource hello(String name) { + @Path("{last}") + public RestSubResource hello() { return restSubResource; } } @@ -61,8 +75,8 @@ public RestSubResource hello(String name) { public static class RestSubResource { @GET - public Response hello(HttpHeaders headers, @RestPath String name) { - return Response.ok(name).header("single-filter", headers.getHeaderString("single-filter")).build(); + public Response hello(HttpHeaders headers, @RestPath String first, @RestPath String last) { + return Response.ok(first + " " + last).header("single-filter", headers.getHeaderString("single-filter")).build(); } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java index 0b875e61aee..4b39cb27921 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java @@ -58,11 +58,11 @@ */ private Object[] parameters; private RuntimeResource target; + /** - * When a subresource has been located and the processing has been restarted (and thus target point to the new subresource), - * this field contains the target that resulted in the offloading to the new target + * info about path params and other data about previously matched sub resource locators */ - private RuntimeResource locatorTarget; + private PreviousResource previousResource; /** * The parameter values extracted from the path. @@ -79,11 +79,6 @@ * Note: those are decoded. */ private Object pathParamValues; - /** - * When a subresource has been located and the processing has been restarted (and thus target point to the new subresource), - * this field contains the pathParamValues of the target that resulted in the offloading to the new target - */ - private Object locatorPathParamValues; private UriInfo uriInfo; /** @@ -178,8 +173,7 @@ public void restart(RuntimeResource target, boolean setLocatorTarget) { position = 0; parameters = new Object[target.getParameterTypes().length]; if (setLocatorTarget) { - this.locatorTarget = this.target; - this.locatorPathParamValues = this.pathParamValues; + previousResource = new PreviousResource(this.target, pathParamValues, previousResource); } this.target = target; } @@ -222,10 +216,6 @@ public String getPathParam(int index) { return doGetPathParam(index, pathParamValues); } - public String getLocatorPathParam(int index) { - return doGetPathParam(index, locatorPathParamValues); - } - private String doGetPathParam(int index, Object pathParamValues) { if (pathParamValues instanceof String[]) { return ((String[]) pathParamValues)[index]; @@ -320,10 +310,6 @@ public RuntimeResource getTarget() { return target; } - public RuntimeResource getLocatorTarget() { - return locatorTarget; - } - public void mapExceptionIfPresent() { // this is called from the abort chain, but we can abort because we have a Response, or because // we got an exception @@ -928,4 +914,76 @@ public ResteasyReactiveResourceInfo getResteasyReactiveResourceInfo() { protected abstract Executor getEventLoop(); public abstract Runnable registerTimer(long millis, Runnable task); + + public String getResourceLocatorPathParam(String name) { + return getResourceLocatorPathParam(name, previousResource); + } + + private String getResourceLocatorPathParam(String name, PreviousResource previousResource) { + if (previousResource == null) { + return null; + } + + int index = 0; + URITemplate classPath = previousResource.locatorTarget.getClassPath(); + if (classPath != null) { + for (URITemplate.TemplateComponent component : classPath.components) { + if (component.name != null) { + if (component.name.equals(name)) { + return doGetPathParam(index, previousResource.locatorPathParamValues); + } + index++; + } else if (component.names != null) { + for (String nm : component.names) { + if (nm.equals(name)) { + return doGetPathParam(index, previousResource.locatorPathParamValues); + } + } + index++; + } + } + } + for (URITemplate.TemplateComponent component : previousResource.locatorTarget.getPath().components) { + if (component.name != null) { + if (component.name.equals(name)) { + return doGetPathParam(index, previousResource.locatorPathParamValues); + } + index++; + } else if (component.names != null) { + for (String nm : component.names) { + if (nm.equals(name)) { + return doGetPathParam(index, previousResource.locatorPathParamValues); + } + } + index++; + } + } + return getResourceLocatorPathParam(name, previousResource.prev); + } + + static class PreviousResource { + + public PreviousResource(RuntimeResource locatorTarget, Object locatorPathParamValues, PreviousResource prev) { + this.locatorTarget = locatorTarget; + this.locatorPathParamValues = locatorPathParamValues; + this.prev = prev; + } + + /** + * When a subresource has been located and the processing has been restarted (and thus target point to the new + * subresource), + * this field contains the target that resulted in the offloading to the new target + */ + private final RuntimeResource locatorTarget; + + /** + * When a subresource has been located and the processing has been restarted (and thus target point to the new + * subresource), + * this field contains the pathParamValues of the target that resulted in the offloading to the new target + */ + private final Object locatorPathParamValues; + + private final PreviousResource prev; + + } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.java index 76bb46097e2..835be0b5153 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.java @@ -1,7 +1,6 @@ package org.jboss.resteasy.reactive.server.core.parameters; import org.jboss.resteasy.reactive.server.core.ResteasyReactiveRequestContext; -import org.jboss.resteasy.reactive.server.mapping.URITemplate; public class LocatableResourcePathParamExtractor implements ParameterExtractor { @@ -13,48 +12,7 @@ public LocatableResourcePathParamExtractor(String name) { @Override public Object extractParameter(ResteasyReactiveRequestContext context) { - int index = findPathParamIndex(context.getLocatorTarget().getClassPath(), context.getLocatorTarget().getPath()); - if (index >= 0) { - return context.getLocatorPathParam(index); - } - return null; - } - - private int findPathParamIndex(URITemplate classPathTemplate, URITemplate methodPathTemplate) { - int index = 0; - if (classPathTemplate != null) { - for (URITemplate.TemplateComponent component : classPathTemplate.components) { - if (component.name != null) { - if (component.name.equals(this.name)) { - return index; - } - index++; - } else if (component.names != null) { - for (String nm : component.names) { - if (nm.equals(this.name)) { - return index; - } - } - index++; - } - } - } - for (URITemplate.TemplateComponent component : methodPathTemplate.components) { - if (component.name != null) { - if (component.name.equals(this.name)) { - return index; - } - index++; - } else if (component.names != null) { - for (String nm : component.names) { - if (nm.equals(this.name)) { - return index; - } - } - index++; - } - } - return -1; + return context.getResourceLocatorPathParam(name); } }

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/test/java/io/quarkus/resteasy/reactive/server/test/resource/basic/SubResourceRequestFilterTest.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/ResteasyReactiveRequestContext.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/parameters/LocatableResourcePathParamExtractor.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/15092/14991

quarkusio

quarkus

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

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

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

fixes

Classloading error with QuarkusMock regression in 1.12.0.CR1

**Describe the bug** I upgraded from `1.11.2` to `1.12.0.CR1`, and I get the following error in my unit tests: ``` [ERROR] Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 10.123 s <<< FAILURE! - in com.xx.arte.ocpdeploy.deploy.noreg.DeployNoRegFtuTest [ERROR] com.xx.arte.ocpdeploy.deploy.noreg.DeployNoRegFtuTest.noreg Time elapsed: 1.327 s <<< ERROR! java.lang.ClassCastException: class org.mockito.codegen.VaultSystemBackendEngine$MockitoMock$192437934 cannot be cast to class io.quarkus.vault.runtime.VaultSystemBackendManager (org.mockito.codegen.VaultSystemBackendEngine$MockitoMock$192437934 is in unnamed module of loader net.bytebuddy.dynamic.loading.MultipleParentClassLoader @36d1793a; io.quarkus.vault.runtime.VaultSystemBackendManager is in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @6b08b323) at com.xx.arte.ocpdeploy.deploy.noreg.DeployNoRegFtuTest.noreg(DeployNoRegFtuTest.java:21) ``` I don't have a stacktrace other than the line of the test. **Expected behavior** No regression. Mock works as expected. **Actual behavior** The unit test fails with the above exception. **To Reproduce** I don't have yet an independent reproducer. Here is the code in my application that is causing the issue: ``` @BeforeAll public static void mockVaultSystemBackendEngine() { VaultSystemBackendEngine sys = Mockito.mock(VaultSystemBackendEngine.class); VaultHealthStatus vaultHealthStatus = new VaultHealthStatus(); vaultHealthStatus.setInitialized(true); Mockito.when(sys.healthStatus()).thenReturn(vaultHealthStatus); QuarkusMock.installMockForType(sys, VaultSystemBackendEngine.class); } ``` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: `Microsoft Windows [Version 10.0.17763.1697]` - Output of `java -version`: `openjdk version "11.0.1-redhat" 2018-10-16 LTS` - GraalVM version (if different from Java): N/A - Quarkus version or git rev: `1.12.0.CR1` - Build tool (ie. output of `mvnw --version` or `gradlew --version`): `Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f)`

c16567ce465794c9cb076670331894424b4864e2

8305da83c21061dbaf32cabefa83c16ba1a77e08

https://github.com/quarkusio/quarkus/compare/c16567ce465794c9cb076670331894424b4864e2...8305da83c21061dbaf32cabefa83c16ba1a77e08

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java index 7e8718e6295..4410f808f41 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java @@ -118,7 +118,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName, FieldCreator beanField = clientProxy.getFieldCreator(BEAN_FIELD, DescriptorUtils.extToInt(beanClassName)) .setModifiers(ACC_PRIVATE | ACC_FINAL); if (mockable) { - clientProxy.getFieldCreator(MOCK_FIELD, Object.class).setModifiers(ACC_PRIVATE | ACC_VOLATILE); + clientProxy.getFieldCreator(MOCK_FIELD, providerType.descriptorName()).setModifiers(ACC_PRIVATE | ACC_VOLATILE); } FieldCreator contextField = null; if (BuiltinScope.APPLICATION.is(bean.getScope())) { @@ -133,7 +133,7 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName, implementGetContextualInstance(clientProxy, providerType); implementGetBean(clientProxy, beanField.getFieldDescriptor()); if (mockable) { - implementMockMethods(clientProxy); + implementMockMethods(clientProxy, providerType); } for (MethodInfo method : getDelegatingMethods(bean, bytecodeTransformerConsumer, transformUnproxyableClasses)) { @@ -231,17 +231,19 @@ Collection<Resource> generate(BeanInfo bean, String beanClassName, return classOutput.getResources(); } - private void implementMockMethods(ClassCreator clientProxy) { + private void implementMockMethods(ClassCreator clientProxy, ProviderType providerType) { MethodCreator clear = clientProxy .getMethodCreator(MethodDescriptor.ofMethod(clientProxy.getClassName(), CLEAR_MOCK_METHOD_NAME, void.class)); - clear.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, Object.class), clear.getThis(), + clear.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, providerType.descriptorName()), + clear.getThis(), clear.loadNull()); clear.returnValue(null); MethodCreator set = clientProxy .getMethodCreator( MethodDescriptor.ofMethod(clientProxy.getClassName(), SET_MOCK_METHOD_NAME, void.class, Object.class)); - set.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, Object.class), set.getThis(), + set.writeInstanceField(FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, providerType.descriptorName()), + set.getThis(), set.getMethodParam(0)); set.returnValue(null); } @@ -268,7 +270,8 @@ void implementDelegate(ClassCreator clientProxy, ProviderType providerType, Fiel if (mockable) { //if mockable and mocked just return the mock ResultHandle mock = creator.readInstanceField( - FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, Object.class.getName()), creator.getThis()); + FieldDescriptor.of(clientProxy.getClassName(), MOCK_FIELD, providerType.descriptorName()), + creator.getThis()); BytecodeCreator falseBranch = creator.ifNull(mock).falseBranch(); falseBranch.returnValue(falseBranch.checkCast(mock, providerType.className())); } diff --git a/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java b/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java index 2bbf9b6c1de..60107393d70 100644 --- a/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java +++ b/test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.java @@ -36,6 +36,10 @@ static <T> void installMock(T instance, T mock) { if (inst == null) { throw new IllegalStateException("No test in progress"); } + if (!(instance.getClass().getSuperclass().isAssignableFrom(mock.getClass()))) { + throw new RuntimeException(mock + + " is not assignable to type " + instance.getClass().getSuperclass()); + } try { Method setMethod = instance.getClass().getDeclaredMethod("arc$setMock", Object.class); setMethod.invoke(instance, mock);

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ClientProxyGenerator.java', 'test-framework/junit5/src/main/java/io/quarkus/test/junit/MockSupport.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/15067/15026

quarkusio

quarkus

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

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

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

fixes

@PreDestroy method seems to not be invocked when ExecutorManager is being used.

In the following project test-executor project https://github.com/wmedvede/test-executor-issue.git I have the silly component below. All right, when I execute my application in dev mode, with mvn clean compile quarkus:dev In can see that the created MyRunnable is executing, etc, as expected. When I stop the application with "CTRL+C" the application stops gracefully, i.e. the @PreDestroy method is executed, the MyRunnable instance is stopped etc. BUT, when I execute same application with java -jar target/test-executor-1.0.0-SNAPSHOT-runner.jar (or with the generated native image) There's no way to stop the application, i.e., the "CTRL+C" seems to simply do nothing in that particular scenario, and the @PreDestroy isn't invoked. note: The @Observes ShutdownEvent works in all cases ` @ApplicationScoped @Startup public class MyService { class MyRunnable implements Runnable { private AtomicBoolean exit = new AtomicBoolean(false); public void exit() { exit.set(true); } @Override public void run() { while (!exit.get()) { try { Thread.sleep(2000); System.out.println("MyRunnable is working!"); } catch (InterruptedException e) { Thread.currentThread().interrupt(); exit.set(true); } } System.out.println("MyRunnable has finished it work!"); } } @Inject ManagedExecutor managedExecutor; MyRunnable myRunnableInstance; @PostConstruct void startService() { myRunnableInstance = new MyRunnable(); managedExecutor.execute(myRunnableInstance); } /** * When we stop the application with CTRL+C this method is only invoked when * the application is started in dev mode. But not in native or if we execute the java runner. */ @PreDestroy void destroyService() { System.out.println("Destroying the service!"); if (myRunnableInstance != null) { System.out.println("Destroying the runnable!"); myRunnableInstance.exit(); } } /* This variant is always invocked void onShutDownEvent(@Observes ShutdownEvent ev) { System.out.println("SHUT DOWN EVENT is executed!!!!"); if (myRunnableInstance != null) { System.out.println("Destroying the runnable!"); myRunnableInstance.exit(); } } */ } `

fa941e8c7b528b3d9847f9cd4dcbfde410c113ae

3f78097884e1ed8c83e1c27b61edc412dce03bd1

https://github.com/quarkusio/quarkus/compare/fa941e8c7b528b3d9847f9cd4dcbfde410c113ae...3f78097884e1ed8c83e1c27b61edc412dce03bd1

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java index d5b0f1618c0..372b4a0adbc 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java @@ -54,7 +54,7 @@ public void run() { executor = devModeExecutor; Runtime.getRuntime().addShutdownHook(new Thread(shutdownTask, "Executor shutdown thread")); } else { - shutdownContext.addShutdownTask(shutdownTask); + shutdownContext.addLastShutdownTask(shutdownTask); executor = underlying; } if (threadPoolConfig.prefill) { diff --git a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java index 5537feb0935..92941faaa61 100644 --- a/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java +++ b/extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.java @@ -66,12 +66,6 @@ public String getThreadContextType() { return ThreadContext.CDI; } - // see ThreadContextController#endContext() - private static void deactivateRequestContext() throws IllegalStateException { - // Only deactivate the context - Arc.container().requestContext().deactivate(); - } - private static final class ClearContextSnapshot implements ThreadContextSnapshot { @Override @@ -92,7 +86,7 @@ public ThreadContextController begin() { } else { // context not active, activate blank one, deactivate afterwards requestContext.activate(); - return ArcContextProvider::deactivateRequestContext; + return requestContext::deactivate; } } } @@ -155,7 +149,7 @@ public ThreadContextController begin() { } else { // context not active, activate and pass it new instance, deactivate afterwards requestContext.activate(state); - return ArcContextProvider::deactivateRequestContext; + return requestContext::deactivate; } }

['core/runtime/src/main/java/io/quarkus/runtime/ExecutorRecorder.java', 'extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/context/ArcContextProvider.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/15063/15062

quarkusio

quarkus

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

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

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

fixes

"Using Java versions older than 11 ... " complaint with Java 17 Early Access build

I see `[WARNING] [io.quarkus.deployment.QuarkusAugmentor] Using Java versions older than 11 to build Quarkus applications is deprecated and will be disallowed in a future release!` complaint when using Java 17 Early Access build Code for version check probably doesn't handle `-ea` suffix in Early Access Java build version, e.g. `17-ea`.

d392404a6f00ce43d058dc8dc2f96c906a023849

05a31b65f8b8eadf09141c54e3d03bbcd7a8cdb8

https://github.com/quarkusio/quarkus/compare/d392404a6f00ce43d058dc8dc2f96c906a023849...05a31b65f8b8eadf09141c54e3d03bbcd7a8cdb8

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java b/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java index 4236031c1d2..74d7d0c31ea 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.java @@ -5,7 +5,7 @@ public class JavaVersionUtil { - private static final Pattern PATTERN = Pattern.compile("(?:1\\\\.)?(\\\\d+)(?:\\\\..*)?"); + private static final Pattern PATTERN = Pattern.compile("(?:1\\\\.)?(\\\\d+)"); private static boolean IS_JAVA_11_OR_NEWER; private static boolean IS_JAVA_13_OR_NEWER; @@ -16,7 +16,7 @@ public class JavaVersionUtil { // visible for testing static void performChecks() { - Matcher matcher = PATTERN.matcher(System.getProperty("java.version", "")); + Matcher matcher = PATTERN.matcher(System.getProperty("java.specification.version", "")); if (matcher.matches()) { int first = Integer.parseInt(matcher.group(1)); IS_JAVA_11_OR_NEWER = (first >= 11); diff --git a/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java b/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java index 0e47d6b54a2..d2300aa1483 100644 --- a/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java +++ b/core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java @@ -7,11 +7,11 @@ class JavaVersionUtilTest { - private static final String JAVA_VERSION = "java.version"; + private static final String JAVA_SPECIFICATION_VERSION = "java.specification.version"; @Test void testJava8() { - testWithVersion("1.8.0_242", () -> { + testWithVersion("1.8", () -> { assertFalse(JavaVersionUtil.isJava11OrHigher()); assertFalse(JavaVersionUtil.isJava13OrHigher()); }); @@ -19,7 +19,7 @@ void testJava8() { @Test void testJava11() { - testWithVersion("11.0.7", () -> { + testWithVersion("11", () -> { assertTrue(JavaVersionUtil.isJava11OrHigher()); assertFalse(JavaVersionUtil.isJava13OrHigher()); }); @@ -27,20 +27,36 @@ void testJava11() { @Test void testJava14() { - testWithVersion("14.0.1", () -> { + testWithVersion("14", () -> { assertTrue(JavaVersionUtil.isJava11OrHigher()); assertTrue(JavaVersionUtil.isJava13OrHigher()); }); } - private void testWithVersion(String javaVersion, Runnable test) { - String previous = System.getProperty(JAVA_VERSION); - System.setProperty(JAVA_VERSION, javaVersion); + @Test + void testJava17() { + testWithVersion("17", () -> { + assertTrue(JavaVersionUtil.isJava11OrHigher()); + assertTrue(JavaVersionUtil.isJava13OrHigher()); + }); + } + + @Test + void testJava21() { + testWithVersion("21", () -> { + assertTrue(JavaVersionUtil.isJava11OrHigher()); + assertTrue(JavaVersionUtil.isJava13OrHigher()); + }); + } + + private void testWithVersion(String javaSpecificationVersion, Runnable test) { + String previous = System.getProperty(JAVA_SPECIFICATION_VERSION); + System.setProperty(JAVA_SPECIFICATION_VERSION, javaSpecificationVersion); JavaVersionUtil.performChecks(); try { test.run(); } finally { - System.setProperty(JAVA_VERSION, previous); + System.setProperty(JAVA_SPECIFICATION_VERSION, previous); JavaVersionUtil.performChecks(); }

['core/runtime/src/test/java/io/quarkus/runtime/util/JavaVersionUtilTest.java', 'core/runtime/src/main/java/io/quarkus/runtime/util/JavaVersionUtil.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/15589/15581

quarkusio

quarkus

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

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

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

close

Named Redis client injection not working when used in separate JAR

**Describe the bug** We have an application scoped bean, defined in our common project and being used by other services, that utilizes `RedisClient`: ``` @ApplicationScoped public class Service { @Inject @RedisClientName("second") RedisClient redisClient; ... } ``` This common project is packaged as JAR and then used as a Maven dependency from other services. We keep getting this error when starting those other services: ``` javax.enterprise.inject.spi.DeploymentException: javax.enterprise.inject.UnsatisfiedResolutionException: Unsatisfied dependency for type io.quarkus.redis.client.RedisClient and qualifiers [@RedisClientName(value = "second")] ``` We've defined an alternate Redis connection like this: ``` quarkus.redis.second.hosts=redis://localhost:6379 ``` and made sure it's being used as expected by a Redis client defined in our service (not the common JAR!) like this: ``` @Inject @RedisClientName("second") RedisClient redisClient; ``` Should it be possible to have a bean class contained in a dependency JAR and make it use Redis connection defined in the project that uses that JAR? **Expected behavior** Bean defined in a dependency JAR, which uses a Redis client annotated by `@RedisClientName`, properly using Redis connection defined in containing service.

eb98535ef9d17f08205586ee1fcfbf24990c8010

ac273f991cda30ab6d5bb98ff0537c70efa40da3

https://github.com/quarkusio/quarkus/compare/eb98535ef9d17f08205586ee1fcfbf24990c8010...ac273f991cda30ab6d5bb98ff0537c70efa40da3

diff --git a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java index 8be65bfaef8..319d51f966a 100644 --- a/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java +++ b/extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.java @@ -16,13 +16,13 @@ import org.jboss.jandex.IndexView; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; +import io.quarkus.arc.deployment.BeanArchiveIndexBuildItem; import io.quarkus.arc.deployment.SyntheticBeanBuildItem; import io.quarkus.deployment.Feature; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; -import io.quarkus.deployment.builditem.ApplicationArchivesBuildItem; import io.quarkus.deployment.builditem.ExtensionSslNativeSupportBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; @@ -80,13 +80,13 @@ RuntimeInitializedClassBuildItem initializeBulkTypeDuringRuntime() { @BuildStep @Record(ExecutionTime.RUNTIME_INIT) - public void produceRedisClient(RedisClientRecorder recorder, ApplicationArchivesBuildItem applicationArchives, + public void produceRedisClient(RedisClientRecorder recorder, BeanArchiveIndexBuildItem indexBuildItem, BuildProducer<SyntheticBeanBuildItem> syntheticBeans, VertxBuildItem vertxBuildItem) { Set<String> clientNames = new HashSet<>(); clientNames.add(RedisClientUtil.DEFAULT_CLIENT); - IndexView indexView = applicationArchives.getRootArchive().getIndex(); + IndexView indexView = indexBuildItem.getIndex(); Collection<AnnotationInstance> clientAnnotations = indexView.getAnnotations(REDIS_CLIENT_ANNOTATION); for (AnnotationInstance annotation : clientAnnotations) { clientNames.add(annotation.value().asString());

['extensions/redis-client/deployment/src/main/java/io/quarkus/redis/client/deployment/RedisClientProcessor.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/15610/15607

quarkusio

quarkus

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

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

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

fixes

Weird warn message with the OpenShift extension

Using the OpenShift extension, I now have this: ``` 2021-03-10 17:12:56,920 WARN [io.qua.kub.dep.KubernetesProcessor] (build-56) exposition openshift=Optional.empty ``` I don't think that is normal. It looks like a debug message (and if not, the `Optional.empty` should go). This is with master, no idea if it ended up in another branch so this needs to be checked.

712fc3c7bbf5e77662b0e2611163bba8b2fc31d8

65226168d123782697f93c333a61b769b454f968

https://github.com/quarkusio/quarkus/compare/712fc3c7bbf5e77662b0e2611163bba8b2fc31d8...65226168d123782697f93c333a61b769b454f968

diff --git a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java index e1fe9b8fc5e..c1c3bbf1e90 100644 --- a/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java +++ b/extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.java @@ -106,8 +106,6 @@ public void build(ApplicationInfoBuildItem applicationInfo, throw new RuntimeException("Unable to setup environment for generating Kubernetes resources", e); } - log.warn("exposition openshift=" + openshiftConfig.route.host); - Map<String, Object> config = KubernetesConfigUtil.toMap(kubernetesConfig, openshiftConfig, knativeConfig); Set<String> deploymentTargets = kubernetesDeploymentTargets.getEntriesSortedByPriority().stream() .map(DeploymentTargetEntry::getName)

['extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/KubernetesProcessor.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/15619/15502

quarkusio

quarkus

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

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

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

fixes

Amazon LambdaRecorder Handler Discovery fails if handleRequest is in abstract class

**Describe the bug** If the handleRequest method is implemented in abstract class, then AmazonLambdaRecorder.discoverHandlerMethod fails on [line 88](https://github.com/quarkusio/quarkus/blob/0a7518157ce3fa1ecaf39d62d7b9005ec54f5ff6/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java#L88) with an ArrayIndexOutOfBoundsException. **Expected behavior** The handler discovery should include inherited methods or it should produce a better error message, e.g. "No handleRequest method found on class com.ExampleHandler. The handleRequest method should be implemented directly in the handler class. Inherited handler methods are not currently supported." **Actual behavior** ``` 2021-03-05 15:04:02,378 ERROR [io.qua.ama.lam.run.AbstractLambdaPollLoop] (Lambda Thread) Lambda init error: java.lang.IllegalStateException: Interrupted while waiting for another thread to start the application at io.quarkus.runtime.Application.interruptedOnAwaitStart(Application.java:219) at io.quarkus.runtime.Application.start(Application.java:75) at io.quarkus.amazon.lambda.runtime.AbstractLambdaPollLoop.checkQuarkusBootstrapped(AbstractLambdaPollLoop.java:160) at io.quarkus.amazon.lambda.runtime.AbstractLambdaPollLoop$1.run(AbstractLambdaPollLoop.java:46) at java.lang.Thread.run(Thread.java:834) at com.oracle.svm.core.thread.JavaThreads.threadStartRoutine(JavaThreads.java:519) at com.oracle.svm.core.posix.thread.PosixJavaThreads.pthreadStartRoutine(PosixJavaThreads.java:192) 2021-03-05 15:04:02,383 ERROR [io.qua.run.Application] (main) Failed to start application (with profile prod): java.lang.ArrayIndexOutOfBoundsException: Index 0 out of bounds for length 0 at io.quarkus.amazon.lambda.runtime.AmazonLambdaRecorder.discoverHandlerMethod(AmazonLambdaRecorder.java:88) at io.quarkus.amazon.lambda.runtime.AmazonLambdaRecorder.setHandlerClass(AmazonLambdaRecorder.java:47) at io.quarkus.amazon.lambda.runtime.AmazonLambdaRecorder.chooseHandlerClass(AmazonLambdaRecorder.java:140) at io.quarkus.deployment.steps.AmazonLambdaProcessor$recordHandlerClass-1619263778.deploy_0(AmazonLambdaProcessor$recordHandlerClass-1619263778.zig:196) at io.quarkus.deployment.steps.AmazonLambdaProcessor$recordHandlerClass-1619263778.deploy(AmazonLambdaProcessor$recordHandlerClass-1619263778.zig:40) at io.quarkus.runtime.Application.start(Application.java:90) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:100) at io.quarkus.runtime.Quarkus.run(Quarkus.java:66) ``` **To Reproduce** This was with a Graal Native custom Lambda runtime created following this guide: https://quarkus.io/guides/amazon-lambda When the handleRequest method is implemented in an abstract class, and is not implemented in the concrete class, the lookup fails with the above error. **Work around** Don't use an abstract handler. Yet another reason to prefer composition, I guess.

19e87cc2c715957b1eee3a61fc11ad7d5ad14507

0c67301e076524193f88331dfc3ebf98bcb49ac3

https://github.com/quarkusio/quarkus/compare/19e87cc2c715957b1eee3a61fc11ad7d5ad14507...0c67301e076524193f88331dfc3ebf98bcb49ac3

diff --git a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java index 959399a01ee..025873490e4 100644 --- a/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java +++ b/extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.java @@ -84,9 +84,12 @@ private Method discoverHandlerMethod(Class<? extends RequestHandler<?, ?>> handl } } } - if (method == null) { + if (method == null && methods.length > 0) { method = methods[0]; } + if (method == null) { + throw new RuntimeException("Unable to find a method which handles request on handler class " + handlerClass); + } return method; }

['extensions/amazon-lambda/runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AmazonLambdaRecorder.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/15930/15837

quarkusio

quarkus

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

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

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

close

devmode - Not using JVM instrumentation, but always full restart

## Describe the bug I read from @maxandersen that in 1.11+ devmode new ability to detect wether a change can be applied using JVM instrumentation (what ides uses to update running jvms) or it requires a restart as devmode usually do. ### Expected behavior Hot swap/reload applying JVM instrumentation, without a restart. ### Actual behavior There´s always a restart, see logs below: ``` 12:38:28: Executing task 'quarkusDev'... > Task :quarkusGenerateCode preparing quarkus application > Task :compileJava > Task :processResources UP-TO-DATE > Task :classes > Task :quarkusDev Listening for transport dt_socket at address: 5005 2021-03-22 12:38:35,557 INFO [io.quarkus] (Quarkus Main Thread) my-artifactId my-version on JVM (powered by Quarkus 1.12.2.Final) started in 3.008s. Listening on: http://localhost:8080 2021-03-22 12:38:35,561 INFO [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated. 2021-03-22 12:38:35,562 INFO [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, resteasy, resteasy-jackson] 2021-03-22 12:38:51,100 INFO [io.qua.dep.dev.RuntimeUpdatesProcessor] (vert.x-worker-thread-1) Changed source files detected, recompiling [/Users/admin/dev/others/my-artifactId/src/main/java/org/my/group/MyResource.java] 2021-03-22 12:38:51,597 WARN [io.qua.dep.dev.JavaCompilationProvider] (vert.x-worker-thread-1) system modules path not set in conjunction with -source 11, line -1 in [unknown source] 2021-03-22 12:38:51,663 INFO [io.quarkus] (Quarkus Main Thread) my-artifactId stopped in 0.065s 2021-03-22 12:38:52,370 INFO [io.quarkus] (Quarkus Main Thread) my-artifactId my-version on JVM (powered by Quarkus 1.12.2.Final) started in 0.701s. Listening on: http://localhost:8080 2021-03-22 12:38:52,371 INFO [io.quarkus] (Quarkus Main Thread) Profile dev activated. Live Coding activated. 2021-03-22 12:38:52,371 INFO [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, resteasy, resteasy-jackson] 2021-03-22 12:38:52,371 INFO [io.qua.dep.dev.RuntimeUpdatesProcessor] (vert.x-worker-thread-1) Hot replace total time: 1.273s ``` ## To Reproduce - I´ve used directly the output of ``` mvn io.quarkus:quarkus-maven-plugin:1.12.2.Final:create \\ -DprojectGroupId=my-groupId \\ -DprojectArtifactId=my-artifactId \\ -DprojectVersion=my-version \\ -DclassName="org.my.group.MyResource" \\ -Dextensions="resteasy,resteasy-jackson" \\ -DbuildTool=gradle ``` ## Environment (please complete the following information): Intellij IDEA community 2020.3 build 203.5981.155 (also from console directly) OS: Mac Quarkus 1.12.2 ### Output of `java -version` >java -version openjdk version "15" 2020-09-15 OpenJDK Runtime Environment (build 15+36-1562) OpenJDK 64-Bit Server VM (build 15+36-1562, mixed mode, sharing) ### GraalVM version (if different from Java) Not used ### Quarkus version or git rev 1.12.2 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 6.8.3

04db442e87626fa58c08a51fe4dd4f56ca912dd2

2161d421e9bbb8e4e02c95e8299c9aa267ec8f59

https://github.com/quarkusio/quarkus/compare/04db442e87626fa58c08a51fe4dd4f56ca912dd2...2161d421e9bbb8e4e02c95e8299c9aa267ec8f59

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 d8c94a0a744..07fcf7de684 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 @@ -236,11 +236,21 @@ private QuarkusDevModeLauncher newLauncher() throws Exception { for (AppDependency appDependency : appModel.getFullDeploymentDeps()) { final AppArtifact appArtifact = appDependency.getArtifact(); + //we only use the launcher for launching from the IDE, we need to exclude it + if (appArtifact.getGroupId().equals("io.quarkus") && appArtifact.getGroupId().equals("quarkus-ide-launcher")) { + continue; + } if (!projectDependencies.contains(new AppArtifactKey(appArtifact.getGroupId(), appArtifact.getArtifactId()))) { appArtifact.getPaths().forEach(p -> { if (Files.exists(p)) { - addToClassPaths(builder, p.toFile()); + if (appArtifact.getGroupId().equals("io.quarkus") + && appArtifact.getArtifactId().equals("quarkus-class-change-agent")) { + builder.jvmArgs("-javaagent:" + p.toFile().getAbsolutePath()); + } else { + addToClassPaths(builder, p.toFile()); + } } + }); } }

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

{'.java': 1}

Java

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

Apache License 2.0

quarkusio/quarkus/15913/15442

quarkusio

quarkus

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

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

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

fixes

Narayana STM failing to build in Native

**Describe the bug** When building a Quarkus application with the Narayana STM and also using any other extension that also brings the narayana JTA extension (hibernate orm, agroal, etc), the build fails in Native with: ``` [INFO] [io.quarkus.deployment.pkg.steps.NativeImageBuildStep] docker run -v /home/jcarvaja/Downloads/tmp/code-with-quarkus/target/code-with-quarkus-1.0.0-SNAPSHOT-native-image-source-jar:/project:z --env LANG=C --user 1000:1000 --rm quay.io/quarkus/ubi-quarkus-native-image:21.0.0-java11 -J-DCoordinatorEnvironmentBean.transactionStatusManagerEnable=false -J-Dsun.nio.ch.maxUpdateArraySize=100 -J-Djava.util.logging.manager=org.jboss.logmanager.LogManager -J-Dvertx.logger-delegate-factory-class-name=io.quarkus.vertx.core.runtime.VertxLogDelegateFactory -J-Dvertx.disableDnsResolver=true -J-Dio.netty.leakDetection.level=DISABLED -J-Dio.netty.allocator.maxOrder=1 -J-DCoordinatorEnvironmentBean.transactionStatusManagerEnable=false -J-Duser.language=es -J-Duser.country=ES -J-Dfile.encoding=UTF-8 --initialize-at-build-time= -H:InitialCollectionPolicy=com.oracle.svm.core.genscavenge.CollectionPolicy\\$BySpaceAndTime -H:+JNI -H:+AllowFoldMethods -jar code-with-quarkus-1.0.0-SNAPSHOT-runner.jar -H:FallbackThreshold=0 -H:+ReportExceptionStackTraces -J-Xmx4g -H:-AddAllCharsets -H:EnableURLProtocols=http --no-server -H:-UseServiceLoaderFeature -H:+StackTrace code-with-quarkus-1.0.0-SNAPSHOT-runner [code-with-quarkus-1.0.0-SNAPSHOT-runner:24] classlist: 4.198,77 ms, 1,19 GB [code-with-quarkus-1.0.0-SNAPSHOT-runner:24] (cap): 815,95 ms, 1,19 GB [code-with-quarkus-1.0.0-SNAPSHOT-runner:24] setup: 2.879,19 ms, 1,19 GB 15:13:59,636 INFO [org.jbo.threads] JBoss Threads version 3.2.0.Final To see how the classes got initialized, use --trace-class-initialization=com.arjuna.ats.internal.arjuna.utils.SocketProcessId [code-with-quarkus-1.0.0-SNAPSHOT-runner:24] analysis: 37.311,65 ms, 1,87 GB Error: Classes that should be initialized at run time got initialized during image building: com.arjuna.ats.internal.arjuna.utils.SocketProcessId the class was requested to be initialized at run time (from feature io.quarkus.runner.AutoFeature.beforeAnalysis). To see why com.arjuna.ats.internal.arjuna.utils.SocketProcessId got initialized use --trace-class-initialization=com.arjuna.ats.internal.arjuna.utils.SocketProcessId com.oracle.svm.core.util.UserError$UserException: Classes that should be initialized at run time got initialized during image building: com.arjuna.ats.internal.arjuna.utils.SocketProcessId the class was requested to be initialized at run time (from feature io.quarkus.runner.AutoFeature.beforeAnalysis). To see why com.arjuna.ats.internal.arjuna.utils.SocketProcessId got initialized use --trace-class-initialization=com.arjuna.ats.internal.arjuna.utils.SocketProcessId at com.oracle.svm.core.util.UserError.abort(UserError.java:68) at com.oracle.svm.hosted.classinitialization.ConfigurableClassInitialization.checkDelayedInitialization(ConfigurableClassInitialization.java:539) at com.oracle.svm.hosted.classinitialization.ClassInitializationFeature.duringAnalysis(ClassInitializationFeature.java:226) at com.oracle.svm.hosted.NativeImageGenerator.lambda$runPointsToAnalysis$8(NativeImageGenerator.java:740) at com.oracle.svm.hosted.FeatureHandler.forEachFeature(FeatureHandler.java:70) at com.oracle.svm.hosted.NativeImageGenerator.runPointsToAnalysis(NativeImageGenerator.java:740) at com.oracle.svm.hosted.NativeImageGenerator.doRun(NativeImageGenerator.java:563) at com.oracle.svm.hosted.NativeImageGenerator.lambda$run$0(NativeImageGenerator.java:476) at java.base/java.util.concurrent.ForkJoinTask$AdaptedRunnableAction.exec(ForkJoinTask.java:1407) at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:290) at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1020) at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1656) at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1594) at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183) Error: Image build request failed with exit status 1 ``` **Expected behavior** It should work as in JVM. **Actual behavior** It fails when building, see exception above. **To Reproduce** Steps to reproduce the behavior: 1. Go to code.quarkus.io 2. Select Narayana STM extension and Agroal (or directly Narayana JTA) 3. Download the ZIP and try to build the application using: ``` mvn clean install -Dnative -Dquarkus.native.container-build=true ``` **Environment (please complete the following information):** - Quarkus version or git rev: 1.12.0.Final and 999-SNAPSHOT

33062777080701f3d7c258f8585081357c12d56c

78c56330ecb4355e948b55f78ecf13de57759dd6

https://github.com/quarkusio/quarkus/compare/33062777080701f3d7c258f8585081357c12d56c...78c56330ecb4355e948b55f78ecf13de57759dd6

diff --git a/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java b/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java index b23e3d0b602..bb2082d8e3b 100644 --- a/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java +++ b/extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.java @@ -18,6 +18,7 @@ import com.arjuna.ats.internal.arjuna.coordinator.CheckedActionFactoryImple; import com.arjuna.ats.internal.arjuna.objectstore.ShadowNoFileLockStore; +import com.arjuna.ats.internal.arjuna.utils.SocketProcessId; import com.arjuna.ats.txoj.Lock; import io.quarkus.deployment.Feature; @@ -30,6 +31,7 @@ import io.quarkus.deployment.builditem.nativeimage.NativeImageSystemPropertyBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyBuildItem; +import io.quarkus.deployment.builditem.nativeimage.RuntimeInitializedClassBuildItem; import io.quarkus.narayana.stm.runtime.NarayanaSTMRecorder; class NarayanaSTMProcessor { @@ -60,8 +62,11 @@ public NativeImageSystemPropertyBuildItem substrateSystemPropertyBuildItem() { // so disable it at runtime @BuildStep() @Record(RUNTIME_INIT) - public void configureRuntimeProperties(NarayanaSTMRecorder recorder) { + public void configureRuntimeProperties(NarayanaSTMRecorder recorder, + BuildProducer<RuntimeInitializedClassBuildItem> runtimeInit) { recorder.disableTransactionStatusManager(); + runtimeInit.produce(new RuntimeInitializedClassBuildItem(SocketProcessId.class.getName())); + runtimeInit.produce(new RuntimeInitializedClassBuildItem(Lock.class.getName())); } // register STM dynamic proxies

['extensions/narayana-stm/deployment/src/main/java/io/quarkus/narayana/stm/deployment/NarayanaSTMProcessor.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/15910/15903

quarkusio

quarkus

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

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

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

fixes

MappedByteBufferReplacement substitutions is obsolete in JDK16

## Describe the bug Trying to build a simple Quarkus Native Image application with a JDK16 based GraalVM results in ``` Error: Could not find target method: private void io.quarkus.runtime.graal.MappedByteBufferReplacement.force0(java.io.FileDescriptor,long,long) com.oracle.svm.core.util.UserError$UserException: Could not find target method: private void io.quarkus.runtime.graal.MappedByteBufferReplacement.force0(java.io.FileDescriptor,long,long) at com.oracle.svm.core.util.UserError.abort(UserError.java:68) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.findOriginalMethod(AnnotationSubstitutionProcessor.java:734) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleMethodInAliasClass(AnnotationSubstitutionProcessor.java:366) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleAliasClass(AnnotationSubstitutionProcessor.java:338) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.handleClass(AnnotationSubstitutionProcessor.java:310) at com.oracle.svm.hosted.substitute.AnnotationSubstitutionProcessor.init(AnnotationSubstitutionProcessor.java:266) at com.oracle.svm.hosted.NativeImageGenerator.createDeclarativeSubstitutionProcessor(NativeImageGenerator.java:952) at com.oracle.svm.hosted.NativeImageGenerator.setupNativeImage(NativeImageGenerator.java:886) at com.oracle.svm.hosted.NativeImageGenerator.doRun(NativeImageGenerator.java:578) at com.oracle.svm.hosted.NativeImageGenerator.lambda$run$2(NativeImageGenerator.java:493) at java.base/java.util.concurrent.ForkJoinTask$AdaptedRunnableAction.exec(ForkJoinTask.java:1414) at java.base/java.util.concurrent.ForkJoinTask.doExec(ForkJoinTask.java:295) at java.base/java.util.concurrent.ForkJoinPool$WorkQueue.topLevelExec(ForkJoinPool.java:1016) at java.base/java.util.concurrent.ForkJoinPool.scan(ForkJoinPool.java:1665) at java.base/java.util.concurrent.ForkJoinPool.runWorker(ForkJoinPool.java:1598) at java.base/java.util.concurrent.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:183) ``` The target method [`MappedByteBuffer.force0`](https://github.com/quarkusio/quarkus/blob/main/core/runtime/src/main/java/io/quarkus/runtime/graal/MappedByteBufferReplacement.java#L13) has been removed in JDK16. Note: A JDK16 GraalVM is not widely available yet, it must be built from source.

33062777080701f3d7c258f8585081357c12d56c

7bf3040ea9e4d0c20322ff841ae9617de761081a

https://github.com/quarkusio/quarkus/compare/33062777080701f3d7c258f8585081357c12d56c...7bf3040ea9e4d0c20322ff841ae9617de761081a

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/MappedByteBufferReplacement.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/MappedByteBufferReplacement.java index f98382534aa..4b8967faffb 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/graal/MappedByteBufferReplacement.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/MappedByteBufferReplacement.java @@ -5,8 +5,9 @@ import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; +import com.oracle.svm.core.jdk.JDK15OrEarlier; -@TargetClass(MappedByteBuffer.class) +@TargetClass(value = MappedByteBuffer.class, onlyWith = JDK15OrEarlier.class) final class MappedByteBufferReplacement { @Substitute

['core/runtime/src/main/java/io/quarkus/runtime/graal/MappedByteBufferReplacement.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/15898/15886

quarkusio

quarkus

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

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

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

resolves

CDI events qualifiers not working when abstract superclass is in a library

## Describe the bug CDI events qualifiers are not working well when abstract superclass is in a library since when implementing the class it will be registered as a general observer instead of one with a qualifier. Check https://github.com/MarcoMartins86/event_qualifier_issue for more details. ### Expected behavior If I trigger an important event `http://localhost:8080/Events/Important` should appear: ```text Library AbstractObserverImportantEvent: Important event message 0 Event qualifiers[[@org.acme.ImportantEvent(), @javax.enterprise.inject.Any()]] Runner ImportantEventImpl: Important event message 0 ``` ### Actual behavior If I trigger an important event `http://localhost:8080/Events/Important` appears: ```text Library AbstractObserverNormalEvent: Important event message 0 Event qualifiers[[@org.acme.ImportantEvent(), @javax.enterprise.inject.Any()]] Runner NormalEventImpl: Important event message 0 Library AbstractObserverImportantEvent: Important event message 0 Event qualifiers[[@org.acme.ImportantEvent(), @javax.enterprise.inject.Any()]] Runner ImportantEventImpl: Important event message 0 ``` ## To Reproduce A project that reproduces this https://github.com/MarcoMartins86/event_qualifier_issue Steps to reproduce the behavior: 1. make 2. Do GET to http://localhost:8080/Events/Important 3. Check the command line for the prints ## Environment (please complete the following information): ### Output of `uname -a` or `ver` Darwin PT-320323-MBP16 20.2.0 Darwin Kernel Version 20.2.0: Wed Dec 2 20:39:59 PST 2020; root:xnu-7195.60.75~1/RELEASE_X86_64 x86_64 ### Output of `java -version` java version "11.0.9" 2020-10-20 LTS Java(TM) SE Runtime Environment 18.9 (build 11.0.9+7-LTS) Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.9+7-LTS, mixed mode) ### GraalVM version (if different from Java) ### Quarkus version or git rev 1.12.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /usr/local/Cellar/maven/3.6.3_1/libexec Java version: 11.0.9, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk-11.0.9.jdk/Contents/Home Default locale: en_PT, platform encoding: UTF-8 OS name: "mac os x", version: "10.16", arch: "x86_64", family: "mac" ## Additional context

69c1551a0fde22c007e1e6e19a87ac2d4421eb8e

4f83ab734e829099bf5ce010eb07fb3035b89895

https://github.com/quarkusio/quarkus/compare/69c1551a0fde22c007e1e6e19a87ac2d4421eb8e...4f83ab734e829099bf5ce010eb07fb3035b89895

diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java index 9712660d828..175bae52a50 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.java @@ -86,7 +86,7 @@ Type getDisposedParameterType() { MethodParameterInfo initDisposedParam(MethodInfo disposerMethod) { List<MethodParameterInfo> disposedParams = new ArrayList<>(); for (AnnotationInstance annotation : disposerMethod.annotations()) { - if (Kind.METHOD_PARAMETER.equals(annotation.target().kind()) && annotation.name().equals(DotNames.DISPOSES)) { + if (Kind.METHOD_PARAMETER == annotation.target().kind() && annotation.name().equals(DotNames.DISPOSES)) { disposedParams.add(annotation.target().asMethodParameter()); } } diff --git a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java index 298109e92db..b23b85a08b5 100644 --- a/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java +++ b/independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java @@ -1,5 +1,8 @@ package io.quarkus.arc.processor; +import static io.quarkus.arc.processor.Annotations.find; +import static io.quarkus.arc.processor.Annotations.getParameterAnnotations; + import io.quarkus.arc.processor.BuildExtension.BuildContext; import io.quarkus.arc.processor.ObserverTransformer.ObserverTransformation; import io.quarkus.arc.processor.ObserverTransformer.TransformationContext; @@ -36,9 +39,11 @@ public class ObserverInfo implements InjectionTargetInfo { static ObserverInfo create(BeanInfo declaringBean, MethodInfo observerMethod, Injection injection, boolean isAsync, List<ObserverTransformer> transformers, BuildContext buildContext, boolean jtaCapabilities) { MethodParameterInfo eventParameter = initEventParam(observerMethod, declaringBean.getDeployment()); - AnnotationInstance priorityAnnotation = observerMethod.annotation(DotNames.PRIORITY); + AnnotationInstance priorityAnnotation = find( + getParameterAnnotations(declaringBean.getDeployment(), observerMethod, eventParameter.position()), + DotNames.PRIORITY); Integer priority; - if (priorityAnnotation != null && priorityAnnotation.target().equals(eventParameter)) { + if (priorityAnnotation != null) { priority = priorityAnnotation.value().asInt(); } else { priority = ObserverMethod.DEFAULT_PRIORITY; @@ -285,10 +290,9 @@ static TransactionPhase initTransactionPhase(boolean isAsync, BeanDeployment bea static Set<AnnotationInstance> initQualifiers(BeanDeployment beanDeployment, MethodInfo observerMethod, MethodParameterInfo eventParameter) { Set<AnnotationInstance> qualifiers = new HashSet<>(); - for (AnnotationInstance annotation : beanDeployment.getAnnotations(observerMethod)) { - if (annotation.target().equals(eventParameter)) { - beanDeployment.extractQualifiers(annotation).forEach(qualifiers::add); - } + for (AnnotationInstance annotation : getParameterAnnotations(beanDeployment, observerMethod, + eventParameter.position())) { + beanDeployment.extractQualifiers(annotation).forEach(qualifiers::add); } return qualifiers; }

['independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/ObserverInfo.java', 'independent-projects/arc/processor/src/main/java/io/quarkus/arc/processor/DisposerInfo.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/15869/15859

quarkusio

quarkus

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

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

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

fixes

"quarkus.http.test-timeout" Was removed ? (using 1.12.1.Final)

I have this in my application.properties # timeout for junit RestAssured / debug %test.quarkus.http.test-timeout=600s I'm using : <quarkus.platform.version>1.12.1.Final</quarkus.platform.version> and now I obtain this in the logs 2021-03-18 12:47:35,512 WARN [io.qua.config] (main) Unrecognized configuration key "quarkus.http.test-timeout" was provided; it will be ignored; verify that the dependency extension for this configuration is set or you did not make a typo In that guide : https://quarkus.io/guides/getting-started-testing 4.2. Controlling HTTP interaction timeout When using REST Assured in your test, the connection and response timeouts are set to 30 seconds. You can override this setting with the quarkus.http.test-timeout property: quarkus.http.test-timeout=10s It should be a false warning:

f54f17f1a899805fab6c7e1e05716fa94b51f592

521b939d089339b30e2f198ebed3e44592e9ce9d

https://github.com/quarkusio/quarkus/compare/f54f17f1a899805fab6c7e1e05716fa94b51f592...521b939d089339b30e2f198ebed3e44592e9ce9d

diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java index 172a24288d0..6bca11e7fe1 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.java @@ -1,5 +1,7 @@ package io.quarkus.vertx.http.runtime; +import java.time.Duration; + import io.quarkus.runtime.annotations.ConfigItem; import io.quarkus.runtime.annotations.ConfigPhase; import io.quarkus.runtime.annotations.ConfigRoot; @@ -68,4 +70,10 @@ public class HttpBuildTimeConfig { */ @ConfigItem(defaultValue = "true") public boolean redirectToNonApplicationRootPath; + + /** + * The REST Assured client timeout for testing. + */ + @ConfigItem(defaultValue = "30s") + public Duration testTimeout; }

['extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/HttpBuildTimeConfig.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/15838/15825

quarkusio

quarkus

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

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

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

fixes

ElasticRestClient fails to load the provided custom configuration via @ElasticsearchClientConfig

## Describe the bug The ElasticRestClient fails to load the provided custom configuration via @ElasticsearchClientConfig. I followed the documentation here https://quarkus.io/guides/elasticsearch#programmatically-configuring-elasticsearch to provide a custom configuration for elastic search. In my case I am adding AWS signing interceptor to the httpClientBuilder. Version 1.12.2.Final ### Expected behavior The custom configuration (signing interceptor) should get loaded up ### Actual behavior Fails to load the custom configuration. ## To Reproduce Add a new custom configuration based on the docs. ``` @ApplicationScoped @ElasticsearchClientConfig public class MyCustomConfig implements RestClientBuilder.HttpClientConfigCallback { @Override public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder httpClientBuilder) { // log something here } } ``` Then inject the REST client. ``` @Inject RestClient lowLevelClient; ``` No logged message above From the MR here: https://github.com/quarkusio/quarkus/commit/08df613dd1f989a96b2414755ddd1dbc1c8ec02b#diff-3530ce31269994606ad048f4d42f2fa57425d1fa08c6cf4ffb37980ee8dcbd5dR86 ``` Iterable<InstanceHandle<RestClientBuilder.HttpClientConfigCallback>> handles = Arc.container() .select(RestClientBuilder.HttpClientConfigCallback.class, new ElasticsearchClientConfig.Literal()) .handles(); ``` I copied the above code to my unit tests and the size of the `handles` variable always seem to be 0. Arc.container() does not seem to find the custom config. Or is there another class registration step missed in the documentation ? Any feedback is really appreciated. Thank you Tagging original authors for help. @eAybars @gsmet

2ffff2ec818ca84fc4ed77768c4d453c57aae5b3

ef38740d32498754972755acfbf58caa0889a8d2

https://github.com/quarkusio/quarkus/compare/2ffff2ec818ca84fc4ed77768c4d453c57aae5b3...ef38740d32498754972755acfbf58caa0889a8d2

diff --git a/extensions/elasticsearch-rest-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/deployment/ElasticsearchLowLevelClientProcessor.java b/extensions/elasticsearch-rest-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/deployment/ElasticsearchLowLevelClientProcessor.java index 00187a72355..5f631fc2dc1 100644 --- a/extensions/elasticsearch-rest-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/deployment/ElasticsearchLowLevelClientProcessor.java +++ b/extensions/elasticsearch-rest-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/deployment/ElasticsearchLowLevelClientProcessor.java @@ -6,6 +6,7 @@ import io.quarkus.arc.deployment.BeanDefiningAnnotationBuildItem; import io.quarkus.arc.processor.DotNames; import io.quarkus.deployment.Feature; +import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.elasticsearch.restclient.lowlevel.ElasticsearchClientConfig; @@ -27,8 +28,13 @@ AdditionalBeanBuildItem build() { } @BuildStep - BeanDefiningAnnotationBuildItem elasticsearchClientConfigBeanDefiningAnnotation() { - return new BeanDefiningAnnotationBuildItem(ELASTICSEARCH_CLIENT_CONFIG, DotNames.APPLICATION_SCOPED, false); + void elasticsearchClientConfigSupport(BuildProducer<AdditionalBeanBuildItem> additionalBeans, + BuildProducer<BeanDefiningAnnotationBuildItem> beanDefiningAnnotations) { + // add the @ElasticsearchClientConfig class otherwise it won't be registered as a qualifier + additionalBeans.produce(AdditionalBeanBuildItem.builder().addBeanClass(ElasticsearchClientConfig.class).build()); + + beanDefiningAnnotations + .produce(new BeanDefiningAnnotationBuildItem(ELASTICSEARCH_CLIENT_CONFIG, DotNames.APPLICATION_SCOPED, false)); } @BuildStep diff --git a/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java index 06c308031e9..2f56c48eff7 100644 --- a/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java +++ b/extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.java @@ -26,30 +26,24 @@ public class ElasticsearchClientConfigTest { @Inject ElasticsearchConfig config; - @Inject - @ElasticsearchClientConfig - TestConfigurator testConfigurator; @Test public void testRestClientBuilderHelperWithElasticsearchClientConfig() { RestClientBuilderHelper.createRestClientBuilder(config).build(); - assertTrue(testConfigurator.isInvoked()); + assertTrue(TestConfigurator.invoked); } @ElasticsearchClientConfig @ApplicationScoped public static class TestConfigurator implements RestClientBuilder.HttpClientConfigCallback { - private boolean invoked = false; + + private static boolean invoked = false; @Override public HttpAsyncClientBuilder customizeHttpClient(HttpAsyncClientBuilder builder) { invoked = true; return builder; } - - public boolean isInvoked() { - return invoked; - } } }

['extensions/elasticsearch-rest-client/deployment/src/main/java/io/quarkus/elasticsearch/restclient/lowlevel/deployment/ElasticsearchLowLevelClientProcessor.java', 'extensions/elasticsearch-rest-client/deployment/src/test/java/io/quarkus/elasticsearch/restclient/lowlevel/runtime/ElasticsearchClientConfigTest.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/15798/10578

quarkusio

quarkus

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

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

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

fixes

Named handler log files get logs duplicated when hot reload is performed

**Describe the bug** In properties file I have configured 2 different named handlers, for very specific logging categories. In dev mode the log in these categories are working fine and directed toward the right file handler. When an hot-reload is performed I see the log lines duplicated, and each time a new hot-reload is performed there is one more copy of the log lines pushed to the files. This might be related to the named log handler being registered multiple times on hot reload, I'm guessing, because console log and the general `quarkus.log.file.path` do not get duplicates traces after several hot reloads. **Expected behavior** Hot reload should reset logging configuration, and not duplicate log lines in named handler files **Actual behavior** After hot reload duplicate log lines are added to named handler log files, and the duplication factor is the number of live reloads performed. **To Reproduce** Steps to reproduce the behavior: 1. Configure named log handler 2. Append to the matching log topic/categories 3. See log lines appears one at a time 4. Perform hot reload, changing a blank line in source or something meaningless 5. See log lines appears duplicate 6. Perform another hot reload 7. See log lines appear 3 times each **Configuration** ```properties # Add your application.properties here, if applicable. #Logging quarkus.log.level=INFO quarkus.log.category."com.darva.urlshortener".level=DEBUG # Configure a named handler that logs to Activite file quarkus.log.handler.file."ACTIVITE".enable=true quarkus.log.handler.file."ACTIVITE".path=../logs/activite.log quarkus.log.handler.file."ACTIVITE".format=%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX};%X{raisonsociale};%X{userroles};%X{sessionId};%X{posteId};%X{userId};%X{versionApp};%X{service};SERVICE-NAME;%X{numclient};%X{transactionId};%X{versionConfApp};%X{versionConfTech};%X{codePro};%X{codeAbo};%m%n quarkus.log.category."com.company.log.ActivityTracer".level=INFO quarkus.log.category."com.company.log.ActivityTracer".handlers=ACTIVITE # Configure a named handler that logs to Exploitation file quarkus.log.handler.file."EXPLOITATION".enable=true quarkus.log.handler.file."EXPLOITATION".path=../logs/exploitation.log quarkus.log.handler.file."EXPLOITATION".format=%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX};%X{raisonsociale};%X{userroles};%X{sessionId};%X{posteId};%X{userId};%X{versionApp};%X{service};SERVICE-NAME;%X{numclient};%X{transactionId};%X{versionConfApp};%X{versionConfTech};%X{codePro};%X{codeAbo};%p;%C;%m;%M%n quarkus.log.category."com.company.log.ExploitationTracer".level=ERROR quarkus.log.category."com.company.log.ExploitationTracer".handlers=EXPLOITATION # General log goes to Application file quarkus.log.file.enable=true quarkus.log.file.path=../logs/application.log quarkus.log.file.format=%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX};%X{raisonsociale};%X{userroles};%X{sessionId};%X{posteId};%X{userId};%X{versionApp};%X{service};SERVICE-NAME;%X{numclient};%X{transactionId};%X{versionConfApp};%X{versionConfTech};%X{codePro};%X{codeAbo};%p;%C;%m;%M%n quarkus.log.file.level=DEBUG quarkus.log.min-level=DEBUG ``` **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Darwin ***********.local 19.5.0 Darwin Kernel Version 19.5.0: Tue May 26 20:41:44 PDT 2020; root:xnu-6153.121.2~2/RELEASE_X86_64 x86_64 - Output of `java -version`: java version "11.0.7" 2020-04-14 LTS Java(TM) SE Runtime Environment 18.9 (build 11.0.7+8-LTS) Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.7+8-LTS, mixed mode) - GraalVM version (if different from Java): - Quarkus version or git rev: 1.5.2.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) **Additional context** This all happened in dev mode, running the application using either `mvn quarkus:dev` or `./mvnw quarkus:dev`. Not very critical to me either, as hot reload is only useful for dev environment.

ce244e1c13933a1862163fc70d0d5babcacdd41b

5b69ffa9ded999138edfaaa6d9692bbf9697ee4a

https://github.com/quarkusio/quarkus/compare/ce244e1c13933a1862163fc70d0d5babcacdd41b...5b69ffa9ded999138edfaaa6d9692bbf9697ee4a

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java index 3bd50a147ad..9715b77d878 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.java @@ -289,14 +289,27 @@ private static void addToNamedHandlers(Map<String, Handler> namedHandlers, Handl handlerName)); } namedHandlers.put(handlerName, handler); + InitialConfigurator.DELAYED_HANDLER.addLoggingCloseTask(new Runnable() { + @Override + public void run() { + handler.close(); + } + }); } private static void addNamedHandlersToCategory(CategoryConfig categoryConfig, Map<String, Handler> namedHandlers, Logger categoryLogger, ErrorManager errorManager) { for (String categoryNamedHandler : categoryConfig.handlers.get()) { - if (namedHandlers.get(categoryNamedHandler) != null) { - categoryLogger.addHandler(namedHandlers.get(categoryNamedHandler)); + Handler handler = namedHandlers.get(categoryNamedHandler); + if (handler != null) { + categoryLogger.addHandler(handler); + InitialConfigurator.DELAYED_HANDLER.addLoggingCloseTask(new Runnable() { + @Override + public void run() { + categoryLogger.removeHandler(handler); + } + }); } else { errorManager.error(String.format("Handler with name '%s' is linked to a category but not configured.", categoryNamedHandler), null, ErrorManager.GENERIC_FAILURE); diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java index ae28d6fc633..b39f29a5d57 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java @@ -17,7 +17,9 @@ package io.quarkus.bootstrap.logging; import java.util.ArrayDeque; +import java.util.ArrayList; import java.util.Deque; +import java.util.List; import java.util.logging.ErrorManager; import java.util.logging.Formatter; import java.util.logging.Handler; @@ -36,6 +38,7 @@ public class QuarkusDelayedHandler extends ExtHandler { private final Deque<ExtLogRecord> logRecords = new ArrayDeque<>(); + private final List<Runnable> logCloseTasks = new ArrayList<>(); private final int queueLimit; private volatile boolean buildTimeLoggingActivated = false; @@ -135,6 +138,10 @@ public Handler[] setHandlers(final Handler[] newHandlers) throws SecurityExcepti return result; } + public void addLoggingCloseTask(Runnable runnable) { + logCloseTasks.add(runnable); + } + public synchronized Handler[] setBuildTimeHandlers(final Handler[] newHandlers) throws SecurityException { final Handler[] result = super.setHandlers(newHandlers); buildTimeLoggingActivated = true; @@ -177,6 +184,9 @@ public void removeHandler(final Handler handler) throws SecurityException { @Override public Handler[] clearHandlers() throws SecurityException { activated = false; + for (Runnable i : logCloseTasks) { + i.run(); + } return super.clearHandlers(); }

['independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java', 'core/runtime/src/main/java/io/quarkus/runtime/logging/LoggingSetupRecorder.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/15796/15195

quarkusio

quarkus

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

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

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

fixes

Subsequent @QuarkusTest's stuck when running with different @TestProfile for testing Lambdas

**Describe the bug** The Gradle project consists of multiple `RequestHandler` which all need to be tested individually. We use one test profile for each handler test and one test class per handler. The test profiles spawns test resources (WireMock, localstack) and sets the handler `quarkus.lambda.handler` accordingly with some other variables. When running the tests we observe that the first `@QuarkusTest` class runs as expected but the subsequent class get stuck on the `LambdaClient.invoke(...)` call and blocks infinitely. After some investigation it seems like the running `AbstractLambdaPollLoop` of the first QuarkusTest does not receive/check the interrupt of the Quarkus shutdown due to TestProfile switch. Additionally the second QuarkusTest somehow does not wait until the old poll loop is destroyed and starts its poll loop and tests. The Lambda test call of the second QuarkusTest is queued into `LambdaClient.REQUEST_QUEUE`. However, due to the fact that the first poll loop is still running, it requests another requestId in line `AbstractLambdaPollLoop.java:60` which is then dequeued of the REQUEST_QUEUE by `LambdaResourceManager`. Since the loop has been stopped, it exits and does not propagate the response to the `CompletableFuture` inside `LambdaClient`. The test call however of the second QuarkusTest is still waiting for the response. **Expected behavior** All tests run with their assigned profile without being blocking. **Actual behavior** A subsequent QuarkusTest blocks due to a not returning call inside `AbstractLambdaPollLoop`. **To Reproduce** We were not able to reproduce it in a small example project. However we hope that contributors of the lambda extension with more in-depth knowledge of the Quarkus testing lifecycle will understand the above. If not we can only provide an example of the testing setup based on the aws-lambda archetype project which somehow does not run in the stated problem. **Configuration** ```properties quarkus.lambda.enable-polling-jvm-mode=true ``` **Screenshots** (If applicable, add screenshots to help explain your problem.) **Environment (please complete the following information):** - Output of `java -version`: openjdk 13.0.2 2020-01-14 OpenJDK Runtime Environment (build 13.0.2+8) OpenJDK 64-Bit Server VM (build 13.0.2+8, mixed mode, sharing) - Quarkus version or git rev: 1.11.3.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Gradle 6.5.1 **Additional context** (Add any other context about the problem here.)

ce244e1c13933a1862163fc70d0d5babcacdd41b

7c6f45a4561e245638be998fe00b28d9b7f8f372

https://github.com/quarkusio/quarkus/compare/ce244e1c13933a1862163fc70d0d5babcacdd41b...7c6f45a4561e245638be998fe00b28d9b7f8f372

diff --git a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java index 720e8d4f452..0777ce720e8 100644 --- a/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java +++ b/extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java @@ -36,7 +36,6 @@ public AbstractLambdaPollLoop(ObjectMapper objectMapper, ObjectReader cognitoIdR public void startPollLoop(ShutdownContext context) { final AtomicBoolean running = new AtomicBoolean(true); - final Thread pollingThread = new Thread(new Runnable() { @SuppressWarnings("unchecked") @Override @@ -122,8 +121,11 @@ public void run() { } } }, "Lambda Thread"); + pollingThread.setDaemon(true); context.addShutdownTask(() -> { running.set(false); + //note that this does not seem to be 100% reliable in unblocking the thread + //which is why it is a daemon. pollingThread.interrupt(); }); pollingThread.start(); diff --git a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java index 1ae03daefd9..73278d9e3bd 100644 --- a/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java +++ b/test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.java @@ -7,6 +7,7 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; import com.fasterxml.jackson.databind.ObjectMapper; @@ -14,6 +15,7 @@ import io.quarkus.amazon.lambda.runtime.FunctionError; import io.quarkus.test.common.QuarkusTestResourceLifecycleManager; import io.undertow.Undertow; +import io.undertow.httpcore.StatusCodes; import io.undertow.server.HttpHandler; import io.undertow.server.HttpServerExchange; import io.undertow.server.RoutingHandler; @@ -21,27 +23,38 @@ public class LambdaResourceManager implements QuarkusTestResourceLifecycleManager { + private volatile boolean started = false; private volatile Undertow undertow; + private final AtomicInteger currentPollCount = new AtomicInteger(); public static final int PORT = Integer.getInteger("quarkus-internal.aws-lambda.test-port", 5387); @Override public Map<String, String> start() { - + started = true; RoutingHandler routingHandler = new RoutingHandler(true); routingHandler.add("GET", AmazonLambdaApi.API_PATH_INVOCATION_NEXT, new HttpHandler() { @Override public void handleRequest(HttpServerExchange exchange) throws Exception { - LambdaStartedNotifier.started = true; - Map.Entry<String, String> req = null; - while (req == null) { - req = LambdaClient.REQUEST_QUEUE.poll(100, TimeUnit.MILLISECONDS); - if (undertow == null || undertow.getWorker() == null || undertow.getWorker().isShutdown()) { - return; + currentPollCount.incrementAndGet(); + try { + LambdaStartedNotifier.started = true; + Map.Entry<String, String> req = null; + while (req == null) { + req = LambdaClient.REQUEST_QUEUE.poll(100, TimeUnit.MILLISECONDS); + if (!started || undertow == null || undertow.getWorker() == null || undertow.getWorker().isShutdown()) { + exchange.setStatusCode(StatusCodes.SERVICE_UNAVAILABLE); + exchange.setPersistent(false); + exchange.getOutputStream().close(); + return; + } } + exchange.addResponseHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, req.getKey()); + exchange.getOutputStream().write(req.getValue().getBytes(StandardCharsets.UTF_8)); + exchange.getOutputStream().close(); + } finally { + currentPollCount.decrementAndGet(); } - exchange.addResponseHeader(AmazonLambdaApi.LAMBDA_RUNTIME_AWS_REQUEST_ID, req.getKey()); - exchange.writeAsync(req.getValue()); } }); routingHandler.add("POST", AmazonLambdaApi.API_PATH_INVOCATION + "{req}" + AmazonLambdaApi.API_PATH_RESPONSE, @@ -117,6 +130,16 @@ public void handleRequest(HttpServerExchange exchange) throws Exception { @Override public void stop() { + started = false; + while (currentPollCount.get() > 0) { + try { + //wait for all the responses to be sent + //before we shutdown + Thread.sleep(10); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } if (undertow == null) return; undertow.stop();

['extensions/amazon-lambda/common-runtime/src/main/java/io/quarkus/amazon/lambda/runtime/AbstractLambdaPollLoop.java', 'test-framework/amazon-lambda/src/main/java/io/quarkus/amazon/lambda/test/LambdaResourceManager.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/15795/15204

quarkusio

quarkus

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

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

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

fixes

NoClassDefFoundError for multi-module dependency in Vert.x reactive routes when using Maven quarkusDev

**Describe the bug** A multi-module maven project contains two submodules _mod1_ and _mod2_, where _mod2_ depends on _mod1_. When running _mod2_ in dev mode, `NoClassDefFoundError` occurs for a route class from _mod1_. The error does not occur when the application is built with `mvn package` and run with `java -jar mod2/target/mod2-0.0.1-SNAPSHOT-runner.jar`. **Expected behavior** The application should work no matter if it is run in dev mode or not. **Actual behavior** If the application is started with `mvn compile quarkus:dev -pl mod2`, an internal server error is returned when a request is made to a route in _mod1_. Both the log and the HTTP response contain a stacktrace: ``` 2021-02-20 02:39:39,613 ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] (vert.x-eventloop-thread-3) HTTP Request to /mod1/ failed, error id: d2ed3e7e-337e-4fcf-9c6e-eddc7944cecc-1: java.lang.NoClassDefFoundError: sg/wjtan/mod1/IndexPage at sg.wjtan.mod1.IndexPage_RouteHandler_index_279c3f7d45b3461bf7246354cb951cebf8120d77.invoke(IndexPage_RouteHandler_index_279c3f7d45b3461bf7246354cb951cebf8120d77.zig:104) at io.quarkus.vertx.web.runtime.RouteHandler.handle(RouteHandler.java:97) at io.quarkus.vertx.web.runtime.RouteHandler.handle(RouteHandler.java:22) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1038) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:101) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:132) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$17.handle(VertxHttpRecorder.java:1121) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$17.handle(VertxHttpRecorder.java:1092) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1038) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:137) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:132) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$4.handle(VertxHttpRecorder.java:333) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$4.handle(VertxHttpRecorder.java:311) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1038) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:137) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:132) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$3.handle(VertxHttpHotReplacementSetup.java:86) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$3.handle(VertxHttpHotReplacementSetup.java:75) at io.vertx.core.impl.ContextImpl.lambda$null$0(ContextImpl.java:327) at io.vertx.core.impl.ContextImpl.executeTask(ContextImpl.java:366) at io.vertx.core.impl.EventLoopContext.lambda$executeAsync$0(EventLoopContext.java:38) at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:164) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:472) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:500) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:989) at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:834) Caused by: java.lang.ClassNotFoundException: sg.wjtan.mod1.IndexPage at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:581) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:521) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:428) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:378) ... 28 more ``` **To Reproduce** Steps to reproduce the behavior: 1. Fetch to sample project from https://github.com/wjtan/quarkus-multi-web 2. Compile the project `mvn install` 2. Start the application using `mvn compile quarkus:dev -pl mod2` 3. Open the URL http://localhost:8080/mod1 **Environment (please complete the following information):** - Output of `uname -a` or `ver`: Windows 10 20H2 - Output of `java -version`: java 11.0.10 2021-01-19 LTS - GraalVM version (if different from Java): n/a - Quarkus version or git rev: 1.12.0.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Maven 3.6.3

ce244e1c13933a1862163fc70d0d5babcacdd41b

ae14fff9e70d6a77e532e40481cbbe843d2b92b8

https://github.com/quarkusio/quarkus/compare/ce244e1c13933a1862163fc70d0d5babcacdd41b...ae14fff9e70d6a77e532e40481cbbe843d2b92b8

diff --git a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java index 30889c74c92..add7a48d162 100644 --- a/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java +++ b/extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.java @@ -63,7 +63,7 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; -import io.quarkus.deployment.builditem.ApplicationIndexBuildItem; +import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; import io.quarkus.deployment.builditem.GeneratedClassBuildItem; import io.quarkus.deployment.builditem.LaunchModeBuildItem; @@ -231,14 +231,19 @@ void addAdditionalRoutes( BuildProducer<RouteDescriptionBuildItem> descriptions, Capabilities capabilities, Optional<BeanValidationAnnotationsBuildItem> beanValidationAnnotations, - ApplicationIndexBuildItem applicationIndex) { + List<ApplicationClassPredicateBuildItem> predicates) { Predicate<String> appClassPredicate = new Predicate<String>() { @Override public boolean test(String name) { int idx = name.lastIndexOf(HANDLER_SUFFIX); String className = idx != -1 ? name.substring(0, idx) : name; - return applicationIndex.getIndex().getClassByName(DotName.createSimple(className.replace("/", "."))) != null; + for (ApplicationClassPredicateBuildItem i : predicates) { + if (i.test(className)) { + return true; + } + } + return false; } }; ClassOutput classOutput = new GeneratedClassGizmoAdaptor(generatedClass, appClassPredicate);

['extensions/vertx-web/deployment/src/main/java/io/quarkus/vertx/web/deployment/VertxWebProcessor.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/15748/15657

quarkusio

quarkus

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

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

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

fixes

Resteasy Reactive - NoClassDefFoundError: io/quarkus/generated/java/lang/Long$quarkusrestparamConverter$

**Describe the bug** I have a class "ListFilterImportData", which is used in all projects as BeanParam, in a common artefact. it looks something like this (getter/setter omitted for brevity): ``` @QueryParam("language") String language; @QueryParam("page") @DefaultValue("1") Integer page; @QueryParam("sortAscending") @DefaultValue("false") Boolean sortAscending; @QueryParam("anotherValue") @DefaultValue("1") Long anotherValue; @QueryParam("anotherValue2") @DefaultValue("1") Short anotherValue2; ``` I now want to use this common artefact on a resource method like this: ``` @GET public String hello(@BeanParam ListFilterImportData filterImportData) ``` This works without Problems in Resteasy Classic. In Resteasy Reactive however, the ParamConverter for Long can not be found in dev mode, as indicated by the exception below. If I add this missing ParamConverter, another exception is throw but this time for Integer missing its ParamConverter. **Expected behavior** Classes defined in other artefacts should just work as BeanParams. **Actual behavior** I get this exception, indicating a missing ParamConverter for Long. I also get the same exception for String and Boolean. ``` Listening for transport dt_socket at address: 5005 2021-03-12 08:38:22,539 INFO [org.jbo.threads] (main) JBoss Threads version 3.2.0.Final 2021-03-12 08:38:24,439 INFO [io.qua.dep.dev.IsolatedDevModeMain] (main) Attempting to start hot replacement endpoint to recover from previous Quarkus startup failure 2021-03-12 08:38:24,440 ERROR [io.qua.run.boo.StartupActionImpl] (Quarkus Main Thread) Error running Quarkus: 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.runner.bootstrap.StartupActionImpl$3.run(StartupActionImpl.java:134) at java.base/java.lang.Thread.run(Thread.java:834) Caused by: java.lang.ExceptionInInitializerError at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.base/java.lang.reflect.Constructor.newInstance(Constructor.java:490) at java.base/java.lang.Class.newInstance(Class.java:584) at io.quarkus.runtime.Quarkus.run(Quarkus.java:65) at io.quarkus.runtime.Quarkus.run(Quarkus.java:42) at io.quarkus.runtime.Quarkus.run(Quarkus.java:119) at io.quarkus.runner.GeneratedMain.main(GeneratedMain.zig:29) ... 6 more Caused by: java.lang.RuntimeException: Failed to start quarkus at io.quarkus.runner.ApplicationImpl.<clinit>(ApplicationImpl.zig:255) ... 15 more Caused by: java.lang.NoClassDefFoundError: io/quarkus/generated/java/lang/Long$quarkusrestparamConverter$ at org.acme.common.ListFilterImportData.__quarkus_init_converter__anotherValue(ListFilterImportData.java) at io.quarkus.rest.runtime.__QuarkusInit.init(__QuarkusInit.zig:31) at io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRecorder.createDeployment(ResteasyReactiveRecorder.java:113) at io.quarkus.deployment.steps.ResteasyReactiveProcessor$setupEndpoints-1591811826.deploy_1(ResteasyReactiveProcessor$setupEndpoints-1591811826.zig:3522) at io.quarkus.deployment.steps.ResteasyReactiveProcessor$setupEndpoints-1591811826.deploy(ResteasyReactiveProcessor$setupEndpoints-1591811826.zig:45) at io.quarkus.runner.ApplicationImpl.<clinit>(ApplicationImpl.zig:224) ... 15 more Caused by: java.lang.ClassNotFoundException: io.quarkus.generated.java.lang.Long$quarkusrestparamConverter$ at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:581) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178) at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:522) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:428) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:378) ... 21 more ``` **To Reproduce** Steps to reproduce the behavior: 1. Download the reproducer: [rr-missing-paramconverter.zip](https://github.com/quarkusio/quarkus/files/6128351/rr-missing-paramconverter.zip) 2. cd common, mvn clean install 3. cd ../web, mvn quarkus:dev 4. The exception from above happens **Environment (please complete the following information):** - Output of `uname -a` or `ver`: MSYS_NT-10.0 NANB7NLNVP2 2.10.0(0.325/5/3) 2018-06-13 23:34 x86_64 Msys - Quarkus version or git rev: 1.12.2.Final - Build tool (ie. output of `mvnw --version` or `gradlew --version`): Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: C:\\eclipse\\tools\\apache-maven\\bin\\.. Java version: 11.0.7, vendor: Azul Systems, Inc., runtime: C:\\eclipse\\tools\\zulu11.39.15-ca-jdk11.0.7-win_x64 Default locale: de_DE, platform encoding: Cp1252 OS name: "windows 10", version: "10.0", arch: "amd64", family: "windows"

40b3c2bc0536d1669268a7804adcd0bc5d7462d7

4ef6058a5f876208808c013818d5b66565812d82

https://github.com/quarkusio/quarkus/compare/40b3c2bc0536d1669268a7804adcd0bc5d7462d7...4ef6058a5f876208808c013818d5b66565812d82

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java index 2e02d9759b5..72479621899 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.function.Predicate; import javax.ws.rs.core.MediaType; @@ -53,6 +54,7 @@ private final DefaultProducesHandler defaultProducesHandler; private final Map<String, String> multipartGeneratedPopulators = new HashMap<>(); + private final Predicate<String> applicationClassPredicate; private static final Set<DotName> CONTEXT_TYPES = Collections.unmodifiableSet(new HashSet<>(Arrays.asList( DotName.createSimple(HttpServerRequest.class.getName()), @@ -66,6 +68,7 @@ this.bytecodeTransformerBuildProducer = builder.bytecodeTransformerBuildProducer; this.reflectiveClassProducer = builder.reflectiveClassProducer; this.defaultProducesHandler = builder.defaultProducesHandler; + this.applicationClassPredicate = builder.applicationClassPredicate; } protected boolean isContextType(ClassType klass) { @@ -166,7 +169,9 @@ protected ParameterConverterSupplier extractConverter(String elementType, IndexV } baseName = effectivePrefix + "$quarkusrestparamConverter$"; try (ClassCreator classCreator = new ClassCreator( - new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, true), baseName, null, + new GeneratedClassGizmoAdaptor(generatedClassBuildItemBuildProducer, + applicationClassPredicate.test(elementType)), + baseName, null, Object.class.getName(), ParameterConverter.class.getName())) { MethodCreator mc = classCreator.getMethodCreator("convert", Object.class, Object.class); if (stringCtor != null) { @@ -245,6 +250,7 @@ public static final class Builder extends AbstractBuilder<Builder> { private BuildProducer<ReflectiveClassBuildItem> reflectiveClassProducer; private MethodCreator initConverters; private DefaultProducesHandler defaultProducesHandler = DefaultProducesHandler.Noop.INSTANCE; + public Predicate<String> applicationClassPredicate; @Override public QuarkusServerEndpointIndexer build() { @@ -273,6 +279,11 @@ public Builder setReflectiveClassProducer( return this; } + public Builder setApplicationClassPredicate(Predicate<String> applicationClassPredicate) { + this.applicationClassPredicate = applicationClassPredicate; + return this; + } + public Builder setInitConverters(MethodCreator initConverters) { this.initConverters = initConverters; return this; diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java index 307adbaee1a..738d8c310fd 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java @@ -77,6 +77,7 @@ import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; +import io.quarkus.deployment.builditem.ApplicationClassPredicateBuildItem; import io.quarkus.deployment.builditem.BytecodeTransformerBuildItem; import io.quarkus.deployment.builditem.CapabilityBuildItem; import io.quarkus.deployment.builditem.FeatureBuildItem; @@ -244,6 +245,7 @@ public void setupEndpoints(Capabilities capabilities, BeanArchiveIndexBuildItem ExceptionMappersBuildItem exceptionMappersBuildItem, ParamConverterProvidersBuildItem paramConverterProvidersBuildItem, ContextResolversBuildItem contextResolversBuildItem, + List<ApplicationClassPredicateBuildItem> applicationClassPredicateBuildItems, List<MethodScannerBuildItem> methodScanners, ResteasyReactiveServerConfig serverConfig) throws NoSuchMethodException { @@ -367,7 +369,15 @@ private boolean hasAnnotation(MethodInfo method, short paramPosition, DotName an return false; } }) - .setInitConverters(initConverters); + .setInitConverters(initConverters) + .setApplicationClassPredicate(s -> { + for (ApplicationClassPredicateBuildItem i : applicationClassPredicateBuildItems) { + if (i.test(s)) { + return true; + } + } + return false; + }); if (!serverDefaultProducesHandlers.isEmpty()) { List<DefaultProducesHandler> handlers = new ArrayList<>(serverDefaultProducesHandlers.size());

['extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/QuarkusServerEndpointIndexer.java', 'extensions/resteasy-reactive/quarkus-resteasy-reactive/deployment/src/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.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/15730/15735

quarkusio

quarkus

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

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

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

fixes

QuarkusSecurityIdentity.builder(identity) loses isAnonymous flag

## Describe the bug If QuarkusSecurityIdentity.builder(identity) is called with an identity that is anonymous then the identity returned from the builder returns always `false` on `isAnonymous()` This typcially happens in a `SecurityIdentityAugmentor` that doesn't check the identity for anonymous. ### Expected behavior If QuarkusSecurityIdentity.builder(identity) is called with an anonymous identity (`isAnonymous()` returns true) the produced identity must be an anonymous identity too, if not specified otherwise. Or if that's not supported builder(identity) should throw an exception if the specified identity is anonymous. Since `SecurityIdentity` is an interface, QuarkusSecurityIdentity.builder should not also work with other implementations of the interface. ### Actual behavior (Describe the actual behavior clearly and concisely.) ## To Reproduce See above See also #15730

a5657b67fb68a0234dcfa3533f70dc14f3810fcf

fdb63d34fbb3ee181473426d2f978ef571f5cc80

https://github.com/quarkusio/quarkus/compare/a5657b67fb68a0234dcfa3533f70dc14f3810fcf...fdb63d34fbb3ee181473426d2f978ef571f5cc80

diff --git a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java index 54638f3d978..50bd92790f5 100644 --- a/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java +++ b/extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java @@ -22,6 +22,7 @@ public class QuarkusSecurityIdentity implements SecurityIdentity { private final Set<Credential> credentials; private final Map<String, Object> attributes; private final List<Function<Permission, Uni<Boolean>>> permissionCheckers; + private final boolean anonymous; private QuarkusSecurityIdentity(Builder builder) { this.principal = builder.principal; @@ -29,6 +30,7 @@ private QuarkusSecurityIdentity(Builder builder) { this.credentials = Collections.unmodifiableSet(builder.credentials); this.attributes = Collections.unmodifiableMap(builder.attributes); this.permissionCheckers = Collections.unmodifiableList(builder.permissionCheckers); + this.anonymous = builder.anonymous; } @Override @@ -38,7 +40,7 @@ public Principal getPrincipal() { @Override public boolean isAnonymous() { - return false; + return anonymous; } @Override @@ -121,11 +123,13 @@ public static Builder builder() { } public static Builder builder(SecurityIdentity identity) { - return new Builder() + Builder builder = new Builder() .addAttributes(identity.getAttributes()) .addCredentials(identity.getCredentials()) .addRoles(identity.getRoles()) - .setPrincipal(identity.getPrincipal()); + .setPrincipal(identity.getPrincipal()) + .setAnonymous(identity.isAnonymous()); + return builder; } public static class Builder { @@ -135,6 +139,7 @@ public static class Builder { Set<Credential> credentials = new HashSet<>(); Map<String, Object> attributes = new HashMap<>(); List<Function<Permission, Uni<Boolean>>> permissionCheckers = new ArrayList<>(); + private boolean anonymous; boolean built = false; public Builder setPrincipal(Principal principal) { @@ -211,7 +216,25 @@ public Builder addPermissionChecker(Function<Permission, Uni<Boolean>> function) return this; } + /** + * Sets an anonymous identity status. + * + * @param anonymous the anonymous status + * @return This builder + */ + public Builder setAnonymous(boolean anonymous) { + if (built) { + throw new IllegalStateException(); + } + this.anonymous = anonymous; + return this; + } + public QuarkusSecurityIdentity build() { + if (principal == null && !anonymous) { + throw new IllegalStateException("Principal is null but anonymous status is false"); + } + built = true; return new QuarkusSecurityIdentity(this); } diff --git a/extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.java b/extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.java index c1704c16b5e..7d9dc11e67b 100644 --- a/extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.java +++ b/extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.java @@ -1,11 +1,23 @@ package io.quarkus.security.runtime; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.security.Permission; +import java.security.Principal; +import java.util.Collections; +import java.util.Map; +import java.util.Set; import org.junit.jupiter.api.Test; +import io.quarkus.security.credential.Credential; import io.quarkus.security.credential.PasswordCredential; import io.quarkus.security.identity.SecurityIdentity; +import io.smallrye.mutiny.Uni; public class QuarkusSecurityIdentityTest { @@ -18,11 +30,132 @@ public void testCopyIdentity() throws Exception { .addAttribute("key", "value") .build(); + assertFalse(identity1.isAnonymous()); + SecurityIdentity identity2 = QuarkusSecurityIdentity.builder(identity1).build(); + assertFalse(identity1.isAnonymous()); assertEquals(identity1.getAttributes(), identity2.getAttributes()); assertEquals(identity1.getPrincipal(), identity2.getPrincipal()); assertEquals(identity1.getCredentials(), identity2.getCredentials()); assertEquals(identity1.getRoles(), identity2.getRoles()); } + + @Test + public void testAnonymousPrincipalWithCustomIdentity() throws Exception { + SecurityIdentity identity1 = new TestSecurityIdentityAnonymousPrincipal(); + assertTrue(identity1.isAnonymous()); + assertEquals("anonymous-principal", identity1.getPrincipal().getName()); + + SecurityIdentity identity2 = QuarkusSecurityIdentity.builder(identity1).build(); + assertTrue(identity2.isAnonymous()); + assertEquals("anonymous-principal", identity2.getPrincipal().getName()); + } + + @Test + public void testPrincipalNullAnonymousFalseWithBuilder() throws Exception { + QuarkusSecurityIdentity.Builder builder = QuarkusSecurityIdentity.builder() + .addRole("admin") + .addCredential(new PasswordCredential("password".toCharArray())) + .addAttribute("key", "value"); + ; + + assertThrows(IllegalStateException.class, () -> builder.build()); + } + + @Test + public void testPrincipalNullAnonymousFalseWithCustomIdentity() throws Exception { + SecurityIdentity identity1 = new TestSecurityIdentityPrincipalNullAnonymousFalse(); + assertFalse(identity1.isAnonymous()); + assertNull(identity1.getPrincipal()); + + assertThrows(IllegalStateException.class, () -> QuarkusSecurityIdentity.builder(identity1).build()); + } + + @Test + public void testPrincipalNullAnonymousFalseWithCustomIdentityFixed() throws Exception { + SecurityIdentity identity1 = new TestSecurityIdentityPrincipalNullAnonymousFalse(); + assertFalse(identity1.isAnonymous()); + assertNull(identity1.getPrincipal()); + + SecurityIdentity identity2 = QuarkusSecurityIdentity.builder(identity1).setAnonymous(true).build(); + assertTrue(identity2.isAnonymous()); + assertNull(identity2.getPrincipal()); + } + + static class TestSecurityIdentityAnonymousPrincipal extends AbstractTestSecurityIdentity { + + @Override + public Principal getPrincipal() { + return new Principal() { + @Override + public String getName() { + return "anonymous-principal"; + } + }; + } + + @Override + public boolean isAnonymous() { + return true; + } + + } + + static class TestSecurityIdentityPrincipalNullAnonymousFalse extends AbstractTestSecurityIdentity { + + @Override + public Principal getPrincipal() { + return null; + } + + @Override + public boolean isAnonymous() { + return false; + } + + } + + static abstract class AbstractTestSecurityIdentity implements SecurityIdentity { + + @Override + public Set<String> getRoles() { + return Collections.emptySet(); + } + + @Override + public boolean hasRole(String role) { + // TODO Auto-generated method stub + return false; + } + + @Override + public <T extends Credential> T getCredential(Class<T> credentialType) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Set<Credential> getCredentials() { + return Collections.emptySet(); + } + + @Override + public <T> T getAttribute(String name) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map<String, Object> getAttributes() { + return Collections.emptyMap(); + } + + @Override + public Uni<Boolean> checkPermission(Permission permission) { + // TODO Auto-generated method stub + return null; + } + + } }

['extensions/security/runtime/src/main/java/io/quarkus/security/runtime/QuarkusSecurityIdentity.java', 'extensions/security/runtime/src/test/java/io/quarkus/security/runtime/QuarkusSecurityIdentityTest.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/15645/15492

quarkusio

quarkus

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

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

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

fixes

Validation for REST endpoints does not return messages about the constraints violated

**Describe the bug** After the changes in https://github.com/quarkusio/quarkus/pull/15447, now when using REST Panache or Spring Data REST quarkus extensions, we got 400 when there are constraint violations. The problem now is that the response does not return the constraints that have been violated. **Expected behavior** After a REST violation, It's expected to receive something like: ```json { "classViolations": [], "parameterViolations": [ { "constraintType": "PARAMETER", "message": "Title may not be blank", "path": "addBook.book.title", "value": "" } ], "propertyViolations": [], "returnValueViolations": [] } ``` * If we're using JSON... * **Actual behavior** No message is returned. **To Reproduce** 1- git clone https://github.com/Sgitario/beefy-scenarios 2- git checkout reproducer_15409 3- cd beefy-scenarios/602-spring-data-rest 4- mvn clean verify There are some tests failing due to this issue. **Environment (please complete the following information):** - Quarkus version or git rev: 999-SNAPSHOT

e86d7112630a6f630423f90d55eb134a7e0b10b9

da3a42865d767d1800a91e72b2d462cda012d72d

https://github.com/quarkusio/quarkus/compare/e86d7112630a6f630423f90d55eb134a7e0b10b9...da3a42865d767d1800a91e72b2d462cda012d72d

diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java index 98d8c347b25..f5c6b67156f 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java @@ -33,16 +33,20 @@ class JaxRsResourceImplementor { private static final Logger LOGGER = Logger.getLogger(JaxRsResourceImplementor.class); - private final List<MethodImplementor> METHOD_IMPLEMENTORS = Arrays.asList( - new GetMethodImplementor(), - new GetHalMethodImplementor(), - new ListMethodImplementor(), - new ListHalMethodImplementor(), - new AddMethodImplementor(), - new AddHalMethodImplementor(), - new UpdateMethodImplementor(), - new UpdateHalMethodImplementor(), - new DeleteMethodImplementor()); + private final List<MethodImplementor> methodImplementors; + + JaxRsResourceImplementor(boolean withValidation) { + this.methodImplementors = Arrays.asList( + new GetMethodImplementor(), + new GetHalMethodImplementor(), + new ListMethodImplementor(), + new ListHalMethodImplementor(), + new AddMethodImplementor(withValidation), + new AddHalMethodImplementor(withValidation), + new UpdateMethodImplementor(withValidation), + new UpdateHalMethodImplementor(withValidation), + new DeleteMethodImplementor()); + } /** * Implement a JAX-RS resource with a following structure. @@ -81,13 +85,14 @@ private void implementClassAnnotations(ClassCreator classCreator, ResourceProper private FieldDescriptor implementResourceField(ClassCreator classCreator, ResourceMetadata resourceMetadata) { FieldCreator resourceFieldCreator = classCreator.getFieldCreator("resource", resourceMetadata.getResourceClass()); - resourceFieldCreator.setModifiers(resourceFieldCreator.getModifiers() & ~Modifier.PRIVATE).addAnnotation(Inject.class); + resourceFieldCreator.setModifiers(resourceFieldCreator.getModifiers() & ~Modifier.PRIVATE) + .addAnnotation(Inject.class); return resourceFieldCreator.getFieldDescriptor(); } private void implementMethods(ClassCreator classCreator, ResourceMetadata resourceMetadata, ResourceProperties resourceProperties, FieldDescriptor resourceField) { - for (MethodImplementor methodImplementor : METHOD_IMPLEMENTORS) { + for (MethodImplementor methodImplementor : methodImplementors) { methodImplementor.implement(classCreator, resourceMetadata, resourceProperties, resourceField); } } diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java index 082c361d05b..0e3574c7b80 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java @@ -7,6 +7,8 @@ import io.quarkus.arc.deployment.GeneratedBeanBuildItem; import io.quarkus.arc.deployment.GeneratedBeanGizmoAdaptor; +import io.quarkus.deployment.Capabilities; +import io.quarkus.deployment.Capability; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.CombinedIndexBuildItem; @@ -31,10 +33,10 @@ public class RestDataProcessor { @BuildStep void implementResources(CombinedIndexBuildItem index, List<RestDataResourceBuildItem> resourceBuildItems, - List<ResourcePropertiesBuildItem> resourcePropertiesBuildItems, + List<ResourcePropertiesBuildItem> resourcePropertiesBuildItems, Capabilities capabilities, BuildProducer<GeneratedBeanBuildItem> implementationsProducer) { ClassOutput classOutput = new GeneratedBeanGizmoAdaptor(implementationsProducer); - JaxRsResourceImplementor jaxRsResourceImplementor = new JaxRsResourceImplementor(); + JaxRsResourceImplementor jaxRsResourceImplementor = new JaxRsResourceImplementor(hasValidatorCapability(capabilities)); ResourcePropertiesProvider resourcePropertiesProvider = new ResourcePropertiesProvider(index.getIndex()); for (RestDataResourceBuildItem resourceBuildItem : resourceBuildItems) { @@ -80,4 +82,8 @@ private ResourceProperties getResourceProperties(ResourcePropertiesProvider reso } return resourcePropertiesProvider.getForInterface(resourceMetadata.getResourceInterface()); } + + private boolean hasValidatorCapability(Capabilities capabilities) { + return capabilities.isPresent(Capability.HIBERNATE_VALIDATOR); + } } diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java index e41d2e373f9..28b7be0ee95 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java @@ -2,6 +2,7 @@ import static io.quarkus.gizmo.MethodDescriptor.ofMethod; +import javax.validation.Valid; import javax.ws.rs.core.Response; import io.quarkus.gizmo.ClassCreator; @@ -22,6 +23,12 @@ public final class AddMethodImplementor extends StandardMethodImplementor { private static final String REL = "add"; + private final boolean withValidation; + + public AddMethodImplementor(boolean withValidation) { + this.withValidation = withValidation; + } + /** * Generate JAX-RS POST method that exposes {@link RestDataResource#add(Object)}. * Generated code looks more or less like this: @@ -67,6 +74,10 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res addConsumesAnnotation(methodCreator, APPLICATION_JSON); addProducesAnnotation(methodCreator, APPLICATION_JSON); addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL); + // Add parameter annotations + if (withValidation) { + methodCreator.getParameterAnnotations(0).addAnnotation(Valid.class); + } ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis()); ResultHandle entityToSave = methodCreator.getMethodParam(0); diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java index d5ffb4cd0c8..21335d65f46 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java @@ -2,6 +2,7 @@ import static io.quarkus.gizmo.MethodDescriptor.ofMethod; +import javax.validation.Valid; import javax.ws.rs.core.Response; import io.quarkus.gizmo.BranchResult; @@ -26,6 +27,12 @@ public final class UpdateMethodImplementor extends StandardMethodImplementor { private static final String REL = "update"; + private final boolean withValidation; + + public UpdateMethodImplementor(boolean withValidation) { + this.withValidation = withValidation; + } + /** * Generate JAX-RS UPDATE method that exposes {@link RestDataResource#update(Object, Object)}. * Expose {@link RestDataResource#update(Object, Object)} via JAX-RS method. @@ -79,6 +86,10 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res addConsumesAnnotation(methodCreator, APPLICATION_JSON); addProducesAnnotation(methodCreator, APPLICATION_JSON); addLinksAnnotation(methodCreator, resourceMetadata.getEntityType(), REL); + // Add parameter annotations + if (withValidation) { + methodCreator.getParameterAnnotations(1).addAnnotation(Valid.class); + } ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis()); ResultHandle id = methodCreator.getMethodParam(0); diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java index fce46c72078..4e12f49b9ac 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java @@ -2,6 +2,7 @@ import static io.quarkus.gizmo.MethodDescriptor.ofMethod; +import javax.validation.Valid; import javax.ws.rs.core.Response; import io.quarkus.gizmo.ClassCreator; @@ -20,6 +21,12 @@ public final class AddHalMethodImplementor extends HalMethodImplementor { private static final String RESOURCE_METHOD_NAME = "add"; + private final boolean withValidation; + + public AddHalMethodImplementor(boolean withValidation) { + this.withValidation = withValidation; + } + /** * Expose {@link RestDataResource#add(Object)} via HAL JAX-RS method. * Generated code looks more or less like this: @@ -61,6 +68,10 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res addPostAnnotation(methodCreator); addConsumesAnnotation(methodCreator, APPLICATION_JSON); addProducesAnnotation(methodCreator, APPLICATION_HAL_JSON); + // Add parameter annotations + if (withValidation) { + methodCreator.getParameterAnnotations(0).addAnnotation(Valid.class); + } ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis()); ResultHandle entityToSave = methodCreator.getMethodParam(0); diff --git a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java index ee55679932b..7c07580ce60 100644 --- a/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java +++ b/extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java @@ -2,6 +2,7 @@ import static io.quarkus.gizmo.MethodDescriptor.ofMethod; +import javax.validation.Valid; import javax.ws.rs.core.Response; import io.quarkus.gizmo.BranchResult; @@ -24,6 +25,12 @@ public final class UpdateHalMethodImplementor extends HalMethodImplementor { private static final String RESOURCE_GET_METHOD_NAME = "get"; + private final boolean withValidation; + + public UpdateHalMethodImplementor(boolean withValidation) { + this.withValidation = withValidation; + } + /** * Expose {@link RestDataResource#update(Object, Object)} via HAL JAX-RS method. * Generated code looks more or less like this: @@ -72,6 +79,10 @@ protected void implementInternal(ClassCreator classCreator, ResourceMetadata res addPathParamAnnotation(methodCreator.getParameterAnnotations(0), "id"); addConsumesAnnotation(methodCreator, APPLICATION_JSON); addProducesAnnotation(methodCreator, APPLICATION_HAL_JSON); + // Add parameter annotations + if (withValidation) { + methodCreator.getParameterAnnotations(1).addAnnotation(Valid.class); + } ResultHandle resource = methodCreator.readInstanceField(resourceField, methodCreator.getThis()); ResultHandle id = methodCreator.getMethodParam(0); diff --git a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java index df2f9f3db55..1e06b968175 100644 --- a/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java +++ b/integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java @@ -178,7 +178,9 @@ void shouldNotCreateBookWithBlankTitle() { .and().contentType("application/json") .and().body(book.toString()) .when().post("/books") - .then().statusCode(400); + .then().statusCode(400) + .and().body("parameterViolations[0].path", equalTo("add.arg0.title")) + .and().body("parameterViolations[0].message", equalTo("must not be blank")); } @Test @@ -230,4 +232,24 @@ void shouldCreateUpdateAndDeleteBook() { when().delete(location) .then().statusCode(204); } + + @Test + void shouldNotUpdateBookWithBlankTitle() { + JsonObject author = Json.createObjectBuilder() + .add("id", DOSTOEVSKY_ID) + .add("name", DOSTOEVSKY_NAME) + .add("dob", DOSTOEVSKY_DOB) + .build(); + JsonObject book = Json.createObjectBuilder() + .add("title", "") + .add("author", author) + .build(); + given().accept("application/json") + .and().contentType("application/json") + .and().body(book.toString()) + .when().put("/books/" + CRIME_AND_PUNISHMENT_ID) + .then().statusCode(400) + .and().body("parameterViolations[0].path", equalTo("update.arg1.title")) + .and().body("parameterViolations[0].message", equalTo("must not be blank")); + } } diff --git a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java index 7631cfe405b..0a5325c28e8 100644 --- a/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java +++ b/integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java @@ -156,6 +156,26 @@ void shouldCreateAndDeleteBook() { .then().statusCode(404); } + @Test + void shouldNotCreateBookWithBlankTitle() { + JsonObject author = Json.createObjectBuilder() + .add("id", DOSTOEVSKY_ID) + .add("name", DOSTOEVSKY_NAME) + .add("dob", DOSTOEVSKY_DOB) + .build(); + JsonObject book = Json.createObjectBuilder() + .add("title", "") + .add("author", author) + .build(); + given().accept("application/json") + .and().contentType("application/json") + .and().body(book.toString()) + .when().post("/books") + .then().statusCode(400) + .and().body("parameterViolations[0].path", equalTo("add.arg0.title")) + .and().body("parameterViolations[0].message", equalTo("must not be blank")); + } + @Test void shouldNotUpdateAuthor() { JsonObject author = Json.createObjectBuilder() @@ -207,7 +227,7 @@ void shouldCreateUpdateAndDeleteBook() { } @Test - void shouldNotCreateBookWithBlankTitle() { + void shouldNotUpdateBookWithBlankTitle() { JsonObject author = Json.createObjectBuilder() .add("id", DOSTOEVSKY_ID) .add("name", DOSTOEVSKY_NAME) @@ -220,7 +240,9 @@ void shouldNotCreateBookWithBlankTitle() { given().accept("application/json") .and().contentType("application/json") .and().body(book.toString()) - .when().put("/books/100") - .then().statusCode(400); + .when().put("/books/" + CRIME_AND_PUNISHMENT_ID) + .then().statusCode(400) + .and().body("parameterViolations[0].path", equalTo("update.arg1.title")) + .and().body("parameterViolations[0].message", equalTo("must not be blank")); } }

['extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/UpdateMethodImplementor.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/AddHalMethodImplementor.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/AddMethodImplementor.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/methods/hal/UpdateHalMethodImplementor.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/RestDataProcessor.java', 'integration-tests/hibernate-orm-rest-data-panache/src/test/java/io/quarkus/it/hibernate/orm/rest/data/panache/HibernateOrmRestDataPanacheTest.java', 'integration-tests/spring-data-rest/src/test/java/io/quarkus/it/spring/data/rest/SpringDataRestTest.java', 'extensions/panache/rest-data-panache/deployment/src/main/java/io/quarkus/rest/data/panache/deployment/JaxRsResourceImplementor.java']

{'.java': 8}

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/15636/15220

quarkusio

quarkus

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

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

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

fixes

Memory leak in non-quarkus main() in quarkus-using module (due to quarkus dependencies)

To reproduce, take any quarkus quickstart and add this class in `src/test/java` (or `src/main/java`): ``` import org.slf4j.Logger; import org.slf4j.LoggerFactory; public class LoggingMemoryLeakMain { protected static final Logger logger = LoggerFactory.getLogger(LoggingMemoryLeakMain.class); public static void main(String[] args) { for (int i = 0; i < 1_000_000_000; i++) { System.out.println("Sout iteration " + i); if (i % 1_000_000 == 0) { logger.info("Iteration {}", i); } else if (i % 1_000 == 0) { logger.debug("Iteration {}", i); } else { logger.trace("Iteration {}", i); } } } } ``` With JDK 11, I get this: ``` Sout iteration 21071313 Sout iteration 21071314 Exception: java.lang.OutOfMemoryError thrown from the UncaughtExceptionHandler in thread "main" ``` That takes a few minutes. Use `-Xmx64m` to get it in a few seconds. Its caused by jboss logging that by default remembers all logging statements in memory, see https://quarkusio.zulipchat.com/#narrow/stream/187030-users/topic/Memory.20leak.2C.20logging.20and.20psvm **This memory leak might also affects unit tests that don't use quarkus integration.** Why is this a problem? It's often useful to add plain old mains in a quarkus module too, without having to create yet another module for them. These do not replace the Quarkus main that is the actually application. Examples include: - to run a benchmark - to experiment with a new library before mixing Quarkus in the complexity mix - to run a tool such as converting adoc into html that goes in META-INF/resources, etc. - ... All of these have alternative ways of accomplishing that goal, which are better but more work intensive: it's easier to temporary just add a plain-java main and it's very _surprising_ that quarkus crippled that with a memory leak. It doesn't abide by the principle of least surprise.

258d74ebf0cc7f07781cba186de5638eaf1fb529

1748cd3135c64aa737d08bf55b2194f1d88e4976

https://github.com/quarkusio/quarkus/compare/258d74ebf0cc7f07781cba186de5638eaf1fb529...1748cd3135c64aa737d08bf55b2194f1d88e4976

diff --git a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java index 6fe4b7ed492..ae28d6fc633 100644 --- a/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java +++ b/independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.java @@ -18,6 +18,7 @@ import java.util.ArrayDeque; import java.util.Deque; +import java.util.logging.ErrorManager; import java.util.logging.Formatter; import java.util.logging.Handler; import java.util.logging.Logger; @@ -36,10 +37,19 @@ public class QuarkusDelayedHandler extends ExtHandler { private final Deque<ExtLogRecord> logRecords = new ArrayDeque<>(); + private final int queueLimit; private volatile boolean buildTimeLoggingActivated = false; private volatile boolean activated = false; private volatile boolean callerCalculationRequired = false; + public QuarkusDelayedHandler() { + this(4000); + } + + public QuarkusDelayedHandler(final int queueLimit) { + this.queueLimit = queueLimit; + } + @Override protected void doPublish(final ExtLogRecord record) { // If activated just delegate @@ -53,6 +63,13 @@ protected void doPublish(final ExtLogRecord record) { publishToNestedHandlers(record); super.doPublish(record); } else { + // Determine whether the queue was overrun + if (logRecords.size() >= queueLimit) { + reportError( + "The delayed handler's queue was overrun and log record(s) were lost. Did you forget to configure logging?", + null, ErrorManager.WRITE_FAILURE); + return; + } // Determine if we need to calculate the caller information before we queue the record if (isCallerCalculationRequired()) { // prepare record to move to another thread

['independent-projects/bootstrap/runner/src/main/java/io/quarkus/bootstrap/logging/QuarkusDelayedHandler.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/34144/34141

quarkusio

quarkus

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

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

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

closes

Remove usage of @AlwaysInline as it's not GraalVM API

### Describe the bug There are some usages of `@AlwaysInline` that prevent a switch-over of the GraalVM dependency from `org.graalvm.nativeimage:svm` (which isn't supposed to be API) to `org.graalvm.sdk:graal-sdk`. These are currently: ``` grep -rn @AlwaysInline core/runtime/src/main/java/io/quarkus/runtime/graal/ConfigurationSubstitutions.java:26: @AlwaysInline("trivial") extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java:90: @AlwaysInline("We need this to be constant folded") ``` ### Expected behavior No more use of `@AlwaysInline` and `graal-sdk` is being used as a dep only. ### Actual behavior Some modules fail to compile with the `graal-sdk` dependency. For example: ``` [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] /home/sgehwolf/Documents/openjdk/quarkus/quarkus-source/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java:[12,27] cannot find symbol symbol: class AlwaysInline location: package com.oracle.svm.core [ERROR] /home/sgehwolf/Documents/openjdk/quarkus/quarkus-source/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java:[90,6] cannot find symbol symbol: class AlwaysInline location: class io.quarkus.jdbc.mssql.runtime.graal.com.microsoft.sqlserver.jdbc.DisableFMTRemove ``` ### How to Reproduce? Change the deps to `graal-sdk` over `svm` artifact. Compile quarkus. ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17 ### GraalVM version (if different from Java) 22.3.2 ### Quarkus version or git rev main ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information See https://github.com/oracle/graal/pull/4683 which moved supported annotations to the `graal-sdk`.

297c0ca19015608487eb603b7432bf6f9375737f

0c5d2988f51ea4ac54cadd9f25cd14a0eeeb2184

https://github.com/quarkusio/quarkus/compare/297c0ca19015608487eb603b7432bf6f9375737f...0c5d2988f51ea4ac54cadd9f25cd14a0eeeb2184

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/graal/ConfigurationSubstitutions.java b/core/runtime/src/main/java/io/quarkus/runtime/graal/ConfigurationSubstitutions.java index c65c8bbad71..deda93e99ee 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/graal/ConfigurationSubstitutions.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/graal/ConfigurationSubstitutions.java @@ -2,7 +2,6 @@ import org.eclipse.microprofile.config.Config; -import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.annotate.Alias; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; @@ -23,7 +22,6 @@ public Config getConfig() { } @Substitute - @AlwaysInline("trivial") public Config getConfig(ClassLoader classLoader) { return getConfig(); } diff --git a/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java b/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java index b5e861f1b2c..02fbe8d1fa4 100644 --- a/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java +++ b/extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java @@ -9,7 +9,6 @@ import com.microsoft.sqlserver.jdbc.SQLServerException; import com.microsoft.sqlserver.jdbc.SQLServerStatement; import com.microsoft.sqlserver.jdbc.SqlAuthenticationToken; -import com.oracle.svm.core.AlwaysInline; import com.oracle.svm.core.annotate.Delete; import com.oracle.svm.core.annotate.Substitute; import com.oracle.svm.core.annotate.TargetClass; @@ -87,7 +86,6 @@ final class SQLServerFMTQuery { final class DisableFMTRemove { @Substitute - @AlwaysInline("We need this to be constant folded") public final boolean getUseFmtOnly() throws SQLServerException { return false;//Important for this to be disabled via a constant }

['extensions/jdbc/jdbc-mssql/runtime/src/main/java/io/quarkus/jdbc/mssql/runtime/graal/com/microsoft/sqlserver/jdbc/SQLServerJDBCSubstitutions.java', 'core/runtime/src/main/java/io/quarkus/runtime/graal/ConfigurationSubstitutions.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/34246/34089

quarkusio

quarkus

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

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

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

fixes

Quarkus extension created with 2.13 stream and Quarkus CLI 3 contains Jakarta imports

### Describe the bug I create extension with Quarkus CLI 3 for my application that uses Quarkus 2.13 and module `integration tests` of generated projects contain Jakarta imports. ### Expected behavior Generated tests should be working for Quarkus 2.13. ### Actual behavior ``` [ERROR] /home/mvavrik/Downloads/tmp/ex2/quarkus-extension-abc/integration-tests/src/main/java/io/quarkiverse/extension/abc/it/ExtensionAbcResource.java:[19,34] package jakarta.enterprise.context does not exist [ERROR] /home/mvavrik/Downloads/tmp/ex2/quarkus-extension-abc/integration-tests/src/main/java/io/quarkiverse/extension/abc/it/ExtensionAbcResource.java:[20,21] package jakarta.ws.rs does not exist [ERROR] /home/mvavrik/Downloads/tmp/ex2/quarkus-extension-abc/integration-tests/src/main/java/io/quarkiverse/extension/abc/it/ExtensionAbcResource.java:[21,21] package jakarta.ws.rs does not exist [ERROR] /home/mvavrik/Downloads/tmp/ex2/quarkus-extension-abc/integration-tests/src/main/java/io/quarkiverse/extension/abc/it/ExtensionAbcResource.java:[23,2] cannot find symbol [ERROR] symbol: class Path [ERROR] /home/mvavrik/Downloads/tmp/ex2/quarkus-extension-abc/integration-tests/src/main/java/io/quarkiverse/extension/abc/it/ExtensionAbcResource.java:[24,2] cannot find symbol [ERROR] symbol: class ApplicationScoped [ERROR] /home/mvavrik/Downloads/tmp/ex2/quarkus-extension-abc/integration-tests/src/main/java/io/quarkiverse/extension/abc/it/ExtensionAbcResource.java:[28,6] cannot find symbol ``` ### How to Reproduce? Steps to reproduce the behavior: 1. `quarkus create extension extension-abc --stream=2.13` 2. `cd quarkus-extension-abc/` 3. `quarkus build` ### Output of `uname -a` or `ver` Linux apc-ap8641-3a-d11d.mgmt.pnr.lab.eng.rdu2.redhat.com 6.3.6-200.fc38.x86_64 #1 SMP PREEMPT_DYNAMIC Mon Jun 5 15:45:04 UTC 2023 x86_64 GNU/Linux ### Output of `java -version` openjdk version "17.0.7" 2023-04-18 ### GraalVM version (if different from Java) 22.3 ### Quarkus version or git rev 2.13.8.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.9.2 and 3.8.6 ### Additional information _No response_

eedd893f21a045ce7b9a943cc36103189dfecdae

8a96b2747ddc8e57ab70aa1fdec3b3dc447de239

https://github.com/quarkusio/quarkus/compare/eedd893f21a045ce7b9a943cc36103189dfecdae...8a96b2747ddc8e57ab70aa1fdec3b3dc447de239

diff --git a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java index 720033d91c9..076f775b79b 100644 --- a/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java +++ b/devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java @@ -1,9 +1,16 @@ package org.acme; +{#if quarkus.bom.version.startsWith("2.") or quarkus.bom.version.startsWith("1.")} +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +{#else} import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; +{/if} @Path("{resource.path}") public class {resource.class-name} { diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java index 99eb1068ffd..ed38c752d39 100644 --- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java +++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.java @@ -16,9 +16,15 @@ */ package {package-name}.it; +{#if quarkus.bom.version.startsWith("2.") or quarkus.bom.version.startsWith("1.")} +import javax.enterprise.context.ApplicationScoped; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +{#else} import jakarta.enterprise.context.ApplicationScoped; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; +{/if} @Path("/{extension.id}") @ApplicationScoped

['devtools/project-core-extension-codestarts/src/main/resources/codestarts/quarkus/extension-codestarts/resteasy-codestart/java/src/main/java/org/acme/{resource.class-name}.tpl.qute.java', 'independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/integration-tests/java/integration-tests/src/main/java/{package-name.dir}/it/{class-name-base}Resource.tpl.qute.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/35174/34576

quarkusio

quarkus

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

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

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

fixes

Live reload stopped working on 3.2 when using XA transactions

### Describe the bug When upgrading from 3.1 to 3.2, using quarkus:dev mode, the application will no longer reload on code changes, but fail with an exception, if an XA transaction manager is used (`quarkus.datasource.jdbc.transactions=xa`). ### Expected behavior Application reloads as before ### Actual behavior ``` 023-07-06 14:42:10,384 ERROR [io.qua.run.Application] (Quarkus Main Thread) Failed to start application (with profile [dev]) [Error Occurred After Shutdown]: java.lang.RuntimeException: Failed to start quarkus at io.quarkus.runner.ApplicationImpl.doStart(Unknown Source) at io.quarkus.runtime.Application.start(Application.java:101) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:111) at io.quarkus.runtime.Quarkus.run(Quarkus.java:71) at io.quarkus.runtime.Quarkus.run(Quarkus.java:44) at io.quarkus.runtime.Quarkus.run(Quarkus.java:124) at io.quarkus.runner.GeneratedMain.main(Unknown Source) at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103) at java.base/java.lang.reflect.Method.invoke(Method.java:580) at io.quarkus.runner.bootstrap.StartupActionImpl$1.run(StartupActionImpl.java:104) at java.base/java.lang.Thread.run(Thread.java:1583) Caused by: java.lang.IllegalStateException: ARJUNA012400: Cannot terminate the recovery manager as the implementation is not known. Could be the recovery manager was not started yet? at com.arjuna.ats.arjuna.recovery.RecoveryManager.checkState(RecoveryManager.java:489) at com.arjuna.ats.arjuna.recovery.RecoveryManager.getModules(RecoveryManager.java:355) at com.arjuna.ats.jbossatx.jta.RecoveryManagerService.addXAResourceRecovery(RecoveryManagerService.java:97) at io.quarkus.narayana.jta.runtime.QuarkusRecoveryService.addXAResourceRecovery(QuarkusRecoveryService.java:30) at io.agroal.narayana.NarayanaTransactionIntegration.addResourceRecoveryFactory(NarayanaTransactionIntegration.java:132) at io.agroal.pool.ConnectionPool.init(ConnectionPool.java:133) at io.agroal.pool.DataSource.<init>(DataSource.java:42) at io.quarkus.agroal.runtime.DataSources.doCreateDataSource(DataSources.java:246) at io.quarkus.agroal.runtime.DataSources$1.apply(DataSources.java:129) at io.quarkus.agroal.runtime.DataSources$1.apply(DataSources.java:126) at java.base/java.util.concurrent.ConcurrentHashMap.computeIfAbsent(ConcurrentHashMap.java:1708) at io.quarkus.agroal.runtime.DataSources.getDataSource(DataSources.java:126) at io.quarkus.agroal.runtime.DataSources.fromName(DataSources.java:122) at io.quarkus.agroal.runtime.AgroalRecorder.agroalDataSourceSupplier(AgroalRecorder.java:23) at io.quarkus.deployment.steps.AgroalProcessor$generateDataSourceBeans109901991.deploy_0(Unknown Source) at io.quarkus.deployment.steps.AgroalProcessor$generateDataSourceBeans109901991.deploy(Unknown Source) ... 11 more ``` ### How to Reproduce? ``` modules: agroal, narayana-jta, postgres jdbc driver quarkus.datasource.db-kind=postgresql quarkus.datasource.username=postgres quarkus.datasource.password=postgres quarkus.datasource.jdbc.url=jdbc:postgresql://localhost:5432/postgres quarkus.datasource.jdbc.transactions=xa quarkus.transaction-manager.enable-recovery=true @Inject DataSource ds; @GET @Produces(MediaType.TEXT_PLAIN) public String hello() throws Exception{ QuarkusTransaction.requiringNew() .run(()->{ try(var c = ds.getConnection()) { } catch (Exception e) { throw new RuntimeException(e); } }); return "blah"; // <-- change output to test live reload } ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 20 ### GraalVM version (if different from Java) 20 ### Quarkus version or git rev 3.2.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven ### Additional information _No response_

6e65c470dd80761951d144a816f85a413c7cef06

d99f0b52d202bc36a4731652052b706e096a412f

https://github.com/quarkusio/quarkus/compare/6e65c470dd80761951d144a816f85a413c7cef06...d99f0b52d202bc36a4731652052b706e096a412f

diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java index 38b1b1293ae..c73a1cddb39 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.java @@ -16,7 +16,6 @@ import com.arjuna.ats.arjuna.common.arjPropertyManager; import com.arjuna.ats.arjuna.coordinator.TransactionReaper; import com.arjuna.ats.arjuna.coordinator.TxControl; -import com.arjuna.ats.arjuna.recovery.RecoveryManager; import com.arjuna.ats.internal.arjuna.objectstore.jdbc.JDBCStore; import com.arjuna.ats.jta.common.JTAEnvironmentBean; import com.arjuna.ats.jta.common.jtaPropertyManager; @@ -158,7 +157,14 @@ public void startRecoveryService(final TransactionManagerConfiguration transacti public void handleShutdown(ShutdownContext context, TransactionManagerConfiguration transactions) { context.addLastShutdownTask(() -> { if (transactions.enableRecovery) { - RecoveryManager.manager().terminate(true); + try { + QuarkusRecoveryService.getInstance().stop(); + } catch (Exception e) { + // the recovery manager throws IllegalStateException if it has already been shutdown + log.warn("The recovery manager has already been shutdown", e); + } finally { + QuarkusRecoveryService.getInstance().destroy(); + } } TransactionReaper.terminate(false); }); diff --git a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/QuarkusRecoveryService.java b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/QuarkusRecoveryService.java index 55ff7ae05fe..923bcfe4625 100644 --- a/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/QuarkusRecoveryService.java +++ b/extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/QuarkusRecoveryService.java @@ -51,4 +51,11 @@ public void create() { } xaResources.clear(); } + + @Override + public void destroy() { + super.destroy(); + isCreated = false; + recoveryManagerService = null; + } }

['extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/QuarkusRecoveryService.java', 'extensions/narayana-jta/runtime/src/main/java/io/quarkus/narayana/jta/runtime/NarayanaJtaRecorder.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/35188/34908

quarkusio

quarkus

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

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

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

fixes

@RouteFilter stopped working with WebSocket requests Quarkus 3.2.0.Final

### Describe the bug We were migrating from 2.16.7 to 3.2.0.Final And we have WebSocket interceptor implemented with @RouteFilter It looks like this: ```java @RouteFilter void authFilter(RoutingContext rc) { /// logic to search for websocket header etc } ``` We use it to intercept GQL Subscriptions and its initial websocket request. After migration to 3.2.0.Final it stopped intercepting WebSocket for some reason. ### Expected behavior Intercept all requests as it was in 2.16.7 ### Actual behavior Not intercepting websocket initial request ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.2.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) gradle 8.1.1 ### Additional information _No response_

6e65c470dd80761951d144a816f85a413c7cef06

2be7e958493f2a947be72120d03ccfa9b3e55e52

https://github.com/quarkusio/quarkus/compare/6e65c470dd80761951d144a816f85a413c7cef06...2be7e958493f2a947be72120d03ccfa9b3e55e52

diff --git a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java index d5857405ca9..9a494fdb4df 100644 --- a/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java +++ b/extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.java @@ -146,6 +146,8 @@ public class SmallRyeGraphQLProcessor { private static final List<String> SUPPORTED_WEBSOCKET_SUBPROTOCOLS = List.of(SUBPROTOCOL_GRAPHQL_WS, SUBPROTOCOL_GRAPHQL_TRANSPORT_WS); + private static final int GRAPHQL_WEBSOCKET_HANDLER_ORDER = -10000; + @BuildStep void feature(BuildProducer<FeatureBuildItem> featureProducer) { featureProducer.produce(new FeatureBuildItem(Feature.SMALLRYE_GRAPHQL)); @@ -370,7 +372,7 @@ void buildExecutionEndpoint( runBlocking); HttpRootPathBuildItem.Builder subscriptionsBuilder = httpRootPathBuildItem.routeBuilder() - .orderedRoute(graphQLConfig.rootPath, Integer.MIN_VALUE) + .orderedRoute(graphQLConfig.rootPath, GRAPHQL_WEBSOCKET_HANDLER_ORDER) .handler(graphqlOverWebsocketHandler); routeProducer.produce(subscriptionsBuilder.build());

['extensions/smallrye-graphql/deployment/src/main/java/io/quarkus/smallrye/graphql/deployment/SmallRyeGraphQLProcessor.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/35203/34875

quarkusio

quarkus

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

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

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

fix

Quarkus build does not work since 3.2.0 with teamcity/plexus launcher

### Describe the bug We have some custom extensions which use dependencies from a private repository. Since quarkus 3.2.0 the build fails while generating the test code. Up to 3.1.3 it worked fine. ``` [INFO] --- quarkus:3.2.1.Final:generate-code-tests (default) @ database-extension-base --- [INFO] Artifact de.mobilexag.serviceplatform:service-parent-kotlin:pom:1.8.1 is present in the local repository, but cached from a remote repository ID that is unavailable in current build context, verifying that is downloadable from [central (https://repo.maven.apache.org/maven2, default, releases)] Downloading from central: https://repo.maven.apache.org/maven2/de/mobilexag/serviceplatform/service-parent-kotlin/1.8.1/service-parent-kotlin-1.8.1.pom [INFO] No previous run data found, generating javadoc. Failed to execute goal io.quarkus:quarkus-maven-plugin:3.2.1.Final:generate-code-tests (default) on project database-extension-base: Quarkus code generation phase has failed ``` I first thought this might be the problem, but it fails still with 3.2.1 https://github.com/quarkusio/quarkus/issues/34448 We encountered the problem on our build system teamcity. It starts maven builds via the plexus launcher. https://codehaus-plexus.github.io/plexus-classworlds/launcher.html The quarkus maven plugin seems to ignore the settings file set via plexus. The call looks something like this: ``` java -Dmaven.repo.local=local-repo \\ -Dclassworlds.conf=teamcity.m2.conf \\ -Dmaven.multiModuleProjectDirectory=../code-with-quarkus \\ --add-opens \\ java.base/java.lang=ALL-UNNAMED \\ -classpath \\ "$MAVEN_HOME/boot/*:" \\ org.codehaus.plexus.classworlds.launcher.Launcher \\ -f \\ pom.xml \\ -B \\ -s \\ custom-settings.xml \\ -fae \\ -Plicense \\ -X \\ clean \\ package ``` The settings file is set via -s command on maven start. In the reproducer, there are some scripts to start the build. ### Expected behavior Build should work. ### Actual behavior Build fails. ### How to Reproduce? https://github.com/robp94/quarkus-3.2.x-maven-problem ### Output of `uname -a` or `ver` ubuntu ### Output of `java -version` 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.2.2 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven 3.9.3 ### Additional information _No response_

0d3cb3545c838b7232a32b4a0b7e993c8bd5a496

3306eb930024c8726c53e02e4532805b33e9b369

https://github.com/quarkusio/quarkus/compare/0d3cb3545c838b7232a32b4a0b7e993c8bd5a496...3306eb930024c8726c53e02e4532805b33e9b369

diff --git a/devtools/maven/src/main/java/io/quarkus/maven/DependencyTreeMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/DependencyTreeMojo.java index a990e5d8ccd..22891e8f44d 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DependencyTreeMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DependencyTreeMojo.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.function.Consumer; +import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -37,6 +38,9 @@ public class DependencyTreeMojo extends AbstractMojo { @Parameter(defaultValue = "${project}", readonly = true, required = true) protected MavenProject project; + @Parameter(defaultValue = "${session}", readonly = true) + protected MavenSession session; + @Parameter(defaultValue = "${project.remoteProjectRepositories}", readonly = true, required = true) private List<RemoteRepository> repos; @@ -130,6 +134,7 @@ private void logTree(final Consumer<String> log) throws MojoExecutionException { protected MavenArtifactResolver resolver() { return resolver == null ? resolver = workspaceProvider.createArtifactResolver(BootstrapMavenContext.config() + .setUserSettings(session.getRequest().getUserSettingsFile()) // The system needs to be initialized with the bootstrap model builder to properly interpolate system properties set on the command line // e.g. -Dquarkus.platform.version=xxx //.setRepositorySystem(repoSystem) 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 b06e1b16173..34d04f14e98 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java @@ -1137,6 +1137,7 @@ private QuarkusDevModeLauncher newLauncher(Boolean debugPortOk, String bootstrap bootstrapProvider.close(); } else { final BootstrapMavenContextConfig<?> mvnConfig = BootstrapMavenContext.config() + .setUserSettings(session.getRequest().getUserSettingsFile()) .setRemoteRepositories(repos) .setWorkspaceDiscovery(true) .setPreferPomsFromWorkspace(true) diff --git a/devtools/maven/src/main/java/io/quarkus/maven/GoOfflineMojo.java b/devtools/maven/src/main/java/io/quarkus/maven/GoOfflineMojo.java index 4502351c87d..d76dee2638e 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/GoOfflineMojo.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/GoOfflineMojo.java @@ -7,6 +7,7 @@ import java.util.List; import java.util.Set; +import org.apache.maven.execution.MavenSession; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; @@ -43,6 +44,9 @@ public class GoOfflineMojo extends AbstractMojo { @Parameter(defaultValue = "${project}", readonly = true, required = true) MavenProject project; + @Parameter(defaultValue = "${session}", readonly = true) + MavenSession session; + @Component RepositorySystem repoSystem; @@ -118,6 +122,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { private MavenArtifactResolver getResolver() throws MojoExecutionException { return workspaceProvider.createArtifactResolver(BootstrapMavenContext.config() + .setUserSettings(session.getRequest().getUserSettingsFile()) .setCurrentProject(project.getBasedir().toString()) .setRemoteRepositoryManager(remoteRepositoryManager) .setRemoteRepositories(repos) diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java index 36bcdf8908c..2ae61b88271 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.java @@ -180,6 +180,9 @@ private MavenArtifactResolver artifactResolver(QuarkusBootstrapMojo mojo, Launch if (mode == LaunchMode.DEVELOPMENT || mode == LaunchMode.TEST || isWorkspaceDiscovery(mojo)) { return workspaceProvider.createArtifactResolver( BootstrapMavenContext.config() + // it's important to pass user settings in case the process was not launched using the original mvn script + // for example using org.codehaus.plexus.classworlds.launcher.Launcher + .setUserSettings(mojo.mavenSession().getRequest().getUserSettingsFile()) .setCurrentProject(mojo.mavenProject().getFile().toString()) .setPreferPomsFromWorkspace(true) .setProjectModelProvider(getProjectMap(mojo.mavenSession())::get)); diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java index 16043a4d5aa..62a7e1437ac 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java @@ -11,6 +11,7 @@ import java.util.Collections; import java.util.List; +import org.apache.maven.execution.MavenSession; import org.apache.maven.model.Dependency; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; @@ -52,6 +53,9 @@ public abstract class QuarkusProjectMojoBase extends AbstractMojo { @Parameter(defaultValue = "${project}") protected MavenProject project; + @Parameter(defaultValue = "${session}", readonly = true) + MavenSession session; + @Component protected RepositorySystem repoSystem; diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.java index 9007e7315bb..62a346128a0 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.java @@ -140,6 +140,7 @@ protected MavenArtifactResolver catalogArtifactResolver() throws MojoExecutionEx @Override protected MavenArtifactResolver initArtifactResolver() throws MojoExecutionException { return workspaceProvider.createArtifactResolver(BootstrapMavenContext.config() + .setUserSettings(session.getRequest().getUserSettingsFile()) .setRemoteRepositoryManager(remoteRepositoryManager) // The system needs to be initialized with the bootstrap model builder to properly interpolate system properties set on the command line // e.g. -Dquarkus.platform.version=xxx

['devtools/maven/src/main/java/io/quarkus/maven/DependencyTreeMojo.java', 'devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectMojoBase.java', 'devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.java', 'devtools/maven/src/main/java/io/quarkus/maven/GoOfflineMojo.java', 'devtools/maven/src/main/java/io/quarkus/maven/DevMojo.java', 'devtools/maven/src/main/java/io/quarkus/maven/QuarkusBootstrapProvider.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/35301/35285

quarkusio

quarkus

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

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

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

fixes

NullPointerException during http post request when quarkus-csrf-reactive extension is added to a project

### Describe the bug Adding the quarkus-csrf-reactive extension to a project leads to a NPE during a post request when CsrfRequestResponseReactiveFilter is checking the media type. ``` 2023-08-09 13:47:44,725 ERROR [io.qua.ver.htt.run.QuarkusErrorHandler] (vert.x-eventloop-thread-1) HTTP Request to /hello failed, error id: c34caf8f-fc59-48c7-9cdd-cb2b1041ef1c-13: java.lang.NullPointerException: Cannot invoke "jakarta.ws.rs.core.MediaType.getType()" because "contentType" is null at io.quarkus.csrf.reactive.runtime.CsrfRequestResponseReactiveFilter.isMatchingMediaType(CsrfRequestResponseReactiveFilter.java:152) at io.quarkus.csrf.reactive.runtime.CsrfRequestResponseReactiveFilter.filter(CsrfRequestResponseReactiveFilter.java:100) at io.quarkus.csrf.reactive.runtime.CsrfRequestResponseReactiveFilter$GeneratedServerRequestFilter$filter.filter(Unknown Source) at io.quarkus.csrf.reactive.runtime.CsrfRequestResponseReactiveFilter$GeneratedServerRequestFilter$filter_ClientProxy.filter(Unknown Source) at org.jboss.resteasy.reactive.server.handlers.ResourceRequestFilterHandler.handle(ResourceRequestFilterHandler.java:48) at io.quarkus.resteasy.reactive.server.runtime.QuarkusResteasyReactiveRequestContext.invokeHandler(QuarkusResteasyReactiveRequestContext.java:131) at org.jboss.resteasy.reactive.common.core.AbstractResteasyReactiveContext.run(AbstractResteasyReactiveContext.java:145) at org.jboss.resteasy.reactive.server.handlers.RestInitialHandler.beginProcessing(RestInitialHandler.java:48) at org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler.handle(ResteasyReactiveVertxHandler.java:23) at org.jboss.resteasy.reactive.server.vertx.ResteasyReactiveVertxHandler.handle(ResteasyReactiveVertxHandler.java:10) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1284) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:177) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:141) at io.quarkus.vertx.http.runtime.options.HttpServerCommonHandlers$1.handle(HttpServerCommonHandlers.java:58) at io.quarkus.vertx.http.runtime.options.HttpServerCommonHandlers$1.handle(HttpServerCommonHandlers.java:36) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1284) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:177) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:141) at io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRecorder$13.handle(ResteasyReactiveRecorder.java:382) at io.quarkus.resteasy.reactive.server.runtime.ResteasyReactiveRecorder$13.handle(ResteasyReactiveRecorder.java:375) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1284) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:177) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:141) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup.handleHotReplacementRequest(VertxHttpHotReplacementSetup.java:135) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$5.handle(VertxHttpRecorder.java:434) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$5.handle(VertxHttpRecorder.java:430) at io.vertx.ext.web.impl.RouteState.handleContext(RouteState.java:1284) at io.vertx.ext.web.impl.RoutingContextImplBase.iterateNext(RoutingContextImplBase.java:177) at io.vertx.ext.web.impl.RoutingContextImpl.next(RoutingContextImpl.java:141) at io.vertx.ext.web.impl.RouterImpl.handle(RouterImpl.java:68) at io.vertx.ext.web.impl.RouterImpl.handle(RouterImpl.java:37) at io.quarkus.vertx.http.runtime.options.HttpServerCommonHandlers$2.handle(HttpServerCommonHandlers.java:82) at io.quarkus.vertx.http.runtime.options.HttpServerCommonHandlers$2.handle(HttpServerCommonHandlers.java:65) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$1.handle(VertxHttpRecorder.java:177) at io.quarkus.vertx.http.runtime.VertxHttpRecorder$1.handle(VertxHttpRecorder.java:153) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$5.handle(VertxHttpHotReplacementSetup.java:194) at io.quarkus.vertx.http.runtime.devmode.VertxHttpHotReplacementSetup$5.handle(VertxHttpHotReplacementSetup.java:185) at io.vertx.core.impl.future.FutureImpl$3.onSuccess(FutureImpl.java:141) at io.vertx.core.impl.future.FutureBase.lambda$emitSuccess$0(FutureBase.java:54) at io.netty.util.concurrent.AbstractEventExecutor.runTask(AbstractEventExecutor.java:174) at io.netty.util.concurrent.AbstractEventExecutor.safeExecute(AbstractEventExecutor.java:167) at io.netty.util.concurrent.SingleThreadEventExecutor.runAllTasks(SingleThreadEventExecutor.java:470) at io.netty.channel.nio.NioEventLoop.run(NioEventLoop.java:569) at io.netty.util.concurrent.SingleThreadEventExecutor$4.run(SingleThreadEventExecutor.java:997) at io.netty.util.internal.ThreadExecutorMap$2.run(ThreadExecutorMap.java:74) at io.netty.util.concurrent.FastThreadLocalRunnable.run(FastThreadLocalRunnable.java:30) at java.base/java.lang.Thread.run(Thread.java:833) ``` ### Expected behavior Adding the extension doesn't lead to a NPEs during HTTP POST Requests. ### How to Reproduce? Reproducer: https://github.com/tamaro-skaljic/quarkus-csrf-np-bug/ Steps to reproduce behaviour: 1. Start Quarkus in Dev Mode 2. Visit http://localhost:8080/q/dev-ui/io.quarkus.quarkus-smallrye-openapi/swagger-ui 3. Do a post request to /hello through it ### Additional information If further configuration is required so that the extension does not produce errors, the build should fail.

a34ab2742b2133ffabb4b547c7a2485f98287036

3c6944364aa3936e6353327da3947367e04de850

https://github.com/quarkusio/quarkus/compare/a34ab2742b2133ffabb4b547c7a2485f98287036...3c6944364aa3936e6353327da3947367e04de850

diff --git a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java index 8fcba71e714..4c5eaa15177 100644 --- a/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java +++ b/extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java @@ -97,15 +97,16 @@ public void filter(ResteasyReactiveContainerRequestContext requestContext, Routi } else if (config.verifyToken) { // unsafe HTTP method, token is required - if (!isMatchingMediaType(requestContext.getMediaType(), MediaType.APPLICATION_FORM_URLENCODED_TYPE) - && !isMatchingMediaType(requestContext.getMediaType(), MediaType.MULTIPART_FORM_DATA_TYPE)) { + MediaType mediaType = requestContext.getMediaType(); + if (!isMatchingMediaType(mediaType, MediaType.APPLICATION_FORM_URLENCODED_TYPE) + && !isMatchingMediaType(mediaType, MediaType.MULTIPART_FORM_DATA_TYPE)) { if (config.requireFormUrlEncoded) { - LOG.debugf("Request has the wrong media type: %s", requestContext.getMediaType().toString()); + LOG.debugf("Request has the wrong media type: %s", mediaType); requestContext.abortWith(badClientRequest()); return; } else { - LOG.debugf("Request has the media type: %s, skipping the token verification", - requestContext.getMediaType().toString()); + LOG.debugf("Request has the media type: %s, skipping the token verification", + mediaType); return; } } @@ -148,7 +149,16 @@ public void filter(ResteasyReactiveContainerRequestContext requestContext, Routi } } + /** + * Compares if {@link MediaType} matches the expected type. + * <p> + * Note: isCompatible is taking wildcards, which is why we individually compare types and subtypes, + * so if someone sends a <code>Content-Type: *</code> it will be marked as compatible which is a problem + */ private static boolean isMatchingMediaType(MediaType contentType, MediaType expectedType) { + if (contentType == null) { + return (expectedType == null); + } return contentType.getType().equals(expectedType.getType()) && contentType.getSubtype().equals(expectedType.getSubtype()); }

['extensions/csrf-reactive/runtime/src/main/java/io/quarkus/csrf/reactive/runtime/CsrfRequestResponseReactiveFilter.java']

{'.java': 1}