Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Spotbugs 4.7.0] More precise exception handling, don't throw 

RuntimeException, use our own UncheckedException.
This commit is contained in:
Gary Gregory 2022-05-15 16:21:49 -04:00
parent af157c49d5
commit f813045283
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/org/apache/commons/lang3/AnnotationUtils.java
View File

@ -17,12 +17,12 @@
package org.apache.commons.lang3;
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.Arrays;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import org.apache.commons.lang3.exception.UncheckedException;
/**
* <p>Helper methods for working with {@link Annotation} instances.</p>
@ -136,7 +136,7 @@ public class AnnotationUtils {
}
}
}
} catch (final IllegalAccessException | InvocationTargetException ex) {
} catch (final ReflectiveOperationException ex) {
return false;
}
return true;
@ -161,14 +161,11 @@ public class AnnotationUtils {
try {
final Object value = m.invoke(a);
if (value == null) {
throw new IllegalStateException(
String.format("Annotation method %s returned null", m));
throw new IllegalStateException(String.format("Annotation method %s returned null", m));
}
result += hashMember(m.getName(), value);
} catch (final RuntimeException ex) {
throw ex;
} catch (final Exception ex) {
throw new RuntimeException(ex);
} catch (final ReflectiveOperationException ex) {
throw new UncheckedException(ex);
}
}
return result;
@ -186,14 +183,12 @@ public class AnnotationUtils {
final ToStringBuilder builder = new ToStringBuilder(a, TO_STRING_STYLE);
for (final Method m : a.annotationType().getDeclaredMethods()) {
if (m.getParameterTypes().length > 0) {
continue; //wtf?
continue; // wtf?
}
try {
builder.append(m.getName(), m.invoke(a));
} catch (final RuntimeException ex) {
throw ex;
} catch (final Exception ex) {
throw new RuntimeException(ex);
} catch (final ReflectiveOperationException ex) {
throw new UncheckedException(ex);
}
}
return builder.build();