This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit 41f2f3aa2dd913044d813277ac39e6c9cbdcf02f Author: Mark Struberg <[email protected]> AuthorDate: Wed Jun 25 08:21:53 2025 +0200 DELTASPIKE-1477 set passivationId for Repository --- .../java/org/apache/deltaspike/core/util/Annotateds.java | 14 +++++++------- .../partialbean/impl/PartialBeanBindingExtension.java | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/Annotateds.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java similarity index 99% rename from deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/Annotateds.java rename to deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java index c9024ba33..a5df9b5d9 100644 --- a/deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/Annotateds.java +++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java @@ -19,7 +19,7 @@ package org.apache.deltaspike.core.util; -import jakarta.enterprise.inject.Typed; +import jakarta.enterprise.inject.Vetoed; import jakarta.enterprise.inject.spi.Annotated; import jakarta.enterprise.inject.spi.AnnotatedCallable; import jakarta.enterprise.inject.spi.AnnotatedConstructor; @@ -67,7 +67,7 @@ public final class Annotateds * Does the first stage of comparing AnnoatedCallables, however it cannot * compare the method parameters */ - @Typed() + @Vetoed private static class AnnotatedCallableComparator<T> implements Comparator<AnnotatedCallable<? super T>>, Serializable { @@ -92,7 +92,7 @@ public final class Annotateds } - @Typed() + @Vetoed private static class AnnotatedMethodComparator<T> implements Comparator<AnnotatedMethod<? super T>>, Serializable { @@ -126,7 +126,7 @@ public final class Annotateds } - @Typed() + @Vetoed private static class AnnotatedConstructorComparator<T> implements Comparator<AnnotatedConstructor<? super T>>, Serializable { @@ -160,7 +160,7 @@ public final class Annotateds } - @Typed() + @Vetoed private static class AnnotatedFieldComparator<T> implements Comparator<AnnotatedField<? super T>>, Serializable { @@ -182,7 +182,7 @@ public final class Annotateds } - @Typed() + @Vetoed private static class AnnotationComparator implements Comparator<Annotation>, Serializable { @@ -194,7 +194,7 @@ public final class Annotateds } } - @Typed() + @Vetoed private static class MethodComparator implements Comparator<Method> { diff --git a/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java b/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java index a06526f0a..9ef5ecb15 100644 --- a/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java +++ b/deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java @@ -40,6 +40,7 @@ import jakarta.enterprise.inject.spi.configurator.BeanConfigurator; import org.apache.deltaspike.core.api.provider.BeanProvider; import org.apache.deltaspike.core.spi.activation.Deactivatable; +import org.apache.deltaspike.core.util.Annotateds; import org.apache.deltaspike.core.util.AnnotationUtils; import org.apache.deltaspike.core.util.BeanConfiguratorUtils; import org.apache.deltaspike.core.util.BeanUtils; @@ -176,6 +177,7 @@ public class PartialBeanBindingExtension implements Extension, Deactivatable BeanConfigurator<T> beanConfigurator = afterBeanDiscovery.addBean(); BeanConfiguratorUtils.read(beanManager, beanConfigurator, annotatedType) .beanClass(beanClass); + beanConfigurator.id(PartialBeanBinding.class.getName() + ":" + Annotateds.createTypeId(annotatedType)); new DeltaSpikeProxyBeanConfigurator(beanClass, descriptor.getHandler(),
