WELD-2357 fallback in JandexDiscoveryStrategy when there is no ClassI… #1633
Conversation
| @@ -493,4 +499,36 @@ public static boolean isDefault(Method method) { | |||
| return ((method.getModifiers() & (Modifier.ABSTRACT | Modifier.PUBLIC | Modifier.STATIC)) == Modifier.PUBLIC) | |||
| && method.getDeclaringClass().isInterface(); | |||
| } | |||
|
|
|||
| public static boolean hasBeanDefiningAnnotation(Class<?> clazz, Set<Class<? extends Annotation>> initialBeanDefiningAnnotations) { | |||
There was a problem hiding this comment.
Wrong Reflections class ;-) It should be org.jboss.weld.environment.util.Reflections.
tremes
force-pushed
the
WELD-2357
branch
2 times, most recently
from
a63ebb2
to
7c14cfa
Compare
| @@ -33,6 +40,8 @@ | |||
| */ | |||
| public final class Reflections { | |||
|
|
|||
| public static final List<Class<? extends Annotation>> metaAnnotations = ImmutableList.of(Stereotype.class, NormalScope.class); | |||
There was a problem hiding this comment.
The constant name should be META_ANNOTATIONS
| @@ -125,6 +134,8 @@ public static boolean isClassLoadable(ResourceLoader resourceLoader, String clas | |||
| return cast(Class.forName(className)); | |||
| } catch (Exception e) { | |||
There was a problem hiding this comment.
What about catch (Exception | LinkageError e) {...?
| } catch (Exception e) { | ||
| throw CommonLogger.LOG.cannotLoadClass(className, e); | ||
| } catch (Exception | LinkageError e) { | ||
| throw new ResourceLoadingException("Error loading class " + className, e); |
There was a problem hiding this comment.
I think we should use CommonLogger.LOG.cannotLoadClass() here. org.jboss.weld.resources.spi.ResourceLoader is related to ResourceLoader. Also the cannotLoadClass() method is only used here...
| } else { | ||
| //if ClassInfo is not available (e.g for WEB-INF/lib/jars) then fallback to reflection | ||
| Class<?> clazz = Reflections.loadClass(resourceLoader, className); | ||
| if (!Reflections.hasBeanDefiningAnnotation(clazz, initialBeanDefiningAnnotations)) { |
There was a problem hiding this comment.
One last thing - we should add if (clazz != null) to avoid possible NPE...
There was a problem hiding this comment.
Then it would make more sense to define it as:
clazz == null || !Reflections.hasBeanDefiningAnnotation(clazz, initialBeanDefiningAnnotations)
or not?
There was a problem hiding this comment.
Actually, we should follow ReflectionDiscoveryStrategy.java , ie.:
if (clazz == null || !Reflections.hasBeanDefiningAnnotation(clazz, initialBeanDefiningAnnotations)) {
classIterator.remove();
}
…nfo available.