Skip to content

Commit 41f2f3a

Browse files
committed
DELTASPIKE-1477 set passivationId for Repository
1 parent 84b3e06 commit 41f2f3a

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

deltaspike/core/api/obsolete/src/main/java/org/apache/deltaspike/core/util/Annotateds.java renamed to deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/Annotateds.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.deltaspike.core.util;
2121

22-
import jakarta.enterprise.inject.Typed;
22+
import jakarta.enterprise.inject.Vetoed;
2323
import jakarta.enterprise.inject.spi.Annotated;
2424
import jakarta.enterprise.inject.spi.AnnotatedCallable;
2525
import jakarta.enterprise.inject.spi.AnnotatedConstructor;
@@ -67,7 +67,7 @@ private Annotateds()
6767
* Does the first stage of comparing AnnoatedCallables, however it cannot
6868
* compare the method parameters
6969
*/
70-
@Typed()
70+
@Vetoed
7171
private static class AnnotatedCallableComparator<T>
7272
implements Comparator<AnnotatedCallable<? super T>>, Serializable
7373
{
@@ -92,7 +92,7 @@ public int compare(AnnotatedCallable<? super T> arg0, AnnotatedCallable<? super
9292

9393
}
9494

95-
@Typed()
95+
@Vetoed
9696
private static class AnnotatedMethodComparator<T>
9797
implements Comparator<AnnotatedMethod<? super T>>, Serializable
9898
{
@@ -126,7 +126,7 @@ public int compare(AnnotatedMethod<? super T> arg0, AnnotatedMethod<? super T> a
126126

127127
}
128128

129-
@Typed()
129+
@Vetoed
130130
private static class AnnotatedConstructorComparator<T>
131131
implements Comparator<AnnotatedConstructor<? super T>>, Serializable
132132
{
@@ -160,7 +160,7 @@ public int compare(AnnotatedConstructor<? super T> arg0, AnnotatedConstructor<?
160160

161161
}
162162

163-
@Typed()
163+
@Vetoed
164164
private static class AnnotatedFieldComparator<T>
165165
implements Comparator<AnnotatedField<? super T>>, Serializable
166166
{
@@ -182,7 +182,7 @@ public int compare(AnnotatedField<? super T> arg0, AnnotatedField<? super T> arg
182182

183183
}
184184

185-
@Typed()
185+
@Vetoed
186186
private static class AnnotationComparator implements Comparator<Annotation>, Serializable
187187
{
188188

@@ -194,7 +194,7 @@ public int compare(Annotation arg0, Annotation arg1)
194194
}
195195
}
196196

197-
@Typed()
197+
@Vetoed
198198
private static class MethodComparator implements Comparator<Method>
199199
{
200200

deltaspike/modules/partial-bean/impl/src/main/java/org/apache/deltaspike/partialbean/impl/PartialBeanBindingExtension.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.apache.deltaspike.core.api.provider.BeanProvider;
4141

4242
import org.apache.deltaspike.core.spi.activation.Deactivatable;
43+
import org.apache.deltaspike.core.util.Annotateds;
4344
import org.apache.deltaspike.core.util.AnnotationUtils;
4445
import org.apache.deltaspike.core.util.BeanConfiguratorUtils;
4546
import org.apache.deltaspike.core.util.BeanUtils;
@@ -176,6 +177,7 @@ protected <T> boolean createPartialBean(Class<T> beanClass, PartialBeanDescripto
176177
BeanConfigurator<T> beanConfigurator = afterBeanDiscovery.addBean();
177178
BeanConfiguratorUtils.read(beanManager, beanConfigurator, annotatedType)
178179
.beanClass(beanClass);
180+
beanConfigurator.id(PartialBeanBinding.class.getName() + ":" + Annotateds.createTypeId(annotatedType));
179181

180182
new DeltaSpikeProxyBeanConfigurator(beanClass,
181183
descriptor.getHandler(),

0 commit comments

Comments
 (0)