-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33556 from gsmet/3.1.0-backports-1
3.1.0 backports 1
- Loading branch information
Showing
87 changed files
with
1,319 additions
and
420 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
.../deployment/src/main/java/io/quarkus/deployment/pkg/steps/NoopNativeImageBuildRunner.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| package io.quarkus.deployment.pkg.steps; | ||
|
|
||
| import java.nio.file.Path; | ||
| import java.util.List; | ||
|
|
||
| public class NoopNativeImageBuildRunner extends NativeImageBuildRunner { | ||
|
|
||
| private static final String MESSAGE = "NoopNativeImageBuildRunner is not meant to be used to perform an actual build."; | ||
| private final boolean isContainer; | ||
|
|
||
| public NoopNativeImageBuildRunner(boolean isContainer) { | ||
| this.isContainer = isContainer; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isContainer() { | ||
| return isContainer; | ||
| } | ||
|
|
||
| @Override | ||
| protected String[] getGraalVMVersionCommand(List<String> args) { | ||
| throw new UnsupportedOperationException(MESSAGE); | ||
| } | ||
|
|
||
| @Override | ||
| protected String[] getBuildCommand(Path outputDir, List<String> args) { | ||
| throw new UnsupportedOperationException(MESSAGE); | ||
| } | ||
|
|
||
| @Override | ||
| protected void objcopy(Path outputDir, String... args) { | ||
| throw new UnsupportedOperationException(MESSAGE); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
...test/observer/injectionpoint/ObserverInjectingDependentSyntheticBeanWithMetadataTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package io.quarkus.arc.test.observer.injectionpoint; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| import jakarta.enterprise.event.Observes; | ||
|
|
||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| import io.quarkus.runtime.StartupEvent; | ||
| import io.quarkus.test.QuarkusUnitTest; | ||
| import io.smallrye.config.ConfigMapping; | ||
| import io.smallrye.config.WithDefault; | ||
|
|
||
| public class ObserverInjectingDependentSyntheticBeanWithMetadataTest { | ||
|
|
||
| @RegisterExtension | ||
| static final QuarkusUnitTest config = new QuarkusUnitTest() | ||
| .withApplicationRoot(root -> root.addClasses(MyConfig.class)).overrideConfigKey("my.config.value1", "42"); | ||
|
|
||
| @Test | ||
| public void testInjection() { | ||
|
|
||
| } | ||
|
|
||
| @ConfigMapping(prefix = "my.config") | ||
| public interface MyConfig { | ||
|
|
||
| int value1(); | ||
|
|
||
| @WithDefault("baz") | ||
| String value2(); | ||
|
|
||
| } | ||
|
|
||
| public static class MyBean { | ||
|
|
||
| void onStart(@Observes StartupEvent event, MyConfig config) { | ||
| // A @Dependent synthetic bean is registered for MyConfig, and it attempts to obtain InjectionPoint in its create() method | ||
| assertEquals(42, config.value1()); | ||
| assertEquals("baz", config.value2()); | ||
| } | ||
|
|
||
| } | ||
|
|
||
| } |
13 changes: 6 additions & 7 deletions
13
extensions/arc/runtime/src/main/java/io/quarkus/arc/runtime/ConfigMappingCreator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.