Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-263 - Fixed incompatibility with OpenWebbeans < 1.1.8.

Browse Source 
Prefer using non-anonymous inner classes to represent @Default and @Any qualifiers. Upgraded to OpenWebbeans 1.1.7 along the way.
This commit is contained in:
Oliver Gierke
2013-01-05 19:31:42 +01:00
parent c289428fe5
commit 68ef3c68b0
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-commons-core/pom.xml
View File

@@ -19,7 +19,7 @@
<mockito.version>1.8.5</mockito.version>
<querydsl.version>2.8.0</querydsl.version>
<slf4j.version>1.7.1</slf4j.version>
<webbeans.version>1.1.3</webbeans.version>
<webbeans.version>1.1.7</webbeans.version>
</properties>
<dependencies>

23
spring-data-commons-core/src/main/java/org/springframework/data/repository/cdi/CdiRepositoryExtensionSupport.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2011 the original author or authors.
* Copyright 2011-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -94,7 +94,6 @@ public abstract class CdiRepositoryExtensionSupport implements Extension {
/**
* Determines the qualifiers of the given type.
*/
@SuppressWarnings("serial")
private Set<Annotation> getQualifiers(final Class<?> type) {
Set<Annotation> qualifiers = new HashSet<Annotation>();
@@ -105,14 +104,14 @@ public abstract class CdiRepositoryExtensionSupport implements Extension {
qualifiers.add(annotation);
}
}
// Add @Default qualifier if no qualifier is specified.
if (qualifiers.isEmpty()) {
qualifiers.add(new AnnotationLiteral<Default>() {
});
qualifiers.add(DefaultAnnotationLiteral.INSTANCE);
}
// Add @Any qualifier.
qualifiers.add(new AnnotationLiteral<Any>() {
});
qualifiers.add(AnyAnnotationLiteral.INSTANCE);
return qualifiers;
}
@@ -124,4 +123,16 @@ public abstract class CdiRepositoryExtensionSupport implements Extension {
protected Iterable<Entry<Class<?>, Set<Annotation>>> getRepositoryTypes() {
return repositoryTypes.entrySet();
}
private static class DefaultAnnotationLiteral extends AnnotationLiteral<Default> implements Default {
private static final long serialVersionUID = 511359421048623933L;
private static final DefaultAnnotationLiteral INSTANCE = new DefaultAnnotationLiteral();
}
private static class AnyAnnotationLiteral extends AnnotationLiteral<Any> implements Any {
private static final long serialVersionUID = 7261821376671361463L;
private static final AnyAnnotationLiteral INSTANCE = new AnyAnnotationLiteral();
}
}