Skip to content

Fix NPE in ReflectionUtils when scaning interfaces #1496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 13, 2015
+9 −1
Merged

Fix NPE in ReflectionUtils when scaning interfaces #1496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/swagger-core/src/main/java/io/swagger/util/ReflectionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public static boolean isConstructorCompatible(Constructor<?> constructor) {
* @return list of Fields
*/
public static List<Field> getDeclaredFields(Class<?> cls) {
if (cls.equals(Object.class)) {
if (cls == null || Object.class.equals(cls)) {
return Collections.emptyList();
}
final List<Field> fields = new ArrayList<Field>();
Expand Down
8 changes: 8 additions & 0 deletions modules/swagger-core/src/test/java/io/swagger/ReflectionUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiResponses;
import io.swagger.reflection.Child;
import io.swagger.reflection.IParent;
import io.swagger.reflection.Parent;
import io.swagger.util.ReflectionUtils;

Expand All @@ -12,6 +13,7 @@
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.Arrays;
import java.util.Collections;

import javax.ws.rs.Path;

Expand Down Expand Up @@ -114,4 +116,10 @@ public void testDerivedAnnotation() {
Assert.assertNotNull(annotation);
Assert.assertEquals(annotation.value(), "parentInterfacePath");
}

@Test
public void getDeclaredFieldsFromInterfaceTest() throws NoSuchMethodException {
final Class cls = IParent.class;
Assert.assertEquals(Collections.emptyList(), ReflectionUtils.getDeclaredFields(cls));
}
}