Datasets:

JetBrains-Research

/

lca-bug-localization

like 1

quarkusio/quarkus/22917/22911

quarkusio

quarkus

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

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

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

resolves

CLI cannot remove registry from the list

### Describe the bug Registries added to cli cannot be removed ### Expected behavior Attempts to remove registries from config should be successfull ### Actual behavior Attempt to remove a registry from the list leads to error `Can only remove registries from an existing configuration. The specified config file does not exist: null` ### How to Reproduce? 1. `quarkus registry add quarkus.example.com` 2. Check the list: ``` $ quarkus registry Configured Quarkus extension registries: registry.quarkus.io quarkus.example.com (Config source: file: ~/.quarkus/config.yaml) ``` 2. `$ quarkus registry remove quarkus.example.com` ### Output of `uname -a` or `ver` OS name: "linux", version: "5.15.6-100.fc34.x86_64" ### Output of `java -version` 11.0.13, vendor: Eclipse Adoptium ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

0ab516441721f5b4eab72acabf2afd3817d84326

1827376df1afc4d543ace1a12673bab00219d892

https://github.com/quarkusio/quarkus/compare/0ab516441721f5b4eab72acabf2afd3817d84326...1827376df1afc4d543ace1a12673bab00219d892

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java index 7ce770d8546..284b57a0c63 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java @@ -7,6 +7,7 @@ import io.quarkus.cli.registry.BaseRegistryCommand; import io.quarkus.registry.config.RegistriesConfig; +import io.quarkus.registry.config.RegistryConfig; import picocli.CommandLine; @CommandLine.Command(name = "add", sortOptions = false, showDefaultValues = true, mixinStandardHelpOptions = false, header = "Add a Quarkus extension registry", description = "%n" @@ -30,7 +31,6 @@ public Integer call() throws Exception { existingConfig = Files.exists(configYaml); } - registryClient.refreshRegistryCache(output); final RegistriesConfig.Mutable config; if (configYaml != null && !existingConfig) { // we're creating a new configuration for a new file @@ -38,6 +38,7 @@ public Integer call() throws Exception { } else { config = registryClient.resolveConfig().mutable(); } + registryClient.refreshRegistryCache(output); boolean persist = false; for (String registryId : registryIds) { @@ -45,6 +46,10 @@ public Integer call() throws Exception { } if (persist) { + output.printText("Configured registries:"); + for (RegistryConfig rc : config.getRegistries()) { + output.printText("- " + rc.getId()); + } if (configYaml != null) { config.persist(configYaml); } else { diff --git a/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java index 27b27916167..b98aa196299 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java @@ -7,6 +7,7 @@ import io.quarkus.cli.registry.BaseRegistryCommand; import io.quarkus.registry.config.RegistriesConfig; +import io.quarkus.registry.config.RegistryConfig; import picocli.CommandLine; @CommandLine.Command(name = "remove", sortOptions = false, showDefaultValues = true, mixinStandardHelpOptions = false, header = "Remove a Quarkus extension registry", description = "%n" @@ -31,18 +32,13 @@ public Integer call() throws Exception { } final RegistriesConfig.Mutable config; - if (existingConfig) { - registryClient.refreshRegistryCache(output); - config = registryClient.resolveConfig().mutable(); - if (config.getSource().getFilePath() == null) { - output.error("Can only modify file-based configuration. Config source is " + config.getSource().describe()); - return CommandLine.ExitCode.SOFTWARE; - } + if (configYaml != null && !existingConfig) { + // we're creating a new configuration for a new file + config = RegistriesConfig.builder(); } else { - output.error("Can only remove registries from an existing configuration. The specified config file does not exist: " - + configYaml); - return CommandLine.ExitCode.SOFTWARE; + config = registryClient.resolveConfig().mutable(); } + registryClient.refreshRegistryCache(output); boolean persist = false; for (String registryId : registryIds) { @@ -50,7 +46,15 @@ public Integer call() throws Exception { } if (persist) { - config.persist(); + output.printText("Configured registries:"); + for (RegistryConfig rc : config.getRegistries()) { + output.printText("- " + rc.getId()); + } + if (configYaml != null) { + config.persist(configYaml); + } else { + config.persist(); + } } return CommandLine.ExitCode.OK; } diff --git a/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java b/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java index 402dcc83643..27047474844 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.java @@ -12,7 +12,6 @@ import picocli.CommandLine; import picocli.CommandLine.Help.ColorScheme; import picocli.CommandLine.Model.CommandSpec; -import picocli.CommandLine.Spec; public class OutputOptionMixin implements MessageWriter { @@ -83,7 +82,7 @@ public boolean isAnsiEnabled() { return CommandLine.Help.Ansi.AUTO.enabled(); } - public void printText(String[] text) { + public void printText(String... text) { for (String line : text) { out().println(colorScheme().ansi().new Text(line, colorScheme())); }

['devtools/cli/src/main/java/io/quarkus/cli/RegistryRemoveCommand.java', 'devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java', 'devtools/cli/src/main/java/io/quarkus/cli/common/OutputOptionMixin.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/23620/23602

quarkusio

quarkus

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

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

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

fixes

Using Mongo ChangeStreamDocument in Native Image Fails Decoding On Update

### Describe the bug Using the Mongo ChangeStream fails in native mode when receiving notification of a database update with the following error: ```posh Change Stream Subscription Error: org.bson.codecs.configuration.CodecConfigurationException: Failed to decode 'ChangeStreamDocument'. Decoding 'updateDescription' errored with: Cannot find a public constructor for 'UpdateDescription'. event-publishing-eventPublisher-1 | at org.bson.codecs.pojo.PojoCodecImpl.decodePropertyModel(PojoCodecImpl.java:206) event-publishing-eventPublisher-1 | at org.bson.codecs.pojo.PojoCodecImpl.decodeProperties(PojoCodecImpl.java:179) event-publishing-eventPublisher-1 | at org.bson.codecs.pojo.PojoCodecImpl.decode(PojoCodecImpl.java:103) event-publishing-eventPublisher-1 | at org.bson.codecs.pojo.PojoCodecImpl.decode(PojoCodecImpl.java:107) event-publishing-eventPublisher-1 | at com.mongodb.client.model.changestream.ChangeStreamDocumentCodec.decode(ChangeStreamDocumentCodec.java:63) event-publishing-eventPublisher-1 | at com.mongodb.client.model.changestream.ChangeStreamDocumentCodec.decode(ChangeStreamDocumentCodec.java:35) event-publishing-eventPublisher-1 | at org.bson.RawBsonDocument.decode(RawBsonDocument.java:161) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.ChangeStreamBatchCursor.convertAndProduceLastId(ChangeStreamBatchCursor.java:185) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.AsyncChangeStreamBatchCursor$2.onResult(AsyncChangeStreamBatchCursor.java:201) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.AsyncChangeStreamBatchCursor$2.onResult(AsyncChangeStreamBatchCursor.java:194) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.AsyncQueryBatchCursor.next(AsyncQueryBatchCursor.java:163) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.AsyncChangeStreamBatchCursor$1.apply(AsyncChangeStreamBatchCursor.java:83) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.AsyncChangeStreamBatchCursor.resumeableOperation(AsyncChangeStreamBatchCursor.java:194) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.AsyncChangeStreamBatchCursor.next(AsyncChangeStreamBatchCursor.java:79) event-publishing-eventPublisher-1 | at com.mongodb.reactivestreams.client.internal.BatchCursor.lambda$next$0(BatchCursor.java:35) event-publishing-eventPublisher-1 | at reactor.core.publisher.MonoCreate.subscribe(MonoCreate.java:57) event-publishing-eventPublisher-1 | at reactor.core.publisher.MonoPeek.subscribe(MonoPeek.java:67) event-publishing-eventPublisher-1 | at reactor.core.publisher.MonoPeek.subscribe(MonoPeek.java:67) event-publishing-eventPublisher-1 | at reactor.core.publisher.MonoPeekTerminal.subscribe(MonoPeekTerminal.java:61) event-publishing-eventPublisher-1 | at reactor.core.publisher.Mono.subscribe(Mono.java:3873) event-publishing-eventPublisher-1 | at reactor.core.publisher.Mono.subscribeWith(Mono.java:3979) event-publishing-eventPublisher-1 | at reactor.core.publisher.Mono.subscribe(Mono.java:3758) event-publishing-eventPublisher-1 | at com.mongodb.reactivestreams.client.internal.BatchCursorFlux.recurseCursor(BatchCursorFlux.java:104) event-publishing-eventPublisher-1 | at com.mongodb.reactivestreams.client.internal.BatchCursorFlux.lambda$subscribe$0(BatchCursorFlux.java:56) event-publishing-eventPublisher-1 | at reactor.core.publisher.LambdaMonoSubscriber.onNext(LambdaMonoSubscriber.java:137) event-publishing-eventPublisher-1 | at reactor.core.publisher.FluxMapFuseable$MapFuseableSubscriber.onNext(FluxMapFuseable.java:121) event-publishing-eventPublisher-1 | at reactor.core.publisher.Operators$MonoSubscriber.complete(Operators.java:1643) event-publishing-eventPublisher-1 | at reactor.core.publisher.MonoFlatMap$FlatMapInner.onNext(MonoFlatMap.java:241) event-publishing-eventPublisher-1 | at reactor.core.publisher.FluxPeek$PeekSubscriber.onNext(FluxPeek.java:192) event-publishing-eventPublisher-1 | at reactor.core.publisher.MonoCreate$DefaultMonoSink.success(MonoCreate.java:156) event-publishing-eventPublisher-1 | at com.mongodb.reactivestreams.client.internal.MongoOperationPublisher.lambda$sinkToCallback$30(MongoOperationPublisher.java:549) event-publishing-eventPublisher-1 | at com.mongodb.reactivestreams.client.internal.OperationExecutorImpl.lambda$execute$2(OperationExecutorImpl.java:78) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.ChangeStreamOperation$2$1.call(ChangeStreamOperation.java:347) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.OperationHelper.withAsyncConnectionSource(OperationHelper.java:727) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.OperationHelper.access$100(OperationHelper.java:69) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.OperationHelper$AsyncCallableWithSourceCallback.onResult(OperationHelper.java:706) event-publishing-eventPublisher-1 | at com.mongodb.internal.operation.OperationHelper$AsyncCallableWithSourceCallback.onResult(OperationHelper.java:696) event-publishing-eventPublisher-1 | at com.mongodb.internal.async.ErrorHandlingResultCallback.onResult(ErrorHandlingResultCallback.java:48) event-publishing-eventPublisher-1 | at com.mongodb.internal.async.client.ClientSessionBinding$WrappingCallback.onResult(ClientSessionBinding.java:267) event-publishing-eventPublisher-1 | at com.mongodb.internal.async.client.ClientSessionBinding$WrappingCallback.onResult(ClientSessionBinding.java:255) event-publishing-eventPublisher-1 | at com.mongodb.internal.binding.AsyncClusterBinding$1.onResult(AsyncClusterBinding.java:119) event-publishing-eventPublisher-1 | at com.mongodb.internal.binding.AsyncClusterBinding$1.onResult(AsyncClusterBinding.java:113) event-publishing-eventPublisher-1 | at com.mongodb.internal.connection.BaseCluster$ServerSelectionRequest.onResult(BaseCluster.java:430) event-publishing-eventPublisher-1 | at com.mongodb.internal.connection.BaseCluster.handleServerSelectionRequest(BaseCluster.java:294) event-publishing-eventPublisher-1 | at com.mongodb.internal.connection.BaseCluster.selectServerAsync(BaseCluster.java:155) event-publishing-eventPublisher-1 | at com.mongodb.internal.connection.SingleServerCluster.selectServerAsync(SingleServerCluster.java:41) ``` This works fine in jvm mode, suggesting some classes may need registering for reflection ### Expected behavior Expect document unmarshalled correctly. ### Actual behavior _No response_ ### How to Reproduce? https://github.com/luke-gee/monog-changestream-reproducer Added steps in the readme ### Output of `uname -a` or `ver` Microsoft Windows [Version 10.0.19042.1466] ### Output of `java -version` openjdk version "16.0.2" 2021-07-20 OpenJDK Runtime Environment GraalVM CE 21.2.0 (build 16.0.2+7-jvmci-21.2-b08) OpenJDK 64-Bit Server VM GraalVM CE 21.2.0 (build 16.0.2+7-jvmci-21.2-b08, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) mvn ### Additional information Image build in container, not using the java env above.

8a6287ca678fc59d37f7a76d32f232718e26a088

4ff6eb085eecbce555e74cb5cd4c3873cd674abf

https://github.com/quarkusio/quarkus/compare/8a6287ca678fc59d37f7a76d32f232718e26a088...4ff6eb085eecbce555e74cb5cd4c3873cd674abf

diff --git a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java index 333a38bea82..962c20e2709 100644 --- a/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java +++ b/extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java @@ -26,6 +26,7 @@ import com.mongodb.client.MongoClient; import com.mongodb.client.model.changestream.ChangeStreamDocument; +import com.mongodb.client.model.changestream.UpdateDescription; import com.mongodb.event.CommandListener; import com.mongodb.event.ConnectionPoolListener; @@ -151,6 +152,7 @@ List<ReflectiveClassBuildItem> addExtensionPointsToNative(CodecProviderBuildItem .collect(Collectors.toCollection(ArrayList::new)); // ChangeStreamDocument needs to be registered for reflection with its fields. reflectiveClass.add(new ReflectiveClassBuildItem(true, true, true, ChangeStreamDocument.class.getName())); + reflectiveClass.add(new ReflectiveClassBuildItem(true, true, false, UpdateDescription.class.getName())); return reflectiveClass; }

['extensions/mongodb-client/deployment/src/main/java/io/quarkus/mongodb/deployment/MongoClientProcessor.java']

{'.java': 1}

Java

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

Apache License 2.0

quarkusio/quarkus/23625/23573

quarkusio

quarkus

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

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

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

fixes

Confusing, if not downright wrong, warning message

### Describe the bug I run my app in dev mode. I change a build time property in `application.properties` and the application properly restarts but I get the following warning in the console: ```java 2022-02-10 09:57:08,244 WARN [io.qua.run.con.ConfigRecorder] (Quarkus Main Thread) Build time property cannot be changed at runtime: - quarkus.operator-sdk.crd.apply was 'true' at build time and is now 'false' ``` What is this message trying to tell me? What is the state of my property, i.e. is it `true` or is it `false`? ### Expected behavior A clear message as to what happened. ### Actual behavior The currently ambiguous or wrong message. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

a75b6db3ed6867d37ed605417944bd2154c85202

f2f37f8ad8372e6ffa7f59ef48f970b85b260094

https://github.com/quarkusio/quarkus/compare/a75b6db3ed6867d37ed605417944bd2154c85202...f2f37f8ad8372e6ffa7f59ef48f970b85b260094

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigRecorder.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigRecorder.java index 5b39842d77f..aaec129f11e 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigRecorder.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigRecorder.java @@ -34,9 +34,9 @@ public void handleConfigChange(Map<String, String> buildTimeConfig) { if (mismatches == null) { mismatches = new ArrayList<>(); } - mismatches.add( - " - " + entry.getKey() + " was '" + entry.getValue() + "' at build time and is now '" + val.get() - + "'"); + mismatches.add(" - " + entry.getKey() + " is set to '" + entry.getValue() + + "' but it is build time fixed to '" + val.get() + "'. Did you change the property " + + entry.getKey() + " after building the application?"); } } }

['core/runtime/src/main/java/io/quarkus/runtime/configuration/ConfigRecorder.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/23648/23646

quarkusio

quarkus

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

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

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

fix

quarkus:info/update doesn't handle modules defined in activeByDefault profile

### Describe the bug quarkus:info/update doesn't handle modules defined in activeByDefault profile `mvn quarkus:info` works if `mvn clean install` is executed before the command (and thus the module defined in profile gets into local maven repository. When running `mvn clean test` the module defined in activeByDefault profile gets picked, but running `mvn quarkus:info` command ends with `[ERROR] Failed to execute goal io.quarkus.platform:quarkus-maven-plugin:2.7.1.Final:info (default-cli) on project module-c: Failed to resolve the Quarkus application model for project org.acme:module-c::pom:1.0.0-SNAPSHOT: Failed to resolve artifact org.acme:module-c:pom:1.0.0-SNAPSHOT: Could not find artifact org.acme:module-c:pom:1.0.0-SNAPSHOT -> [Help 1]` part of the stacktrace when using `mvn -e ...` ``` Caused by: org.eclipse.aether.transfer.ArtifactNotFoundException: Could not find artifact org.acme:module-c:pom:1.0.0-SNAPSHOT at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolve (DefaultArtifactResolver.java:414) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifacts (DefaultArtifactResolver.java:229) at org.eclipse.aether.internal.impl.DefaultArtifactResolver.resolveArtifact (DefaultArtifactResolver.java:207) at org.eclipse.aether.internal.impl.DefaultRepositorySystem.resolveArtifact (DefaultRepositorySystem.java:262) at io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver.resolveInternal (MavenArtifactResolver.java:164) at io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver.resolve (MavenArtifactResolver.java:158) at io.quarkus.bootstrap.resolver.BootstrapAppModelResolver.resolve (BootstrapAppModelResolver.java:323) at io.quarkus.bootstrap.resolver.BootstrapAppModelResolver.doResolveModel (BootstrapAppModelResolver.java:195) at io.quarkus.bootstrap.resolver.BootstrapAppModelResolver.resolveManagedModel (BootstrapAppModelResolver.java:166) at io.quarkus.bootstrap.resolver.BootstrapAppModelResolver.resolveModel (BootstrapAppModelResolver.java:149) at io.quarkus.maven.QuarkusProjectStateMojoBase.resolveApplicationModel (QuarkusProjectStateMojoBase.java:69) at io.quarkus.maven.InfoMojo.processProjectState (InfoMojo.java:33) at io.quarkus.maven.QuarkusProjectStateMojoBase.doExecute (QuarkusProjectStateMojoBase.java:56) at io.quarkus.maven.QuarkusProjectMojoBase.execute (QuarkusProjectMojoBase.java:111) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo (DefaultBuildPluginManager.java:137) ``` @aloubyansky ### Expected behavior quarkus:info/update executed properly on modules defined in activeByDefault profile ### Actual behavior quarkus:info/update is not executed properly on modules defined in activeByDefault profile, ends with failure to resolve artifact ### How to Reproduce? - clone https://github.com/rsvoboda/code-with-quarkus-multi (module-c is defined in profile that is activatedByDefault) - run `mvn quarkus:info` ### Output of `uname -a` or `ver` macOS ### Output of `java -version` Java 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 ### Additional information _No response_

cb23550e66fddbe3b62c921ce4c27134d3e4aaf8

d351f25981eab3e2c907b343e46c55886f669c54

https://github.com/quarkusio/quarkus/compare/cb23550e66fddbe3b62c921ce4c27134d3e4aaf8...d351f25981eab3e2c907b343e46c55886f669c54

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 94d93a29de7..8ab8dd01203 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.java @@ -50,11 +50,20 @@ public void doExecute(QuarkusProject quarkusProject, MessageWriter log) throws M throw new MojoExecutionException("This goal requires a Quarkus extension registry client to be enabled"); } + // to support profiles + final String emb = System.getProperty("quarkus.bootstrap.effective-model-builder"); + System.setProperty("quarkus.bootstrap.effective-model-builder", "true"); + final Collection<Path> createdDirs = ensureResolvable(new DefaultArtifact(project.getGroupId(), project.getArtifactId(), ArtifactCoords.TYPE_POM, project.getVersion())); try { processProjectState(quarkusProject); } finally { + if (emb == null) { + System.clearProperty("quarkus.bootstrap.effective-model-builder"); + } else { + System.setProperty("quarkus.bootstrap.effective-model-builder", emb); + } for (Path p : createdDirs) { IoUtils.recursiveDelete(p); }

['devtools/maven/src/main/java/io/quarkus/maven/QuarkusProjectStateMojoBase.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/23664/23661

quarkusio

quarkus

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

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

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

fixes

Micrometer JSON registry uses a non-blocking route

### Describe the bug ... so if there are gauges which require a blocking operation to get the value, then the call to `/metrics` fails ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? Use `quarkus.micrometer.export.json.enabled=true` and register a gauge that requires a blocking operation to retrieve the value, and then request a JSON export from `/metrics` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information see discussion https://github.com/quarkusio/quarkus/discussions/23605

8d8a13d51626ab499f5f881bf6716519f9a45941

30ccd52ec0643726340448d7c26f6cb7e54c40a9

https://github.com/quarkusio/quarkus/compare/8d8a13d51626ab499f5f881bf6716519f9a45941...30ccd52ec0643726340448d7c26f6cb7e54c40a9

diff --git a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.java b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.java index 6b0ce9ad374..d97cf11de29 100644 --- a/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.java +++ b/extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.java @@ -45,6 +45,7 @@ public void initializeJsonRegistry(MicrometerConfig config, routes.produce(nonApplicationRootPathBuildItem.routeBuilder() .routeFunction(config.export.json.path, recorder.route()) .handler(recorder.getHandler()) + .blockingRoute() .build()); log.debug("Initialized a JSON meter registry on path="

['extensions/micrometer/deployment/src/main/java/io/quarkus/micrometer/deployment/export/JsonRegistryProcessor.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/24106/23727

quarkusio

quarkus

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

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

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

fixes

Odd class format error

### Describe the bug Only The `LicensedPracticalNurse` class triggers this error at startup while the other classes work fine (removing it fixes the problem). The snippet below is the entire application. ```kotlin @Path("/api/list") class ReactiveGreetingResource { @GET @Produces(MediaType.APPLICATION_JSON) @Path("/lpn") fun lpn() = LicensedPracticalNurse.listAll() @GET @Produces(MediaType.APPLICATION_JSON) @Path("/all") fun all() = NursingStaffMember.listAll() @GET @Produces(MediaType.APPLICATION_JSON) @Path("/rn") fun rn() = RegisteredNurse.listAll() @GET @Produces(MediaType.APPLICATION_JSON) @Path("/cna") fun cna() = CertifiedNursingAssisant.listAll() } enum class JobTitle { CNA, RN , LPN } @MappedSuperclass abstract class AbstractStaffMember : PanacheEntity() { @Column(name = "staff_id") lateinit var staffId: String @Column(name = "first_name") lateinit var firstName: String @Column(name = "last_name") lateinit var lastName: String @Column(name = "full_name") lateinit var fullName: String @Enumerated(EnumType.STRING) @Column(name = "job_title") lateinit var jobTitle: JobTitle } @Entity @Table(name = "LICENSED_PRACTICAL_NURSE") class LicensedPracticalNurse : AbstractStaffMember() { companion object : PanacheCompanion<LicensedPracticalNurse> } @Entity @Table(name = "REGISTERED_NURSE") class RegisteredNurse : AbstractStaffMember() { companion object : PanacheCompanion<RegisteredNurse> } @Entity @Table(name = "CERTIFIED_NURSING_ASSISTANT") class CertifiedNursingAssisant : AbstractStaffMember() { companion object : PanacheCompanion<CertifiedNursingAssisant> } ``` ### Expected behavior _No response_ ### Actual behavior ```posh 2022-02-15 09:01:57,346 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:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.runner.bootstrap.StartupActionImpl$1.run(StartupActionImpl.java:103) at java.base/java.lang.Thread.run(Thread.java:833) 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:77) at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499) at java.base/java.lang.reflect.ReflectAccess.newInstance(ReflectAccess.java:128) at java.base/jdk.internal.reflect.ReflectionFactory.newInstance(ReflectionFactory.java:347) at java.base/java.lang.Class.newInstance(Class.java:645) at io.quarkus.runtime.Quarkus.run(Quarkus.java:66) at io.quarkus.runtime.Quarkus.run(Quarkus.java:41) at io.quarkus.runtime.Quarkus.run(Quarkus.java:120) at io.quarkus.runner.GeneratedMain.main(Unknown Source) ... 6 more Caused by: java.lang.RuntimeException: Failed to start quarkus at io.quarkus.runner.ApplicationImpl.<clinit>(Unknown Source) ... 17 more Caused by: java.lang.ClassFormatError: Field "this" in class LicensedPracticalNurse$Companion has illegal signature "LicensedPracticalNurse$Companion" at java.base/java.lang.ClassLoader.defineClass1(Native Method) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1012) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:454) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:414) at java.base/java.lang.Class.getDeclaredFields0(Native Method) at java.base/java.lang.Class.privateGetDeclaredFields(Class.java:3297) at java.base/java.lang.Class.getDeclaredFields(Class.java:2371) at org.hibernate.annotations.common.reflection.java.JavaXClass.getDeclaredFieldProperties(JavaXClass.java:84) at org.hibernate.annotations.common.reflection.java.JavaXClass.getDeclaredProperties(JavaXClass.java:113) at org.hibernate.annotations.common.reflection.java.JavaXClass.getDeclaredProperties(JavaXClass.java:108) at org.hibernate.cfg.InheritanceState.determineDefaultAccessType(InheritanceState.java:258) at org.hibernate.cfg.InheritanceState.getElementsToProcess(InheritanceState.java:211) at org.hibernate.cfg.AnnotationBinder.bindClass(AnnotationBinder.java:771) at org.hibernate.boot.model.source.internal.annotations.AnnotationMetadataSourceProcessorImpl.processEntityHierarchies(AnnotationMetadataSourceProcessorImpl.java:225) at org.hibernate.boot.model.process.spi.MetadataBuildingProcess$1.processEntityHierarchies(MetadataBuildingProcess.java:239) at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:282) at io.quarkus.hibernate.orm.runtime.boot.FastBootMetadataBuilder.build(FastBootMetadataBuilder.java:354) at io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder.createMetadata(PersistenceUnitsHolder.java:101) at io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder.constructMetadataAdvance(PersistenceUnitsHolder.java:73) at io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder.initializeJpa(PersistenceUnitsHolder.java:40) at io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder$1.created(HibernateOrmRecorder.java:69) at io.quarkus.arc.runtime.ArcRecorder.initBeanContainer(ArcRecorder.java:70) at io.quarkus.deployment.steps.ArcProcessor$generateResources686947423.deploy_0(Unknown Source) at io.quarkus.deployment.steps.ArcProcessor$generateResources686947423.deploy(Unknown Source) ... 18 more 2022-02-15 09:01:57,376 INFO [org.jbo.threads] (main) JBoss Threads version 3.4.2.Final 2022-02-15 09:01:57,425 ERROR [io.qua.dep.dev.IsolatedDevModeMain] (main) Failed to start quarkus: java.lang.RuntimeException: java.lang.ClassFormatError: Field "this" in class LicensedPracticalNurse$Companion has illegal signature "LicensedPracticalNurse$Companion" at io.quarkus.dev.appstate.ApplicationStateNotification.waitForApplicationStart(ApplicationStateNotification.java:51) at io.quarkus.runner.bootstrap.StartupActionImpl.runMainClass(StartupActionImpl.java:122) at io.quarkus.deployment.dev.IsolatedDevModeMain.firstStart(IsolatedDevModeMain.java:144) at io.quarkus.deployment.dev.IsolatedDevModeMain.accept(IsolatedDevModeMain.java:455) at io.quarkus.deployment.dev.IsolatedDevModeMain.accept(IsolatedDevModeMain.java:66) at io.quarkus.bootstrap.app.CuratedApplication.runInCl(CuratedApplication.java:150) at io.quarkus.bootstrap.app.CuratedApplication.runInAugmentClassLoader(CuratedApplication.java:106) at io.quarkus.deployment.dev.DevModeMain.start(DevModeMain.java:132) at io.quarkus.deployment.dev.DevModeMain.main(DevModeMain.java:62) Caused by: java.lang.ClassFormatError: Field "this" in class LicensedPracticalNurse$Companion has illegal signature "LicensedPracticalNurse$Companion" at java.base/java.lang.ClassLoader.defineClass1(Native Method) at java.base/java.lang.ClassLoader.defineClass(ClassLoader.java:1012) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:454) at io.quarkus.bootstrap.classloading.QuarkusClassLoader.loadClass(QuarkusClassLoader.java:414) at java.base/java.lang.Class.getDeclaredFields0(Native Method) at java.base/java.lang.Class.privateGetDeclaredFields(Class.java:3297) at java.base/java.lang.Class.getDeclaredFields(Class.java:2371) at org.hibernate.annotations.common.reflection.java.JavaXClass.getDeclaredFieldProperties(JavaXClass.java:84) at org.hibernate.annotations.common.reflection.java.JavaXClass.getDeclaredProperties(JavaXClass.java:113) at org.hibernate.annotations.common.reflection.java.JavaXClass.getDeclaredProperties(JavaXClass.java:108) at org.hibernate.cfg.InheritanceState.determineDefaultAccessType(InheritanceState.java:258) at org.hibernate.cfg.InheritanceState.getElementsToProcess(InheritanceState.java:211) at org.hibernate.cfg.AnnotationBinder.bindClass(AnnotationBinder.java:771) at org.hibernate.boot.model.source.internal.annotations.AnnotationMetadataSourceProcessorImpl.processEntityHierarchies(AnnotationMetadataSourceProcessorImpl.java:225) at org.hibernate.boot.model.process.spi.MetadataBuildingProcess$1.processEntityHierarchies(MetadataBuildingProcess.java:239) at org.hibernate.boot.model.process.spi.MetadataBuildingProcess.complete(MetadataBuildingProcess.java:282) at io.quarkus.hibernate.orm.runtime.boot.FastBootMetadataBuilder.build(FastBootMetadataBuilder.java:354) at io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder.createMetadata(PersistenceUnitsHolder.java:101) at io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder.constructMetadataAdvance(PersistenceUnitsHolder.java:73) at io.quarkus.hibernate.orm.runtime.PersistenceUnitsHolder.initializeJpa(PersistenceUnitsHolder.java:40) at io.quarkus.hibernate.orm.runtime.HibernateOrmRecorder$1.created(HibernateOrmRecorder.java:69) at io.quarkus.arc.runtime.ArcRecorder.initBeanContainer(ArcRecorder.java:70) at io.quarkus.deployment.steps.ArcProcessor$generateResources686947423.deploy_0(Unknown Source) at io.quarkus.deployment.steps.ArcProcessor$generateResources686947423.deploy(Unknown Source) at io.quarkus.runner.ApplicationImpl.<clinit>(Unknown Source) at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at java.base/jdk.internal.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.base/java.lang.reflect.Constructor.newInstanceWithCaller(Constructor.java:499) at java.base/java.lang.reflect.ReflectAccess.newInstance(ReflectAccess.java:128) at java.base/jdk.internal.reflect.ReflectionFactory.newInstance(ReflectionFactory.java:347) at java.base/java.lang.Class.newInstance(Class.java:645) at io.quarkus.runtime.Quarkus.run(Quarkus.java:66) at io.quarkus.runtime.Quarkus.run(Quarkus.java:41) at io.quarkus.runtime.Quarkus.run(Quarkus.java:120) at io.quarkus.runner.GeneratedMain.main(Unknown Source) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.runner.bootstrap.StartupActionImpl$1.run(StartupActionImpl.java:103) at java.base/java.lang.Thread.run(Thread.java:833) ``` ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Darwin Kernel Version 21.3. ### Output of `java -version` openjdk version "17.0.2" 2022-01-18 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 ### Additional information _No response_

8cdad730bd93c5e912b6f657336319f78b07f330

b7ba58b7f05a44d3702c6be5cbb6fc604bbbd597

https://github.com/quarkusio/quarkus/compare/8cdad730bd93c5e912b6f657336319f78b07f330...b7ba58b7f05a44d3702c6be5cbb6fc604bbbd597

diff --git a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java index c2f035b45ae..038f51ee624 100644 --- a/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java +++ b/extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.java @@ -237,8 +237,7 @@ private void collectMethods(ClassInfo classInfo) { private String desc(String name) { String s = name.replace(".", "/"); - s = s.startsWith("L") || s.startsWith("[") ? s : "L" + s + ";"; - return s; + return s.startsWith("[") ? s : "L" + s + ";"; } private void descriptors(MethodInfo method, StringJoiner joiner) {

['extensions/panache/panache-common/deployment/src/main/java/io/quarkus/panache/common/deployment/visitors/KotlinPanacheClassOperationGenerationVisitor.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/24142/24008

quarkusio

quarkus

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

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

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

fix

Apicurio Registry DevService cannot be used by multiple Quarkus services

### Describe the bug Currently I'm trying to connect two simple Quarkus services using the default DevServices as Kafka broker and schema registry. According to the logs both services can successfully find the DevServices, which are automatically started by Quarkus. However, by trying to send a first message into the configured topic the following error occurs: ``` ERROR [io.sma.rea.mes.kafka] (smallrye-kafka-producer-thread-0) SRMSG18260: Unable to recover from the serialization failure (topic: movies), configure a SerializationFailureHandler to recover from errors.: io.vertx.core.VertxException: Invalid url: localhost:64263/apis/registry/v2/groups/default/artifacts?ifExists=RETURN_OR_UPDATE&canonical=false at io.vertx.core.http.RequestOptions.parseUrl(RequestOptions.java:357) at io.vertx.core.http.RequestOptions.setAbsoluteURI(RequestOptions.java:370) at io.apicurio.rest.client.VertxHttpClient.sendRequest(VertxHttpClient.java:74) at io.apicurio.registry.rest.client.impl.RegistryClientImpl.createArtifact(RegistryClientImpl.java:236) at io.apicurio.registry.rest.client.RegistryClient.createArtifact(RegistryClient.java:139) at io.apicurio.registry.serde.DefaultSchemaResolver.lambda$handleAutoCreateArtifact$2(DefaultSchemaResolver.java:174) at io.apicurio.registry.serde.ERCache.lambda$getValue$0(ERCache.java:132) at io.apicurio.registry.serde.ERCache.retry(ERCache.java:171) at io.apicurio.registry.serde.ERCache.getValue(ERCache.java:131) at io.apicurio.registry.serde.ERCache.getByContent(ERCache.java:116) at io.apicurio.registry.serde.DefaultSchemaResolver.handleAutoCreateArtifact(DefaultSchemaResolver.java:172) at io.apicurio.registry.serde.DefaultSchemaResolver.resolveSchema(DefaultSchemaResolver.java:82) at io.apicurio.registry.serde.AbstractKafkaSerializer.serialize(AbstractKafkaSerializer.java:92) at io.smallrye.reactive.messaging.kafka.fault.SerializerWrapper.lambda$serialize$1(SerializerWrapper.java:56) at io.smallrye.reactive.messaging.kafka.fault.SerializerWrapper.wrapSerialize(SerializerWrapper.java:81) at io.smallrye.reactive.messaging.kafka.fault.SerializerWrapper.serialize(SerializerWrapper.java:56) at org.apache.kafka.clients.producer.KafkaProducer.doSend(KafkaProducer.java:945) at org.apache.kafka.clients.producer.KafkaProducer.send(KafkaProducer.java:905) at io.smallrye.reactive.messaging.kafka.impl.ReactiveKafkaProducer.lambda$send$3(ReactiveKafkaProducer.java:111) at io.smallrye.context.impl.wrappers.SlowContextualConsumer.accept(SlowContextualConsumer.java:21) at io.smallrye.mutiny.operators.uni.builders.UniCreateWithEmitter.subscribe(UniCreateWithEmitter.java:22) at io.smallrye.mutiny.operators.AbstractUni.subscribe(AbstractUni.java:36) at io.smallrye.mutiny.operators.uni.UniRunSubscribeOn.lambda$subscribe$0(UniRunSubscribeOn.java:27) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at java.base/java.lang.Thread.run(Thread.java:829) Caused by: java.net.MalformedURLException: unknown protocol: localhost at java.base/java.net.URL.<init>(URL.java:652) at java.base/java.net.URL.<init>(URL.java:541) at java.base/java.net.URL.<init>(URL.java:488) at io.vertx.core.http.RequestOptions.parseUrl(RequestOptions.java:355) ... 25 more ``` This error only occurs on the Quarkus service (consumer or producer), which connects to an already existing Apicurio Registry started as Devservice. ### Expected behavior Multiple Quarkus Services in Dev mode can connect to an existing Apicurio Registry DevService automatically started by one of them ### Actual behavior The configured URL to an Apicurio Registry DevService contains no protocol for those services, which try to connect an existing instance of the DevService ### How to Reproduce? Using following consumer and producer services: https://github.com/sombraglez/quarkus-kafka-avro-schema-consumer https://github.com/sombraglez/quarkus-kafka-avro-schema-producer 1. Start consumer `quarkus-kafka-avro-schema-consumer` in Dev mode `mvn quarkus:dev` 2. Start producer `quarkus-kafka-avro-schema-producer` in Dev mode `mvn quarkus:dev` 3. Access consumer REST-EndPoint `http://localhost:8081/consumed-movies` 4. Produce a message via POST at `http://localhost:8080/movies` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk 11.0.14 2022-01-18 LTS ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.2 ### Additional information _No response_

f8b96e930afa8985fab62c18d7c91f67d8059eab

cf8fe1d2687b306424b3f4a03ced41a977544ef2

https://github.com/quarkusio/quarkus/compare/f8b96e930afa8985fab62c18d7c91f67d8059eab...cf8fe1d2687b306424b3f4a03ced41a977544ef2

diff --git a/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java b/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java index f5401c50c39..7456b684a2e 100644 --- a/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java +++ b/extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.java @@ -158,8 +158,10 @@ private RunningDevService startApicurioRegistry(ApicurioRegistryDevServiceCfg co // Starting the broker return apicurioRegistryContainerLocator.locateContainer(config.serviceName, config.shared, launchMode.getLaunchMode()) - .map(containerAddress -> new RunningDevService(Feature.APICURIO_REGISTRY_AVRO.getName(), - containerAddress.getId(), null, REGISTRY_URL_CONFIG, getRegistryUrlConfig(containerAddress.getUrl()))) + .map(address -> new RunningDevService(Feature.APICURIO_REGISTRY_AVRO.getName(), + address.getId(), null, REGISTRY_URL_CONFIG, + // address does not have the URL Scheme - just the host:port, so prepend http:// + getRegistryUrlConfig("http://" + address.getUrl()))) .orElseGet(() -> { ApicurioRegistryContainer container = new ApicurioRegistryContainer( DockerImageName.parse(config.imageName), config.fixedExposedPort,

['extensions/apicurio-registry-avro/deployment/src/main/java/io/quarkus/apicurio/registry/avro/DevServicesApicurioRegistryProcessor.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/34024/33993

quarkusio

quarkus

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

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

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

fixes

Quarkus startup hangs in OidcRecorder

### Describe the bug In some context (I'm still figuring out when) the server startup hangs indefinitely in OidcRecorder.java L143. It's only happening in production unfortunately. I managed to get this jstack: ``` "main" #1 prio=5 os_prio=0 cpu=2263.87ms elapsed=692.56s tid=0x00007f5c40024ec0 nid=0x3f waiting on condition [0x00007f5c472d1000] java.lang.Thread.State: WAITING (parking) at jdk.internal.misc.Unsafe.park(java.base@17.0.7/Native Method) - parking to wait for <0x00000000f14a1d18> (a java.util.concurrent.CountDownLatch$Sync) at java.util.concurrent.locks.LockSupport.park(java.base@17.0.7/LockSupport.java:211) at java.util.concurrent.locks.AbstractQueuedSynchronizer.acquire(java.base@17.0.7/AbstractQueuedSynchronizer.java:715) at java.util.concurrent.locks.AbstractQueuedSynchronizer.acquireSharedInterruptibly(java.base@17.0.7/AbstractQueuedSynchronizer.java:1047) at java.util.concurrent.CountDownLatch.await(java.base@17.0.7/CountDownLatch.java:230) at io.smallrye.mutiny.operators.uni.UniBlockingAwait.await(UniBlockingAwait.java:67) at io.smallrye.mutiny.groups.UniAwait.atMost(UniAwait.java:65) at io.smallrye.mutiny.groups.UniAwait.indefinitely(UniAwait.java:46) at io.quarkus.oidc.runtime.OidcRecorder.createStaticTenantContext(OidcRecorder.java:143) at io.quarkus.oidc.runtime.OidcRecorder.setup(OidcRecorder.java:64) at io.quarkus.deployment.steps.OidcBuildStep$setup635434700.deploy_0(Unknown Source) at io.quarkus.deployment.steps.OidcBuildStep$setup635434700.deploy(Unknown Source) 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 jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(java.base@17.0.7/Native Method) at jdk.internal.reflect.NativeMethodAccessorImpl.invoke(java.base@17.0.7/NativeMethodAccessorImpl.java:77) at jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(java.base@17.0.7/DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(java.base@17.0.7/Method.java:568) at io.quarkus.bootstrap.runner.QuarkusEntryPoint.doRun(QuarkusEntryPoint.java:61) at io.quarkus.bootstrap.runner.QuarkusEntryPoint.main(QuarkusEntryPoint.java:32) ``` I think there should be a log at least, possibly a timeout or even this should be deferred to later to avoid a network call on startup. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.1.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

5c2df5112331ef170c0b0ad83c84c6f853c2d5d6

61805454010a39fabcdf9e3e7fe3be019951da98

https://github.com/quarkusio/quarkus/compare/5c2df5112331ef170c0b0ad83c84c6f853c2d5d6...61805454010a39fabcdf9e3e7fe3be019951da98

diff --git a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java index 4d3015c4363..4915d298d23 100644 --- a/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java +++ b/extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.java @@ -87,7 +87,7 @@ public OidcClients get() { protected static OidcClient createOidcClient(OidcClientConfig oidcConfig, String oidcClientId, TlsConfig tlsConfig, Supplier<Vertx> vertx) { - return createOidcClientUni(oidcConfig, oidcClientId, tlsConfig, vertx).await().indefinitely(); + return createOidcClientUni(oidcConfig, oidcClientId, tlsConfig, vertx).await().atMost(oidcConfig.connectionTimeout); } protected static Uni<OidcClient> createOidcClientUni(OidcClientConfig oidcConfig, String oidcClientId, 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 3f10ffc72b0..1a77ace20ff 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 @@ -140,7 +140,7 @@ public TenantConfigContext apply(Throwable t) { throw new OIDCException(t); } }) - .await().indefinitely(); + .await().atMost(oidcConfig.getConnectionTimeout()); } private static Throwable logTenantConfigContextFailure(Throwable t, String tenantId) {

['extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java', 'extensions/oidc-client/runtime/src/main/java/io/quarkus/oidc/client/runtime/OidcClientRecorder.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/34020/34005

quarkusio

quarkus

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

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

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

fixes

Panache tries to (and fails to) transform classes even if disabled

### Describe the bug Panache seems to perform some class transformations regardless of whether Panache is enabled, leading to exceptions when running tests. ### Expected behavior Panache should not try to do anything if Panache is disabled. ### Actual behavior ``` [error]: Build step io.quarkus.deployment.steps.ClassTransformingBuildStep#handleClassTransformation threw an exception: java.lang.IllegalStateException: java.util.concurrent.ExecutionException: java.lang.IllegalStateException: Could not find indexed method: Lorg/acme/Person;.updateFirstnameStatic_orig with descriptor (Ljava/lang/String;)V and arg types [java.lang.String] at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:918) at io.quarkus.builder.BuildContext.run(BuildContext.java:281) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Caused by: java.util.concurrent.ExecutionException: java.lang.IllegalStateException: Could not find indexed method: Lorg/acme/Person;.updateFirstnameStatic_orig with descriptor (Ljava/lang/String;)V and arg types [java.lang.String] at java.base/java.util.concurrent.FutureTask.report(FutureTask.java:122) at java.base/java.util.concurrent.FutureTask.get(FutureTask.java:191) at io.quarkus.deployment.steps.ClassTransformingBuildStep.handleClassTransformation(ClassTransformingBuildStep.java:267) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$3.execute(ExtensionLoader.java:909) ... 6 more Caused by: java.lang.IllegalStateException: Could not find indexed method: Lorg/acme/Person;.updateFirstnameStatic_orig with descriptor (Ljava/lang/String;)V and arg types [java.lang.String] at io.quarkus.panache.common.deployment.visitors.PanacheEntityClassOperationGenerationVisitor.visitMethod(PanacheEntityClassOperationGenerationVisitor.java:99) at org.objectweb.asm.ClassVisitor.visitMethod(ClassVisitor.java:384) at io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsProcessor$InterceptedStaticMethodsClassVisitor.visitMethod(InterceptedStaticMethodsProcessor.java:449) at org.objectweb.asm.ClassReader.readMethod(ClassReader.java:1353) at org.objectweb.asm.ClassReader.accept(ClassReader.java:744) at org.objectweb.asm.ClassReader.accept(ClassReader.java:424) at io.quarkus.deployment.steps.ClassTransformingBuildStep.transformClass(ClassTransformingBuildStep.java:361) at io.quarkus.deployment.steps.ClassTransformingBuildStep$2.call(ClassTransformingBuildStep.java:232) at io.quarkus.deployment.steps.ClassTransformingBuildStep$2.call(ClassTransformingBuildStep.java:219) at java.base/java.util.concurrent.FutureTask.run(FutureTask.java:264) ... 5 more ``` ### How to Reproduce? 1. Clone https://github.com/yrodiere/quarkus-resteasy-postgres/tree/panache-hibernate-disabled 2. Run `mvn clean verify` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

210b2a332e855aee3a73f71f7cdb7d10a3467c6f

0a6d90945ef528d30dbe0800f28b08c81f87d347

https://github.com/quarkusio/quarkus/compare/210b2a332e855aee3a73f71f7cdb7d10a3467c6f...0a6d90945ef528d30dbe0800f28b08c81f87d347

diff --git a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java index 7edb7fcddba..82ff8080397 100644 --- a/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java +++ b/extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java @@ -21,6 +21,7 @@ import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.arc.deployment.ValidationPhaseBuildItem; +import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem; import io.quarkus.builder.BuildException; import io.quarkus.deployment.Feature; import io.quarkus.deployment.annotations.BuildProducer; @@ -92,6 +93,7 @@ void collectEntityClasses(CombinedIndexBuildItem index, BuildProducer<PanacheEnt @BuildStep @Consume(HibernateEnhancersRegisteredBuildItem.class) + @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class) void build( CombinedIndexBuildItem index, BuildProducer<BytecodeTransformerBuildItem> transformers, diff --git a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java index 194f123bf06..68a4e402578 100644 --- a/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java +++ b/extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java @@ -18,6 +18,7 @@ import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.arc.deployment.ValidationPhaseBuildItem; +import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem; import io.quarkus.builder.BuildException; import io.quarkus.deployment.Feature; import io.quarkus.deployment.annotations.BuildProducer; @@ -90,6 +91,7 @@ void collectEntityClasses(CombinedIndexBuildItem index, BuildProducer<PanacheEnt @BuildStep @Consume(HibernateEnhancersRegisteredBuildItem.class) + @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class) void build(CombinedIndexBuildItem index, BuildProducer<BytecodeTransformerBuildItem> transformers, List<PanacheEntityClassBuildItem> entityClasses, diff --git a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java index 199f8fae507..f99d26b3418 100644 --- a/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java +++ b/extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.java @@ -30,11 +30,13 @@ import io.quarkus.arc.deployment.UnremovableBeanBuildItem; import io.quarkus.arc.deployment.ValidationPhaseBuildItem; +import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem; import io.quarkus.bootstrap.classloading.ClassPathElement; import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.builder.BuildException; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.annotations.Consume; import io.quarkus.deployment.annotations.ExecutionTime; import io.quarkus.deployment.annotations.Record; import io.quarkus.deployment.bean.JavaBeanUtil; @@ -76,6 +78,7 @@ public abstract class BasePanacheMongoResourceProcessor { public static final String BSON_PACKAGE = "org.bson."; @BuildStep + @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class) public void buildImperative(CombinedIndexBuildItem index, BuildProducer<BytecodeTransformerBuildItem> transformers, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, @@ -94,6 +97,7 @@ public void buildImperative(CombinedIndexBuildItem index, } @BuildStep + @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class) public void buildReactive(CombinedIndexBuildItem index, BuildProducer<ReflectiveClassBuildItem> reflectiveClass, BuildProducer<ReflectiveHierarchyBuildItem> reflectiveHierarchy, diff --git a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java index 82cf77985d5..656c2c1e3a8 100644 --- a/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java +++ b/extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java @@ -14,6 +14,7 @@ import org.jboss.jandex.DotName; import org.jboss.jandex.FieldInfo; +import io.quarkus.arc.deployment.staticmethods.InterceptedStaticMethodsTransformersRegisteredBuildItem; import io.quarkus.bootstrap.classloading.ClassPathElement; import io.quarkus.bootstrap.classloading.QuarkusClassLoader; import io.quarkus.deployment.annotations.BuildProducer; @@ -81,6 +82,7 @@ void findEntityClasses(CombinedIndexBuildItem index, @BuildStep @Consume(HibernateEnhancersRegisteredBuildItem.class) + @Consume(InterceptedStaticMethodsTransformersRegisteredBuildItem.class) void replaceFieldAccesses(CombinedIndexBuildItem index, ApplicationArchivesBuildItem applicationArchivesBuildItem, Optional<HibernateMetamodelForFieldAccessBuildItem> modelInfoBuildItem,

['extensions/panache/panache-hibernate-common/deployment/src/main/java/io/quarkus/panache/common/deployment/PanacheHibernateCommonResourceProcessor.java', 'extensions/panache/hibernate-reactive-panache/deployment/src/main/java/io/quarkus/hibernate/reactive/panache/common/deployment/PanacheHibernateResourceProcessor.java', 'extensions/panache/hibernate-orm-panache/deployment/src/main/java/io/quarkus/hibernate/orm/panache/deployment/PanacheHibernateResourceProcessor.java', 'extensions/panache/mongodb-panache-common/deployment/src/main/java/io/quarkus/mongodb/panache/deployment/BasePanacheMongoResourceProcessor.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/33971/33961

quarkusio

quarkus

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

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

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

fixes

:dev terminal test commands don't work anymore (testSupport.include is null)

### Describe the bug When invoking the terminal (`:`) while in `:dev` mode, the options to set the `test pattern` for includes and excludes don't seem to work (anymore). Maybe I'm missing something but I don't seem to be able to include and exclude patterns once the dev mode has been started. Example: ``` : $ test pattern exclude .*UITest java.lang.NullPointerException: Cannot invoke "java.util.regex.Pattern.pattern()" because "testSupport.include" is null ``` If I look into the source code of `io.quarkus.deployment.dev.testing.TestSupport`, then indeed `include` and `exclude` are `null`. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? 1. Have a project with different test naming strategies (e.g. `...Test`, `...UITest`, `...APITest`). 2. Run `mvn quarkus:dev` 3. Start the terminal (`:`) 4. Try to set the exclude and include patterns (maybe multiple times) ### Output of `uname -a` or `ver` Linux squarelinux 6.1.7-arch1-1 #1 SMP PREEMPT_DYNAMIC Wed, 18 Jan 2023 19:54:38 +0000 x86_64 GNU/Linux ### Output of `java -version` OpenJDK Runtime Environment Temurin-18.0.1+10 (build 18.0.1+10) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 3.1.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.6 ### Additional information _No response_

35e0f9c21c1e0a7f994d5b4fd590280a23693600

7206ac0ba8156f5e0f23642457b4999bc6e5c586

https://github.com/quarkusio/quarkus/compare/35e0f9c21c1e0a7f994d5b4fd590280a23693600...7206ac0ba8156f5e0f23642457b4999bc6e5c586

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java index d72622e78dc..8ff20a9bcf9 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.java @@ -298,7 +298,7 @@ protected String configKey() { @Override protected void configure(TestSupport testSupport) { - testSupport.setPatterns(pattern, testSupport.exclude.pattern()); + testSupport.setPatterns(pattern, testSupport.exclude != null ? testSupport.exclude.pattern() : null); } } @@ -320,7 +320,7 @@ protected String configKey() { @Override protected void configure(TestSupport testSupport) { - testSupport.setPatterns(testSupport.include.pattern(), pattern); + testSupport.setPatterns(testSupport.include != null ? testSupport.include.pattern() : null, pattern); } }

['core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestTracingProcessor.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/22816/20492

quarkusio

quarkus

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

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

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

fixes

Class PostgreSQL10Dialect not found on Quarkus in Google App Engine java11?

### Describe the bug I wanted to deploy my quarkus application including hibernate panache to GCP app engine standard and got the error: Class PostgreSQL10Dialect not found on Quarkus ### Expected behavior Successful startup of quarkus on GCP app engine standard ### Actual behavior I've set up my quarkus application regarding to https://quarkus.io/guides/deploying-to-google-cloud Created a Cloud SQL instance. And happily deployed the java11 app the first time to GAE. :-) But - on startup quarkus fails with this reason: ``` Caused by: java.lang.ClassNotFoundException: org.hibernate.dialect.PostgreSQL10Dialect 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 java.base/java.lang.Class.forName0(Native Method) at java.base/java.lang.Class.forName(Class.java:398) at io.quarkus.hibernate.orm.runtime.service.FlatClassLoaderService.classForName(FlatClassLoaderService.java:36) ``` Looking at the jar: ``` $ jar tvf foodie-1.0-SNAPSHOT-runner.jar | fgrep PostgreSQL10Dialect 1184 Tue Sep 28 20:12:07 CEST 2021 io/quarkus/hibernate/orm/runtime/dialect/QuarkusPostgreSQL10Dialect.class 990 Tue Sep 28 20:12:08 CEST 2021 org/hibernate/dialect/PostgreSQL10Dialect.class ``` Any hints how to proceed? application.properties: ``` quarkus.package.type=uber-jar quarkus.datasource.db-kind=other %dev.quarkus.datasource.jdbc.url=jdbc:postgresql:///quarkus quarkus.datasource.jdbc.url=jdbc:postgresql:///quarkus quarkus.datasource.jdbc.driver=org.postgresql.Driver quarkus.datasource.jdbc.additional-jdbc-properties.cloudSqlInstance=addlogic-foodiefnf-1:europe-west3:quarkus quarkus.datasource.jdbc.additional-jdbc-properties.socketFactory=com.google.cloud.sql.postgres.SocketFactory quarkus.hibernate-orm.dialect=org.hibernate.dialect.PostgreSQL10Dialect ``` Extract from pom.xml: ``` <maven.compiler.target>11</maven.compiler.target> <quarkus-plugin.version>2.2.3.Final</quarkus-plugin.version> <quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id> <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id> <quarkus.platform.version>2.2.3.Final</quarkus.platform.version> <postgres-socket-factory.version>1.3.3</postgres-socket-factory.version> [...] <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-jdbc-postgresql</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-hibernate-orm-panache</artifactId> </dependency> <dependency> <groupId>com.google.cloud.sql</groupId> <artifactId>postgres-socket-factory</artifactId> <version>${postgres-socket-factory.version}</version> </dependency> ``` Sidenote on deployment? ---------------------------- How to investigate this warning on ´mvn clean package appengine:deploy´? ``` [INFO] Staging the application to: D:\\eclipse\\eclipse-workspace\\code-with-quarkus\\target\\appengine-staging [INFO] Detected App Engine app.yaml based application. Okt. 01, 2021 8:08:38 AM com.google.cloud.tools.appengine.operations.AppYamlProjectStaging copyArtifactJarClasspath WARNING: Could not copy 'Class-Path' jar: D:\\eclipse\\eclipse-workspace\\code-with-quarkus\\target referenced in MANIFEST.MF ``` Just a sidenote as deployment with `gcloud app deploy target/code-with-quarkus-1.0.0-SNAPSHOT-runner.jar` gives no WARNINFS and has same effects. Alternative with mysql is functioning ===================================== I've tried an alternative with mysql, which is functioning in the same MCVE and another testing project which I have set up. pom.xml ``` <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-jdbc-mysql</artifactId> </dependency> <dependency> <groupId>com.google.cloud.sql</groupId> <artifactId>mysql-socket-factory-connector-j-8</artifactId> <version>1.3.3</version> </dependency> ``` application.properties ``` # https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/blob/main/docs/jdbc-mysql.md quarkus.datasource.db-kind=other quarkus.datasource.jdbc.url=jdbc:mysql:///quarkus quarkus.datasource.jdbc.driver=com.mysql.cj.jdbc.Driver quarkus.datasource.username=root quarkus.datasource.password=quarkus quarkus.datasource.jdbc.additional-jdbc-properties.cloudSqlInstance=addlogic-foodiefnf-1:europe-west3:quarkusmysql quarkus.datasource.jdbc.additional-jdbc-properties.socketFactory=com.google.cloud.sql.mysql.SocketFactory quarkus.hibernate-orm.dialect=org.hibernate.dialect.MySQL8Dialect ``` ***So this makes me more curious why it is not working with PostgreSQL.*** ### How to Reproduce? An MCVE reproducer project can be found at `git@gitlab.com:addlogic/code-with-quarkus.git#` See README for reproduction steps. ### Output of `uname -a` or `ver` CYGWIN_NT-10.0 levante2b 3.2.0(0.340/5/3) 2021-03-29 08:42 x86_64 Cygwin ### Output of `java -version` $ java -version java version "11.0.11" 2021-04-20 LTS Java(TM) SE Runtime Environment 18.9 (build 11.0.11+9-LTS-194) Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.11+9-LTS-194, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.2.3.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) apache-maven-3.8.1 ### Additional information _No response_

376d631081852877d8781a20b4666e8220057360

bfabc1c06609c99115cb4dc78a73c96c6f3c2df9

https://github.com/quarkusio/quarkus/compare/376d631081852877d8781a20b4666e8220057360...bfabc1c06609c99115cb4dc78a73c96c6f3c2df9

diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java index 33e03cd274b..cd1436fca8e 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java @@ -19,10 +19,20 @@ public class CharsetConverter implements Converter<Charset>, Serializable { @Override public Charset convert(String value) { + if (value == null) { + return null; + } + + String trimmedCharset = value.trim(); + + if (trimmedCharset.isEmpty()) { + return null; + } + try { - return Charset.forName(value); + return Charset.forName(trimmedCharset); } catch (Exception e) { - throw new IllegalArgumentException("Unable to create Charset from: '" + value + "'", e); + throw new IllegalArgumentException("Unable to create Charset from: '" + trimmedCharset + "'", e); } } } diff --git a/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java b/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java index 4588db6b50e..f0f8eabbedf 100644 --- a/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java +++ b/core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java @@ -10,8 +10,15 @@ public TrimmedStringConverter() { @Override public String convert(String s) { if (s == null) { - return s; + return null; } - return s.trim(); + + String trimmedString = s.trim(); + + if (trimmedString.isEmpty()) { + return null; + } + + return trimmedString; } } diff --git a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java index 2b9c324b2a2..6d5e3877ac7 100644 --- a/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java +++ b/extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.java @@ -4,6 +4,8 @@ import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class DataSourceJdbcBuildTimeConfig { @@ -18,6 +20,7 @@ public class DataSourceJdbcBuildTimeConfig { * The datasource driver class name */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> driver = Optional.empty(); /** diff --git a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java index 82c9f351e8c..d22a84034e5 100644 --- a/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java +++ b/extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java @@ -4,6 +4,8 @@ import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class DataSourceRuntimeConfig { @@ -24,6 +26,7 @@ public class DataSourceRuntimeConfig { * The credentials provider name */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> credentialsProvider = Optional.empty(); /** @@ -35,5 +38,6 @@ public class DataSourceRuntimeConfig { * For Vault it is: vault-credentials-provider. Not necessary if there is only one credentials provider available. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> credentialsProviderName = Optional.empty(); } diff --git a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java index b7e4ad913de..c0018f9e2ab 100644 --- a/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java +++ b/extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java @@ -14,6 +14,8 @@ import io.quarkus.runtime.annotations.ConfigDocSection; import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class HibernateOrmConfigPersistenceUnit { @@ -23,11 +25,13 @@ public class HibernateOrmConfigPersistenceUnit { * <p> * If undefined, it will use the default datasource. */ + @ConvertWith(TrimmedStringConverter.class) public Optional<String> datasource; /** * The packages in which the entities affected to this persistence unit are located. */ + @ConvertWith(TrimmedStringConverter.class) public Optional<Set<String>> packages; /** @@ -71,6 +75,7 @@ public class HibernateOrmConfigPersistenceUnit { */ // @formatter:on @ConfigItem(defaultValueDocumentation = "import.sql in DEV, TEST ; no-file otherwise") + @ConvertWith(TrimmedStringConverter.class) public Optional<List<String>> sqlLoadScript; /** @@ -103,6 +108,7 @@ public class HibernateOrmConfigPersistenceUnit { * Class name of the Hibernate PhysicalNamingStrategy implementation */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> physicalNamingStrategy; /** @@ -111,6 +117,7 @@ public class HibernateOrmConfigPersistenceUnit { * Class name of the Hibernate ImplicitNamingStrategy implementation */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> implicitNamingStrategy; /** @@ -130,6 +137,7 @@ public class HibernateOrmConfigPersistenceUnit { * @asciidoclet */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> metadataBuilderContributor; /** @@ -139,6 +147,7 @@ public class HibernateOrmConfigPersistenceUnit { * Pass `no-file` to force Hibernate ORM to ignore `META-INF/orm.xml`. */ @ConfigItem(defaultValueDocumentation = "META-INF/orm.xml if it exists; no-file otherwise") + @ConvertWith(TrimmedStringConverter.class) public Optional<Set<String>> mappingFiles; /** @@ -201,6 +210,7 @@ public class HibernateOrmConfigPersistenceUnit { * @asciidoclet */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> multitenant; /** @@ -208,6 +218,7 @@ public class HibernateOrmConfigPersistenceUnit { * if not set. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> multitenantSchemaDatasource; /** @@ -259,6 +270,7 @@ public static class HibernateOrmConfigPersistenceUnitDialect { // TODO should it be dialects //TODO should it be shortcuts like "postgresql" "h2" etc @ConfigItem(name = ConfigItem.PARENT) + @ConvertWith(TrimmedStringConverter.class) public Optional<String> dialect; /** @@ -269,6 +281,7 @@ public static class HibernateOrmConfigPersistenceUnitDialect { * @asciidoclet */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> storageEngine; public boolean isAnyPropertySet() { @@ -342,6 +355,7 @@ public static class HibernateOrmConfigPersistenceUnitJdbc { * The time zone pushed to the JDBC driver. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> timezone; /** diff --git a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java index b3676ba8270..98bb49330d9 100644 --- a/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java +++ b/extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java @@ -5,6 +5,8 @@ import io.quarkus.runtime.annotations.ConfigDocSection; import io.quarkus.runtime.annotations.ConfigGroup; import io.quarkus.runtime.annotations.ConfigItem; +import io.quarkus.runtime.annotations.ConvertWith; +import io.quarkus.runtime.configuration.TrimmedStringConverter; @ConfigGroup public class HibernateOrmRuntimeConfigPersistenceUnit { @@ -49,12 +51,14 @@ public static class HibernateOrmConfigPersistenceUnitDatabase { * The default catalog to use for the database objects. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> defaultCatalog; /** * The default schema to use for the database objects. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> defaultSchema; public boolean isAnyPropertySet() { @@ -92,6 +96,7 @@ public static class HibernateOrmConfigPersistenceUnitDatabaseGeneration { * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`. */ @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none") + @ConvertWith(TrimmedStringConverter.class) public String generation = "none"; /** @@ -122,18 +127,21 @@ public static class HibernateOrmConfigPersistenceUnitScriptGeneration { * Accepted values: `none`, `create`, `drop-and-create`, `drop`, `update`, `validate`. */ @ConfigItem(name = ConfigItem.PARENT, defaultValue = "none") + @ConvertWith(TrimmedStringConverter.class) public String generation = "none"; /** * Filename or URL where the database create DDL file should be generated. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> createTarget = Optional.empty(); /** * Filename or URL where the database drop DDL file should be generated. */ @ConfigItem + @ConvertWith(TrimmedStringConverter.class) public Optional<String> dropTarget = Optional.empty(); public boolean isAnyPropertySet() {

['extensions/datasource/runtime/src/main/java/io/quarkus/datasource/runtime/DataSourceRuntimeConfig.java', 'core/runtime/src/main/java/io/quarkus/runtime/configuration/TrimmedStringConverter.java', 'extensions/hibernate-orm/runtime/src/main/java/io/quarkus/hibernate/orm/runtime/HibernateOrmRuntimeConfigPersistenceUnit.java', 'core/runtime/src/main/java/io/quarkus/runtime/configuration/CharsetConverter.java', 'extensions/hibernate-orm/deployment/src/main/java/io/quarkus/hibernate/orm/deployment/HibernateOrmConfigPersistenceUnit.java', 'extensions/agroal/runtime/src/main/java/io/quarkus/agroal/runtime/DataSourceJdbcBuildTimeConfig.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/22809/22792

quarkusio

quarkus

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

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

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

fixes

Continuous testing fails when `@QuarkusMainTest` and a `@ConfigMapping` are involved

### Describe the bug Running a test annotated with `@QuarkusMainTest` in continuous testing mode where another test tests a config mapping defined by `@ConfigMapping` causes the test to fail with a `ClassCastException`: ``` Caused by: java.lang.ClassCastException: class io.quarkus.test.junit.RunningAppConfigResolver$1 cannot be cast to class io.smallrye.config.SmallRyeConfig (io.quarkus.test.junit.RunningAppConfigResolver$1 and io.smallrye.config.SmallRyeConfig are in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @6c85b253) at io.quarkus.deployment.steps.ConfigGenerationBuildStep.watchConfigFiles(ConfigGenerationBuildStep.java:241) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:887) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) ``` It is important that the test testing the `@ConfigMapping` is run before the `@QuarkusMainTest`. The other way round the behavior couldn't be observed. The tests pass when run with `./mvnw clean verify` ### Expected behavior Tests passing when run with `./mvnw clean verify` also pass when run in continuous testing mode. ### Actual behavior When a test using an injected `@ConfigMapping` is run before a `@QuarkusMainTest` the `@QuarkusMainTest` fails with a class cast exception: ``` Caused by: java.lang.ClassCastException: class io.quarkus.test.junit.RunningAppConfigResolver$1 cannot be cast to class io.smallrye.config.SmallRyeConfig (io.quarkus.test.junit.RunningAppConfigResolver$1 and io.smallrye.config.SmallRyeConfig are in unnamed module of loader io.quarkus.bootstrap.classloading.QuarkusClassLoader @6c85b253) at io.quarkus.deployment.steps.ConfigGenerationBuildStep.watchConfigFiles(ConfigGenerationBuildStep.java:241) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:77) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:568) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:887) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1452) at java.base/java.lang.Thread.run(Thread.java:833) at org.jboss.threads.JBossThread.run(JBossThread.java:501) ``` ### How to Reproduce? 1. Download the demo at tag [QuarkusMainTestFailWithConfigMapping](https://github.com/itbh-at/quarkus-main-test/releases/tag/QuarkusMainTestFailWithConfigMapping) 2. Run `quarkus dev` 3. Start tests -> fail 4. Remove the `@QuarkusMainTest` -> pass 5. Add again the `@QuarkusMainTest` and remove `ConfigurationTest` -> pass 6. Add `ConfigurationTest` again 7. Rename `ConfigurationTest.java` to `GreetingConfigurationTest.java` to ensure it is run after the `@QuarkusMainTest` in `GreetingCommandTest.java` 8. Run the test in `quarkus dev` -> fail, but not because of the `ClassCastException` but because of what is described in #22790 8. Make sure the app looks the same as after the download and exit `quarkus dev` 9. Run `./mvnw clean verify` -> pass ### Output of `uname -a` or `ver` Darwin cdh 21.2.0 Darwin Kernel Version 21.2.0: Sun Nov 28 20:29:10 PST 2021; root:xnu-8019.61.5~1/RELEASE_ARM64_T8101 arm64 ### Output of `java -version` java version "17" 2021-09-14 LTS Java(TM) SE Runtime Environment (build 17+35-LTS-2724) Java HotSpot(TM) 64-Bit Server VM (build 17+35-LTS-2724, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) Maven home: ~/.m2/wrapper/dists/apache-maven-3.8.1-bin/2l5mhf2pq2clrde7f7qp1rdt5m/apache-maven-3.8.1 Java version: 17, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home Default locale: de_AT, platform encoding: UTF-8 OS name: "mac os x", version: "12.1", arch: "aarch64", family: "mac" ### Additional information _No response_

d31c534d288497b71f363b4b0f8e22100184fabe

76842aefc2bfd0023fbbc19829d433388ce7201f

https://github.com/quarkusio/quarkus/compare/d31c534d288497b71f363b4b0f8e22100184fabe...76842aefc2bfd0023fbbc19829d433388ce7201f

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java index 0793c514d43..0d5f07a2337 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java @@ -72,7 +72,6 @@ import io.smallrye.config.ConfigMappings.ConfigClassWithPrefix; import io.smallrye.config.ConfigSourceFactory; import io.smallrye.config.PropertiesLocationConfigSourceFactory; -import io.smallrye.config.SmallRyeConfig; public class ConfigGenerationBuildStep { @@ -238,7 +237,7 @@ public void setupConfigOverride( public void watchConfigFiles(BuildProducer<HotDeploymentWatchedFileBuildItem> watchedFiles) { List<String> configWatchedFiles = new ArrayList<>(); - SmallRyeConfig config = (SmallRyeConfig) ConfigProvider.getConfig(); + Config config = ConfigProvider.getConfig(); String userDir = System.getProperty("user.dir"); // Main files

['core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.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/22769/22699

quarkusio

quarkus

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

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

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

fixes

2.6 - Error with config locations

### Describe the bug I have an `application.yaml` that gets used for all projects (containing things like `ignored-split-packages`). With the `ConfigGenerationBuildStep` changes in 2.6 I now get an exception during builds because of the following lines in my `build.gradle` file. ```groovy build { // Shared Quarkus configuration applied to all projects def shareConfig = rootProject.projectDir.toURI().toString() + "/conf/quarkus" System.setProperty("quarkus.config.locations", "${shareConfig}") } ``` It looks like `ConfigGenerationBuildStep` doesn't seem to like the URI string format (see exception below). I also tried `toAbsolutePath()` instead of `toURI().toString()`, but then it pushed the error to `bstractLocationConfigSourceLoader`, which didn't like the drive letter when in Windows (see exception below). ### Expected behavior Successful build ### Actual behavior Error using `toURI().toString()` ``` Caused by: java.nio.file.InvalidPathException: Illegal char <:> at index 4: file:/C:/my/git//conf/quarkus at io.quarkus.deployment.steps.ConfigGenerationBuildStep.lambda$watchConfigFiles$0(ConfigGenerationBuildStep.java:259) at io.quarkus.deployment.steps.ConfigGenerationBuildStep.watchConfigFiles(ConfigGenerationBuildStep.java:257) ``` Error using `toAbsolutePath()` ``` Caused by: java.lang.IllegalArgumentException: SRCFG00033: Scheme C not supported at io.smallrye.config.AbstractLocationConfigSourceLoader.loadConfigSources(AbstractLocationConfigSourceLoader.java:101) at io.smallrye.config.AbstractLocationConfigSourceLoader.loadConfigSources(AbstractLocationConfigSourceLoader.java:80) at io.smallrye.config.AbstractLocationConfigSourceFactory.getConfigSources(AbstractLocationConfigSourceFactory.java:30) at io.smallrye.config.PropertiesLocationConfigSourceFactory.getConfigSources(PropertiesLocationConfigSourceFactory.java:16) at io.smallrye.config.ConfigurableConfigSource.unwrap(ConfigurableConfigSource.java:53) at io.smallrye.config.ConfigurableConfigSource.getConfigSources(ConfigurableConfigSource.java:49) at io.smallrye.config.SmallRyeConfig$ConfigSources.mapLateSources(SmallRyeConfig.java:618) at io.smallrye.config.SmallRyeConfig$ConfigSources.<init>(SmallRyeConfig.java:529) at io.smallrye.config.SmallRyeConfig.<init>(SmallRyeConfig.java:66) at io.smallrye.config.SmallRyeConfigBuilder.build(SmallRyeConfigBuilder.java:419) at io.quarkus.deployment.ExtensionLoader.loadStepsFrom(ExtensionLoader.java:173) at io.quarkus.deployment.QuarkusAugmentor.run(QuarkusAugmentor.java:108) at io.quarkus.runner.bootstrap.AugmentActionImpl.runAugment(AugmentActionImpl.java:328) ``` ### How to Reproduce? ```groovy build { // Shared Quarkus configuration applied to all projects def shareConfig = rootProject.projectDir.toURI().toString() + "/conf/quarkus" System.setProperty("quarkus.config.locations", "${shareConfig}") } ``` or ```groovy build { // Shared Quarkus configuration applied to all projects def shareConfig = rootProject.projectDir.getAbsolutePath() + "/conf/quarkus" System.setProperty("quarkus.config.locations", "${shareConfig}") } ``` ### Output of `uname -a` or `ver` MINGW64_NT-10.0-19042 ### Output of `java -version` OpenJDK 11.0.11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.3.3 ### Additional information _No response_

2e9d5d5bc80c737a3a540d411b71459d106d4052

c1a065c3cc1a52edeec5ac513ac09173510bae74

https://github.com/quarkusio/quarkus/compare/2e9d5d5bc80c737a3a540d411b71459d106d4052...c1a065c3cc1a52edeec5ac513ac09173510bae74

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java index af8f03468ff..0793c514d43 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.java @@ -260,8 +260,8 @@ public void watchConfigFiles(BuildProducer<HotDeploymentWatchedFileBuildItem> wa for (URI location : locations) { Path path = location.getScheme() != null ? Paths.get(location) : Paths.get(location.getPath()); if (!Files.isDirectory(path)) { - configWatchedFiles.add(location.toString()); - configWatchedFiles.add(appendProfileToFilename(location.toString(), profile)); + configWatchedFiles.add(path.toString()); + configWatchedFiles.add(appendProfileToFilename(path.toString(), profile)); } } });

['core/deployment/src/main/java/io/quarkus/deployment/steps/ConfigGenerationBuildStep.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/22767/22765

quarkusio

quarkus

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

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

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

fixes

Status Code and Message Mismatch in WebApplicationException

### Describe the bug When using the RESTEasy Reactive Client the HTTP status message doesn't match the HTTP status code. ### Expected behavior The HTTP status message is expected to match the status code ### Actual behavior ```java @Test void testWebApplicationException() { assertEquals("HTTP 428 Precondition required", new WebApplicationException(428).getMessage()); // HTTP 428 Expectation Failed // should be: HTTP 428 Precondition required assertEquals("HTTP 429 Too Many Requests", new WebApplicationException(429).getMessage()); // HTTP 429 Precondition Required // should be: HTTP 429 Too Many Requests assertEquals("431 Request Header Fields Too Large", new WebApplicationException(431).getMessage()); // HTTP 431 Too Many Requests // should be: HTTP 431 Request Header Fields Too Large } // taken from Response.class // // REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"), // /** // * 417 Expectation Failed, see {@link <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.18">HTTP/1.1 documentation</a>}. // * // * @since 2.0 // */ // EXPECTATION_FAILED(417, "Expectation Failed"), // /** // * 428 Precondition required, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-3">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // PRECONDITION_REQUIRED(428, "Precondition Required"), // /** // * 429 Too Many Requests, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-4">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // TOO_MANY_REQUESTS(429, "Too Many Requests"), // /** // * 431 Request Header Fields Too Large, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-5">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"), ``` ### How to Reproduce? run the JBang script: ```java ///usr/bin/env jbang "$0" "$@" ; exit $? //JAVAC_OPTIONS -parameters //JAVA_OPTIONS -Djava.util.logging.manager=org.jboss.logmanager.LogManager //DEPS io.quarkus:quarkus-rest-client-reactive:2.6.1.Final //DEPS io.quarkus:quarkus-arc:2.6.1.Final import static java.lang.System.*; import io.quarkus.runtime.annotations.QuarkusMain; import io.quarkus.runtime.Quarkus; import javax.inject.Inject; import org.jboss.logging.Logger; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; @QuarkusMain public class webapplicationexception { public static void main(String... args) { System.out.println("Expected: " + Response.Status.PRECONDITION_REQUIRED.getStatusCode() + " " + Response.Status.PRECONDITION_REQUIRED.getReasonPhrase()); System.out.println("Got: " + new WebApplicationException(428).getMessage()); System.out.println(); System.out.println("Expected: " + Response.Status.TOO_MANY_REQUESTS.getStatusCode() + " " + Response.Status.TOO_MANY_REQUESTS.getReasonPhrase()); System.out.println("Got: " + new WebApplicationException(429).getMessage()); System.out.println(); System.out.println("Expected: " + Response.Status.REQUEST_HEADER_FIELDS_TOO_LARGE.getStatusCode() + " " + Response.Status.REQUEST_HEADER_FIELDS_TOO_LARGE.getReasonPhrase()); System.out.println("Got: " + new WebApplicationException(431).getMessage()); } // taken from public enum Status implements StatusType in Response.class // // REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"), // /** // * 417 Expectation Failed, see {@link <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html#sec10.4.18">HTTP/1.1 documentation</a>}. // * // * @since 2.0 // */ // EXPECTATION_FAILED(417, "Expectation Failed"), // /** // * 428 Precondition required, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-3">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // PRECONDITION_REQUIRED(428, "Precondition Required"), // /** // * 429 Too Many Requests, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-4">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // TOO_MANY_REQUESTS(429, "Too Many Requests"), // /** // * 431 Request Header Fields Too Large, see {@link <a href="https://tools.ietf.org/html/rfc6585#section-5">RFC 6585: Additional HTTP Status Codes</a>}. // * // * @since 2.1 // */ // REQUEST_HEADER_FIELDS_TOO_LARGE(431, "Request Header Fields Too Large"), } ``` ### Output of `uname -a` or `ver` Darwin cdh.localdomain 21.2.0 Darwin Kernel Version 21.2.0: Sun Nov 28 20:29:10 PST 2021; root:xnu-8019.61.5~1/RELEASE_ARM64_T8101 arm64 ### Output of `java -version` java version "17" 2021-09-14 LTS Java(TM) SE Runtime Environment (build 17+35-LTS-2724) Java HotSpot(TM) 64-Bit Server VM (build 17+35-LTS-2724, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.1 (05c21c65bdfed0f71a2f2ada8b84da59348c4c5d) Maven home: ~/.m2/wrapper/dists/apache-maven-3.8.1-bin/2l5mhf2pq2clrde7f7qp1rdt5m/apache-maven-3.8.1 Java version: 17, vendor: Oracle Corporation, runtime: /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home Default locale: de_AT, platform encoding: UTF-8 OS name: "mac os x", version: "12.1", arch: "aarch64", family: "mac" ### Additional information _No response_

2e9d5d5bc80c737a3a540d411b71459d106d4052

4716194b4eb7e151e8e54192598d1191a567ab7e

https://github.com/quarkusio/quarkus/compare/2e9d5d5bc80c737a3a540d411b71459d106d4052...4716194b4eb7e151e8e54192598d1191a567ab7e

diff --git a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java index 6d074fa75f2..df452fb0532 100644 --- a/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java +++ b/independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.java @@ -32,6 +32,8 @@ static { defaultReasonPhrases.put(100, "Continue"); defaultReasonPhrases.put(101, "Switching Protocols"); + defaultReasonPhrases.put(102, "Processing"); + defaultReasonPhrases.put(103, "Early Hints"); defaultReasonPhrases.put(200, "OK"); defaultReasonPhrases.put(201, "Created"); defaultReasonPhrases.put(202, "Accepted"); @@ -39,6 +41,8 @@ defaultReasonPhrases.put(204, "No Content"); defaultReasonPhrases.put(205, "Reset Content"); defaultReasonPhrases.put(206, "Partial Content"); + defaultReasonPhrases.put(208, "Already Reported"); + defaultReasonPhrases.put(226, "IM Used"); defaultReasonPhrases.put(300, "Multiple Choices"); defaultReasonPhrases.put(301, "Moved Permanently"); defaultReasonPhrases.put(302, "Found"); @@ -65,16 +69,22 @@ defaultReasonPhrases.put(415, "Unsupported Media Type"); defaultReasonPhrases.put(416, "Requested Range Not Satisfiable"); defaultReasonPhrases.put(417, "Expectation Failed"); + defaultReasonPhrases.put(421, "Misdirected Request"); defaultReasonPhrases.put(426, "Upgrade Required"); - defaultReasonPhrases.put(428, "Expectation Failed"); - defaultReasonPhrases.put(429, "Precondition Required"); - defaultReasonPhrases.put(431, "Too Many Requests"); + defaultReasonPhrases.put(428, "Precondition Required"); + defaultReasonPhrases.put(429, "Too Many Requests"); + defaultReasonPhrases.put(431, "Request Header Fields Too Large"); + defaultReasonPhrases.put(451, "Unavailable For Legal Reasons"); defaultReasonPhrases.put(500, "Internal Server Error"); defaultReasonPhrases.put(501, "Not Implemented"); defaultReasonPhrases.put(502, "Bad Gateway"); defaultReasonPhrases.put(503, "Service Unavailable"); defaultReasonPhrases.put(504, "Gateway Timeout"); defaultReasonPhrases.put(505, "HTTP Version Not Supported"); + defaultReasonPhrases.put(506, "Variant Also Negotiates"); + defaultReasonPhrases.put(507, "Insufficient Storage"); + defaultReasonPhrases.put(508, "Loop Detected"); + defaultReasonPhrases.put(510, "Not Extended"); defaultReasonPhrases.put(511, "Network Authentication Required"); }

['independent-projects/resteasy-reactive/common/runtime/src/main/java/org/jboss/resteasy/reactive/common/jaxrs/AbstractRestResponseBuilder.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/22744/22731

quarkusio

quarkus

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

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

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

fixes

NPE when adding new registry in Quarkus CLI

### Describe the bug When new registry is added into freshly installed Quarkus CLI, the operation fails with NullPointerException. ### Expected behavior New registry is added successfully. ### Actual behavior Exception in console: ``` java.lang.NullPointerException at io.quarkus.registry.config.RegistriesConfigMapperHelper.serialize(RegistriesConfigMapperHelper.java:45) at io.quarkus.registry.config.RegistriesConfig$Mutable.persist(RegistriesConfig.java:111) at io.quarkus.cli.RegistryAddCommand.call(RegistryAddCommand.java:54) at io.quarkus.cli.RegistryAddCommand.call(RegistryAddCommand.java:12) at picocli.CommandLine.executeUserObject(CommandLine.java:1953) at picocli.CommandLine.access$1300(CommandLine.java:145) at picocli.CommandLine$RunLast.executeUserObjectOfLastSubcommandWithSameParent(CommandLine.java:2358) at picocli.CommandLine$RunLast.handle(CommandLine.java:2352) at picocli.CommandLine$RunLast.handle(CommandLine.java:2314) at picocli.CommandLine$AbstractParseResultHandler.execute(CommandLine.java:2179) at picocli.CommandLine$RunLast.execute(CommandLine.java:2316) at picocli.CommandLine.execute(CommandLine.java:2078) at io.quarkus.cli.QuarkusCli.run(QuarkusCli.java:50) at io.quarkus.cli.QuarkusCli_ClientProxy.run(Unknown Source) at io.quarkus.runtime.ApplicationLifecycleManager.run(ApplicationLifecycleManager.java:125) at io.quarkus.runtime.Quarkus.run(Quarkus.java:67) at io.quarkus.runtime.Quarkus.run(Quarkus.java:41) at io.quarkus.cli.Main.main(Main.java:9) ``` ### How to Reproduce? Steps to reproduce: 1. `jbang app uninstall quarkus` 2. `rm -r ~/.quarkus/` 3. `jbang app install --fresh --force quarkus@quarkusio` 4. ``` $ quarkus version 2.6.1.Final # 2.5.2.Final worked as expected ``` 5. `quarkus registry add registry.quarkus.redhat.com` ### Output of `uname -a` or `ver` OS name: "linux", version: "5.15.6-100.fc34.x86_64" ### Output of `java -version` 11.0.13, vendor: Eclipse Adoptium ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

aed1114b1aded4611a16817841d7659e3821db8a

df807fbf7e4901784b6fa00899f821428fc2d55d

https://github.com/quarkusio/quarkus/compare/aed1114b1aded4611a16817841d7659e3821db8a...df807fbf7e4901784b6fa00899f821428fc2d55d

diff --git a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java index 016147cb321..7ce770d8546 100644 --- a/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java +++ b/devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java @@ -30,16 +30,13 @@ public Integer call() throws Exception { existingConfig = Files.exists(configYaml); } + registryClient.refreshRegistryCache(output); final RegistriesConfig.Mutable config; - if (existingConfig) { - registryClient.refreshRegistryCache(output); - config = registryClient.resolveConfig().mutable(); - if (config.getSource().getFilePath() == null) { - output.error("Can only modify file-based configuration. Config source is " + config.getSource().describe()); - return CommandLine.ExitCode.SOFTWARE; - } - } else { + if (configYaml != null && !existingConfig) { + // we're creating a new configuration for a new file config = RegistriesConfig.builder(); + } else { + config = registryClient.resolveConfig().mutable(); } boolean persist = false; @@ -48,10 +45,10 @@ public Integer call() throws Exception { } if (persist) { - if (existingConfig) { - config.persist(); - } else { + if (configYaml != null) { config.persist(configYaml); + } else { + config.persist(); } } return CommandLine.ExitCode.OK; diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java index dd969f9982e..495e8f3827e 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.java @@ -217,7 +217,9 @@ public String toString() { static void persistConfigSource(RegistriesConfigImpl config) throws IOException { Path targetFile = config.configSource.getFilePath(); - if (targetFile == null) { + if (config.configSource == ConfigSource.DEFAULT) { + targetFile = RegistriesConfigLocator.getDefaultConfigYamlLocation(); + } else if (targetFile == null) { throw new UnsupportedOperationException( String.format("Can not write configuration as it was read from an alternate source: %s", config.configSource.describe())); diff --git a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java index f26ac04d706..66ce462cf0d 100644 --- a/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java +++ b/independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java @@ -159,8 +159,6 @@ public static RegistryConfig getDefaultRegistry() { } /** - * TODO: compare set *.json.RegistriesConfigLocator#initFromEnvironmentOrNull - * * @param map A Map containing environment variables, e.g. {@link System#getenv()} * @return A RegistriesConfig object initialized from environment variables. */

['independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigLocator.java', 'devtools/cli/src/main/java/io/quarkus/cli/RegistryAddCommand.java', 'independent-projects/tools/registry-client/src/main/java/io/quarkus/registry/config/RegistriesConfigImpl.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/22732/19063

quarkusio

quarkus

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

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

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

fixes

NPE in LambdaHttpHandler (amazon-lambda-http extension)

### Describe the bug While testing a Quarkus Lambda function, I hit the following NPE: ERROR [qua.ama.lam.http] (main) Request Failure: java.lang.NullPointerException at io.quarkus.amazon.lambda.http.LambdaHttpHandler.nettyDispatch(LambdaHttpHandler.java:171) at io.quarkus.amazon.lambda.http.LambdaHttpHandler.handleRequest(LambdaHttpHandler.java:63) at io.quarkus.amazon.lambda.http.LambdaHttpHandler.handleRequest(LambdaHttpHandler.java:43) at io.quarkus.amazon.lambda.runtime.AmazonLambdaRecorder.handle(AmazonLambdaRecorder.java:71) at io.quarkus.amazon.lambda.runtime.QuarkusStreamHandler.handleRequest(QuarkusStreamHandler.java:58) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) at java.base/java.lang.reflect.Method.invoke(Unknown Source) at lambdainternal.EventHandlerLoader$StreamMethodRequestHandler.handleRequest(EventHandlerLoader.java:375) at lambdainternal.EventHandlerLoader$2.call(EventHandlerLoader.java:899) at lambdainternal.AWSLambda.startRuntime(AWSLambda.java:257) at lambdainternal.AWSLambda.startRuntime(AWSLambda.java:192) at lambdainternal.AWSLambda.main(AWSLambda.java:187) Would be nicer to get a proper error message. I'm willing to open a PR, just wondering what would be the best way to fix/ validate this? @patriot1burke @richiethom @HardNorth ### Expected behavior A proper error message ### Actual behavior NullPointerException ### How to Reproduce? 1. Open a deployed Quarkus Lambda function in AWS console 2. Hit Test button 3. NPE is shown in Log output section ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` Java 11 (Corretto) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.1.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.1 ### Additional information _No response_

6a36ecf6d078769c0f5095b83d858afce5a7b79e

151897a299dbe3e4665171c9a989922fcabe84dd

https://github.com/quarkusio/quarkus/compare/6a36ecf6d078769c0f5095b83d858afce5a7b79e...151897a299dbe3e4665171c9a989922fcabe84dd

diff --git a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java index 7236fe332fe..dea92dbf76d 100644 --- a/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java +++ b/extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.java @@ -167,8 +167,16 @@ private APIGatewayV2HTTPResponse nettyDispatch(InetSocketAddress clientAddress, quarkusHeaders.setContextObject(Context.class, context); quarkusHeaders.setContextObject(APIGatewayV2HTTPEvent.class, request); quarkusHeaders.setContextObject(APIGatewayV2HTTPEvent.RequestContext.class, request.getRequestContext()); + HttpMethod httpMethod = null; + if (request.getRequestContext() != null && request.getRequestContext().getHttp() != null + && request.getRequestContext().getHttp().getMethod() != null) { + httpMethod = HttpMethod.valueOf(request.getRequestContext().getHttp().getMethod()); + } + if (httpMethod == null) { + throw new IllegalStateException("Missing HTTP method in request event"); + } DefaultHttpRequest nettyRequest = new DefaultHttpRequest(HttpVersion.HTTP_1_1, - HttpMethod.valueOf(request.getRequestContext().getHttp().getMethod()), ofNullable(request.getRawQueryString()) + httpMethod, ofNullable(request.getRawQueryString()) .filter(q -> !q.isEmpty()).map(q -> request.getRawPath() + '?' + q).orElse(request.getRawPath()), quarkusHeaders); if (request.getHeaders() != null) { //apparently this can be null if no headers are sent

['extensions/amazon-lambda-http/runtime/src/main/java/io/quarkus/amazon/lambda/http/LambdaHttpHandler.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/22717/21455

quarkusio

quarkus

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

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

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

fixes

Quarkus quartz should not reschedule jobs on start

### Describe the bug Bug introduced by https://github.com/quarkusio/quarkus/issues/20538 Anytime quarkus starts it will reschedule jobs, not matter if the job config changed or not. It's a tough decision, at best it should only detect changes and WARN, nothing else. This can have serious collateral damages depending on what your jobs are doing. If you are cleaning up your data once a year, you don't want that to be re initialized and triggered every time you restart the app or scale up your cluster. ### Expected behavior Do not reschedule jobs, WARN or maybe improve the dev tools but this is too dangerous. ### Actual behavior All jobs are rescheduled on start. ### How to Reproduce? Pick any quartz based clustered app. Create a job running every 5 sec for example. Request the db for select * from qrtz_simple_triggers and select * from qrtz_triggers Restart the app and check the table again. All triggers, executions are reset, ignoring past execution and, most important, the expected and persistent next_fire_time on qrtz_triggers. ### Output of `uname -a` or `ver` no impact ### Output of `java -version` no impact ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev since 2.3.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) no impact ### Additional information _No response_

8d0517772f179f09c9b73379645a4f476bc8432d

d657de40d9fe415d10a7f8f5ac21c8b44d8fe829

https://github.com/quarkusio/quarkus/compare/8d0517772f179f09c9b73379645a4f476bc8432d...d657de40d9fe415d10a7f8f5ac21c8b44d8fe829

diff --git a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java index d3939ebe628..6fc95db8c4a 100644 --- a/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java +++ b/extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.java @@ -201,7 +201,9 @@ public QuartzScheduler(SchedulerContext context, QuartzSupport quartzSupport, Sc LOGGER.debugf("Scheduled business method %s with config %s", method.getMethodDescription(), scheduled); } else { - scheduler.rescheduleJob(trigger.getKey(), trigger); + org.quartz.Trigger oldTrigger = scheduler.getTrigger(trigger.getKey()); + scheduler.rescheduleJob(trigger.getKey(), + triggerBuilder.startAt(oldTrigger.getNextFireTime()).build()); LOGGER.debugf("Rescheduled business method %s with config %s", method.getMethodDescription(), scheduled); }

['extensions/quartz/runtime/src/main/java/io/quarkus/quartz/runtime/QuartzScheduler.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/22681/22662

quarkusio

quarkus

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

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

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

fixes

Gauges annotation are not showing up his value, on a resteasy endpoint

### Describe the bug If a gauge is declared in a Resteasy endpoint through an annotation, the gauge value is not pushed to `/metrics` Example: ``` @Path("/using-microprofile-pingpong") public class UsingMicroProfilePingPongResource { private static final String PING_PONG = "ping pong"; private static final long DEFAULT_GAUGE_VALUE = 100L; // counters works as expected @GET @Counted(name = "simple_counter_mp", absolute = true) @Produces(MediaType.TEXT_PLAIN) @Path("/counter") public String simpleScenario() { return PING_PONG; } //TODO gauges are not promoting their values to /metrics @GET @Gauge(name = "simple_gauge_mp", unit = MetricUnits.NONE) @Produces(MediaType.TEXT_PLAIN) @Path("/gauge") public long highestPrimeNumberSoFar() { return DEFAULT_GAUGE_VALUE; } } ``` But If I move on the gauge to a separate public method, then works as expected: ``` @Path("/using-microprofile-pingpong") public class UsingMicroProfilePingPongResource { private static final String PING_PONG = "ping pong"; private static final long DEFAULT_GAUGE_VALUE = 100L; @GET @Counted(name = "simple_counter_mp", absolute = true) @Produces(MediaType.TEXT_PLAIN) @Path("/counter") public String simpleScenario() { return PING_PONG; } @GET @Produces(MediaType.TEXT_PLAIN) @Path("/gauge") public long highestPrimeNumberSoFar() { return getDefaultGauge(); } @Gauge(name = "simple_gauge_mp", unit = MetricUnits.NONE) public long getDefaultGauge() { return DEFAULT_GAUGE_VALUE; } } ``` Additional when the gauge is not promoted I am getting the following warning message: ``` 2022-01-05 16:48:04,996 WARN [io.mic.cor.ins.int.DefaultGauge] (vert.x-worker-thread-0) Failed to apply the value function for the gauge 'io.quarkus.ts.micrometer.prometheus.UsingMicroProfilePingPongResource.simple_gauge_mp'. Note that subsequent logs will be logged at debug level.: javax.enterprise.context.ContextNotActiveException at io.quarkus.arc.impl.ClientProxies.getDelegate(ClientProxies.java:46) at io.quarkus.vertx.http.runtime.CurrentVertxRequest_ClientProxy.arc$delegate(Unknown Source) ``` From a developer experience point of view, would be great to have the same behavior in all metrics data structures. So, if counter annotations is available in an endpoint declaration then gauges should be also valid. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` openjdk 11.0.11 2021-04-20 OpenJDK Runtime Environment AdoptOpenJDK-11.0.11+9 (build 11.0.11+9) OpenJDK 64-Bit Server VM AdoptOpenJDK-11.0.11+9 (build 11.0.11+9, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

9a40f35af46ddeb20a6426fef10348fe02045788

6c613029edec5fcddea931062ebb9f2ecdde0c01

https://github.com/quarkusio/quarkus/compare/9a40f35af46ddeb20a6426fef10348fe02045788...6c613029edec5fcddea931062ebb9f2ecdde0c01

diff --git a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java index 820e93c7411..835b0e6e831 100644 --- a/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java +++ b/extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java @@ -10,7 +10,7 @@ import io.micrometer.core.instrument.Tags; -class MetricDescriptor { +public class MetricDescriptor { final String name; final Tags tags; ExtendedMetricID metricId = null; diff --git a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java index 232fa2cc10d..80df6d2aee8 100644 --- a/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java +++ b/extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java @@ -4,6 +4,7 @@ import java.util.Set; import javax.annotation.Priority; +import javax.enterprise.context.ContextNotActiveException; import javax.inject.Inject; import javax.interceptor.AroundInvoke; import javax.interceptor.Interceptor; @@ -12,6 +13,7 @@ import io.quarkus.arc.ArcInvocationContext; import io.quarkus.vertx.http.runtime.CurrentVertxRequest; import io.vertx.core.http.impl.HttpServerRequestInternal; +import io.vertx.ext.web.RoutingContext; @SuppressWarnings("unused") @QuarkusRestPathTemplate @@ -24,7 +26,13 @@ public class QuarkusRestPathTemplateInterceptor { @AroundInvoke Object restMethodInvoke(InvocationContext context) throws Exception { QuarkusRestPathTemplate annotation = getAnnotation(context); - if ((annotation != null) && (request.getCurrent() != null)) { + RoutingContext routingContext = null; + try { + routingContext = request.getCurrent(); + } catch (ContextNotActiveException ex) { + // just leave routingContext as null + } + if ((annotation != null) && (routingContext != null)) { ((HttpServerRequestInternal) request.getCurrent().request()).context().putLocal("UrlPathTemplate", annotation.value()); } diff --git a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java index 8504a49f242..0545b7477f9 100644 --- a/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java +++ b/integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.java @@ -70,6 +70,8 @@ String checkPrime(long number) { } @Gauge(name = "highestPrimeNumberSoFar", unit = MetricUnits.NONE, description = "Highest prime number so far.") + @GET + @Path("/blabla") // make this a REST method just to verify that a gauge will still work on it public Long highestPrimeNumberSoFar() { return highestPrimeSoFar.get(); }

['extensions/resteasy-classic/resteasy/runtime/src/main/java/io/quarkus/resteasy/runtime/QuarkusRestPathTemplateInterceptor.java', 'extensions/micrometer/runtime/src/main/java/io/quarkus/micrometer/runtime/binder/mpmetrics/MetricDescriptor.java', 'integration-tests/micrometer-mp-metrics/src/main/java/io/quarkus/it/micrometer/mpmetrics/PrimeResource.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/22667/22663

quarkusio

quarkus

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

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

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

close

Gradle Task quarkusTest stopped working with version 2.6.1

### Describe the bug `./gradlew quarkusTest` stopped working after upgrading Quarkus to version 2.6.1 `./gradlew quarkusDev` still works as expected (and also runs the tests, if told so) ### Expected behavior `./gradlew quarkusTest` runs quarkus in test mode ### Actual behavior Logs an error: ``` > Task :quarkusGenerateCode preparing quarkus application > Task :quarkusGenerateCodeTests preparing quarkus application > Task :quarkusTest FAILED FAILURE: Build failed with an exception. * What went wrong: A problem was found with the configuration of task ':quarkusTest' (type 'QuarkusTest'). - In plugin 'io.quarkus' type 'io.quarkus.gradle.tasks.QuarkusTest' property 'quarkusDevConfiguration' doesn't have a configured value. Reason: This property isn't marked as optional and no value has been configured. Possible solutions: 1. Assign a value to 'quarkusDevConfiguration'. 2. Mark property 'quarkusDevConfiguration' as optional. Please refer to https://docs.gradle.org/7.3.3/userguide/validation_problems.html#value_not_set for more details about this problem. * Try: > Run with --stacktrace option to get the stack trace. > Run with --info or --debug option to get more log output. > Run with --scan to get full insights. * Get more help at https://help.gradle.org BUILD FAILED in 9s 6 actionable tasks: 6 executed ``` ### How to Reproduce? Steps to reproduce the behaviour: 1. Download and unpack empty project with gradle from code.quarkus.io 2. Run `./gradlew quarkusTest` inside the folder ### Output of `uname -a` or `ver` Darwin FXMBPFVFF771GQ05N 21.2.0 Darwin Kernel Version 21.2.0: Sun Nov 28 20:29:10 PST 2021; root:xnu-8019.61.5~1/RELEASE_ARM64_T8101 arm64 ### Output of `java -version` openjdk version "11.0.13" 2021-10-19 ### GraalVM version (if different from Java) OpenJDK Runtime Environment GraalVM CE 21.3.0 (build 11.0.13+7-jvmci-21.3-b05) ### Quarkus version or git rev 2.6.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.3.3 ### Additional information _No response_

4e9dea2835302bafe4ccfab24594b3447e7fea7e

5e70a7cbb1a0f835d3f9f84c2c0a4949044a0f9d

https://github.com/quarkusio/quarkus/compare/4e9dea2835302bafe4ccfab24594b3447e7fea7e...5e70a7cbb1a0f835d3f9f84c2c0a4949044a0f9d

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index c2860d18b4e..8d4451fe3dd 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -167,7 +167,7 @@ public void execute(Task test) { ConfigurationContainer configurations = project.getConfigurations(); // create a custom configuration for devmode - Configuration configuration = configurations.create(DEV_MODE_CONFIGURATION_NAME) + Configuration devModeConfiguration = configurations.create(DEV_MODE_CONFIGURATION_NAME) .extendsFrom(configurations.findByName(JavaPlugin.IMPLEMENTATION_CONFIGURATION_NAME)); tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile.class, @@ -197,12 +197,15 @@ public void execute(Task test) { task.dependsOn(classesTask, resourcesTask, testClassesTask, testResourcesTask, quarkusGenerateCodeDev, quarkusGenerateCodeTests); - task.setQuarkusDevConfiguration(configuration); + task.setQuarkusDevConfiguration(devModeConfiguration); }); quarkusRemoteDev.configure(task -> task.dependsOn(classesTask, resourcesTask)); - quarkusTest.configure(task -> task.dependsOn(classesTask, resourcesTask, testClassesTask, testResourcesTask, - quarkusGenerateCode, - quarkusGenerateCodeTests)); + quarkusTest.configure(task -> { + task.dependsOn(classesTask, resourcesTask, testClassesTask, testResourcesTask, + quarkusGenerateCode, + quarkusGenerateCodeTests); + task.setQuarkusDevConfiguration(devModeConfiguration); + }); quarkusBuild.configure( task -> task.dependsOn(classesTask, resourcesTask, tasks.named(JavaPlugin.JAR_TASK_NAME))); diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java index 88ebef62663..38c19e093c2 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java @@ -51,7 +51,7 @@ public class QuarkusDev extends QuarkusTask { public static final String IO_QUARKUS_DEVMODE_ARGS = "io.quarkus.devmode-args"; private Set<File> filesIncludedInClasspath = new HashSet<>(); - private Configuration quarkusDevConfiguration; + protected Configuration quarkusDevConfiguration; private File buildDir;

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

{'.java': 2}

Java

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

Apache License 2.0

quarkusio/quarkus/24038/24037

quarkusio

quarkus

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

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

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

fix

quarkus-reactive-routes fails when using Mutiny.SessionFactory.withSession

### Describe the bug quarkus-reactive-routes based code fails when using Mutiny.SessionFactory.withSession hibernate-reactive-routes-quickstart is failing since https://github.com/quarkusio/quarkus/pull/23719 got merged Code link https://github.com/quarkusio/quarkus-quickstarts/blob/main/hibernate-reactive-routes-quickstart/src/main/java/org/acme/hibernate/reactive/FruitsRoutes.java#L39 ``` 2022-03-01 10:27:25,791 ERROR [org.acm.hib.rea.FruitsRoutes] (vert.x-eventloop-thread-1) Failed to handle request: java.lang.IllegalStateException: The current operation requires a safe (isolated) Vert.x sub-context, but the current context hasn't been flagged as such. You can still use Hibernate Reactive, you just need to avoid using the methods which implicitly require accessing the stateful context, such as MutinySessionFactory#withTransaction and #withSession. at io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle.checkIsSafe(VertxContextSafetyToggle.java:80) at io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle.validateContextIfExists(VertxContextSafetyToggle.java:63) at io.quarkus.hibernate.reactive.runtime.customized.CheckingVertxContext.get(CheckingVertxContext.java:46) at org.hibernate.reactive.mutiny.impl.MutinySessionFactoryImpl.withSession(MutinySessionFactoryImpl.java:189) at org.acme.hibernate.reactive.FruitsRoutes.getAll(FruitsRoutes.java:39) ... ``` Zulip chat - https://quarkusio.zulipchat.com/#narrow/stream/187038-dev/topic/hibernate-reactive-routes-quickstart/near/273641831 Conclusion: the vert.x http server didn't mark the context as safe ### Expected behavior hibernate-reactive-routes-quickstart is passing ### Actual behavior hibernate-reactive-routes-quickstart is failing ### How to Reproduce? Run hibernate-reactive-routes-quickstart ### Output of `uname -a` or `ver` macOS Monterey ### Output of `java -version` Java 17 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev Quarkus main ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

9089423fde7bd7aaf1b93ed5243c4e4db4217211

895f0434c884315a71587730bec38ef63cc1678f

https://github.com/quarkusio/quarkus/compare/9089423fde7bd7aaf1b93ed5243c4e4db4217211...895f0434c884315a71587730bec38ef63cc1678f

diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java index b6f0938dafe..21d7b0ee422 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java @@ -1,5 +1,7 @@ package io.quarkus.grpc.runtime.supports.context; +import static io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle.setContextSafe; + import java.util.function.Supplier; import javax.enterprise.context.ApplicationScoped; @@ -39,6 +41,7 @@ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(ServerCall<ReqT, Re if (capturedVertxContext != null) { // If we are not on a duplicated context, create and switch. Context local = VertxContext.getOrCreateDuplicatedContext(capturedVertxContext); + setContextSafe(local, true); // Must be sure to call next.startCall on the right context return new ListenedOnDuplicatedContext<>(() -> next.startCall(call, headers), local); diff --git a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/InstrumenterVertxTracer.java b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/InstrumenterVertxTracer.java index 7bfd07b10bb..294c0205162 100644 --- a/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/InstrumenterVertxTracer.java +++ b/extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/InstrumenterVertxTracer.java @@ -1,5 +1,7 @@ package io.quarkus.opentelemetry.runtime.tracing.vertx; +import static io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle.setContextSafe; + import java.util.Map; import java.util.function.BiConsumer; @@ -91,6 +93,7 @@ default <R> SpanOperation sendRequest( io.opentelemetry.context.Context spanContext = instrumenter.start(parentContext, writableHeaders((REQ) request, headers)); Context duplicatedContext = VertxContext.getOrCreateDuplicatedContext(context); + setContextSafe(duplicatedContext, true); Scope scope = QuarkusContextStorage.INSTANCE.attach(duplicatedContext, spanContext); return spanOperation(duplicatedContext, (REQ) request, toMultiMap(headers), spanContext, scope); } diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java index 929b1088030..adeb4a57192 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.java @@ -1,5 +1,8 @@ package io.quarkus.vertx.http.runtime; +import static io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle.setContextSafe; +import static io.quarkus.vertx.core.runtime.context.VertxContextSafetyToggle.setCurrentContextSafe; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; @@ -488,6 +491,7 @@ public void handle(HttpServerRequest event) { root = new Handler<HttpServerRequest>() { @Override public void handle(HttpServerRequest event) { + setCurrentContextSafe(true); delegate.handle(new ResumingRequestWrapper(event)); } }; @@ -1209,7 +1213,12 @@ public void initChannel(VirtualChannel ch) throws Exception { VertxHandler<Http1xServerConnection> handler = VertxHandler.create(chctx -> { Http1xServerConnection conn = new Http1xServerConnection( - () -> (ContextInternal) VertxContext.getOrCreateDuplicatedContext(context), + () -> { + ContextInternal internal = (ContextInternal) VertxContext + .getOrCreateDuplicatedContext(context); + setContextSafe(internal, true); + return internal; + }, null, new HttpServerOptions(), chctx,

['extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/supports/context/GrpcDuplicatedContextGrpcInterceptor.java', 'extensions/opentelemetry/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/vertx/InstrumenterVertxTracer.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/VertxHttpRecorder.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/23840/22762

quarkusio

quarkus

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

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

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

fix

Server Sent Events delaying 200 response

### Describe the bug I am on 2.6.1.Final. I have an endpoint that is an SSE endpoint. The status code is only returned after the first element is produced. This was not the case in 1.x and can lead to timeouts on clients. ### Expected behavior I would expect a 200 to be returned immediately (provided everything worked as expected). ### Actual behavior The status code, headers, etc. is not returned until the moment the first item is produced. ### How to Reproduce? [getting-started.zip](https://github.com/quarkusio/quarkus/files/7837816/getting-started.zip) ### Output of `uname -a` or `ver` Linux jose-buguroo 5.11.0-41-generic #45-Ubuntu SMP Fri Nov 5 11:37:01 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` openjdk version "14.0.2" 2020-07-14 OpenJDK Runtime Environment (build 14.0.2+12-46) OpenJDK 64-Bit Server VM (build 14.0.2+12-46, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.6.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.6.3 (cecedd343002696d0abb50b32b541b8a6ba2883f) Maven home: /home/jose/.m2/wrapper/dists/apache-maven-3.6.3-bin/1iopthnavndlasol9gbrbg6bf2/apache-maven-3.6.3 Java version: 14.0.2, vendor: Oracle Corporation, runtime: /home/jose/.sdkman/candidates/java/14.0.2-open Default locale: en_US, platform encoding: UTF-8 OS name: "linux", version: "5.11.0-41-generic", arch: "amd64", family: "unix" ### Additional information From what I see `SseUtil.send` is producing the response the first time an element is produced. Therefore, until the first element is generated, no call to it happens and no response is flushed. I see this could have to do with `PublisherResponseHandler` suspending the context. I wonder if an option could be to have that class handle SSE slightly different and generate a status code. I see that adding: ``` requestContext.serverResponse().setStatusCode(200) requestContext.serverResponse().setChunked(true) requestContext.serverResponse().write(new byte[]{}) ``` to PublisherResponseHandler works as expected (i.e. we get the status code, headers, etc. and then the events get produced as they come). Any reason you can think of not to do that?

5137bb9f42aaa9f3e65f0b494f761ba583de2c7c

23ab5a000f0c5c23c0e3b9a149bc1786a991fe55

https://github.com/quarkusio/quarkus/compare/5137bb9f42aaa9f3e65f0b494f761ba583de2c7c...23ab5a000f0c5c23c0e3b9a149bc1786a991fe55

diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java index 963d71a82fe..07564a0982b 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java @@ -151,8 +151,6 @@ public static void setHeaders(ResteasyReactiveRequestContext context, ServerHttp public static void setHeaders(ResteasyReactiveRequestContext context, ServerHttpResponse response, List<PublisherResponseHandler.StreamingResponseCustomizer> customizers) { - // FIXME: spec says we should flush the headers when first message is sent or when the resource method returns, whichever - // happens first if (!response.headWritten()) { response.setStatusCode(Response.Status.OK.getStatusCode()); response.setResponseHeader(HttpHeaders.CONTENT_TYPE, MediaType.SERVER_SENT_EVENTS); @@ -164,6 +162,7 @@ public static void setHeaders(ResteasyReactiveRequestContext context, ServerHttp customizers.get(i).customize(response); } // FIXME: other headers? + } } } diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java index 43ddb8b91cf..64dc218adb1 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.java @@ -1,10 +1,14 @@ package org.jboss.resteasy.reactive.server.handlers; +import static org.jboss.resteasy.reactive.server.jaxrs.SseEventSinkImpl.EMPTY_BUFFER; + import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.List; import java.util.Map; +import java.util.function.BiConsumer; import java.util.function.BiFunction; +import java.util.function.Consumer; import javax.ws.rs.core.MediaType; import org.jboss.logging.Logger; import org.jboss.resteasy.reactive.common.util.RestMediaType; @@ -43,9 +47,9 @@ private static class SseMultiSubscriber extends AbstractMultiSubscriber { @Override public void onNext(Object item) { OutboundSseEventImpl event = new OutboundSseEventImpl.BuilderImpl().data(item).build(); - SseUtil.send(requestContext, event, customizers).handle(new BiFunction<Object, Throwable, Object>() { + SseUtil.send(requestContext, event, customizers).whenComplete(new BiConsumer<Object, Throwable>() { @Override - public Object apply(Object v, Throwable t) { + public void accept(Object v, Throwable t) { if (t != null) { // need to cancel because the exception didn't come from the Multi subscription.cancel(); @@ -54,7 +58,6 @@ public Object apply(Object v, Throwable t) { // send in the next item subscription.request(1); } - return null; } }); } @@ -250,11 +253,11 @@ public void handle(ResteasyReactiveRequestContext requestContext) throws Excepti requestContext.setResponseContentType(mediaType); // this is the non-async return type requestContext.setGenericReturnType(requestContext.getTarget().getReturnType()); - // we have several possibilities here, but in all we suspend - requestContext.suspend(); + if (mediaType.isCompatible(MediaType.SERVER_SENT_EVENTS_TYPE)) { handleSse(requestContext, result); } else { + requestContext.suspend(); boolean json = mediaType.toString().contains(JSON); if (requiresChunkedStream(mediaType)) { handleChunkedStreaming(requestContext, result, json); @@ -279,7 +282,18 @@ private void handleStreaming(ResteasyReactiveRequestContext requestContext, Publ } private void handleSse(ResteasyReactiveRequestContext requestContext, Publisher<?> result) { - result.subscribe(new SseMultiSubscriber(requestContext, streamingResponseCustomizers)); + SseUtil.setHeaders(requestContext, requestContext.serverResponse(), streamingResponseCustomizers); + requestContext.suspend(); + requestContext.serverResponse().write(EMPTY_BUFFER, new Consumer<Throwable>() { + @Override + public void accept(Throwable throwable) { + if (throwable == null) { + result.subscribe(new SseMultiSubscriber(requestContext, streamingResponseCustomizers)); + } else { + requestContext.resume(throwable); + } + } + }); } public interface StreamingResponseCustomizer { diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java index 6cdf099eab4..48735ac388c 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java @@ -11,7 +11,7 @@ public class SseEventSinkImpl implements SseEventSink { - private static final byte[] EMPTY_BUFFER = new byte[0]; + public static final byte[] EMPTY_BUFFER = new byte[0]; private ResteasyReactiveRequestContext context; private SseBroadcasterImpl broadcaster; private boolean closed;

['independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/jaxrs/SseEventSinkImpl.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/SseUtil.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/PublisherResponseHandler.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/23675/23674

quarkusio

quarkus

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

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

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

fixes

DevUI console no longer responds if you enter input before it boots

### Describe the bug In a Quarkus app, if you type something before the app is initialized with `mvn clean compile quarkus:dev`, you'll get the following exception in the console and the input no longer works (you need to kill the process to Ctrl+C the application): ```java Exception in thread "Aesh InputStream Reader" java.lang.NullPointerException: Cannot invoke "io.quarkus.dev.console.QuarkusConsole$StateChangeInputStream.acceptInput(int)" because "redirectIn" is null at io.quarkus.deployment.console.AeshConsole.lambda$setup$1(AeshConsole.java:231) at org.aesh.terminal.EventDecoder.accept(EventDecoder.java:118) at org.aesh.terminal.EventDecoder.accept(EventDecoder.java:31) at org.aesh.terminal.io.Decoder.write(Decoder.java:133) at org.aesh.readline.tty.terminal.TerminalConnection.openBlocking(TerminalConnection.java:216) at org.aesh.readline.tty.terminal.TerminalConnection.openBlocking(TerminalConnection.java:203) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1136) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:635) at java.base/java.lang.Thread.run(Thread.java:833) ``` ### Expected behavior No errors and input works normally ### Actual behavior You can't input anything in the console while the app is running ### How to Reproduce? 1. Create a Quarkus application 2. Run `mvn clean compile quarkus:dev` 3. Start typing in the console before the application starts ### Output of `uname -a` or `ver` Darwin Kernel Version 21.3.0: Wed Jan 5 21:37:58 PST 2022; root:xnu-8019.80.24~20/RELEASE_ARM64_T6000 arm64 ### Output of `java -version` OpenJDK 64-Bit Server VM Temurin-17.0.2+8 (build 17.0.2+8, mixed mode) ### GraalVM version (if different from Java) None ### Quarkus version or git rev 2.7.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Maven 3.8.4 ### Additional information _No response_

ea4099305aed07d0428bf4aa53de61142a2e7499

cf27363f6bd771062935fdf67c9bc613051971d9

https://github.com/quarkusio/quarkus/compare/ea4099305aed07d0428bf4aa53de61142a2e7499...cf27363f6bd771062935fdf67c9bc613051971d9

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java index b7e144bbbdd..15bec6b648d 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.java @@ -225,6 +225,10 @@ public void run() { conn.setStdinHandler(keys -> { QuarkusConsole.StateChangeInputStream redirectIn = QuarkusConsole.REDIRECT_IN; + // redirectIn might have not been initialized yet + if (redirectIn == null) { + return; + } //see if the users application wants to read the keystrokes: int pos = 0; while (pos < keys.length) {

['core/deployment/src/main/java/io/quarkus/deployment/console/AeshConsole.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/23751/23734

quarkusio

quarkus

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

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

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

resolves

@Message template fails to use #each or #for

### Describe the bug I'm using Qute to enable i18n on a project. When parsing a string using `Qute.fmt`, passing a template directly renders the message just fine. But when I reference its template via the message bundle namespace, such as ```java Qute.fmt("{error:errorMessage(dates)}").data("dates", dates)).attribute('locale', locale).render() ``` I get the following error ```text 2022-02-15 19:54:04,757 ERROR [io.qua.dep.dev.IsolatedDevModeMain] (vert.x-worker-thread-0) Failed to start quarkus: java.lang.RuntimeException: io.quarkus.builder.BuildException: Build failure: Build failed due to errors [error]: Build step io.quarkus.qute.deployment.QuteProcessor#processTemplateErrors threw an exception: io.quarkus.qute.TemplateException: Found template problems (1): [1] Incorrect expression found: {it} - it is not a parameter of the message bundle method net.dummy.example.i18n.ErrorMessages#errorMessage() - at net.dummy.example.i18n.ErrorMessages#errorMessage():1 at io.quarkus.qute.deployment.QuteProcessor.processTemplateErrors(QuteProcessor.java:200) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62) at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.base/java.lang.reflect.Method.invoke(Method.java:566) at io.quarkus.deployment.ExtensionLoader$2.execute(ExtensionLoader.java:882) at io.quarkus.builder.BuildContext.run(BuildContext.java:277) at org.jboss.threads.ContextHandler$1.runWith(ContextHandler.java:18) at org.jboss.threads.EnhancedQueueExecutor$Task.run(EnhancedQueueExecutor.java:2449) at org.jboss.threads.EnhancedQueueExecutor$ThreadBody.run(EnhancedQueueExecutor.java:1478) at java.base/java.lang.Thread.run(Thread.java:834) at org.jboss.threads.JBossThread.run(JBossThread.java:501) Suppressed: io.quarkus.qute.TemplateException: Incorrect expression found: {it} - it is not a parameter of the message bundle method net.dummy.example.i18n.ErrorMessages#errorMessage() - at net.dummy.example.i18n.ErrorMessages#errorMessage():1 at io.quarkus.qute.deployment.QuteProcessor.processTemplateErrors(QuteProcessor.java:174) ... 11 more ``` @Message("FROM i18n A booking for user {user} in the selected period {#each period}{it}{#if it_hasNext}, {/if}{/each} already exists.") I have an interface like this: ```java @MessageBundle(value = "error") public interface ErrorMessages { @Message("Information in the selected period {#each dates}{it}{/each} already exists.") String errorMessage(List<String> dates); } ``` ### Expected behavior I want it to return `Information in the selected period 2022-02-15, 2022-02-16 already exists.` ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` Oracle JDK 11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) ### Additional information _No response_

f52d0ae1a17ae68503e3ecb1dc099675ab76a38b

d596df37371dcf6acc585d631af9a57c59a2279d

https://github.com/quarkusio/quarkus/compare/f52d0ae1a17ae68503e3ecb1dc099675ab76a38b...d596df37371dcf6acc585d631af9a57c59a2279d

diff --git a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java index a226da57c02..2233a59a65d 100644 --- a/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java +++ b/extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java @@ -78,6 +78,7 @@ import io.quarkus.qute.EvaluatedParams; import io.quarkus.qute.Expression; import io.quarkus.qute.Expression.Part; +import io.quarkus.qute.Expressions; import io.quarkus.qute.Namespaces; import io.quarkus.qute.Resolver; import io.quarkus.qute.deployment.QuteProcessor.LookupConfig; @@ -316,8 +317,8 @@ void validateMessageBundleMethods(TemplatesAnalysisBuildItem templatesAnalysis, for (TemplateAnalysis analysis : templatesAnalysis.getAnalysis()) { MessageBundleMethodBuildItem messageBundleMethod = bundleMethods.get(analysis.id); if (messageBundleMethod != null) { + // All top-level expressions without a namespace should be mapped to a param Set<String> usedParamNames = new HashSet<>(); - // All top-level expressions without namespace map to a param Set<String> paramNames = IntStream.range(0, messageBundleMethod.getMethod().parameters().size()) .mapToObj(idx -> getParameterName(messageBundleMethod.getMethod(), idx)).collect(Collectors.toSet()); for (Expression expression : analysis.expressions) { @@ -342,8 +343,12 @@ private void validateExpression(BuildProducer<IncorrectExpressionBuildItem> inco return; } if (!expression.hasNamespace()) { - String name = expression.getParts().get(0).getName(); - if (!paramNames.contains(name)) { + Expression.Part firstPart = expression.getParts().get(0); + String name = firstPart.getName(); + // Skip expressions that have type info derived from a parent section, e.g "it<loop#3>" and "foo<set#3>" + if (firstPart.getTypeInfo() == null || (firstPart.getTypeInfo().startsWith("" + Expressions.TYPE_INFO_SEPARATOR) + && !paramNames.contains(name))) { + // Expression has no type info or type info that does not match a method parameter incorrectExpressions.produce(new IncorrectExpressionBuildItem(expression.toOriginalString(), name + " is not a parameter of the message bundle method " + messageBundleMethod.getMethod().declaringClass().name() + "#" @@ -815,7 +820,7 @@ private String generateImplementation(ClassInfo defaultBundleInterface, String d return generatedName.replace('/', '.'); } - private String getParameterName(MethodInfo method, int position) { + static String getParameterName(MethodInfo method, int position) { String name = method.parameterName(position); AnnotationInstance paramAnnotation = Annotations .find(Annotations.getParameterAnnotations(method.annotations()).stream() 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 50dd9d684b6..7751d806c61 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 @@ -453,8 +453,8 @@ public void beforeParsing(ParserHelper parserHelper) { MethodInfo method = messageBundleMethod.getMethod(); for (ListIterator<Type> it = method.parameters().listIterator(); it.hasNext();) { Type paramType = it.next(); - parserHelper.addParameter(method.parameterName(it.previousIndex()), - JandexUtil.getBoxedTypeName(paramType)); + String name = MessageBundleProcessor.getParameterName(method, it.previousIndex()); + parserHelper.addParameter(name, JandexUtil.getBoxedTypeName(paramType)); } } } diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/Item.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/Item.java index 23b0464cb71..b71ef2116af 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/Item.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/Item.java @@ -1,5 +1,7 @@ package io.quarkus.qute.deployment.i18n; +import java.util.List; + public class Item { private String name; @@ -19,4 +21,8 @@ public Integer getAge() { return age; } + public List<String> getNames() { + return List.of(name); + } + } diff --git a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java index d730e1a6faa..9cb0d8f9096 100644 --- a/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java +++ b/extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java @@ -19,6 +19,7 @@ public class MessageBundleExpressionValidationTest { .withApplicationRoot((jar) -> jar .addClasses(WrongBundle.class, Item.class) .addAsResource(new StringAsset( + // foo is not a parameter of WrongBundle.hello() "hello=Hallo {foo}!"), "messages/msg_de.properties")) .assertException(t -> { @@ -34,10 +35,12 @@ public class MessageBundleExpressionValidationTest { if (te == null) { fail("No template exception thrown: " + t); } - assertTrue(te.getMessage().contains("Found template problems (3)"), te.getMessage()); + assertTrue(te.getMessage().contains("Found template problems (5)"), te.getMessage()); assertTrue(te.getMessage().contains("item.foo"), te.getMessage()); assertTrue(te.getMessage().contains("bar"), te.getMessage()); assertTrue(te.getMessage().contains("foo"), te.getMessage()); + assertTrue(te.getMessage().contains("baf"), te.getMessage()); + assertTrue(te.getMessage().contains("it.baz"), te.getMessage()); }); @Test @@ -48,7 +51,8 @@ public void testValidation() { @MessageBundle public interface WrongBundle { - @Message("Hello {item.foo} {bar}") // -> there is no foo property and bar is not a parameter + // item has no "foo" property, "bar" and "baf" are not parameters + @Message("Hello {item.foo} {bar} {#each item.names}{it}{it.baz}{baf}{/each}") String hello(Item item); }

['extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/MessageBundleProcessor.java', 'extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/MessageBundleExpressionValidationTest.java', 'extensions/qute/deployment/src/test/java/io/quarkus/qute/deployment/i18n/Item.java', 'extensions/qute/deployment/src/main/java/io/quarkus/qute/deployment/QuteProcessor.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/23827/23756

quarkusio

quarkus

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

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

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

fixes

RESTEasy (Reactive) JSON serialization for multipart form data containing emojis is wrong

### Describe the bug Serialization (string) data containing emojis as JSON form parts in multipart responses or payloads differs from serialization in non-multipart contexts: ``` @Path("/test") public class ReactiveMultipartTestResource { public static class TestData { public String bar; public TestData(String bar) { this.bar = bar; } } public static class FormData { @RestForm @PartType(MediaType.APPLICATION_JSON) public TestData data; @RestForm public String dataAsString; } @Inject ObjectMapper om; @GET @Produces(MediaType.MULTIPART_FORM_DATA) public FormData hello() throws JsonProcessingException { FormData form = new FormData(); form.data = new TestData("Bar äöü 😀"); form.dataAsString = om.writeValueAsString(form.data); return form; } } ``` Looking at the raw request's response shows different encodings for the emoji part. It's not a "simple" UTF-8 problem as the German umlauts for example are correct. This is taken from IntelliJ's HTTP request tool's response file, not sure how encoding is screwed by pasting and submitting here though...) ``` --b7ae92fe-eb4e-4a8b-b142-c77b79adbd88 Content-Disposition: form-data; name="data" Content-Type: application/json {"bar":"Bar äöü \\uD83D\\uDE00"} --b7ae92fe-eb4e-4a8b-b142-c77b79adbd88 Content-Disposition: form-data; name="dataAsString" Content-Type: text/plain {"bar":"Bar äöü 😀"} --b7ae92fe-eb4e-4a8b-b142-c77b79adbd88-- ``` ### Expected behavior Serialized JSON should be the same for "standard" serialization and "automatic" serialization in multipart contexts. ### Actual behavior See above :) ### How to Reproduce? See above :) ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

e4886ccf7dbe79754615dc1f301a051903500557

98b54fb8d017d5dd044d195fd22103854428c21d

https://github.com/quarkusio/quarkus/compare/e4886ccf7dbe79754615dc1f301a051903500557...98b54fb8d017d5dd044d195fd22103854428c21d

diff --git a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java index 9de661d986f..d9bbd9fc5c9 100644 --- a/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java +++ b/independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.java @@ -55,7 +55,7 @@ public static void doLegacyWrite(Object o, Annotation[] annotations, Multivalued } } } - entityStream.write(defaultWriter.writeValueAsBytes(o)); + entityStream.write(defaultWriter.writeValueAsString(o).getBytes(StandardCharsets.UTF_8)); } }

['independent-projects/resteasy-reactive/server/jackson/src/main/java/org/jboss/resteasy/reactive/server/jackson/JacksonMessageBodyWriterUtil.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/23839/23735

quarkusio

quarkus

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

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

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

fix

Gradle Unit Tests Don't Work Since 2.7.1

### Describe the bug After moving to Quarkus 2.7.1 from 2.7.0 unit tests in Gradle no longer run. Quarkus says "No tests found" even though there tests. ### Expected behavior Unit tests run and fail because my code is trash ### Actual behavior Unit tests pass saying "No tests found" so I push it to prod and my boss gets angri :fearful: ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` OpenJDK Runtime Environment 18.9 (build 11.0.14+9) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.1 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.3 ### Additional information _No response_

465e779699c2158e92ace1dbaf8573f0b5a1a9e2

b7cff8f2c7c96a7cedb0379aeb9710178040e2d4

https://github.com/quarkusio/quarkus/compare/465e779699c2158e92ace1dbaf8573f0b5a1a9e2...b7cff8f2c7c96a7cedb0379aeb9710178040e2d4

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java index 7dcd4e9de5e..c2e481183a7 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java @@ -487,7 +487,7 @@ private void addLocalProject(ResolvedDependency project, GradleDevModeLauncher.B if (testClassesDir != null && (!testSourcePaths.isEmpty() || (testResourcesOutputDir != null && Files.exists(testResourcesOutputDir)))) { final String testResourcesOutputPath; - if (Files.exists(testResourcesOutputDir)) { + if (testResourcesOutputDir != null && Files.exists(testResourcesOutputDir)) { testResourcesOutputPath = testResourcesOutputDir.toString(); if (!Files.exists(testClassesDir)) { // currently classesDir can't be null and is expected to exist diff --git a/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java b/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java index c7ad440963b..17ecf361f7e 100644 --- a/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java +++ b/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java @@ -43,6 +43,7 @@ import io.quarkus.bootstrap.model.gradle.ModelParameter; import io.quarkus.bootstrap.model.gradle.impl.ModelParameterImpl; import io.quarkus.bootstrap.resolver.AppModelResolverException; +import io.quarkus.bootstrap.workspace.ArtifactSources; import io.quarkus.bootstrap.workspace.DefaultArtifactSources; import io.quarkus.bootstrap.workspace.DefaultSourceDir; import io.quarkus.bootstrap.workspace.DefaultWorkspaceModule; @@ -139,10 +140,10 @@ public static ResolvedDependency getProjectArtifact(Project project, LaunchMode .setBuildFile(project.getBuildFile().toPath()); initProjectModule(project, mainModule, javaConvention.getSourceSets().findByName(SourceSet.MAIN_SOURCE_SET_NAME), - SourceSet.MAIN_SOURCE_SET_NAME, ""); - if (mode.equals(LaunchMode.TEST)) { + SourceSet.MAIN_SOURCE_SET_NAME, ArtifactSources.MAIN); + if (mode.equals(LaunchMode.TEST) || mode.equals(LaunchMode.DEVELOPMENT)) { initProjectModule(project, mainModule, javaConvention.getSourceSets().findByName(SourceSet.TEST_SOURCE_SET_NAME), - SourceSet.TEST_SOURCE_SET_NAME, "tests"); + SourceSet.TEST_SOURCE_SET_NAME, ArtifactSources.TEST); } final PathList.Builder paths = PathList.builder(); @@ -553,11 +554,6 @@ private void addSubstitutedProject(PathList.Builder paths, File projectFile) { } } - private static byte setFlag(byte flags, byte flag) { - flags |= flag; - return flags; - } - private static boolean isFlagOn(byte walkingFlags, byte flag) { return (walkingFlags & flag) > 0; } diff --git a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusMavenWorkspaceBuilder.java b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusMavenWorkspaceBuilder.java index 8cc651d413f..80fa1f1e896 100644 --- a/devtools/maven/src/main/java/io/quarkus/maven/QuarkusMavenWorkspaceBuilder.java +++ b/devtools/maven/src/main/java/io/quarkus/maven/QuarkusMavenWorkspaceBuilder.java @@ -9,9 +9,9 @@ import org.apache.maven.project.MavenProject; import io.quarkus.bootstrap.model.ApplicationModelBuilder; +import io.quarkus.bootstrap.workspace.ArtifactSources; import io.quarkus.bootstrap.workspace.DefaultArtifactSources; import io.quarkus.bootstrap.workspace.DefaultSourceDir; -import io.quarkus.bootstrap.workspace.DefaultWorkspaceModule; import io.quarkus.bootstrap.workspace.SourceDir; import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.bootstrap.workspace.WorkspaceModuleId; @@ -38,7 +38,7 @@ static WorkspaceModule toProjectModule(MavenProject project) { resources.add(new DefaultSourceDir(Path.of(r.getDirectory()), r.getTargetPath() == null ? classesDir : Path.of(r.getTargetPath()))); } - moduleBuilder.addArtifactSources(new DefaultArtifactSources(DefaultWorkspaceModule.MAIN, sources, resources)); + moduleBuilder.addArtifactSources(new DefaultArtifactSources(ArtifactSources.MAIN, sources, resources)); final Path testClassesDir = Path.of(build.getTestOutputDirectory()); final List<SourceDir> testSources = new ArrayList<>(project.getCompileSourceRoots().size()); @@ -48,7 +48,7 @@ static WorkspaceModule toProjectModule(MavenProject project) { testResources.add(new DefaultSourceDir(Path.of(r.getDirectory()), r.getTargetPath() == null ? testClassesDir : Path.of(r.getTargetPath()))); } - moduleBuilder.addArtifactSources(new DefaultArtifactSources(DefaultWorkspaceModule.TEST, testSources, testResources)); + moduleBuilder.addArtifactSources(new DefaultArtifactSources(ArtifactSources.TEST, testSources, testResources)); moduleBuilder.setBuildFile(project.getFile().toPath()); diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java index 5091476bba7..f4016b2dd50 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java @@ -9,12 +9,15 @@ public interface ArtifactSources { + String MAIN = ""; + String TEST = "tests"; + static ArtifactSources main(SourceDir sources, SourceDir resources) { - return new DefaultArtifactSources(DefaultWorkspaceModule.MAIN, List.of(sources), List.of(resources)); + return new DefaultArtifactSources(MAIN, List.of(sources), List.of(resources)); } static ArtifactSources test(SourceDir sources, SourceDir resources) { - return new DefaultArtifactSources(DefaultWorkspaceModule.TEST, List.of(sources), List.of(resources)); + return new DefaultArtifactSources(TEST, List.of(sources), List.of(resources)); } String getClassifier(); diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java index e7ec6096fdd..5a530b56126 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.java @@ -17,9 +17,6 @@ public class DefaultWorkspaceModule implements WorkspaceModule, Serializable { private static final long serialVersionUID = 6906903256002107806L; - public static final String MAIN = ""; - public static final String TEST = "tests"; - public static Builder builder() { return new DefaultWorkspaceModule().new Builder(); } @@ -91,12 +88,12 @@ public Builder addArtifactSources(ArtifactSources sources) { @Override public boolean hasMainSources() { - return DefaultWorkspaceModule.this.sourcesSets.containsKey(DefaultWorkspaceModule.MAIN); + return DefaultWorkspaceModule.this.sourcesSets.containsKey(ArtifactSources.MAIN); } @Override public boolean hasTestSources() { - return DefaultWorkspaceModule.this.sourcesSets.containsKey(DefaultWorkspaceModule.TEST); + return DefaultWorkspaceModule.this.sourcesSets.containsKey(ArtifactSources.TEST); } @Override diff --git a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java index efe2a69638d..4e7ebda086f 100644 --- a/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java +++ b/independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java @@ -28,19 +28,19 @@ static Mutable builder() { ArtifactSources getSources(String classifier); default boolean hasMainSources() { - return hasSources(DefaultWorkspaceModule.MAIN); + return hasSources(ArtifactSources.MAIN); } default boolean hasTestSources() { - return hasSources(DefaultWorkspaceModule.TEST); + return hasSources(ArtifactSources.TEST); } default ArtifactSources getMainSources() { - return getSources(DefaultWorkspaceModule.MAIN); + return getSources(ArtifactSources.MAIN); } default ArtifactSources getTestSources() { - return getSources(DefaultWorkspaceModule.TEST); + return getSources(ArtifactSources.TEST); } PathCollection getBuildFiles(); diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java index 887447a01bc..25cd99bc9c5 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java @@ -2,9 +2,9 @@ import io.quarkus.bootstrap.resolver.maven.BootstrapMavenContext; import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.workspace.ArtifactSources; import io.quarkus.bootstrap.workspace.DefaultArtifactSources; import io.quarkus.bootstrap.workspace.DefaultSourceDir; -import io.quarkus.bootstrap.workspace.DefaultWorkspaceModule; import io.quarkus.bootstrap.workspace.SourceDir; import io.quarkus.bootstrap.workspace.WorkspaceModule; import io.quarkus.maven.dependency.ArtifactCoords; @@ -359,12 +359,12 @@ public WorkspaceModule toWorkspaceModule() { } if (!moduleBuilder.hasMainSources()) { - moduleBuilder.addArtifactSources(new DefaultArtifactSources(DefaultWorkspaceModule.MAIN, + moduleBuilder.addArtifactSources(new DefaultArtifactSources(ArtifactSources.MAIN, Collections.singletonList(new DefaultSourceDir(getSourcesSourcesDir(), getClassesDir())), collectMainResources(null))); } if (!moduleBuilder.hasTestSources()) { - moduleBuilder.addArtifactSources(new DefaultArtifactSources(DefaultWorkspaceModule.TEST, + moduleBuilder.addArtifactSources(new DefaultArtifactSources(ArtifactSources.TEST, Collections.singletonList( new DefaultSourceDir(getTestSourcesSourcesDir(), getTestClassesDir())), collectTestResources(null))); @@ -435,7 +435,7 @@ private List<String> collectChildValues(final Xpp3Dom container) { private static String getClassifier(Xpp3Dom dom, boolean test) { final Xpp3Dom classifier = dom.getChild("classifier"); - return classifier == null ? (test ? DefaultWorkspaceModule.TEST : DefaultWorkspaceModule.MAIN) : classifier.getValue(); + return classifier == null ? (test ? ArtifactSources.TEST : ArtifactSources.MAIN) : classifier.getValue(); } private Collection<SourceDir> collectMainResources(PathFilter filter) { 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 5b2e2e81559..15d1cec60f3 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 @@ -19,24 +19,48 @@ import io.quarkus.bootstrap.model.ApplicationModel; import io.quarkus.bootstrap.resolver.QuarkusGradleModelFactory; +import io.quarkus.bootstrap.workspace.ArtifactSources; import io.quarkus.bootstrap.workspace.SourceDir; import io.quarkus.bootstrap.workspace.WorkspaceModule; +import io.quarkus.maven.dependency.ResolvedDependency; import io.quarkus.paths.PathTree; class QuarkusModelBuilderTest { @Test - public void shouldLoadSimpleModuleModel() throws URISyntaxException, IOException { + public void shouldLoadSimpleModuleTestModel() throws URISyntaxException, IOException { File projectDir = getResourcesProject("builder/simple-module-project"); final ApplicationModel quarkusModel = QuarkusGradleModelFactory.create(projectDir, "TEST"); assertNotNull(quarkusModel); assertNotNull(quarkusModel.getApplicationModule()); assertThat(quarkusModel.getWorkspaceModules()).isEmpty(); + + final ResolvedDependency appArtifact = quarkusModel.getAppArtifact(); + assertThat(appArtifact).isNotNull(); + assertThat(appArtifact.getWorkspaceModule()).isNotNull(); + final ArtifactSources testSources = appArtifact.getWorkspaceModule().getTestSources(); + assertThat(testSources).isNotNull(); + } + + @Test + public void shouldLoadSimpleModuleDevModel() throws URISyntaxException, IOException { + File projectDir = getResourcesProject("builder/simple-module-project"); + final ApplicationModel quarkusModel = QuarkusGradleModelFactory.create(projectDir, "DEVELOPMENT"); + + assertNotNull(quarkusModel); + assertNotNull(quarkusModel.getApplicationModule()); + assertThat(quarkusModel.getWorkspaceModules()).isEmpty(); + + final ResolvedDependency appArtifact = quarkusModel.getAppArtifact(); + assertThat(appArtifact).isNotNull(); + assertThat(appArtifact.getWorkspaceModule()).isNotNull(); + final ArtifactSources testSources = appArtifact.getWorkspaceModule().getTestSources(); + assertThat(testSources).isNotNull(); } @Test - public void shouldLoadMultiModuleModel() throws URISyntaxException, IOException { + public void shouldLoadMultiModuleTestModel() throws URISyntaxException, IOException { File projectDir = getResourcesProject("builder/multi-module-project"); final ApplicationModel quarkusModel = QuarkusGradleModelFactory.create(new File(projectDir, "application"), "TEST"); @@ -51,6 +75,53 @@ public void shouldLoadMultiModuleModel() throws URISyntaxException, IOException for (WorkspaceModule p : projectModules) { assertProjectModule(p, new File(projectDir, p.getId().getArtifactId()), false); } + + final ResolvedDependency appArtifact = quarkusModel.getAppArtifact(); + assertThat(appArtifact).isNotNull(); + assertThat(appArtifact.getWorkspaceModule()).isNotNull(); + final ArtifactSources testSources = appArtifact.getWorkspaceModule().getTestSources(); + assertThat(testSources).isNotNull(); + assertThat(testSources.getSourceDirs().size()).isEqualTo(1); + final SourceDir testSrcDir = testSources.getSourceDirs().iterator().next(); + assertThat(testSrcDir.getDir()) + .isEqualTo(projectDir.toPath().resolve("application").resolve("src").resolve("test").resolve("java")); + assertThat(testSources.getResourceDirs().size()).isEqualTo(1); + final SourceDir testResourcesDir = testSources.getResourceDirs().iterator().next(); + assertThat(testResourcesDir.getDir()) + .isEqualTo(projectDir.toPath().resolve("application").resolve("src").resolve("test").resolve("resources")); + } + + @Test + public void shouldLoadMultiModuleDevModel() throws URISyntaxException, IOException { + File projectDir = getResourcesProject("builder/multi-module-project"); + + final ApplicationModel quarkusModel = QuarkusGradleModelFactory.create(new File(projectDir, "application"), + "DEVELOPMENT"); + + assertNotNull(quarkusModel); + + assertProjectModule(quarkusModel.getApplicationModule(), + new File(projectDir, quarkusModel.getApplicationModule().getId().getArtifactId()), true); + + final Collection<WorkspaceModule> projectModules = quarkusModel.getWorkspaceModules(); + assertEquals(projectModules.size(), 1); + for (WorkspaceModule p : projectModules) { + assertProjectModule(p, new File(projectDir, p.getId().getArtifactId()), false); + } + + final ResolvedDependency appArtifact = quarkusModel.getAppArtifact(); + assertThat(appArtifact).isNotNull(); + assertThat(appArtifact.getWorkspaceModule()).isNotNull(); + final ArtifactSources testSources = appArtifact.getWorkspaceModule().getTestSources(); + assertThat(testSources).isNotNull(); + assertThat(testSources.getSourceDirs().size()).isEqualTo(1); + final SourceDir testSrcDir = testSources.getSourceDirs().iterator().next(); + assertThat(testSrcDir.getDir()) + .isEqualTo(projectDir.toPath().resolve("application").resolve("src").resolve("test").resolve("java")); + assertThat(testSources.getResourceDirs().size()).isEqualTo(1); + final SourceDir testResourcesDir = testSources.getResourceDirs().iterator().next(); + assertThat(testResourcesDir.getDir()) + .isEqualTo(projectDir.toPath().resolve("application").resolve("src").resolve("test").resolve("resources")); } private void assertProjectModule(WorkspaceModule projectModule, File projectDir, boolean withTests) {

['independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/ArtifactSources.java', 'integration-tests/gradle/src/test/java/io/quarkus/gradle/builder/QuarkusModelBuilderTest.java', 'independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/workspace/LocalProject.java', 'devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/tooling/GradleApplicationModelBuilder.java', 'independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/WorkspaceModule.java', 'devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/tasks/QuarkusDev.java', 'devtools/maven/src/main/java/io/quarkus/maven/QuarkusMavenWorkspaceBuilder.java', 'independent-projects/bootstrap/app-model/src/main/java/io/quarkus/bootstrap/workspace/DefaultWorkspaceModule.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/23881/23776

quarkusio

quarkus

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

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

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

close

Running gradle quarkusDev fails in a multi-module Gradle project

### Describe the bug I am learning the tutorial: [GETTING STARTED WITH REACTIVE](https://quarkus.io/guides/getting-started-reactive) When I run `gradle :quarkus-reactive:quarkusDev` in a multi-module gradle project, I get an exception > Execution failed for task ':quarkus-reactive:compileJava'. > \\> Cannot change dependencies of dependency configuration ':quarkus-reactive:annotationProcessor' after it has been included in dependency resolution. Use 'defaultDependencies' instead of 'beforeResolve' to specify default dependencies for a configuration. When I comment out `implementation("io.quarkus:quarkus-hibernate-reactive-panache")` it works fine ### Expected behavior This Quarkus plugin should work fine in other submodules ### Actual behavior this Quarkus plugin doesn't seem to be able to execute `compileJava` task in submodule ### How to Reproduce? Here is my example code: [reproduce/quarkus at main · tabuyos/reproduce](https://github.com/tabuyos/reproduce/tree/main/quarkus) Execute the `gradle :quarkus-reactive:quarkusDev` task in the quarkus directory ### Output of `uname -a` or `ver` Microsoft Windows [version 10.0.19043.1466] ### Output of `java -version` openjdk version "16" 2021-03-16 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.0.2 ### Additional information _No response_

0bd2724d6876ed64ac3420abce5eec196cc20933

d52bc651cc877a8327f2f86c2c1cf973513bfac8

https://github.com/quarkusio/quarkus/compare/0bd2724d6876ed64ac3420abce5eec196cc20933...d52bc651cc877a8327f2f86c2c1cf973513bfac8

diff --git a/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java b/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java index 049f5f9355d..8b6e31b5fee 100644 --- a/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java +++ b/devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.java @@ -70,10 +70,12 @@ public static void initConfigurations(Project project) { configContainer.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME)); // enable the Panache annotation processor on the classpath, if it's found among the dependencies - configContainer.getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME).getIncoming() - .beforeResolve(annotationProcessors -> { - Set<ResolvedArtifact> compileClasspathArtifacts = configContainer - .getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).getResolvedConfiguration() + configContainer.getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME) + .withDependencies(annotationProcessors -> { + Set<ResolvedArtifact> compileClasspathArtifacts = DependencyUtils + .duplicateConfiguration(project, configContainer + .getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)) + .getResolvedConfiguration() .getResolvedArtifacts(); for (ResolvedArtifact artifact : compileClasspathArtifacts) { if ("quarkus-panache-common".equals(artifact.getName())

['devtools/gradle/gradle-model/src/main/java/io/quarkus/gradle/dependency/ApplicationDeploymentClasspathBuilder.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/24028/23776

quarkusio

quarkus

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

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

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

fix

Running gradle quarkusDev fails in a multi-module Gradle project

### Describe the bug I am learning the tutorial: [GETTING STARTED WITH REACTIVE](https://quarkus.io/guides/getting-started-reactive) When I run `gradle :quarkus-reactive:quarkusDev` in a multi-module gradle project, I get an exception > Execution failed for task ':quarkus-reactive:compileJava'. > \\> Cannot change dependencies of dependency configuration ':quarkus-reactive:annotationProcessor' after it has been included in dependency resolution. Use 'defaultDependencies' instead of 'beforeResolve' to specify default dependencies for a configuration. When I comment out `implementation("io.quarkus:quarkus-hibernate-reactive-panache")` it works fine ### Expected behavior This Quarkus plugin should work fine in other submodules ### Actual behavior this Quarkus plugin doesn't seem to be able to execute `compileJava` task in submodule ### How to Reproduce? Here is my example code: [reproduce/quarkus at main · tabuyos/reproduce](https://github.com/tabuyos/reproduce/tree/main/quarkus) Execute the `gradle :quarkus-reactive:quarkusDev` task in the quarkus directory ### Output of `uname -a` or `ver` Microsoft Windows [version 10.0.19043.1466] ### Output of `java -version` openjdk version "16" 2021-03-16 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.0.2 ### Additional information _No response_

a8243c313328641299e0b4ea0400afbae11b67c6

ec596dc0769c9aeb7bca3b3dc99de8acdde26a95

https://github.com/quarkusio/quarkus/compare/a8243c313328641299e0b4ea0400afbae11b67c6...ec596dc0769c9aeb7bca3b3dc99de8acdde26a95

diff --git a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java index 55d857392b2..05cbf49b6a1 100644 --- a/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java +++ b/devtools/gradle/gradle-application-plugin/src/main/java/io/quarkus/gradle/QuarkusPlugin.java @@ -54,6 +54,7 @@ import io.quarkus.gradle.tasks.QuarkusTestNative; import io.quarkus.gradle.tasks.QuarkusUpdate; import io.quarkus.gradle.tooling.GradleApplicationModelBuilder; +import io.quarkus.gradle.tooling.dependency.DependencyUtils; import io.quarkus.gradle.tooling.dependency.ExtensionDependency; public class QuarkusPlugin implements Plugin<Project> { @@ -299,10 +300,12 @@ private void registerConditionalDependencies(Project project) { configName).declareConditionalDependencies(); deploymentClasspathBuilder.createBuildClasspath(testExtensions, configName); }); - project.getConfigurations().getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME).getIncoming() - .beforeResolve(annotationProcessors -> { - Set<ResolvedArtifact> compileClasspathArtifacts = project.getConfigurations() - .getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME).getResolvedConfiguration() + project.getConfigurations().getByName(JavaPlugin.ANNOTATION_PROCESSOR_CONFIGURATION_NAME) + .withDependencies(annotationProcessors -> { + Set<ResolvedArtifact> compileClasspathArtifacts = DependencyUtils + .duplicateConfiguration(project, project.getConfigurations() + .getByName(JavaPlugin.COMPILE_CLASSPATH_CONFIGURATION_NAME)) + .getResolvedConfiguration() .getResolvedArtifacts(); // enable the Panache annotation processor on the classpath, if it's found among the dependencies

['devtools/gradle/gradle-application-plugin/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/23959/23937

quarkusio

quarkus

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

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

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

fixes

quarkus:test Re-run failed tests does not run failed ParameterizedTest

### Describe the bug In Continuous Testing mode tests that use `@ParameterizedTest` with `@ValueSource` like this: ``` @QuarkusTest public class GreetingResourceTest { @ParameterizedTest @ValueSource(strings = {"fail"}) public void parametrizedTest(String input) { assertEquals("ok", input); } } ``` are not rerun when a "Re-run failed tests" command is issued, but `All tests are now passing` is shown instead. ### Expected behavior ParameterizedTest tests that fail should be rerun ### Actual behavior ParameterizedTest tests that fail are declared as passing without having been rerurn ### How to Reproduce? Declare a failing ParameterizedTest test and try to rerun it in Continuous Testing ### Output of `uname -a` or `ver` 5.13.0-30-generic #33-Ubuntu SMP Fri Feb 4 17:03:31 UTC 2022 x86_64 x86_64 x86_64 GNU/Linux ### Output of `java -version` Java version: 11.0.13, vendor: Ubuntu, runtime: /usr/lib/jvm/java-11-openjdk-amd64 ### GraalVM version (if different from Java) NA ### Quarkus version or git rev 2.7.2 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) ### Additional information _No response_

96c1fbdad8ef1194d9b4b69042f00ddedb133c2f

d0fb15ba0d7491d3628458a1183830b9f9ca50f0

https://github.com/quarkusio/quarkus/compare/96c1fbdad8ef1194d9b4b69042f00ddedb133c2f...d0fb15ba0d7491d3628458a1183830b9f9ca50f0

diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java index 85da540feb5..2e965d77246 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java @@ -67,11 +67,6 @@ public void runComplete(TestRunResults testRunResults) { }); } - @Override - public void noTests(TestRunResults results) { - runComplete(results); - } - @Override public void runAborted() { ContinuousTestingSharedStateManager.setInProgress(false); diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java index 1bce4eaedfd..a43da33c5d4 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java @@ -178,21 +178,6 @@ public FilterResult apply(TestDescriptor testDescriptor) { LauncherDiscoveryRequest request = launchBuilder .build(); TestPlan testPlan = launcher.discover(request); - if (!testPlan.containsTests()) { - testState.pruneDeletedTests(allDiscoveredIds, dynamicIds); - //nothing to see here - for (TestRunListener i : listeners) { - i.noTests(new TestRunResults(runId, classScanResult, classScanResult == null, start, - System.currentTimeMillis(), toResultsMap(testState.getCurrentResults()))); - } - quarkusTestClasses.close(); - return new Runnable() { - @Override - public void run() { - - } - }; - } long toRun = testPlan.countTestIdentifiers(TestIdentifier::isTest); for (TestRunListener listener : listeners) { listener.runStarted(toRun); @@ -226,6 +211,7 @@ public void quarkusStarting() { }); Map<String, Map<UniqueId, TestResult>> resultsByClass = new HashMap<>(); + AtomicReference<TestIdentifier> currentNonDynamicTest = new AtomicReference<>(); launcher.execute(testPlan, new TestExecutionListener() { @Override @@ -233,6 +219,10 @@ public void executionStarted(TestIdentifier testIdentifier) { if (aborted) { return; } + boolean dynamic = dynamicIds.contains(UniqueId.parse(testIdentifier.getUniqueId())); + if (!dynamic) { + currentNonDynamicTest.set(testIdentifier); + } startTimes.put(testIdentifier, System.currentTimeMillis()); String testClassName = ""; Class<?> testClass = getTestClassFromSource(testIdentifier.getSource()); @@ -260,7 +250,7 @@ public void executionSkipped(TestIdentifier testIdentifier, String reason) { s -> new HashMap<>()); TestResult result = new TestResult(displayName, testClass.getName(), id, TestExecutionResult.aborted(null), - logHandler.captureOutput(), testIdentifier.isTest(), runId, 0); + logHandler.captureOutput(), testIdentifier.isTest(), runId, 0, true); results.put(id, result); if (result.isTest()) { for (TestRunListener listener : listeners) { @@ -274,6 +264,9 @@ public void executionSkipped(TestIdentifier testIdentifier, String reason) { @Override public void dynamicTestRegistered(TestIdentifier testIdentifier) { dynamicIds.add(UniqueId.parse(testIdentifier.getUniqueId())); + for (TestRunListener listener : listeners) { + listener.dynamicTestRegistered(testIdentifier); + } } @Override @@ -282,6 +275,7 @@ public void executionFinished(TestIdentifier testIdentifier, if (aborted) { return; } + boolean dynamic = dynamicIds.contains(UniqueId.parse(testIdentifier.getUniqueId())); Set<String> touched = touchedClasses.pop(); Class<?> testClass = getTestClassFromSource(testIdentifier.getSource()); String displayName = getDisplayNameFromIdentifier(testIdentifier, testClass); @@ -306,18 +300,33 @@ public void executionFinished(TestIdentifier testIdentifier, testClassUsages.updateTestData(testClassName, id, touched); } } - Map<UniqueId, TestResult> results = resultsByClass.computeIfAbsent(testClassName, s -> new HashMap<>()); TestResult result = new TestResult(displayName, testClassName, id, testExecutionResult, logHandler.captureOutput(), testIdentifier.isTest(), runId, - System.currentTimeMillis() - startTimes.get(testIdentifier)); - results.put(id, result); + System.currentTimeMillis() - startTimes.get(testIdentifier), true); + if (!results.containsKey(id)) { + //if a child has failed we may have already marked the parent failed + results.put(id, result); + } if (result.isTest()) { for (TestRunListener listener : listeners) { listener.testComplete(result); } + if (dynamic && testExecutionResult.getStatus() == TestExecutionResult.Status.FAILED) { + //if it is dynamic we fail the parent as well for re-runs + + RuntimeException failure = new RuntimeException("A child test failed"); + failure.setStackTrace(new StackTraceElement[0]); + results.put(id, + new TestResult(currentNonDynamicTest.get().getDisplayName(), + result.getTestClass(), + currentNonDynamicTest.get().getUniqueIdObject(), + TestExecutionResult.failed(failure), List.of(), false, runId, 0, + false)); + results.put(UniqueId.parse(currentNonDynamicTest.get().getUniqueId()), result); + } } else if (testExecutionResult.getStatus() == TestExecutionResult.Status.FAILED) { //if a parent fails we fail the children Set<TestIdentifier> children = testPlan.getChildren(testIdentifier); @@ -327,7 +336,7 @@ public void executionFinished(TestIdentifier testIdentifier, childId, testExecutionResult, logHandler.captureOutput(), child.isTest(), runId, - System.currentTimeMillis() - startTimes.get(testIdentifier)); + System.currentTimeMillis() - startTimes.get(testIdentifier), true); results.put(childId, result); if (child.isTest()) { for (TestRunListener listener : listeners) { diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java index 764b66944c3..9225b2b8fc4 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.java @@ -220,9 +220,11 @@ public void runComplete(TestRunResults results) { log.error(statusHeader("TEST REPORT #" + results.getId())); for (Map.Entry<String, TestClassResult> classEntry : results.getCurrentFailing().entrySet()) { for (TestResult test : classEntry.getValue().getFailing()) { - log.error( - RED + "Test " + test.getDisplayName() + " failed \\n" + RESET, - test.getTestExecutionResult().getThrowable().get()); + if (test.isReportable()) { + log.error( + RED + "Test " + test.getDisplayName() + " failed \\n" + RESET, + test.getTestExecutionResult().getThrowable().get()); + } } } log.error( @@ -244,11 +246,6 @@ public void runComplete(TestRunResults results) { } } - @Override - public void noTests(TestRunResults results) { - runComplete(results); - } - @Override public void runAborted() { firstRun = false; @@ -268,6 +265,11 @@ public void testStarted(TestIdentifier testIdentifier, String className) { } testsStatusOutput.setMessage(status); } + + @Override + public void dynamicTestRegistered(TestIdentifier testIdentifier) { + totalNoTests.incrementAndGet(); + } }); } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java index 44e278c986e..4250d332492 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java @@ -18,9 +18,10 @@ public class TestResult { final long runId; final long time; final List<Throwable> problems; + final boolean reportable; public TestResult(String displayName, String testClass, UniqueId uniqueId, TestExecutionResult testExecutionResult, - List<String> logOutput, boolean test, long runId, long time) { + List<String> logOutput, boolean test, long runId, long time, boolean reportable) { this.displayName = displayName; this.testClass = testClass; this.uniqueId = uniqueId; @@ -29,6 +30,7 @@ public TestResult(String displayName, String testClass, UniqueId uniqueId, TestE this.test = test; this.runId = runId; this.time = time; + this.reportable = reportable; List<Throwable> problems = new ArrayList<>(); if (testExecutionResult.getThrowable().isPresent()) { Throwable t = testExecutionResult.getThrowable().get(); @@ -75,4 +77,8 @@ public long getTime() { public List<Throwable> getProblems() { return problems; } + + public boolean isReportable() { + return reportable; + } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunListener.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunListener.java index 5a817d18576..0f3e8278d40 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunListener.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunListener.java @@ -24,7 +24,7 @@ default void testStarted(TestIdentifier testIdentifier, String className) { } - default void noTests(TestRunResults results) { + default void dynamicTestRegistered(TestIdentifier testIdentifier) { } } diff --git a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java index 1ac18ade9c3..01d76c06184 100644 --- a/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java +++ b/core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java @@ -374,20 +374,8 @@ public void testStarted(TestIdentifier testIdentifier, String className) { } } - @Override - public void noTests(TestRunResults results) { - allResults.add(results); - runStarted(0); - } })); } - if (testCount.get() == 0) { - TestRunResults results = new TestRunResults(runId, classScanResult, classScanResult == null, start, - System.currentTimeMillis(), Collections.emptyMap()); - for (var i : testRunListeners) { - i.noTests(results); - } - } for (var i : testRunListeners) { i.runStarted(testCount.get()); } diff --git a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java index 3a0ac541a62..5d8ee7d0ce9 100644 --- a/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java +++ b/extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java @@ -146,6 +146,7 @@ DevConsoleRouteBuildItem runAllTests(LaunchModeBuildItem launchModeBuildItem) { @Override public void handle(RoutingContext event) { ts.get().runAllTests(); + event.response().setStatusCode(204).end(); } }); } @@ -178,6 +179,7 @@ DevConsoleRouteBuildItem runFailedTests(LaunchModeBuildItem launchModeBuildItem) @Override public void handle(RoutingContext event) { ts.get().runFailedTests(); + event.response().setStatusCode(204).end(); } }); } @@ -192,6 +194,7 @@ DevConsoleRouteBuildItem printfailures(LaunchModeBuildItem launchModeBuildItem) @Override public void handle(RoutingContext event) { ts.get().printFullResults(); + event.response().setStatusCode(204).end(); } }); } @@ -235,6 +238,7 @@ DevConsoleRouteBuildItem forceRestart(LaunchModeBuildItem launchModeBuildItem) { @Override public void handle(RoutingContext event) { RuntimeUpdatesProcessor.INSTANCE.doScan(true, true); + event.response().setStatusCode(204).end(); } }); } diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java index 57c14bc6694..1c85ca3dd13 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java @@ -13,6 +13,7 @@ import io.quarkus.test.ContinuousTestingTestUtils; import io.quarkus.test.ContinuousTestingTestUtils.TestStatus; import io.quarkus.test.QuarkusDevModeTest; +import io.restassured.RestAssured; public class TestParameterizedTestCase { @@ -42,6 +43,13 @@ public void testParameterizedTests() throws InterruptedException { Assertions.assertEquals(4L, ts.getTestsPassed()); Assertions.assertEquals(0L, ts.getTestsSkipped()); + RestAssured.post("q/dev/io.quarkus.quarkus-vertx-http/tests/runfailed"); + + ts = utils.waitForNextCompletion(); + + Assertions.assertEquals(1L, ts.getTestsFailed()); + Assertions.assertEquals(3L, ts.getTestsPassed()); //they are all re-run + Assertions.assertEquals(0L, ts.getTestsSkipped()); test.modifyTestSourceFile(ParamET.class, new Function<String, String>() { @Override public String apply(String s) {

['core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestRunListener.java', 'extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/testrunner/params/TestParameterizedTestCase.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/testing/ContinuousTestingSharedStateListener.java', 'extensions/vertx-http/deployment/src/main/java/io/quarkus/vertx/http/deployment/devmode/tests/TestsProcessor.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/testing/JunitTestRunner.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestSupport.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestResult.java', 'core/deployment/src/main/java/io/quarkus/deployment/dev/testing/TestConsoleHandler.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/23973/23813

quarkusio

quarkus

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

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

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

fixes

@MongoEntity with database parameter does not detect database when using mongo panache

### Describe the bug The following is my code structure: ``` public interface BaseMongoRepository<T extends BaseMongoEntity> extends ReactivePanacheMongoRepository<T> {} public interface UserRepository extends BaseMongoRepository<UserEntity> {} public class BaseMongoRepositoryImpl<T extends BaseMongoEntity> implements BaseMongoRepository<T> {} public class UserRepositoryImpl extends BaseMongoRepositoryImpl<UserEntity> implements UserRepository @MongoEntity(database = "userDB", collection= "users") public class User {} ``` When I'm running this code, mongo panache fails with IllegalArgumentException: `The database attribute was not set for the @MongoEntity annotation and neither was the database property configured for the default Mongo Client (via 'quarkus.mongodb.database').` If I pass the default client using `quarkus.mongodb.database`, all my collections are created in the same database. However, the collections args for @MongoEntity works fine. ### Expected behavior When passing @MongoEntity(database = "userDB"), the collection should be created in the userDB database. ### Actual behavior If no default database is passed in application.properties, an error is thrown. Else the collection is created in the default database. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` Darwin Kernel Version 21.1.0: Wed Oct 13 17:33:01 PDT 2021; root:xnu-8019.41.5~1/RELEASE_ARM64_T6000 arm64 ### Output of `java -version` openjdk version "17.0.2" 2022-01-18 OpenJDK Runtime Environment Homebrew (build 17.0.2+0) OpenJDK 64-Bit Server VM Homebrew (build 17.0.2+0, mixed mode, sharing) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.0 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Java version: 17.0.2, vendor: Homebrew, runtime: /opt/homebrew/Cellar/openjdk/17.0.2/libexec/openjdk.jdk/Contents/Home Default locale: en_IN, platform encoding: UTF-8 OS name: "mac os x", version: "12.0.1", arch: "aarch64", family: "mac" ### Additional information _No response_

5919bee6710783d5630d6144ba0d5ff15360b87f

0fd7b0d370830b357135511ba76d7795852d2e05

https://github.com/quarkusio/quarkus/compare/5919bee6710783d5630d6144ba0d5ff15360b87f...0fd7b0d370830b357135511ba76d7795852d2e05

diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/ReactiveMongoOperations.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/ReactiveMongoOperations.java index 112cb255871..bf433a4dd30 100644 --- a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/ReactiveMongoOperations.java +++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/ReactiveMongoOperations.java @@ -311,6 +311,9 @@ private ReactiveMongoCollection mongoCollection(Object entity) { private ReactiveMongoDatabase mongoDatabase(MongoEntity mongoEntity) { ReactiveMongoClient mongoClient = clientFromArc(mongoEntity, ReactiveMongoClient.class, true); + if (mongoEntity != null && !mongoEntity.database().isEmpty()) { + return mongoClient.getDatabase(mongoEntity.database()); + } String databaseName = getDefaultDatabaseName(mongoEntity); return mongoClient.getDatabase(databaseName); }

['extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/ReactiveMongoOperations.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/23996/23949

quarkusio

quarkus

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

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

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

closes

NullPointerException in Resteasy Reactive Client due to no Configuration

### Describe the bug When using classic jaxrs ClientBuilder with implementation from Resteasy Reactive Client jars, the configuration is not initialized. ### Expected behavior ClientRequestFilter(s) successfully registered with classic ClientBuilder ### Actual behavior NullPointerException thrown from ```org.jboss.resteasy.reactive.client.impl.ClientBuilderImpl, line 313``` ### How to Reproduce? With dependencies: ```xml io.quarkus.resteasy.reactive:resteasy-reactive-common:jar:2.7.1.Final org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:jar:2.0.1.Final ``` Use the following code: ```java import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.ClientRequestFilter; public static void main(String args[]) { ClientBuilder clientBuilder = ClientBuilder.newBuilder(); for (ClientRequestFilter filter : filters) { // following line has NPE clientBuilder.register(filter); } } ``` ### Output of `uname -a` or `ver` Darwin C02YD0B0JG5J.corp.proofpoint.com 20.6.0 Darwin Kernel Version 20.6.0: Wed Jan 12 22:22:42 PST 2022; root:xnu-7195.141.19~2/RELEASE_X86_64 x86_64 ### Output of `java -version` openjdk version "11.0.12" 2021-07-20 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.1.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) ### Additional information _No response_

e68c24fbfef0a0d92c0f100dbed5f5bba073b46a

b520c71d2e6128fa76067d4c64312ceddd6c7446

https://github.com/quarkusio/quarkus/compare/e68c24fbfef0a0d92c0f100dbed5f5bba073b46a...b520c71d2e6128fa76067d4c64312ceddd6c7446

diff --git a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java index a8baa6b800d..d4389344a49 100644 --- a/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java +++ b/extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.java @@ -47,8 +47,10 @@ public class AsyncRestClientFilterTestCase { @BeforeEach public void before() { - client = ClientBuilder.newClient() + // register one filter with builder to test configuration inheritance + client = ClientBuilder.newBuilder() .register(SyncClientRequestFilter.class) + .build() .register(AsyncClientRequestFilter.class) .register(AsyncClientResponseFilter.class); } diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java index 6ca8e156ec7..b56f7b52b0d 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java @@ -20,6 +20,7 @@ import java.util.regex.Pattern; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; +import javax.ws.rs.RuntimeType; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.core.Configuration; import org.jboss.logging.Logger; @@ -62,6 +63,10 @@ public class ClientBuilderImpl extends ClientBuilder { private ClientLogger clientLogger = new DefaultClientLogger(); private String userAgent = "Resteasy Reactive Client"; + public ClientBuilderImpl() { + configuration = new ConfigurationImpl(RuntimeType.CLIENT); + } + @Override public ClientBuilder withConfig(Configuration config) { this.configuration = new ConfigurationImpl(config);

['independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/ClientBuilderImpl.java', 'extensions/resteasy-reactive/jaxrs-client-reactive/deployment/src/test/java/io/quarkus/jaxrs/client/reactive/deployment/test/AsyncRestClientFilterTestCase.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/24002/23966

quarkusio

quarkus

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

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

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

fixes

Rest Client sets own User-Agent header even if user specifies a different one

### Describe the bug This issue is based on the Zulip chat: https://quarkusio.zulipchat.com/#narrow/stream/187030-users/topic/io.2Evertx.2Ecore.2Ehttp.2Eimpl.2ENoStackTraceTimeoutException We have a reactive rest client where we set a custom `User-Agent` header. The user agent needs to be this specific value for the API to accept our request. ``` @RegisterRestClient(configKey = "xxxxx") @Produces(MediaType.APPLICATION_JSON) interface GatewayApi { @GET @Path("zzzzz") suspend fun getUser( @HeaderParam("Accept-Language") acceptLanguage: String, @HeaderParam("x-request-tracing-id") traceId: String, @HeaderParam("x-api-key") apiKey: String, @HeaderParam("User-Agent") userAgent: String ): Response } ``` Unfortunately, it seems that Quarkus versions >= 2.7.0 add an own `User-Agent` header value with the value: `Resteasy Reactive Client`. This value is always added, no matter if we set our own `User-Agent`. So when we make a request the `User-Agent` header has the values: `[Resteasy Reactive Client, Our_Custom_Header_Value]` compared to versions <= 2.6.3 where the `User-Agent` values is `[Our_Custom_Header_Value]`. A workaround is to add a custom ClientHeadersFactory and register it to above interface. For example: ``` class GatewayHeadersFactory: ClientHeadersFactory { override fun update(incomingHeaders: MultivaluedMap<String, String>?, clientOutgoingHeaders: MultivaluedMap<String, String>?): MultivaluedMap<String, String> { val clientHeaders = MultivaluedHashMap<String, String>() "Our_Custom_Header_Value".addHeader("User-Agent", clientHeaders) return clientHeaders } } ``` ### Expected behavior The rest client should only add its own `User-Agent` header when we do not specify our own header. This should apply when the header is set with the `@HeaderParam` annotation in the method as well as when using `@ClientHeaderParam` to set a `User-Agent` header. ### Actual behavior The rest client always adds it's own User-Agent header. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

4e56d41e4e00cdabda79ad9c978ed73f7d6bbac3

ec4e26752d9c75b6a3187fb21dbd62539487d897

https://github.com/quarkusio/quarkus/compare/4e56d41e4e00cdabda79ad9c978ed73f7d6bbac3...ec4e26752d9c75b6a3187fb21dbd62539487d897

diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java index 3e2c924ac9a..d5341d80e33 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.java @@ -30,6 +30,12 @@ void testHeadersWithSubresource() { assertThat(client.call()).isEqualTo("Resteasy Reactive Client"); } + @Test + void testHeaderOverride() { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); + assertThat(client.callWithUserAgent("custom-agent")).isEqualTo("custom-agent"); + } + @Path("/") @ApplicationScoped public static class Resource { @@ -44,6 +50,10 @@ public interface Client { @Path("/") @GET String call(); + + @Path("/") + @GET + String callWithUserAgent(@HeaderParam("User-AgenT") String userAgent); } } diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java index 5126b4ab0c4..f9f25cf593c 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java @@ -51,9 +51,6 @@ public InvocationBuilderImpl(URI uri, ClientImpl restClient, HttpClient httpClie this.httpClient = httpClient; this.target = target; this.requestSpec = new RequestSpec(configuration); - if (restClient.getUserAgent() != null && !restClient.getUserAgent().isEmpty()) { - this.requestSpec.headers.header(HttpHeaders.USER_AGENT, restClient.getUserAgent()); - } this.configuration = configuration; this.handlerChain = handlerChain; this.requestContext = requestContext; @@ -67,11 +64,13 @@ public InvocationBuilderImpl(URI uri, ClientImpl restClient, HttpClient httpClie @Override public Invocation build(String method) { + setUserAgentIfNotSet(); return new InvocationImpl(method, async(), null); } @Override public Invocation build(String method, Entity<?> entity) { + setUserAgentIfNotSet(); return new InvocationImpl(method, async(), entity); } @@ -97,6 +96,7 @@ public Invocation buildPut(Entity<?> entity) { @Override public AsyncInvokerImpl async() { + setUserAgentIfNotSet(); return new AsyncInvokerImpl(restClient, httpClient, uri, requestSpec, configuration, properties, handlerChain, requestContext); } @@ -175,6 +175,7 @@ public CompletionStageRxInvoker rx() { @Override public <T extends RxInvoker> T rx(Class<T> clazz) { + setUserAgentIfNotSet(); if (clazz == MultiInvoker.class) { return (T) new MultiInvoker(this); } else if (clazz == UniInvoker.class) { @@ -189,6 +190,13 @@ public <T extends RxInvoker> T rx(Class<T> clazz) { return null; } + private void setUserAgentIfNotSet() { + if (!requestSpec.headers.getHeaders().containsKey(HttpHeaders.USER_AGENT) + && restClient.getUserAgent() != null && !restClient.getUserAgent().isEmpty()) { + this.requestSpec.headers.header(HttpHeaders.USER_AGENT, restClient.getUserAgent()); + } + } + @Override public Response get() { return unwrap(async().get());

['independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/InvocationBuilderImpl.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/headers/UserAgentTest.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/24003/23978

quarkusio

quarkus

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

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

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

fixes

Kafka dev services can not be used with redpanda images from outside of DockerHub

### Describe the bug Devmode for Kafka explicitly requires, that images should be from vectorized/redpanda dockerhub repository. Because of that, even if the very same is copied to other docker repository, it can be used. The reproducer uses image `quay.io/quarkusqeteam/redpanda` which was copied with docker pull/push from DockerHub to quay.io ### Expected behavior Kafka dev services should work with redpanda images from any repository ### Actual behavior Error: `IllegalArgumentException: Only vectorized/redpanda images are supported` ### How to Reproduce? 1. `git clone -b reproducer/redpanda git@github.com:fedinskiy/quarkus-test-suite.git` 2. `cd super-size/many-extensions` 3. `mvn clean validate compile test package verify -Dall-modules -DexcludedGroups=fips-incompatible -Dit.test=DevModeManyExtensionsIT` ### Output of `uname -a` or `ver` 5.16.7-200.fc35.x86_64 ### Output of `java -version` 11.0.12, vendor: GraalVM Community ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.7.2.Final, 2.2.5.Final, 3bda8b29565261d2dc188f8feda6d027eb085d6f ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.4 (9b656c72d54e5bacbed989b64718c159fe39b537) ### Additional information _No response_

4e56d41e4e00cdabda79ad9c978ed73f7d6bbac3

eb221b0448485cb3c193c14d053d2b9903b6c1b0

https://github.com/quarkusio/quarkus/compare/4e56d41e4e00cdabda79ad9c978ed73f7d6bbac3...eb221b0448485cb3c193c14d053d2b9903b6c1b0

diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java index 2ce80507699..6e603d381bd 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.java @@ -11,7 +11,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.function.Supplier; -import java.util.regex.Pattern; import java.util.stream.Collectors; import org.apache.kafka.clients.admin.AdminClient; @@ -53,9 +52,6 @@ public class DevServicesKafkaProcessor { private static final Logger log = Logger.getLogger(DevServicesKafkaProcessor.class); private static final String KAFKA_BOOTSTRAP_SERVERS = "kafka.bootstrap.servers"; - private static final Pattern STRIMZI_IMAGE_NAME_PATTERN = Pattern - .compile("(^.*test-container):(\\\\d+\\\\.\\\\d+\\\\.\\\\d+|latest)-kafka-(.*)$"); - /** * Label to add to shared Dev Service for Kafka running in containers. * This allows other applications to discover the running service and use it instead of starting a new instance. diff --git a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/RedPandaKafkaContainer.java b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/RedPandaKafkaContainer.java index d7d9881d1c7..02f3179f02a 100644 --- a/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/RedPandaKafkaContainer.java +++ b/extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/RedPandaKafkaContainer.java @@ -39,15 +39,11 @@ final class RedPandaKafkaContainer extends GenericContainer<RedPandaKafkaContain } // For redpanda, we need to start the broker - see https://vectorized.io/docs/quick-start-docker/ - if (dockerImageName.getRepository().equals("vectorized/redpanda")) { - withCreateContainerCmdModifier(cmd -> { - cmd.withEntrypoint("sh"); - }); - withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT); - waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1)); - } else { - throw new IllegalArgumentException("Only vectorized/redpanda images are supported"); - } + withCreateContainerCmdModifier(cmd -> { + cmd.withEntrypoint("sh"); + }); + withCommand("-c", "while [ ! -f " + STARTER_SCRIPT + " ]; do sleep 0.1; done; " + STARTER_SCRIPT); + waitingFor(Wait.forLogMessage(".*Started Kafka API server.*", 1)); } @Override

['extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/RedPandaKafkaContainer.java', 'extensions/kafka-client/deployment/src/main/java/io/quarkus/kafka/client/deployment/DevServicesKafkaProcessor.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/24014/23986

quarkusio

quarkus

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

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

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

fixes

Quarkus Multipart not working for multi layer applications

### Describe the bug We have an export-import microservice design that exports and imports data, one microservice component per family of entities. This microservice design imports & exports using rest reactive design. And it works perfectly without any issues. **Requirement** But now we have a different requirement. We have a module that provides the user a page to select the list of microservices that needs to be exported and/or imported. After selecting multiple microservices and clicking on "Export" button, a zip file will be generated that contains the exported file of all the microservices selected on the page. **Design** Since all the components already have the export import function, all I have to do is created a separate service that will do the following. - Take a request that comprises the selected component names. - Iterate through the component names, and build a Unijoin list to call the export import function of all the microservices in parallel. `UniJoin.Builder<CommonAccountTypeXMLDto> builder = Uni.join().builder(); builder.joinAll().andFailFast();` - Collect the files into a zip file, and return the zip file. **Issue** The service uses Rest Reactive Client to connect to the individual microservices. So I use the 'Rest Reactive Client with Multipart' approach. But it gives an error. `022-02-25 16:13:11,174 ERROR [org.jbo.res.rea.com.cor.AbstractResteasyReactiveContext] (executor-thread-0) Request failed: javax.ws.rs.ProcessingException: Response could not be mapped to type class com.company.services.exim.client.DownloadFormData` ### Expected behavior A Quarkus microservice using Rest Reactive Client fails with an exception when it connects with a Quarkus Rest Reactive Service. Though the requirement is for Multipart bodies, it fails for normal bodies too. In summary, a Quarkus service calling another quarkus service using Rest Reactive Client fails. ### Actual behavior Quarkus Rest Reactive Client should be able to connect to a Quarkus Rest Service. ### How to Reproduce? Steps to reproduce the issue: 1. Create a Restful Reactive service with two methods, one returning a normal class, while other returns Multipart. 2. Create a separate service with a Restful Reactive Client having the same two methods as defined in Step 1. 3. Call the service through postman. Error occurs: `022-02-25 16:13:11,174 ERROR [org.jbo.res.rea.com.cor.AbstractResteasyReactiveContext] (executor-thread-0) Request failed: javax.ws.rs.ProcessingException: **** could not be mapped to type class ***.***.***.*******` ### Output of `uname -a` or `ver` Microsoft Windows [Version 10.0.19044.1526] ### Output of `java -version` Java HotSpot(TM) 64-Bit Server VM 18.9 (build 11.0.11+9-LTS-194, mixed mode) ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.5.0.FINAL ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.3 (ff8e977a158738155dc465c6a97ffaf31982d739) ### Additional information [Error.txt](https://github.com/quarkusio/quarkus/files/8145574/Error.txt) [raj-quarkus-multipart.zip](https://github.com/quarkusio/quarkus/files/8145575/raj-quarkus-multipart.zip) **Sample** For the sake of simplicity, I am attaching a single project that contains a server project and a client project. - Server package returns a multipart object when export is clicked. - Client package contains the Rest Reactive Client to call the server project. Also attached is the error text. You can run the project and reproduce the same error. Use postman to call the function. Please help find the actual cause of the error. Thanks!

b4e0afddeebf0f536412ddc45cf886d9a13471d6

8efb2f76a0ae1e4d7d7a149cb1ff0c5e2888faef

https://github.com/quarkusio/quarkus/compare/b4e0afddeebf0f536412ddc45cf886d9a13471d6...8efb2f76a0ae1e4d7d7a149cb1ff0c5e2888faef

diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java index 4c73daa59c3..ab9c432c4f4 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java @@ -43,7 +43,7 @@ void shouldParseMultipartResponse() { Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); MultipartData data = client.getFile(); assertThat(data.file).exists(); - verifyWooHooFile(data.file); + verifyWooHooFile(data.file, 10000); assertThat(data.name).isEqualTo("foo"); assertThat(data.panda.weight).isEqualTo("huge"); assertThat(data.panda.height).isEqualTo("medium"); @@ -52,6 +52,18 @@ void shouldParseMultipartResponse() { assertThat(data.numberz).containsSequence(2008, 2011, 2014); } + @Test + void shouldParseMultipartResponseWithSmallFile() { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); + MultipartData data = client.getSmallFile(); + assertThat(data.file).exists(); + verifyWooHooFile(data.file, 1); + assertThat(data.name).isEqualTo("foo"); + assertThat(data.panda).isNull(); + assertThat(data.number).isEqualTo(1984); + assertThat(data.numberz).isNull(); + } + @Test void shouldParseMultipartResponseWithNulls() { Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); @@ -93,7 +105,7 @@ void shouldParseMultipartResponseWithClientBuilderApi() { assertThat(data.numbers).containsSequence(2008, 2011, 2014); } - void verifyWooHooFile(File file) { + void verifyWooHooFile(File file, int expectedTimes) { int position = 0; try (FileReader reader = new FileReader(file)) { int read; @@ -101,7 +113,7 @@ void verifyWooHooFile(File file) { assertThat((char) read).isEqualTo(WOO_HOO_WOO_HOO_HOO.charAt(position % WOO_HOO_WOO_HOO_HOO.length())); position++; } - assertThat(position).isEqualTo(WOO_HOO_WOO_HOO_HOO.length() * 10000); + assertThat(position).isEqualTo(WOO_HOO_WOO_HOO_HOO.length() * expectedTimes); } catch (IOException e) { fail("failed to read provided file", e); } @@ -113,6 +125,11 @@ public interface Client { @Produces(MediaType.MULTIPART_FORM_DATA) MultipartData getFile(); + @GET + @Produces(MediaType.MULTIPART_FORM_DATA) + @Path("/small") + MultipartData getSmallFile(); + @GET @Produces(MediaType.MULTIPART_FORM_DATA) @Path("/empty") @@ -146,6 +163,19 @@ public MultipartData getFile() throws IOException { 1984, new int[] { 2008, 2011, 2014 }); } + @GET + @Produces(MediaType.MULTIPART_FORM_DATA) + @Path("/small") + public MultipartData getSmallFile() throws IOException { + File file = File.createTempFile("toDownload", ".txt"); + file.deleteOnExit(); + // let's write Woo hoo, woo hoo hoo 1 time + try (FileOutputStream out = new FileOutputStream(file)) { + out.write(WOO_HOO_WOO_HOO_HOO.getBytes(StandardCharsets.UTF_8)); + } + return new MultipartData("foo", file, null, 1984, null); + } + @GET @Produces(MediaType.MULTIPART_FORM_DATA) @Path("/empty") diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java index 14af23304ae..c784f803436 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java @@ -51,7 +51,7 @@ public QuarkusMultipartFormUpload(Context context, io.netty.handler.codec.http.HttpMethod.POST, "/"); Charset charset = parts.getCharset() != null ? parts.getCharset() : HttpConstants.DEFAULT_CHARSET; - DefaultHttpDataFactory httpDataFactory = new DefaultHttpDataFactory(DefaultHttpDataFactory.MINSIZE, charset) { + DefaultHttpDataFactory httpDataFactory = new DefaultHttpDataFactory(-1, charset) { @Override public FileUpload createFileUpload(HttpRequest request, String name, String filename, String contentType, String contentTransferEncoding, Charset _charset, long size) { diff --git a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java index 0770f91f9e9..72758422c29 100644 --- a/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java +++ b/independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.java @@ -25,9 +25,7 @@ import io.netty.handler.codec.http.multipart.HttpData; import io.netty.handler.codec.http.multipart.InterfaceHttpData; import io.netty.handler.codec.http.multipart.MemoryAttribute; -import io.netty.handler.codec.http.multipart.MemoryFileUpload; import io.netty.handler.codec.http.multipart.MixedAttribute; -import io.netty.handler.codec.http.multipart.MixedFileUpload; import io.vertx.core.http.HttpClientResponse; import java.io.IOException; import java.nio.charset.Charset; @@ -240,31 +238,16 @@ public Attribute createAttribute(HttpClientResponse response, String name, Strin } // to reuse netty stuff as much as possible, we use FileUpload class to represent the downloaded file + // the difference between this and the original is that we always use DiskFileUpload public FileUpload createFileUpload(HttpClientResponse response, String name, String filename, String contentType, String contentTransferEncoding, Charset charset, long size) { - if (useDisk) { - FileUpload fileUpload = new DiskFileUpload(name, filename, contentType, - contentTransferEncoding, charset, size, baseDir, deleteOnExit); - fileUpload.setMaxSize(maxSize); - checkHttpDataSize(fileUpload); - List<HttpData> list = getList(response); - list.add(fileUpload); - return fileUpload; - } - if (checkSize) { - FileUpload fileUpload = new MixedFileUpload(name, filename, contentType, - contentTransferEncoding, charset, size, minSize, baseDir, deleteOnExit); - fileUpload.setMaxSize(maxSize); - checkHttpDataSize(fileUpload); - List<HttpData> list = getList(response); - list.add(fileUpload); - return fileUpload; - } - MemoryFileUpload fileUpload = new MemoryFileUpload(name, filename, contentType, - contentTransferEncoding, charset, size); + FileUpload fileUpload = new DiskFileUpload(name, filename, contentType, + contentTransferEncoding, charset, size, baseDir, deleteOnExit); fileUpload.setMaxSize(maxSize); checkHttpDataSize(fileUpload); + List<HttpData> list = getList(response); + list.add(fileUpload); return fileUpload; }

['extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartResponseTest.java', 'independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartFormUpload.java', 'independent-projects/resteasy-reactive/client/runtime/src/main/java/org/jboss/resteasy/reactive/client/impl/multipart/QuarkusMultipartResponseDataFactory.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/32703/32702

quarkusio

quarkus

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

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

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

fixes

Native MariaDb with useSsl throw NPE

### Describe the bug When the Jdbc url contains `useSsl=true`, those lines throw a NPE https://github.com/mariadb-corporation/mariadb-connector-j/blob/d541afd6af963d931dd1a86adfb1cbcb1a0af10c/src/main/java/org/mariadb/jdbc/Configuration.java#L672-L679 I guess it's because the processor do not retain the deprecated.properties resource file https://github.com/quarkusio/quarkus/blob/6c7268b90a6f0d76cea39c3ad4520526e66275d9/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java#L65-L71 ### Expected behavior application can connect with `useSsl=true` ### Actual behavior Throw NPE ### Additional information In my case, I have no control over the jdbcUrl. **Would be great to backport it to 2.x**

f14cbb6aa69a498400a19e3181c3d988b676ecfb

6019c4fa82b1e61a10965673a9b5c11af656df26

https://github.com/quarkusio/quarkus/compare/f14cbb6aa69a498400a19e3181c3d988b676ecfb...6019c4fa82b1e61a10965673a9b5c11af656df26

diff --git a/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java b/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java index e652d633874..d5443003105 100644 --- a/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java +++ b/extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.java @@ -68,6 +68,9 @@ void addNativeImageResources(BuildProducer<NativeImageResourceBuildItem> resourc // driver.properties is not added because it only provides optional descriptions for // org.mariadb.jdbc.Driver.getPropertyInfo(), which is probably not even called. resources.produce(new NativeImageResourceBuildItem("mariadb.properties")); + + // necessary when jdbcUrl contains useSsl=true + resources.produce(new NativeImageResourceBuildItem("deprecated.properties")); } @BuildStep

['extensions/jdbc/jdbc-mariadb/deployment/src/main/java/io/quarkus/jdbc/mariadb/deployment/JDBCMariaDBProcessor.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/29734/29732

quarkusio

quarkus

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

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

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

closes

Consuming multiple media types from a resource method does not work

### Describe the bug Consuming multiple media types from a JAX-RS resource method does not work with RR: ``` @Path("postMultiMediaTypeConsumer") @Consumes({"application/soap+xml", MediaType.TEXT_XML}) @POST public Response postMultiMediaTypeConsumer() throws Exception { return Response.ok().build(); } ``` The reason why it does not work is that [MediaTypeMapper](https://github.com/quarkusio/quarkus/blob/main/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java#L38) is only resolving the first media type from the resource method. ### Expected behavior Resolve a JAX-RS method when multiple consume media types are set. ### Actual behavior RR fails to resolve multiple consume media types and only resolves the first one. ### How to Reproduce? ``` @Path("postMultiMediaTypeConsumer") @Consumes({"application/soap+xml", MediaType.TEXT_XML}) @POST public Response postMultiMediaTypeConsumer() throws Exception { return Response.ok().build(); } ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

841d75011753be373046594b78b19162ea34dff5

9dcbd7d7de3b2dbb8bf7b934096b1bfaa7fd8485

https://github.com/quarkusio/quarkus/compare/841d75011753be373046594b78b19162ea34dff5...9dcbd7d7de3b2dbb8bf7b934096b1bfaa7fd8485

diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java index 480d342920c..383b95b3931 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java @@ -28,6 +28,9 @@ */ public class MediaTypeMapper implements ServerRestHandler { + private static final MediaType[] DEFAULT_MEDIA_TYPES = new MediaType[] { MediaType.WILDCARD_TYPE }; + private static final List<MediaType> DEFAULT_MEDIA_TYPES_LIST = List.of(DEFAULT_MEDIA_TYPES); + final Map<MediaType, Holder> resourcesByConsumes; final List<MediaType> consumesTypes; @@ -35,20 +38,17 @@ public MediaTypeMapper(List<RuntimeResource> runtimeResources) { resourcesByConsumes = new HashMap<>(); consumesTypes = new ArrayList<>(); for (RuntimeResource runtimeResource : runtimeResources) { - MediaType consumesMT = runtimeResource.getConsumes().isEmpty() ? MediaType.WILDCARD_TYPE - : runtimeResource.getConsumes().get(0); - if (!resourcesByConsumes.containsKey(consumesMT)) { - consumesTypes.add(consumesMT); - resourcesByConsumes.put(consumesMT, new Holder()); - } - MediaType[] produces = runtimeResource.getProduces() != null - ? runtimeResource.getProduces().getSortedOriginalMediaTypes() - : null; - if (produces == null) { - produces = new MediaType[] { MediaType.WILDCARD_TYPE }; + List<MediaType> consumesMediaTypes = getConsumesMediaTypes(runtimeResource); + for (MediaType consumedMediaType : consumesMediaTypes) { + if (!resourcesByConsumes.containsKey(consumedMediaType)) { + consumesTypes.add(consumedMediaType); + resourcesByConsumes.put(consumedMediaType, new Holder()); + } } - for (MediaType producesMT : produces) { - resourcesByConsumes.get(consumesMT).setResource(runtimeResource, producesMT); + for (MediaType producesMT : getProducesMediaTypes(runtimeResource)) { + for (MediaType consumedMediaType : consumesMediaTypes) { + resourcesByConsumes.get(consumedMediaType).setResource(runtimeResource, producesMT); + } } } for (Holder holder : resourcesByConsumes.values()) { @@ -116,6 +116,17 @@ public MediaType selectMediaType(ResteasyReactiveRequestContext requestContext, return selected; } + private MediaType[] getProducesMediaTypes(RuntimeResource runtimeResource) { + return runtimeResource.getProduces() == null + ? DEFAULT_MEDIA_TYPES + : runtimeResource.getProduces().getSortedOriginalMediaTypes(); + } + + private List<MediaType> getConsumesMediaTypes(RuntimeResource runtimeResource) { + return runtimeResource.getConsumes().isEmpty() ? DEFAULT_MEDIA_TYPES_LIST + : runtimeResource.getConsumes(); + } + private static final class Holder { private final Map<MediaType, RuntimeResource> mtWithoutParamsToResource = new HashMap<>(); diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java index 0dcc8430247..f930b447f4c 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.java @@ -216,4 +216,28 @@ public void postInteger() throws Exception { String responseContent = response.readEntity(String.class); LOG.debug(String.format("Response: %s", responseContent)); } + + @Test + @DisplayName("Post Multi Media Type Consumer") + public void testConsumesMultiMediaType() { + WebTarget target = client.target(generateURL("/postMultiMediaTypeConsumer")); + Response response = target.request().post(Entity.entity("payload", "application/soap+xml")); + Assertions.assertEquals(Response.Status.OK.getStatusCode(), + response.getStatus()); + Assertions.assertEquals("postMultiMediaTypeConsumer", response.readEntity(String.class)); + + response = target.request().post(Entity.entity("payload", MediaType.TEXT_XML)); + Assertions.assertEquals(Response.Status.OK.getStatusCode(), + response.getStatus()); + Assertions.assertEquals("postMultiMediaTypeConsumer", response.readEntity(String.class)); + + response = target.request().post(Entity.entity("payload", "any/media-type")); + Assertions.assertEquals(Response.Status.OK.getStatusCode(), + response.getStatus()); + Assertions.assertEquals("any/media-type", response.readEntity(String.class)); + + response = target.request().post(Entity.entity("payload", "unexpected/media-type")); + Assertions.assertEquals(Response.Status.UNSUPPORTED_MEDIA_TYPE.getStatusCode(), + response.getStatus()); + } } diff --git a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java index 993cb9f9a6e..ba8f67206e0 100644 --- a/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java +++ b/independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java @@ -3,9 +3,11 @@ import java.util.Date; import javax.ws.rs.Consumes; +import javax.ws.rs.HeaderParam; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.Produces; +import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -75,4 +77,18 @@ public Response postIntegerProduce(String source) throws Exception { public Response postInteger(String source) throws Exception { return Response.ok().entity(5).build(); } + + @Path("postMultiMediaTypeConsumer") + @Consumes({ "application/soap+xml", MediaType.TEXT_XML }) + @POST + public Response postMultiMediaTypeConsumer() { + return Response.ok("postMultiMediaTypeConsumer").build(); + } + + @Path("postMultiMediaTypeConsumer") + @Consumes({ "any/media-type" }) + @POST + public Response postMultiMediaTypeConsumerAnyContentType(@HeaderParam(HttpHeaders.CONTENT_TYPE) String contentType) { + return Response.ok(contentType).build(); + } }

['independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/resource/DefaultMediaTypeResource.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/handlers/MediaTypeMapper.java', 'independent-projects/resteasy-reactive/server/vertx/src/test/java/org/jboss/resteasy/reactive/server/vertx/test/resource/basic/DefaultMediaTypeTest.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/26934/26748

quarkusio

quarkus

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

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

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

fix

CVE-2022-2466 - Request Context not terminated with GraphQL

### Describe the bug ~~Upgrading from Quarkus 2.9.x to 2.10.x whenever i try to access `RoutingContext` request from a bean i get always the headers of the first request that have been made to the app.~~ ~~This happens on both @GraphQLApi endpoints and event in any CDI bean that consumes `RoutingContext` or `HttpServerRequest`.~~ ~~Also by debugging, the CurrentVertxRequest has always stale headers.~~ **Update:** The request context was not terminated. The issue is not related to the Routing Context. My dependencies are the following: ```xml <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-kotlin</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-smallrye-graphql</artifactId> </dependency> <dependency> <groupId>io.smallrye</groupId> <artifactId>smallrye-jwt</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-rest-client</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-resteasy</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-rest-client-jackson</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-arc</artifactId> </dependency> <dependency> <groupId>io.quarkus</groupId> <artifactId>quarkus-undertow</artifactId> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-stdlib-jdk8</artifactId> </dependency> ``` CDI bean: ```kotlin @ApplicationScoped class JWTAwareContext @Inject constructor( val routingContext: RoutingContext ): Context { override fun getTenant(): String { return parseClaims()!!.getClaimValueAsString("realm") } override fun getUser(): String { return parseClaims()!!.getClaimValueAsString("email") } fun parseClaims(): JwtClaims? { val rawToken = this.routingContext.request().headers().get("Authorization")?.replace("Bearer ", "") // --> this will always stale in 2.10.x if (rawToken != null) { val jsonClaims = String(Base64.getUrlDecoder().decode(rawToken.split(".")[1]), StandardCharsets.UTF_8) return JwtClaims.parse(jsonClaims) } throw PassProNextForbiddenExceptionGQL(ApiError("Missing Token", ErrorCode.FORBIDDEN)) } } ``` Graphql endpoint ```kotlin @GraphQLApi class Test { @Inject lateinit var routingContext: RoutingContext @Query fun test(): String { return "hello"; } } ``` With 2.9.x works correctly. ### Expected behavior Everytime a new Request is performed by a client, the Request headers should be inline with the actual HTTP Request ### Actual behavior With 2.10.x the first request headers became like cached value and any subsequent request headers will contain those instead of the actual headers ### How to Reproduce? 1) create an app with Quarkus 2.10.1 - 2.10.2 and the smallrye graphql extension 2) create an endpoint or a bean injecting RoutingContext 3) set some HTTP headers like Authorization, MyCustomHeader etc and send the http request 4) print RoutingContext.request().headers 5) set others HTTP headers or remove the previous and send the new http request 6) the second request headers will contain first request data also if you did not send them 7 ) switch to quarkus 2.9.x and will work as expected ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` adopt-openjdk-11.0.8 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.10.1 - 2.10.2 ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) 3.8.1 ### Additional information _No response_

344497091997c5f869d872cec2ce4c00e21d4fc3

08e5c3106ce4bfb18b24a38514eeba6464668b07

https://github.com/quarkusio/quarkus/compare/344497091997c5f869d872cec2ce4c00e21d4fc3...08e5c3106ce4bfb18b24a38514eeba6464668b07

diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java index f0df7f59322..b6f44d441a3 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java @@ -58,22 +58,18 @@ public void handle(Object e) { @Override public void handle(final RoutingContext ctx) { - if (currentManagedContext.isActive()) { - handleWithIdentity(ctx); - } else { - + ctx.response() + .endHandler(currentManagedContextTerminationHandler) + .exceptionHandler(currentManagedContextTerminationHandler) + .closeHandler(currentManagedContextTerminationHandler); + if (!currentManagedContext.isActive()) { currentManagedContext.activate(); - ctx.response() - .endHandler(currentManagedContextTerminationHandler) - .exceptionHandler(currentManagedContextTerminationHandler) - .closeHandler(currentManagedContextTerminationHandler); - - try { - handleWithIdentity(ctx); - } catch (Throwable t) { - currentManagedContext.terminate(); - throw t; - } + } + try { + handleWithIdentity(ctx); + } catch (Throwable t) { + currentManagedContext.terminate(); + throw t; } } diff --git a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java index d153c2c9572..7ff8e8d4039 100644 --- a/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java +++ b/extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java @@ -196,8 +196,8 @@ private JsonObject getJsonObjectFromBody(RoutingContext ctx) throws IOException } private String readBody(RoutingContext ctx) { - if (ctx.getBody() != null) { - return ctx.getBodyAsString(); + if (ctx.body() != null) { + return ctx.body().asString(); } return null; }

['extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLAbstractHandler.java', 'extensions/smallrye-graphql/runtime/src/main/java/io/quarkus/smallrye/graphql/runtime/SmallRyeGraphQLExecutionHandler.java']

{'.java': 2}

Java

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

Apache License 2.0

quarkusio/quarkus/27062/27063

quarkusio

quarkus

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

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

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

fixes

Panache MongoDB doesn't support collation in count

### Describe the bug Panache MongoDB doesn't support `collation` for `count`. Taking a look in the `io.quarkus.mongodb.panache.common.runtime.CommonPanacheQueryImpl` and `io.quarkus.mongodb.panache.common.reactive.runtime.CommonReactivePanacheQueryImpl` we can see the method `count` doesn't support `collation`. Native queries and panache queries already support this, we can confirm in this [PR](https://github.com/loicmathieu/quarkus/commit/5c0a0a2112cc2d33ecc300618f0694846d0f0f1c#diff-610ce4a20cb8ce7c6942db761ecaebe7a4b6fc761e4b4f0b15b7406ec7db305f) from @loicmathieu already merged. I implemented the fix, basically I changed a small piece in `CommonReactivePanacheQueryImpl` and `CommonPanacheQueryImpl`: ``` public Uni<Long> count() { if (count == null) { CountOptions countOptions = new CountOptions(); if (collation != null) { countOptions.collation(collation); } count = mongoQuery == null ? collection.countDocuments() : collection.countDocuments(mongoQuery, countOptions); } return count; } ``` ``` public long count() { if (count == null) { Bson query = getQuery(); CountOptions countOptions = new CountOptions(); if (collation != null) { countOptions.collation(collation); } count = clientSession == null ? collection.countDocuments(query, countOptions) : collection.countDocuments(clientSession, query, countOptions); } return count; } ``` Here is the [PR](https://github.com/quarkusio/quarkus/pull/27062), let me know if I need to change something. Best regards. ### Expected behavior _No response_ ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

ea4990f498023f8b45364f0183c61bace566b7f8

d0bb07268a20cc09a68a6005ac63cc3dc3b0876d

https://github.com/quarkusio/quarkus/compare/ea4990f498023f8b45364f0183c61bace566b7f8...d0bb07268a20cc09a68a6005ac63cc3dc3b0876d

diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/CommonReactivePanacheQueryImpl.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/CommonReactivePanacheQueryImpl.java index 11e71dea326..3e80f4f63f3 100644 --- a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/CommonReactivePanacheQueryImpl.java +++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/CommonReactivePanacheQueryImpl.java @@ -9,6 +9,7 @@ import com.mongodb.ReadPreference; import com.mongodb.client.model.Collation; +import com.mongodb.client.model.CountOptions; import io.quarkus.mongodb.FindOptions; import io.quarkus.mongodb.panache.common.runtime.MongoPropertyUtil; @@ -154,7 +155,14 @@ public <T extends Entity> CommonReactivePanacheQueryImpl<T> withReadPreference(R @SuppressWarnings("unchecked") public Uni<Long> count() { if (count == null) { - count = mongoQuery == null ? collection.countDocuments() : collection.countDocuments(mongoQuery); + CountOptions countOptions = new CountOptions(); + if (collation != null) { + countOptions.collation(collation); + } + + count = mongoQuery == null + ? collection.countDocuments() + : collection.countDocuments(mongoQuery, countOptions); } return count; } diff --git a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/CommonPanacheQueryImpl.java b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/CommonPanacheQueryImpl.java index 73b112ddc07..8ff48b6abd5 100644 --- a/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/CommonPanacheQueryImpl.java +++ b/extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/CommonPanacheQueryImpl.java @@ -16,6 +16,7 @@ import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoCursor; import com.mongodb.client.model.Collation; +import com.mongodb.client.model.CountOptions; import io.quarkus.panache.common.Page; import io.quarkus.panache.common.Range; @@ -157,7 +158,14 @@ public <T extends Entity> CommonPanacheQueryImpl<T> withReadPreference(ReadPrefe public long count() { if (count == null) { Bson query = getQuery(); - count = clientSession == null ? collection.countDocuments(query) : collection.countDocuments(clientSession, query); + CountOptions countOptions = new CountOptions(); + if (collation != null) { + countOptions.collation(collation); + } + + count = clientSession == null + ? collection.countDocuments(query, countOptions) + : collection.countDocuments(clientSession, query, countOptions); } return count; } diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java index 9d8d4cea807..7af7c72c510 100644 --- a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java +++ b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java @@ -113,6 +113,16 @@ public Response testImperativeEntity() { Assertions.assertEquals("aaa", results.get(0).title); Assertions.assertEquals("AAA", results.get(1).title); Assertions.assertEquals("BBB", results.get(2).title); + + //count with collation + collation = Collation.builder() + .locale("en") + .collationStrength(CollationStrength.SECONDARY) + .build(); + Assertions.assertEquals(2, TestImperativeEntity.find("{'title' : ?1}", "aaa").withCollation(collation).count()); + Assertions.assertEquals(2, TestImperativeEntity.find("{'title' : ?1}", "AAA").withCollation(collation).count()); + Assertions.assertEquals(1, TestImperativeEntity.find("{'title' : ?1}", "bbb").withCollation(collation).count()); + Assertions.assertEquals(1, TestImperativeEntity.find("{'title' : ?1}", "BBB").withCollation(collation).count()); entityAUpper.delete(); entityALower.delete(); entityB.delete(); @@ -264,6 +274,17 @@ public Response testImperativeRepository() { Assertions.assertEquals("aaa", results.get(0).title); Assertions.assertEquals("AAA", results.get(1).title); Assertions.assertEquals("BBB", results.get(2).title); + + //count with collation + collation = Collation.builder() + .locale("en") + .collationStrength(CollationStrength.SECONDARY) + .build(); + + Assertions.assertEquals(2, testImperativeRepository.find("{'title' : ?1}", "aaa").withCollation(collation).count()); + Assertions.assertEquals(2, testImperativeRepository.find("{'title' : ?1}", "AAA").withCollation(collation).count()); + Assertions.assertEquals(1, testImperativeRepository.find("{'title' : ?1}", "bbb").withCollation(collation).count()); + Assertions.assertEquals(1, testImperativeRepository.find("{'title' : ?1}", "BBB").withCollation(collation).count()); testImperativeRepository.delete(entityALower); testImperativeRepository.delete(entityAUpper); testImperativeRepository.delete(entityB); @@ -494,6 +515,20 @@ public Response testReactiveEntity() { Assertions.assertEquals("aaa", results.get(0).title); Assertions.assertEquals("AAA", results.get(1).title); Assertions.assertEquals("BBB", results.get(2).title); + + //count with collation + collation = Collation.builder() + .locale("en") + .collationStrength(CollationStrength.SECONDARY) + .build(); + Assertions.assertEquals(2, TestReactiveEntity.find("{'title' : ?1}", "aaa").withCollation(collation).count() + .await().indefinitely()); + Assertions.assertEquals(2, TestReactiveEntity.find("{'title' : ?1}", "AAA").withCollation(collation).count() + .await().indefinitely()); + Assertions.assertEquals(1, TestReactiveEntity.find("{'title' : ?1}", "bbb").withCollation(collation).count() + .await().indefinitely()); + Assertions.assertEquals(1, TestReactiveEntity.find("{'title' : ?1}", "BBB").withCollation(collation).count() + .await().indefinitely()); entityAUpper.delete().await().indefinitely(); entityALower.delete().await().indefinitely(); entityB.delete().await().indefinitely(); @@ -654,6 +689,20 @@ public Response testReactiveRepository() { Assertions.assertEquals("aaa", results.get(0).title); Assertions.assertEquals("AAA", results.get(1).title); Assertions.assertEquals("BBB", results.get(2).title); + + //count with collation + collation = Collation.builder() + .locale("en") + .collationStrength(CollationStrength.SECONDARY) + .build(); + Assertions.assertEquals(2, testReactiveRepository.find("{'title' : ?1}", "aaa").withCollation(collation).count() + .await().indefinitely()); + Assertions.assertEquals(2, testReactiveRepository.find("{'title' : ?1}", "AAA").withCollation(collation).count() + .await().indefinitely()); + Assertions.assertEquals(1, testReactiveRepository.find("{'title' : ?1}", "bbb").withCollation(collation).count() + .await().indefinitely()); + Assertions.assertEquals(1, testReactiveRepository.find("{'title' : ?1}", "BBB").withCollation(collation).count() + .await().indefinitely()); testReactiveRepository.delete(entityALower).await().indefinitely(); testReactiveRepository.delete(entityAUpper).await().indefinitely(); testReactiveRepository.delete(entityB).await().indefinitely();

['integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/test/TestResource.java', 'extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/reactive/runtime/CommonReactivePanacheQueryImpl.java', 'extensions/panache/mongodb-panache-common/runtime/src/main/java/io/quarkus/mongodb/panache/common/runtime/CommonPanacheQueryImpl.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/27091/26938

quarkusio

quarkus

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

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

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

fix

Maven artifacts from additional repo not found during quarkus:build

### Describe the bug Services with dependencies on Maven artifacts that are not on maven-central cannot be built if the repositories are declared only in `settings.xml` and not in the `pom.xml` project. (If the repo is entered in pom.xml, the build for repos works without credentials.) Error message: ``` Failed to execute goal io.quarkus:quarkus-maven-plugin:2.11.0.Final:build (default) on project example-artifact: Failed to build quarkus application: Failed to bootstrap application in NORMAL mode: Failed to resolve dependencies for org.acme:example-artifact:jar:999-SNAPSHOT: Could not find artifact io.confluent:kafka-avro-serializer:jar:7.2.1 in central (https://repo.maven.apache.org/maven2) -> [Help 1] ``` ### Expected behavior Maven artifacts from additional Maven repositories (such as confluent or private repositories) are not found when running mvn quarkus:build. The behavior only occurs if the repositories are defined exclusively in settings.xml. With version 2.10.3.Final, the build still worked correctly. ### Actual behavior Plugin tries to download artifact only from "central" repository and the build breaks with "Could not find artifact" error. Example: ``` Failed to execute goal io.quarkus:quarkus-maven-plugin:2.11.0.Final:build (default) on project example-artifact: Failed to build quarkus application: Failed to bootstrap application in NORMAL mode: Failed to resolve dependencies for org.acme:example-artifact:jar:999-SNAPSHOT: Could not find artifact io.confluent:kafka-avro-serializer:jar:7.2.1 in central (https://repo.maven.apache.org/maven2) -> [Help 1] ``` `mvn compile` can resolve the dependency. Only the quarkus-maven-plugin isn't able to locate the jar. ### How to Reproduce? - Add dependency to an artifact, that isn't on maven-central - Declare the repository only in settings.xml - run mvn quarkus:build Repository in profile in settings.xml: ``` <profiles> <profile> <id>3rdParty-repos</id> <activation> <activeByDefault>true</activeByDefault> </activation> <repositories> <!-- Repository for Confluent--> <repository> <id>confluent</id> <url>https://packages.confluent.io/maven/</url> <snapshots> <enabled>false</enabled> </snapshots> </repository> </repositories> <pluginRepositories> <pluginRepository> <id>confluent-plugins</id> <url>https://packages.confluent.io/maven/</url> <snapshots> <enabled>false</enabled> </snapshots> </pluginRepository> </pluginRepositories> </profile> </profiles> ``` ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.11.0.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Apache Maven 3.8.5 ### Additional information Dependency loading was changed with https://github.com/quarkusio/quarkus/commit/bd30d5cfa498e908e4bea41c508a9da1a820b0b1 AppModel is built only with the `managedRepos` and the repositories of the main-artifact. Other repositories from maven are ignored. - aggregatedRepos with `mangedRepos` and all maven repos: https://github.com/quarkusio/quarkus/blob/main/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java#L254 - Reduce aggregatedRepos to managedRepos and repositories from artifact: https://github.com/quarkusio/quarkus/blob/main/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java#L280-L281 When the reassignment of aggregatedRepos is omitted, `quarkus:build` will work again. But I cannot judge whether this restriction was made deliberately.

f2e4c801027d211f0f539200bff8f2b9034fa962

5657387b2db14008f82652c5399dca5b05179529

https://github.com/quarkusio/quarkus/compare/f2e4c801027d211f0f539200bff8f2b9034fa962...5657387b2db14008f82652c5399dca5b05179529

diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BootstrapFromOriginalJarTestBase.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BootstrapFromOriginalJarTestBase.java index c0943ba8076..0b7a3147953 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BootstrapFromOriginalJarTestBase.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BootstrapFromOriginalJarTestBase.java @@ -26,7 +26,6 @@ import io.quarkus.fs.util.ZipUtils; import io.quarkus.maven.dependency.ArtifactCoords; import io.quarkus.maven.dependency.ArtifactKey; -import io.quarkus.maven.dependency.GACTV; public abstract class BootstrapFromOriginalJarTestBase extends PackageAppTestBase { @@ -145,8 +144,10 @@ protected QuarkusBootstrap.Builder initBootstrapBuilder() throws Exception { modulePom.setParent(parent); final Path moduleDir = IoUtils.mkdirs(ws.resolve(modulePom.getArtifactId())); ModelUtils.persistModel(moduleDir.resolve("pom.xml"), modulePom); - final Path resolvedJar = resolver.resolve(new GACTV(modulePom.getGroupId(), modulePom.getArtifactId(), - moduleDep.getClassifier(), moduleDep.getType(), modulePom.getVersion())).getResolvedPaths() + final Path resolvedJar = resolver + .resolve(ArtifactCoords.of(modulePom.getGroupId(), modulePom.getArtifactId(), + moduleDep.getClassifier(), moduleDep.getType(), modulePom.getVersion())) + .getResolvedPaths() .getSinglePath(); final Path moduleTargetDir = moduleDir.resolve("target"); ZipUtils.unzip(resolvedJar, moduleTargetDir.resolve("classes")); @@ -160,8 +161,10 @@ protected QuarkusBootstrap.Builder initBootstrapBuilder() throws Exception { modulePom.setParent(parent); final Path moduleDir = IoUtils.mkdirs(ws.resolve(modulePom.getArtifactId())); ModelUtils.persistModel(moduleDir.resolve("pom.xml"), modulePom); - final Path resolvedJar = resolver.resolve(new GACTV(modulePom.getGroupId(), modulePom.getArtifactId(), - module.getClassifier(), module.getType(), modulePom.getVersion())).getResolvedPaths() + final Path resolvedJar = resolver + .resolve(ArtifactCoords.of(modulePom.getGroupId(), modulePom.getArtifactId(), + module.getClassifier(), module.getType(), modulePom.getVersion())) + .getResolvedPaths() .getSinglePath(); final Path moduleTargetDir = moduleDir.resolve("target"); ZipUtils.unzip(resolvedJar, moduleTargetDir.resolve("classes")); @@ -201,8 +204,10 @@ protected QuarkusBootstrap.Builder initBootstrapBuilder() throws Exception { modulePom.setParent(parent); final Path moduleDir = IoUtils.mkdirs(ws.resolve(modulePom.getArtifactId())); ModelUtils.persistModel(moduleDir.resolve("pom.xml"), modulePom); - final Path resolvedJar = resolver.resolve(new GACTV(modulePom.getGroupId(), modulePom.getArtifactId(), - a.getClassifier(), a.getType(), modulePom.getVersion())).getResolvedPaths() + final Path resolvedJar = resolver + .resolve(ArtifactCoords.of(modulePom.getGroupId(), modulePom.getArtifactId(), + a.getClassifier(), a.getType(), modulePom.getVersion())) + .getResolvedPaths() .getSinglePath(); final Path moduleTargetDir = moduleDir.resolve("target"); ZipUtils.unzip(resolvedJar, moduleTargetDir.resolve("classes")); @@ -222,6 +227,7 @@ protected QuarkusBootstrap.Builder initBootstrapBuilder() throws Exception { .setWorkspaceDiscovery(true) .setWorkspaceModuleParentHierarchy(workspaceModuleParentHierarchy()) .setRootProjectDir(ws) + .setUserSettings(getSettingsXml() == null ? null : getSettingsXml().toFile()) .setCurrentProject(appPomXml.toString())) .getCurrentProject(); diff --git a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java index 0f6dff9e2ea..3d518736e32 100644 --- a/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java +++ b/core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java @@ -5,6 +5,12 @@ public class SimpleExtAndAppCompileDepsTest extends BootstrapFromOriginalJarTestBase { + @Override + protected boolean setupCustomMavenRepoInSettings() { + // this is to make sure repositories enabled in user settings are properly aggregated + return true; + } + @Override protected TsArtifact composeApplication() { diff --git a/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java b/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java index 8553d60ce73..00a402bcda5 100644 --- a/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java +++ b/devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java @@ -6,7 +6,7 @@ import java.net.MalformedURLException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Collections; +import java.util.Map; import org.apache.maven.settings.Profile; import org.apache.maven.settings.Repository; @@ -78,7 +78,7 @@ static void setup() throws Exception { settingsXml = workDir().resolve("settings.xml"); try (BufferedWriter writer = Files.newBufferedWriter(settingsXml)) { - new DefaultSettingsWriter().write(writer, Collections.emptyMap(), settings); + new DefaultSettingsWriter().write(writer, Map.of(), settings); } testRepo = registryConfigDir.resolve("test-repo"); } @@ -109,7 +109,7 @@ protected static String getCurrentQuarkusVersion() { private static Settings getBaseMavenSettings(Path mavenSettings) throws IOException { if (Files.exists(mavenSettings)) { try (BufferedReader reader = Files.newBufferedReader(mavenSettings)) { - return new DefaultSettingsReader().read(reader, Collections.emptyMap()); + return new DefaultSettingsReader().read(reader, Map.of()); } } return new Settings(); diff --git a/devtools/maven/src/test/java/io/quarkus/maven/DependencyTreeMojoTestBase.java b/devtools/maven/src/test/java/io/quarkus/maven/DependencyTreeMojoTestBase.java index c89f2e5f57a..1ff2aad86c4 100644 --- a/devtools/maven/src/test/java/io/quarkus/maven/DependencyTreeMojoTestBase.java +++ b/devtools/maven/src/test/java/io/quarkus/maven/DependencyTreeMojoTestBase.java @@ -20,7 +20,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import io.quarkus.bootstrap.resolver.BootstrapAppModelResolver; import io.quarkus.bootstrap.resolver.TsArtifact; import io.quarkus.bootstrap.resolver.TsDependency; import io.quarkus.bootstrap.resolver.TsQuarkusExt; @@ -48,7 +47,7 @@ public void setup() throws Exception { .setRemoteRepositories(Collections.emptyList()) .build(); - repoBuilder = TsRepoBuilder.getInstance(new BootstrapAppModelResolver(mvnResolver), workDir); + repoBuilder = TsRepoBuilder.getInstance(mvnResolver, workDir); initRepo(); } diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java index d939ed795b1..9217b3490e2 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java @@ -7,10 +7,10 @@ import io.quarkus.maven.dependency.DependencyFlags; import java.nio.file.Path; import java.util.ArrayList; -import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.stream.Collectors; +import org.eclipse.aether.util.artifact.JavaScopes; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -21,8 +21,8 @@ public abstract class CollectDependenciesBase extends ResolverSetupCleanup { protected TsArtifact root; - protected List<Dependency> expectedResult = Collections.emptyList(); - protected List<Dependency> deploymentDeps = Collections.emptyList(); + protected List<Dependency> expectedResult = List.of(); + protected List<Dependency> deploymentDeps = List.of(); @Override @BeforeEach @@ -57,12 +57,12 @@ protected BootstrapAppModelResolver getTestResolver() throws Exception { } protected Path getInstallDir(TsArtifact artifact) { - return repoHome.resolve(artifact.getGroupId().replace('.', '/')).resolve(artifact.getArtifactId()) + return getInstallDir().resolve(artifact.getGroupId().replace('.', '/')).resolve(artifact.getArtifactId()) .resolve(artifact.getVersion()); } protected TsArtifact install(TsArtifact dep, boolean collected) { - return install(dep, collected ? "compile" : null); + return install(dep, collected ? JavaScopes.COMPILE : null); } protected TsArtifact install(TsArtifact dep, String collectedInScope) { @@ -74,7 +74,7 @@ protected TsArtifact install(TsArtifact dep, String collectedInScope, boolean op } protected TsArtifact install(TsArtifact dep, Path p, boolean collected) { - return install(dep, p, collected ? "compile" : null, false); + return install(dep, p, collected ? JavaScopes.COMPILE : null, false); } protected TsArtifact install(TsArtifact dep, Path p, String collectedInScope, boolean optional) { @@ -93,7 +93,7 @@ protected TsQuarkusExt install(TsQuarkusExt ext) { protected void install(TsQuarkusExt ext, boolean collected) { ext.install(repo); if (collected) { - addCollectedDep(ext.getRuntime(), "compile", false, DependencyFlags.RUNTIME_EXTENSION_ARTIFACT); + addCollectedDep(ext.getRuntime(), JavaScopes.COMPILE, false, DependencyFlags.RUNTIME_EXTENSION_ARTIFACT); addCollectedDeploymentDep(ext.getDeployment()); } } @@ -101,7 +101,7 @@ protected void install(TsQuarkusExt ext, boolean collected) { protected void installAsDep(TsQuarkusExt ext) { ext.install(repo); root.addDependency(ext); - addCollectedDep(ext.getRuntime(), "compile", false, + addCollectedDep(ext.getRuntime(), JavaScopes.COMPILE, false, DependencyFlags.DIRECT | DependencyFlags.RUNTIME_EXTENSION_ARTIFACT | DependencyFlags.TOP_LEVEL_RUNTIME_EXTENSION_ARTIFACT); addCollectedDeploymentDep(ext.getDeployment()); @@ -142,11 +142,11 @@ protected void installAsDep(TsDependency dep, Path p, boolean collected, int... for (int f : flags) { allFlags |= f; } - addCollectedDep(artifact, dep.scope == null ? "compile" : dep.scope, dep.optional, allFlags); + addCollectedDep(artifact, dep.scope == null ? JavaScopes.COMPILE : dep.scope, dep.optional, allFlags); } protected void addCollectedDep(final TsArtifact artifact, int... flags) { - addCollectedDep(artifact, "compile", false, flags); + addCollectedDep(artifact, JavaScopes.COMPILE, false, flags); } protected void addCollectedDep(final TsArtifact artifact, final String scope, boolean optional, int... flags) { @@ -168,7 +168,7 @@ protected void addCollectedDeploymentDep(TsArtifact ext) { deploymentDeps = new ArrayList<>(); } deploymentDeps - .add(new ArtifactDependency(ext.toArtifact(), "compile", + .add(new ArtifactDependency(ext.toArtifact(), JavaScopes.COMPILE, DependencyFlags.DEPLOYMENT_CP)); } diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java index fe7f14a67b6..83c8da19979 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java @@ -4,11 +4,20 @@ import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.bootstrap.resolver.maven.workspace.LocalProject; import io.quarkus.bootstrap.util.IoUtils; +import java.io.BufferedWriter; import java.io.IOException; +import java.net.MalformedURLException; +import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import org.apache.maven.settings.Activation; +import org.apache.maven.settings.Profile; +import org.apache.maven.settings.Repository; +import org.apache.maven.settings.RepositoryPolicy; +import org.apache.maven.settings.Settings; +import org.apache.maven.settings.io.DefaultSettingsWriter; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +28,9 @@ public class ResolverSetupCleanup { protected Path workDir; - protected Path repoHome; + private Path repoHome; + private Path localRepoHome; + private Path settingsXml; protected BootstrapAppModelResolver resolver; protected TsRepoBuilder repo; @@ -30,8 +41,45 @@ public void setup() throws Exception { setSystemProperties(); workDir = initWorkDir(); repoHome = IoUtils.mkdirs(workDir.resolve("repo")); + if (setupCustomMavenRepoInSettings()) { + localRepoHome = IoUtils.mkdirs(workDir).resolve("local-repo"); + + final Settings settings = new Settings(); + final Profile profile = new Profile(); + final Activation activation = new Activation(); + activation.setActiveByDefault(true); + profile.setActivation(activation); + final Repository repo = new Repository(); + repo.setId("custom-repo"); + repo.setName("Custom Test Repo"); + repo.setLayout("default"); + try { + repo.setUrl(repoHome.toUri().toURL().toExternalForm()); + } catch (MalformedURLException e) { + throw new BootstrapMavenException("Failed to initialize Maven repo URL", e); + } + RepositoryPolicy policy = new RepositoryPolicy(); + policy.setEnabled(true); + policy.setChecksumPolicy("ignore"); + policy.setUpdatePolicy("never"); + repo.setReleases(policy); + repo.setSnapshots(policy); + profile.setId("custom-repo"); + profile.addRepository(repo); + settings.addProfile(profile); + + settingsXml = workDir.resolve("settings.xml"); + try (BufferedWriter writer = Files.newBufferedWriter(settingsXml)) { + new DefaultSettingsWriter().write(writer, Map.of(), settings); + } catch (IOException e) { + throw new BootstrapMavenException("Failed to persist settings.xml", e); + } + } else { + localRepoHome = repoHome; + } + resolver = newAppModelResolver(null); - repo = TsRepoBuilder.getInstance(resolver, workDir); + repo = TsRepoBuilder.getInstance(newArtifactResolver(null, true), workDir); } @AfterEach @@ -51,6 +99,22 @@ public void cleanup() { } } + protected Path getInstallDir() { + return repoHome; + } + + /** + * Enabling this option will install all the artifacts to a Maven repo that + * will be enabled in the Maven settings as a remote repo for the test. + * Otherwise, all the artifacts will be installed in a Maven repo that will + * be configured as a local repo for the test. + * + * @return whether to setup a custom remote Maven repo for the test + */ + protected boolean setupCustomMavenRepoInSettings() { + return false; + } + protected void setSystemProperties() { } @@ -68,6 +132,10 @@ protected Path initWorkDir() { return IoUtils.createRandomTmpDir(); } + protected Path getSettingsXml() { + return settingsXml; + } + protected boolean cleanWorkDir() { return true; } @@ -85,12 +153,24 @@ protected BootstrapAppModelResolver newAppModelResolver(LocalProject currentProj } protected MavenArtifactResolver newArtifactResolver(LocalProject currentProject) throws BootstrapMavenException { - return MavenArtifactResolver.builder() - .setLocalRepository(repoHome.toString()) + return newArtifactResolver(currentProject, false); + } + + private MavenArtifactResolver newArtifactResolver(LocalProject currentProject, boolean forInstalling) + throws BootstrapMavenException { + final MavenArtifactResolver.Builder builder = MavenArtifactResolver.builder() .setOffline(true) .setWorkspaceDiscovery(false) - .setCurrentProject(currentProject) - .build(); + .setCurrentProject(currentProject); + if (forInstalling) { + builder.setLocalRepository(repoHome.toString()); + } else { + builder.setLocalRepository(localRepoHome.toString()); + if (settingsXml != null) { + builder.setUserSettings(settingsXml.toFile()).setOffline(false); + } + } + return builder.build(); } protected TsJar newJar() throws IOException { diff --git a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java index 43b240a2c4c..2f1ff0e7b62 100644 --- a/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java +++ b/independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java @@ -1,12 +1,16 @@ package io.quarkus.bootstrap.resolver; +import io.quarkus.bootstrap.resolver.maven.BootstrapMavenException; +import io.quarkus.bootstrap.resolver.maven.MavenArtifactResolver; import io.quarkus.bootstrap.resolver.maven.workspace.ModelUtils; import io.quarkus.maven.dependency.ArtifactCoords; import java.io.BufferedWriter; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.util.Map; import java.util.UUID; +import org.eclipse.aether.artifact.DefaultArtifact; /** * @@ -18,14 +22,14 @@ private static void error(String message, Throwable t) { throw new IllegalStateException(message, t); } - public static TsRepoBuilder getInstance(BootstrapAppModelResolver resolver, Path workDir) { + public static TsRepoBuilder getInstance(MavenArtifactResolver resolver, Path workDir) { return new TsRepoBuilder(resolver, workDir); } protected final Path workDir; - private final BootstrapAppModelResolver resolver; + private final MavenArtifactResolver resolver; - private TsRepoBuilder(BootstrapAppModelResolver resolver, Path workDir) { + private TsRepoBuilder(MavenArtifactResolver resolver, Path workDir) { this.resolver = resolver; this.workDir = workDir; } @@ -77,8 +81,10 @@ public void install(TsArtifact artifact, Path p) { protected void install(ArtifactCoords artifact, Path file) { try { - resolver.install(artifact, file); - } catch (AppModelResolverException e) { + resolver.install(new DefaultArtifact(artifact.getGroupId(), artifact.getArtifactId(), artifact.getClassifier(), + artifact.getType(), + artifact.getVersion(), Map.of(), file.toFile())); + } catch (BootstrapMavenException e) { error("Failed to install " + artifact, e); } } diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java index 7f0dc13be3e..12f32324d52 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java @@ -277,7 +277,7 @@ private ApplicationModel doResolveModel(ArtifactCoords coords, directMvnDeps = DependencyUtils.mergeDeps(directMvnDeps, appArtifactDescr.getDependencies(), managedVersions, getExcludedScopes()); - aggregatedRepos = mvn.aggregateRepositories(managedRepos, + aggregatedRepos = mvn.aggregateRepositories(aggregatedRepos, mvn.newResolutionRepositories(appArtifactDescr.getRepositories())); return buildAppModel(appArtifact, diff --git a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java index d17c5161a23..f538d1a74d2 100644 --- a/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java +++ b/independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java @@ -148,7 +148,7 @@ public BootstrapMavenContext(BootstrapMavenContextConfig<?> config) if (config.rootProjectDir == null) { final String topLevelBaseDirStr = PropertyUtils.getProperty(MAVEN_TOP_LEVEL_PROJECT_BASEDIR); if (topLevelBaseDirStr != null) { - final Path tmp = Paths.get(topLevelBaseDirStr); + final Path tmp = Path.of(topLevelBaseDirStr); if (!Files.exists(tmp)) { throw new BootstrapMavenException("Top-level project base directory " + topLevelBaseDirStr + " specified with system property " + MAVEN_TOP_LEVEL_PROJECT_BASEDIR + " does not exist");

['core/deployment/src/test/java/io/quarkus/deployment/runnerjar/SimpleExtAndAppCompileDepsTest.java', 'independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/maven/BootstrapMavenContext.java', 'devtools/cli/src/test/java/io/quarkus/cli/RegistryClientBuilderTestBase.java', 'core/deployment/src/test/java/io/quarkus/deployment/runnerjar/BootstrapFromOriginalJarTestBase.java', 'independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/TsRepoBuilder.java', 'independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/CollectDependenciesBase.java', 'independent-projects/bootstrap/core/src/test/java/io/quarkus/bootstrap/resolver/ResolverSetupCleanup.java', 'independent-projects/bootstrap/maven-resolver/src/main/java/io/quarkus/bootstrap/resolver/BootstrapAppModelResolver.java', 'devtools/maven/src/test/java/io/quarkus/maven/DependencyTreeMojoTestBase.java']

{'.java': 9}

Java

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

Apache License 2.0

quarkusio/quarkus/27196/27194

quarkusio

quarkus

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

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

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

resolves

AutoAddScopeBuildItem.isUnremovable() is ignored

https://github.com/quarkusio/quarkus/discussions/27103 An additional `UnremovableBeanBuildItem` should be used as a workaround Thanks @azzazzel for spotting the issue!

d9a76859de1d0c3ad89a5461b45f5b6791ffdfd7

eaed7bddce3e21a8cd9db4c22dbeceb2c04c82e7

https://github.com/quarkusio/quarkus/compare/d9a76859de1d0c3ad89a5461b45f5b6791ffdfd7...eaed7bddce3e21a8cd9db4c22dbeceb2c04c82e7

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java index ade8a079fb9..6df8e7ceb9e 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java @@ -1,9 +1,10 @@ package io.quarkus.arc.deployment; import java.util.Comparator; -import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; import java.util.function.BiConsumer; import java.util.function.Predicate; import java.util.stream.Collectors; @@ -43,7 +44,8 @@ void annotationTransformer(List<AutoAddScopeBuildItem> autoScopes, CustomScopeAn containerAnnotationNames.add(DotNames.PRE_DESTROY); containerAnnotationNames.add(DotNames.INJECT); - Set<DotName> unremovables = new HashSet<>(); + ConcurrentMap<DotName, AutoAddScopeBuildItem> unremovables = sortedAutoScopes.stream() + .anyMatch(AutoAddScopeBuildItem::isUnremovable) ? new ConcurrentHashMap<>() : null; annotationsTransformers.produce(new AnnotationsTransformerBuildItem(new AnnotationsTransformer() { @@ -94,8 +96,8 @@ public void transform(TransformationContext context) { scope = autoScope.getDefaultScope(); reason = autoScope.getReason(); context.transform().add(scope).done(); - if (autoScope.isUnremovable()) { - unremovables.add(clazz.name()); + if (unremovables != null && autoScope.isUnremovable()) { + unremovables.put(clazz.name(), autoScope); } LOGGER.debugf("Automatically added scope %s to class %s: %s", scope, clazz, autoScope.getReason()); } @@ -103,12 +105,12 @@ public void transform(TransformationContext context) { } })); - if (!unremovables.isEmpty()) { + if (unremovables != null) { unremovableBeans.produce(new UnremovableBeanBuildItem(new Predicate<BeanInfo>() { @Override public boolean test(BeanInfo bean) { - return bean.isClassBean() && unremovables.contains(bean.getBeanClass()); + return bean.isClassBean() && unremovables.containsKey(bean.getBeanClass()); } })); } diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java index d96ceaebe26..ec9038412da 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.java @@ -1,6 +1,7 @@ package io.quarkus.arc.test.autoscope; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.UUID; @@ -13,6 +14,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import io.quarkus.arc.Arc; import io.quarkus.arc.deployment.AutoAddScopeBuildItem; import io.quarkus.arc.processor.BuiltinScope; import io.quarkus.builder.BuildContext; @@ -46,6 +48,14 @@ public void execute(BuildContext context) { }).defaultScope(BuiltinScope.SINGLETON).priority(10).reason("Foo!").build()); } }).produces(AutoAddScopeBuildItem.class).build(); + b.addBuildStep(new BuildStep() { + @Override + public void execute(BuildContext context) { + context.produce(AutoAddScopeBuildItem.builder().match((clazz, annotations, index) -> { + return clazz.name().toString().equals(NotABean.class.getName()); + }).defaultScope(BuiltinScope.SINGLETON).unremovable().build()); + } + }).produces(AutoAddScopeBuildItem.class).build(); }).setLogRecordPredicate(log -> "AutoScopeBuildItemTest".equals(log.getLoggerName())) .assertLogRecords(records -> { assertEquals(1, records.size()); @@ -56,10 +66,14 @@ public void execute(BuildContext context) { Instance<SimpleBean> instance; @Test - public void testBean() { + public void testBeans() { assertTrue(instance.isResolvable()); // The scope should be @Singleton assertEquals(instance.get().ping(), instance.get().ping()); + + NotABean notABean1 = Arc.container().instance(NotABean.class).get(); + assertNotNull(notABean1); + assertEquals(notABean1.ping(), Arc.container().instance(NotABean.class).get().ping()); } static class SimpleBean { @@ -77,4 +91,20 @@ void init() { } + // add @Singleton and make it unremovable + static class NotABean { + + private String id; + + public String ping() { + return id; + } + + @PostConstruct + void init() { + id = UUID.randomUUID().toString(); + } + + } + }

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoAddScopeProcessor.java', 'extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoscope/AutoScopeBuildItemTest.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/27207/27198

quarkusio

quarkus

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

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

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

resolves

Arc Ignoring injected field

### Describe the bug When building the project we get the following warning: ```java [io.qua.arc.pro.Injection] (build-56) An injection field must be non-static and non-final - ignoring ``` with the given class ```java package //s.service; package // omitted import java.time.LocalDate; import java.util.Collection; import java.util.List; import java.util.Optional; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.inject.Named; import javax.ws.rs.BadRequestException; import //.GlobalConstants; import //.KeycloackService; import //r.BasicUserWithHistoriesDto; import //.UserHistory; import //.HistoryRepository; import //.HistoryUpdateHandler; import //.HttpCacheHandler; @ApplicationScoped @RequiredArgsConstructor(onConstructor = @__(@Inject)) @Slf4j public class HistoryService { private final KeycloackService keycloackService; private final HistoryRepository historyRepository; @Named(GlobalConstants.POST_HISTORY_HANDLERS_NAME) private final List<HistoryUpdateHandler> historyHooks; private final HttpCacheHandler<Collection<BasicUserWithHistoriesDto>, Long> userHistoriesCache; // rest of the code omitted } ``` and the given lombok conf ``` config.stopBubbling = true lombok.addLombokGeneratedAnnotation = true lombok.copyableAnnotations += javax.inject.Named ``` producing the given source: ```java // Generated by delombok at Tue Aug 09 11:28:41 CEST 2022 package // omitted import java.time.LocalDate; import java.util.Collection; import java.util.List; import java.util.Optional; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import javax.inject.Named; import javax.ws.rs.BadRequestException; import //.GlobalConstants; import //.KeycloackService; import //r.BasicUserWithHistoriesDto; import //.UserHistory; import //.HistoryRepository; import //.HistoryUpdateHandler; import //.HttpCacheHandler; @ApplicationScoped public class HistoryService { @java.lang.SuppressWarnings("all") @lombok.Generated private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(HistoryService.class); private final KeycloackService keycloackService; private final HistoryRepository historyRepository; @Named(GlobalConstants.POST_HISTORY_HANDLERS_NAME) private final List<HistoryUpdateHandler> historyHooks; private final HttpCacheHandler<Collection<BasicUserWithHistoriesDto>, Long> userHistoriesCache; // rest of the code omitted @Inject @java.lang.SuppressWarnings("all") @lombok.Generated public HistoryService(final KeycloackService keycloackService, final HistoryRepository historyRepository, @Named(GlobalConstants.POST_HISTORY_HANDLERS_NAME) final List<HistoryUpdateHandler> historyHooks, final HttpCacheHandler<Collection<BasicUserWithHistoriesDto>, Long> userHistoriesCache) { this.keycloackService = keycloackService; this.historyRepository = historyRepository; this.historyHooks = historyHooks; this.userHistoriesCache = userHistoriesCache; } } ``` ### Expected behavior No warning as we use the constructor to inject the value in the field and not `@Inject` ### Actual behavior We get the warning [io.qua.arc.pro.Injection] (build-56) An injection field must be non-static and non-final - ignoring ### How to Reproduce? 1. Use Quarkus 2.11.2.Final 2. Use Lombok with the given configuration 3. Build the project ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` 11 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.11.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) maven ### Additional information _No response_

dc51ebc7ea34339b43139cd16bf8ac4d44ef868a

6ee79e92f4f6aa33700c1e4cd1edc0690aefea16

https://github.com/quarkusio/quarkus/compare/dc51ebc7ea34339b43139cd16bf8ac4d44ef868a...6ee79e92f4f6aa33700c1e4cd1edc0690aefea16

diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java index ffaa6bca3f6..35159793b75 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java @@ -48,7 +48,7 @@ public class ArcConfig { public String removeUnusedBeans; /** - * If set to true {@code @Inject} is automatically added to all non-static fields that are annotated with + * If set to true {@code @Inject} is automatically added to all non-static non-final fields that are annotated with * one of the annotations defined by {@link AutoInjectAnnotationBuildItem}. */ @ConfigItem(defaultValue = "true") diff --git a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java index 861dd020650..2da0e5b6d9c 100644 --- a/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java +++ b/extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java @@ -11,6 +11,7 @@ import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.DotName; +import org.jboss.jandex.FieldInfo; import org.jboss.logging.Logger; import io.quarkus.arc.processor.AnnotationsTransformer; @@ -69,7 +70,10 @@ public int getPriority() { @Override public void transform(TransformationContext ctx) { Collection<AnnotationInstance> fieldAnnotations = ctx.getAnnotations(); - if (Modifier.isStatic(ctx.getTarget().asField().flags()) || contains(fieldAnnotations, DotNames.INJECT) + FieldInfo field = ctx.getTarget().asField(); + if (Modifier.isStatic(field.flags()) + || Modifier.isFinal(field.flags()) + || contains(fieldAnnotations, DotNames.INJECT) || contains(fieldAnnotations, DotNames.PRODUCES)) { return; } diff --git a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java index 69333fcd13e..96b10acffdb 100644 --- a/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java +++ b/extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.java @@ -6,6 +6,7 @@ import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; @@ -35,11 +36,17 @@ public class AutoFieldInjectionTest { public void testInjectionWorks() { assertEquals("ok", bean.foo); assertEquals(1l, bean.bar); + assertNull(Client.staticFoo); + assertNull(bean.baz); } @Dependent static class Client { + // @Inject should not be added here + @MyQualifier + static String staticFoo; + // @Inject is added automatically @MyQualifier String foo; @@ -47,6 +54,14 @@ static class Client { @MyQualifier Long bar; + // @Inject should not be added here + @MyQualifier + final Long baz; + + Client() { + this.baz = null; + } + } static class Producer {

['extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/ArcConfig.java', 'extensions/arc/deployment/src/main/java/io/quarkus/arc/deployment/AutoInjectFieldProcessor.java', 'extensions/arc/deployment/src/test/java/io/quarkus/arc/test/autoinject/AutoFieldInjectionTest.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/27336/27122

quarkusio

quarkus

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

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

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

fixes

io.quarkus.oidc.OidcSession uses Instant to present duration

### Describe the bug In, io.quarkus.oidc.OidcSession (https://github.com/quarkusio/quarkus/blob/main/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcSession.java), it uses Instant to present duration. ``` /** * Return an {@linkplain:Instant} indicating how long will it take for the current session to expire. * * @return */ Instant expiresIn(); ``` Based on [Javadoc](https://docs.oracle.com/javase/8/docs/api/java/time/Instant.html), it is an instantaneous point on the time-line. But the comment says "how long", it should be Duration. When using it in app, it seems that the value is filled with Duration too. e.g. One value I got is `"expiresIn": "1970-01-01T00:23:05Z"`. I guess it means the session has 23 hours and 5 minutes to expire. Personally, I prefer to use Instant but it should assigned the correct time value (a duration value is a little hard to predict the ending time without base time) and the comment should be updated. ### Expected behavior Using Instant but it should assigned the correct time value (a duration value is a little hard to predict the ending time without base time) and the comment should be updated. ### Actual behavior It uses Instant with the wrong value and comment is misleading. ### How to Reproduce? Just any endpoint with injection of OidcSession. ### Output of `uname -a` or `ver` Darwin Kernel Version 21.4.0 ### Output of `java -version` openjdk version "18" 2022-03-2 ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev 2.8.2.Final ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) Gradle 7.4.1 ### Additional information _No response_

e85d92aa11525e35f342540045b09b4f5e5fb8c6

4677e9e3f4ddbc4c395a61361b3bd6f2d71778fa

https://github.com/quarkusio/quarkus/compare/e85d92aa11525e35f342540045b09b4f5e5fb8c6...4677e9e3f4ddbc4c395a61361b3bd6f2d71778fa

diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcSession.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcSession.java index 66fe190fa95..9f50af65aed 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcSession.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcSession.java @@ -1,5 +1,6 @@ package io.quarkus.oidc; +import java.time.Duration; import java.time.Instant; import org.eclipse.microprofile.jwt.JsonWebToken; @@ -18,10 +19,31 @@ public interface OidcSession { /** * Return an {@linkplain:Instant} indicating how long will it take for the current session to expire. * - * @return + * @deprecated This method shouldn't be used as it provides an instant corresponding to 1970-01-01T0:0:0Z plus the duration + * of the validity of the token, which is impractical. Please use either {@link #expiresAt()} or + * {@link #validFor()} depending on your requirements. This method will be removed in a later version of + * Quarkus. + * + * @return Instant */ + @Deprecated(forRemoval = true, since = "2.12.0") Instant expiresIn(); + /** + * Return an {@linkplain Instant} representing the current session's expiration time. + * + * @return Instant + */ + Instant expiresAt(); + + /** + * Return a {@linkplain Duration} indicating how long the current session will remain valid for + * starting from this method's invocation time. + * + * @return Duration + */ + Duration validFor(); + /** * Perform a local logout without a redirect to the OpenId Connect provider. * diff --git a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java index 80f897682aa..af5e1e6b9a4 100644 --- a/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java +++ b/extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java @@ -1,5 +1,6 @@ package io.quarkus.oidc.runtime; +import java.time.Duration; import java.time.Instant; import java.util.function.Function; @@ -56,9 +57,19 @@ public Instant expiresIn() { return Instant.ofEpochSecond(idToken.getExpirationTime() - nowSecs); } + @Override + public Instant expiresAt() { + return Instant.ofEpochSecond(idToken.getExpirationTime()); + } + + @Override + public Duration validFor() { + final long nowSecs = System.currentTimeMillis() / 1000; + return Duration.ofSeconds(idToken.getExpirationTime() - nowSecs); + } + @Override public JsonWebToken getIdToken() { return idToken; } - } diff --git a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java index bca5b831aed..4f752143d3e 100644 --- a/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java +++ b/integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java @@ -27,7 +27,8 @@ public String getTenant() { @Path("query") @Authenticated public String getTenantWithQuery(@QueryParam("code") String value) { - return getTenant() + "?code=" + value; + return getTenant() + "?code=" + value + "&expiresAt=" + session.expiresAt().getEpochSecond() + + "&expiresInDuration=" + session.validFor().getSeconds(); } @GET diff --git a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java index 4c7b5516cd8..c1571712c69 100644 --- a/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java +++ b/integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java @@ -33,6 +33,7 @@ import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.smallrye.jwt.util.KeyUtils; +import io.vertx.core.json.JsonObject; /** * @author <a href="mailto:psilva@redhat.com">Pedro Igor</a> @@ -256,10 +257,18 @@ public void testCodeFlowForceHttpsRedirectUriWithQueryAndPkce() throws Exception URI endpointLocationWithoutQueryUri = URI.create(endpointLocationWithoutQuery); assertEquals("code=b", endpointLocationWithoutQueryUri.getRawQuery()); - page = webClient.getPage(endpointLocationWithoutQueryUri.toURL()); - assertEquals("tenant-https:reauthenticated?code=b", page.getBody().asText()); Cookie sessionCookie = getSessionCookie(webClient, "tenant-https_test"); assertNotNull(sessionCookie); + JsonObject idToken = OidcUtils.decodeJwtContent(sessionCookie.getValue().split("\\\\|")[0]); + String expiresAt = idToken.getInteger("exp").toString(); + page = webClient.getPage(endpointLocationWithoutQueryUri.toURL()); + String response = page.getBody().asText(); + assertTrue( + response.startsWith("tenant-https:reauthenticated?code=b&expiresAt=" + expiresAt + "&expiresInDuration=")); + Integer duration = Integer.valueOf(response.substring(response.length() - 1)); + assertTrue(duration > 1 && duration < 5); + sessionCookie = getSessionCookie(webClient, "tenant-https_test"); + assertNotNull(sessionCookie); webClient.getCookieManager().clearCookies(); } }

['extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcSessionImpl.java', 'integration-tests/oidc-code-flow/src/test/java/io/quarkus/it/keycloak/CodeFlowTest.java', 'integration-tests/oidc-code-flow/src/main/java/io/quarkus/it/keycloak/TenantHttps.java', 'extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcSession.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/27342/27291

quarkusio

quarkus

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

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

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

fixes

BasicAuthenticationMechanism challenge contains a `Quarkus` realm property

### Describe the bug It adds `realm="Quarkus"` to the `WWW-Authenticate` header - it is an implementation detail (that `Quarkus` is used) and also adding `realm` causes side-effects for some applications. ### Expected behavior `realm` property should be returned only if it is configured ### Actual behavior _No response_ ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

233f8b86ce1f3cd51587c42ecc286bcea19643f8

c8843a7f7fd98e6ef135dd9c93d5580c04ad395e

https://github.com/quarkusio/quarkus/compare/233f8b86ce1f3cd51587c42ecc286bcea19643f8...c8843a7f7fd98e6ef135dd9c93d5580c04ad395e

diff --git a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CombinedFormBasicAuthTestCase.java b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CombinedFormBasicAuthTestCase.java index f1ff0f674b6..ea98c661856 100644 --- a/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CombinedFormBasicAuthTestCase.java +++ b/extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CombinedFormBasicAuthTestCase.java @@ -23,6 +23,7 @@ public class CombinedFormBasicAuthTestCase { private static final String APP_PROPS = "" + "quarkus.http.auth.basic=true\\n" + + "quarkus.http.auth.realm=TestRealm\\n" + "quarkus.http.auth.form.enabled=true\\n" + "quarkus.http.auth.form.login-page=login\\n" + "quarkus.http.auth.form.error-page=error\\n" + @@ -154,7 +155,7 @@ public void testBasicAuthFailure() { .then() .assertThat() .statusCode(401) - .header("WWW-Authenticate", equalTo("basic realm=\\"Quarkus\\"")); + .header("WWW-Authenticate", equalTo("basic realm=\\"TestRealm\\"")); } } diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AuthConfig.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AuthConfig.java index c2bfb0bb43a..3e609d66f98 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AuthConfig.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AuthConfig.java @@ -29,8 +29,8 @@ public class AuthConfig { /** * The authentication realm */ - @ConfigItem(defaultValue = "Quarkus") - public String realm; + @ConfigItem + public Optional<String> realm; /** * The HTTP permissions diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java index 1abbb36a500..60566daba95 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java @@ -95,7 +95,7 @@ public BasicAuthenticationMechanism(final String realmName, final boolean silent public BasicAuthenticationMechanism(final String realmName, final boolean silent, Charset charset, Map<Pattern, Charset> userAgentCharsets) { - this.challenge = BASIC_PREFIX + "realm=\\"" + realmName + "\\""; + this.challenge = realmName == null ? BASIC : BASIC_PREFIX + "realm=\\"" + realmName + "\\""; this.silent = silent; this.charset = charset; this.userAgentCharsets = Collections.unmodifiableMap(new LinkedHashMap<>(userAgentCharsets)); diff --git a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java index 9a17a290d64..48a55cba4d3 100644 --- a/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java +++ b/extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java @@ -279,7 +279,8 @@ public Supplier<?> setupBasicAuth(HttpBuildTimeConfig buildTimeConfig) { return new Supplier<BasicAuthenticationMechanism>() { @Override public BasicAuthenticationMechanism get() { - return new BasicAuthenticationMechanism(buildTimeConfig.auth.realm, buildTimeConfig.auth.form.enabled); + return new BasicAuthenticationMechanism(buildTimeConfig.auth.realm.orElse(null), + buildTimeConfig.auth.form.enabled); } }; } 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 993d3b9ac2b..7e98044f368 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 @@ -75,7 +75,7 @@ public void testBasicAuthWrongPassword() { .when().get("/api/users/me") .then() .statusCode(401) - .header("WWW-Authenticate", equalTo("basic realm=\\"Quarkus\\"")); + .header("WWW-Authenticate", equalTo("basic")); } @Test @@ -144,7 +144,7 @@ public void testVerificationFailedNoBearerTokenAndBasicCreds() { RestAssured.given() .when().get("/api/users/me").then() .statusCode(401) - .header("WWW-Authenticate", equalTo("basic realm=\\"Quarkus\\"")); + .header("WWW-Authenticate", equalTo("basic")); } @Test @@ -171,7 +171,7 @@ public void testBearerAuthFailureWhereBasicIsRequired() { .when().get("/basic-only") .then() .statusCode(401) - .header("WWW-Authenticate", equalTo("basic realm=\\"Quarkus\\"")); + .header("WWW-Authenticate", equalTo("basic")); } @Test

['integration-tests/oidc/src/test/java/io/quarkus/it/keycloak/BearerTokenAuthorizationTest.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/HttpSecurityRecorder.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/security/BasicAuthenticationMechanism.java', 'extensions/vertx-http/runtime/src/main/java/io/quarkus/vertx/http/runtime/AuthConfig.java', 'extensions/vertx-http/deployment/src/test/java/io/quarkus/vertx/http/security/CombinedFormBasicAuthTestCase.java']

{'.java': 5}

Java

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

Apache License 2.0

quarkusio/quarkus/27497/27229

quarkusio

quarkus

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

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

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

solve

Broken context propagation in HTTP request that involves hibernate-reactive-panache, resteasy-reactive and qute

### Describe the bug The CDI request context is not active when a template (that leverages a `@RequestScoped` bean) is rendered in a `Uni` chain: ```java @GET public Uni<TemplateInstance> get(@QueryParam("id") Long id) { // Fruit extends io.quarkus.hibernate.reactive.panache.PanacheEntity return Fruit.findById(id).onItem().transform(f -> Templates.fruit((Fruit) f)); } ``` ### How to Reproduce? 1. Checkout [this quarkus-quickstarts branch](https://github.com/mkouba/quarkus-quickstarts/tree/req-context-not-active) 2. Run the modified `hibernate-reactive-panache-quickstart` in the dev mode (can be reproduced in the prod mode as well) 3. HTTP GET `http://localhost:8080/test/template?id=1` You should see a `ContextNotActiveException` in the console. UPDATE: I've added two more simplified resource methods which produce a slightly different error: ``` javax.enterprise.inject.IllegalProductException: Normal scoped producer method may not return null: io.quarkus.vertx.http.runtime.CurrentVertxRequest.getCurrent() ``` It seems that the request context is active but the `CurrentVertxRequest` bean instance is not propagated. How to get this error: 1. HTTP GET `http://localhost:8080/test/simple?id=1` - this one does not involve a qute template 2. HTTP GET `http://localhost:8080/test/no-hibernate?id=1` - this one does not involve `hibernate-reactive-panache` It might be as well a PEBKAC on my side. I would be more than happy if someone explains to me what's going on here ;-)

da0581f3047d547400d7fc323b9ed86ebc792130

edfd6114cd0345d7bb2083b88dff87e97e8833f9

https://github.com/quarkusio/quarkus/compare/da0581f3047d547400d7fc323b9ed86ebc792130...edfd6114cd0345d7bb2083b88dff87e97e8833f9

diff --git a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java index 10b7dc86e0e..ebf2667b445 100644 --- a/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java +++ b/extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.java @@ -24,6 +24,8 @@ public void handle(ResteasyReactiveRequestContext requestContext) { return; } + requestContext.requireCDIRequestScope(); + if (engine == null) { synchronized (this) { if (engine == null) {

['extensions/resteasy-reactive/quarkus-resteasy-reactive-qute/runtime/src/main/java/io/quarkus/resteasy/reactive/qute/runtime/TemplateResponseUniHandler.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/27498/27083

quarkusio

quarkus

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

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

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

fix

RESTEasy Reactive - Server side multipart implementation is not being respected

### Describe the bug We have a multipart endpoint which accepts two parts handled as Strings such as this: ``` public class MultipartUpload { @RestForm @PartType(MediaType.TEXT_PLAIN) public String textPart; @RestForm @PartType(MediaType.APPLICATION_OCTET_STREAM) public String anotherTextPart; } ``` This is after we migrated to RESTEasy Reactive. With the exception of anotherTextPart being of type InputStream instead nothing has really changed since then, so essentially a multipart where we're not interested in working with the parts as files. What we weren't aware of was that some of our users are sending us parts with a filename provided, and whenever they do these two parts end up as null. I've tried looking into the implementation and it kind of looks like the MultipartParser will store everything into a file whenever a filename is provided. Haven't really understood the code completely but my guess is that the implementation will then fail to retrieve the data that was read unless the multipart is defined with File types. But I might be wrong here though. Looking at the [RFC-2183](https://datatracker.ietf.org/doc/html/rfc2183#section-2.3) for the Content-Disposition header, this behavior does not seem in line with the specification: > The presence of the filename parameter does not force an > implementation to write the entity to a separate file. It is > perfectly acceptable for implementations to leave the entity as part > of the normal mail stream unless the user requests otherwise. As a > consequence, the parameter may be used on any MIME entity, even > `inline' ones. These will not normally be written to files, but the > parameter could be used to provide a filename if the receiving user > should choose to write the part to a file. The users haven't changed anything in their implementation so it seems pretty evident that this has changed between Classic and Reactive. ### Expected behavior The server side implementation should be respected regardless of what the client sends. Unless a RESTEasy server multipart has implemented it, don't write parts of a multipart request to file, even if the Content-Disposition includes a filename. The request should still work as if the client had not provided a file name for the part in question, and such is the case in Classic. ### Actual behavior If a client sends a part with filename in the Content-Disposition header, the receiving end implementation writes the data to a file regardless of what the server side multipart implementation looks like. However, if the server side does not implement the part as a file it will not be able to retrieve the data for further use, i.e the part becomes null. ### How to Reproduce? _No response_ ### Output of `uname -a` or `ver` _No response_ ### Output of `java -version` _No response_ ### GraalVM version (if different from Java) _No response_ ### Quarkus version or git rev _No response_ ### Build tool (ie. output of `mvnw --version` or `gradlew --version`) _No response_ ### Additional information _No response_

885e25ef24d27874b3c93f8e44fd9964b5a66bf7

1600494b9dbe3582a997da6b85bf8b96e78ece67

https://github.com/quarkusio/quarkus/compare/885e25ef24d27874b3c93f8e44fd9964b5a66bf7...1600494b9dbe3582a997da6b85bf8b96e78ece67

diff --git a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java index 333226f0a9b..22c7a845d41 100644 --- a/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java +++ b/extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java @@ -2,9 +2,15 @@ import static org.assertj.core.api.Assertions.assertThat; +import java.io.BufferedReader; import java.io.File; import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; import java.net.URI; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.util.stream.Collectors; import javax.enterprise.context.ApplicationScoped; import javax.ws.rs.Consumes; @@ -57,6 +63,45 @@ void shouldUseFileNameFromAnnotation() throws IOException { assertThat(client.postMultipartWithPartFilename(form)).isEqualTo(ClientForm2.FILE_NAME); } + @Test + void shouldCopyFileContentToString() throws IOException { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); + + File file = File.createTempFile("MultipartTest", ".txt"); + Files.writeString(file.toPath(), "content!"); + file.deleteOnExit(); + + ClientForm form = new ClientForm(); + form.file = file; + assertThat(client.postMultipartWithFileContent(form)).isEqualTo("content!"); + } + + @Test + void shouldCopyFileContentToBytes() throws IOException { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); + + File file = File.createTempFile("MultipartTest", ".txt"); + Files.writeString(file.toPath(), "content!"); + file.deleteOnExit(); + + ClientForm form = new ClientForm(); + form.file = file; + assertThat(client.postMultipartWithFileContentAsBytes(form)).isEqualTo("content!"); + } + + @Test + void shouldCopyFileContentToInputStream() throws IOException { + Client client = RestClientBuilder.newBuilder().baseUri(baseUri).build(Client.class); + + File file = File.createTempFile("MultipartTest", ".txt"); + Files.writeString(file.toPath(), "content!"); + file.deleteOnExit(); + + ClientForm form = new ClientForm(); + form.file = file; + assertThat(client.postMultipartWithFileContentAsInputStream(form)).isEqualTo("content!"); + } + @Path("/multipart") @ApplicationScoped public static class Resource { @@ -65,12 +110,52 @@ public static class Resource { public String upload(@MultipartForm FormData form) { return form.myFile.fileName(); } + + @POST + @Path("/file-content") + @Consumes(MediaType.MULTIPART_FORM_DATA) + public String uploadWithFileContent(@MultipartForm FormDataWithFileContent form) { + return form.fileContent; + } + + @POST + @Path("/file-content-as-bytes") + @Consumes(MediaType.MULTIPART_FORM_DATA) + public String uploadWithFileContentAsBytes(@MultipartForm FormDataWithBytes form) { + return new String(form.fileContentAsBytes); + } + + @POST + @Path("/file-content-as-inputstream") + @Consumes(MediaType.MULTIPART_FORM_DATA) + public String uploadWithFileContentAsInputStream(@MultipartForm FormDataWithInputStream form) { + return new BufferedReader(new InputStreamReader(form.fileContentAsInputStream, StandardCharsets.UTF_8)) + .lines() + .collect(Collectors.joining(System.lineSeparator())); + } } public static class FormData { @FormParam("myFile") public FileUpload myFile; + } + public static class FormDataWithFileContent { + @FormParam("myFile") + @PartType(MediaType.APPLICATION_OCTET_STREAM) + public String fileContent; + } + + public static class FormDataWithBytes { + @FormParam("myFile") + @PartType(MediaType.APPLICATION_OCTET_STREAM) + public byte[] fileContentAsBytes; + } + + public static class FormDataWithInputStream { + @FormParam("myFile") + @PartType(MediaType.APPLICATION_OCTET_STREAM) + public InputStream fileContentAsInputStream; } @Path("/multipart") @@ -82,6 +167,21 @@ public interface Client { @POST @Consumes(MediaType.MULTIPART_FORM_DATA) String postMultipartWithPartFilename(@MultipartForm ClientForm2 clientForm); + + @POST + @Path("/file-content") + @Consumes(MediaType.MULTIPART_FORM_DATA) + String postMultipartWithFileContent(@MultipartForm ClientForm clientForm); + + @POST + @Path("/file-content-as-bytes") + @Consumes(MediaType.MULTIPART_FORM_DATA) + String postMultipartWithFileContentAsBytes(@MultipartForm ClientForm clientForm); + + @POST + @Path("/file-content-as-inputstream") + @Consumes(MediaType.MULTIPART_FORM_DATA) + String postMultipartWithFileContentAsInputStream(@MultipartForm ClientForm clientForm); } public static class ClientForm { diff --git a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java index ef0f652e40b..68418ada79c 100644 --- a/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java +++ b/independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java @@ -13,6 +13,7 @@ import io.quarkus.gizmo.MethodDescriptor; import io.quarkus.gizmo.ResultHandle; import java.io.File; +import java.io.InputStream; import java.lang.reflect.Modifier; import java.nio.file.Path; import java.util.ArrayList; @@ -241,11 +242,10 @@ public static String generate(ClassInfo multipartClassInfo, ClassOutput classOut "Setter '" + setterName + "' of class '" + multipartClassInfo + "' must be public"); } - if (fieldDotName.equals(DotNames.INPUT_STREAM_NAME) - || fieldDotName.equals(DotNames.INPUT_STREAM_READER_NAME)) { + if (fieldDotName.equals(DotNames.INPUT_STREAM_READER_NAME)) { // don't support InputStream as it's too easy to get into trouble throw new IllegalArgumentException( - "InputStream and InputStreamReader are not supported as a field type of a Multipart POJO class. Offending field is '" + "InputStreamReader are not supported as a field type of a Multipart POJO class. Offending field is '" + field.name() + "' of class '" + multipartClassName + "'"); } @@ -332,6 +332,33 @@ public static String generate(ClassInfo multipartClassInfo, ClassOutput classOut rrCtxHandle); populate.assign(resultVariableHandle, allFileUploadsHandle); } + } else if (partType.equals(MediaType.APPLICATION_OCTET_STREAM)) { + if (fieldType.kind() == Type.Kind.ARRAY + && fieldType.asArrayType().component().name().equals(DotNames.BYTE_NAME)) { + populate.assign(resultVariableHandle, + populate.invokeStaticMethod(MethodDescriptor.ofMethod(MultipartSupport.class, + "getSingleFileUploadAsArrayBytes", byte[].class, String.class, + ResteasyReactiveRequestContext.class), + formAttrNameHandle, rrCtxHandle)); + } else if (fieldDotName.equals(DotNames.INPUT_STREAM_NAME)) { + populate.assign(resultVariableHandle, + populate.invokeStaticMethod(MethodDescriptor.ofMethod(MultipartSupport.class, + "getSingleFileUploadAsInputStream", InputStream.class, String.class, + ResteasyReactiveRequestContext.class), + formAttrNameHandle, rrCtxHandle)); + } else if (fieldDotName.equals(DotNames.STRING_NAME)) { + populate.assign(resultVariableHandle, + populate.invokeStaticMethod(MethodDescriptor.ofMethod(MultipartSupport.class, + "getSingleFileUploadAsString", String.class, String.class, + ResteasyReactiveRequestContext.class), + formAttrNameHandle, rrCtxHandle)); + } else { + throw new IllegalArgumentException( + "Unsupported type to read multipart file contents. Offending field is '" + + field.name() + "' of class '" + + field.declaringClass().name() + + "'. If you need to read the contents of the uploaded file, use 'Path' or 'File' as the field type and use File IO APIs to read the bytes, while making sure you annotate the endpoint with '@Blocking'"); + } } else { // this is a common enough mistake, so let's provide a good error message failIfFileTypeUsedAsGenericType(field, fieldType, fieldDotName); diff --git a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java index f598d3eaf44..5af3b1b30a7 100644 --- a/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java +++ b/independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java @@ -2,16 +2,20 @@ import java.io.ByteArrayInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.nio.file.Path; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; +import javax.ws.rs.BadRequestException; import javax.ws.rs.NotSupportedException; import javax.ws.rs.RuntimeType; import javax.ws.rs.core.MediaType; @@ -102,6 +106,55 @@ public static Object convertFormAttribute(String value, Class type, Type generic throw new NotSupportedException("Media type '" + mediaType + "' in multipart request is not supported"); } + public static String getSingleFileUploadAsString(String formName, ResteasyReactiveRequestContext context) { + DefaultFileUpload upload = getSingleFileUpload(formName, context); + if (upload != null) { + try { + return Files.readString(upload.filePath(), Charset.defaultCharset()); + } catch (IOException e) { + throw new MultipartPartReadingException(e); + } + } + + return null; + } + + public static byte[] getSingleFileUploadAsArrayBytes(String formName, ResteasyReactiveRequestContext context) { + DefaultFileUpload upload = getSingleFileUpload(formName, context); + if (upload != null) { + try { + return Files.readAllBytes(upload.filePath()); + } catch (IOException e) { + throw new MultipartPartReadingException(e); + } + } + + return null; + } + + public static InputStream getSingleFileUploadAsInputStream(String formName, ResteasyReactiveRequestContext context) { + DefaultFileUpload upload = getSingleFileUpload(formName, context); + if (upload != null) { + try { + return new FileInputStream(upload.filePath().toFile()); + } catch (IOException e) { + throw new MultipartPartReadingException(e); + } + } + + return null; + } + + public static DefaultFileUpload getSingleFileUpload(String formName, ResteasyReactiveRequestContext context) { + List<DefaultFileUpload> uploads = getFileUploads(formName, context); + if (uploads.size() > 1) { + throw new BadRequestException("Found more than one files for attribute '" + formName + "'. Expected only one file"); + } else if (uploads.size() == 1) { + return uploads.get(0); + } + return null; + } + public static DefaultFileUpload getFileUpload(String formName, ResteasyReactiveRequestContext context) { List<DefaultFileUpload> uploads = getFileUploads(formName, context); if (!uploads.isEmpty()) {

['independent-projects/resteasy-reactive/server/processor/src/main/java/org/jboss/resteasy/reactive/server/processor/generation/multipart/MultipartPopulatorGenerator.java', 'independent-projects/resteasy-reactive/server/runtime/src/main/java/org/jboss/resteasy/reactive/server/core/multipart/MultipartSupport.java', 'extensions/resteasy-reactive/rest-client-reactive/deployment/src/test/java/io/quarkus/rest/client/reactive/multipart/MultipartFilenameTest.java']

{'.java': 3}

Java