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

#594 - Polishing.

Browse Source 
Rather use early return for null annotation instead of conditional lookup.

Original pull request: #595.
This commit is contained in:
Oliver Gierke
2017-07-27 17:17:49 +02:00
parent 14a5a79490
commit c784df964e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/hateoas/core/AnnotationMappingDiscoverer.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2016 the original author or authors.
* Copyright 2012-2017 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.
@@ -108,12 +108,12 @@ public class AnnotationMappingDiscoverer implements MappingDiscoverer {
private String[] getMappingFrom(Annotation annotation) {
Object value = null;
if (annotation != null) {
value = mappingAttributeName == null ? getValue(annotation) : getValue(annotation, mappingAttributeName);
if (annotation == null) {
return new String[0];
}
Object value = mappingAttributeName == null ? getValue(annotation) : getValue(annotation, mappingAttributeName);
if (value instanceof String) {
return new String[] { (String) value };
} else if (value instanceof String[]) {