DATACMNS-1224 - Polishing of nullability annotations.

Refactored code to properly check for null fields in Eclipse. Added warning suppressions where suitable.
This commit is contained in:
Oliver Gierke
2017-11-29 23:12:36 +01:00
parent d2a42f780a
commit 34cadd0b9b
16 changed files with 69 additions and 36 deletions

View File

@@ -133,8 +133,8 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor
MethodType methodType = MethodType.methodType(method.getReturnType(), method.getParameterTypes());
return getLookup(method.getDeclaringClass()).findSpecial(method.getDeclaringClass(), method.getName(),
methodType, method.getDeclaringClass());
return getLookup(method.getDeclaringClass(), privateLookupIn).findSpecial(method.getDeclaringClass(),
method.getName(), methodType, method.getDeclaringClass());
}
/*
@@ -146,14 +146,14 @@ public class DefaultMethodInvokingMethodInterceptor implements MethodInterceptor
return true;
}
private Lookup getLookup(Class<?> declaringClass) {
Lookup lookup = MethodHandles.lookup();
private Lookup getLookup(Class<?> declaringClass, @Nullable Method privateLookupIn) {
if (privateLookupIn == null) {
return lookup;
return MethodHandles.lookup();
}
Lookup lookup = MethodHandles.lookup();
try {
return (Lookup) privateLookupIn.invoke(MethodHandles.class, declaringClass, lookup);
} catch (ReflectiveOperationException e) {