-
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 #9576 from mgorniew/private_default
Fix #9260: Shared Annotations Literals with default private Class fields
- Loading branch information
Showing
4 changed files
with
208 additions
and
13 deletions.
There are no files selected for viewing
84 changes: 84 additions & 0 deletions
84
...nt/src/test/java/io/quarkus/arc/test/annotations/SharedLiteralWithPrivateDefaultTest.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,84 @@ | ||
| package io.quarkus.arc.test.annotations; | ||
|
|
||
| import java.util.function.Supplier; | ||
|
|
||
| import javax.enterprise.context.Dependent; | ||
| import javax.enterprise.inject.spi.InjectionPoint; | ||
| import javax.inject.Inject; | ||
|
|
||
| import org.jboss.shrinkwrap.api.ShrinkWrap; | ||
| import org.jboss.shrinkwrap.api.spec.JavaArchive; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.extension.RegisterExtension; | ||
|
|
||
| import io.quarkus.arc.test.annotations.prv.WithPrivateDefault; | ||
| import io.quarkus.test.QuarkusUnitTest; | ||
|
|
||
| public class SharedLiteralWithPrivateDefaultTest { | ||
|
|
||
| @RegisterExtension | ||
| static final QuarkusUnitTest TEST = new QuarkusUnitTest() | ||
| .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class) | ||
| .addClasses(WithPrivateDefault.TO_IMPORT) | ||
| .addClasses(PrivateDefaultBean.class, MySupplier.class, OtherSupplier.class)); | ||
|
|
||
| @Inject | ||
| PrivateDefaultBean privateDefaultBean; | ||
|
|
||
| private WithPrivateDefault.HasPrivateDefault findAnnotation(InjectedField field) { | ||
| return (WithPrivateDefault.HasPrivateDefault) field.injectionPoint.getAnnotated().getAnnotations() | ||
| .stream().filter(ann -> ann.annotationType().equals(WithPrivateDefault.HasPrivateDefault.class)) | ||
| .findFirst().orElseThrow(() -> new IllegalStateException("Didn't found HasPrivateDefault annotation")); | ||
| } | ||
|
|
||
| @Test | ||
| public void testLoadBeanAnnotatedWithPrivateDefault() { | ||
| WithPrivateDefault.HasPrivateDefault defaultAnnotation = findAnnotation(privateDefaultBean.usingDefault); | ||
| Assertions.assertEquals(WithPrivateDefault.PRIVATE_STRING_SUPPLIER, defaultAnnotation.privateDefault()); | ||
| Assertions.assertArrayEquals( | ||
| new Class<?>[] { WithPrivateDefault.PRIVATE_STRING_SUPPLIER, WithPrivateDefault.PublicStringSupplier.class }, | ||
| defaultAnnotation.privateDefaultArray()); | ||
|
|
||
| WithPrivateDefault.HasPrivateDefault overwriteAnnotation = findAnnotation(privateDefaultBean.overwriteDefault); | ||
| Assertions.assertEquals(MySupplier.class, overwriteAnnotation.privateDefault()); | ||
| Assertions.assertArrayEquals(new Class<?>[] { MySupplier.class, OtherSupplier.class }, | ||
| overwriteAnnotation.privateDefaultArray()); | ||
| } | ||
|
|
||
| @Dependent | ||
| public static class PrivateDefaultBean { | ||
|
|
||
| @WithPrivateDefault.HasPrivateDefault | ||
| @Inject | ||
| InjectedField usingDefault; | ||
|
|
||
| @WithPrivateDefault.HasPrivateDefault(privateDefault = MySupplier.class, privateDefaultArray = { MySupplier.class, | ||
| OtherSupplier.class }) | ||
| @Inject | ||
| InjectedField overwriteDefault; | ||
| } | ||
|
|
||
| public static class MySupplier implements Supplier<String> { | ||
|
|
||
| @Override | ||
| public String get() { | ||
| return "MySupplier"; | ||
| } | ||
| } | ||
|
|
||
| public static class OtherSupplier implements Supplier<String> { | ||
|
|
||
| @Override | ||
| public String get() { | ||
| return "OtherSupplier"; | ||
| } | ||
| } | ||
|
|
||
| @Dependent | ||
| public static class InjectedField { | ||
| @Inject | ||
| InjectionPoint injectionPoint; | ||
| } | ||
|
|
||
| } |
38 changes: 38 additions & 0 deletions
38
.../arc/deployment/src/test/java/io/quarkus/arc/test/annotations/prv/WithPrivateDefault.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,38 @@ | ||
| package io.quarkus.arc.test.annotations.prv; | ||
|
|
||
| import java.lang.annotation.Retention; | ||
| import java.lang.annotation.RetentionPolicy; | ||
| import java.util.function.Supplier; | ||
|
|
||
| public class WithPrivateDefault { | ||
|
|
||
| public static final Class<?> PRIVATE_STRING_SUPPLIER = PrivateStringSupplier.class; | ||
|
|
||
| public static final Class<?>[] TO_IMPORT = { WithPrivateDefault.class, | ||
| HasPrivateDefault.class, PrivateStringSupplier.class, PublicStringSupplier.class }; | ||
|
|
||
| @Retention(RetentionPolicy.RUNTIME) | ||
| public @interface HasPrivateDefault { | ||
| Class<? extends Supplier<String>> privateDefault() default PrivateStringSupplier.class; | ||
|
|
||
| Class<? extends Supplier<String>>[] privateDefaultArray() default { PrivateStringSupplier.class, | ||
| PublicStringSupplier.class }; | ||
| } | ||
|
|
||
| private static class PrivateStringSupplier implements Supplier<String> { | ||
|
|
||
| @Override | ||
| public String get() { | ||
| return "PrivateStringSupplier"; | ||
| } | ||
| } | ||
|
|
||
| public static class PublicStringSupplier implements Supplier<String> { | ||
|
|
||
| @Override | ||
| public String get() { | ||
| return "PublicStringSupplier"; | ||
| } | ||
| } | ||
|
|
||
| } |
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