BAEL-2443: jsonview spring security (eugenp#6291)

mchugunov · maibin · commit 1f244261d003 · 2019-02-06T09:37:22.000-08:00
* BAEL-2443: Implement filtering with @JSONVIEW based on spring security role * Cleanup test * Rename tests * Fix renaming roles after refactoring * BAEL-2443: Restore return statement in controller advice
diff --git a/spring-security-mvc-jsonview/src/main/java/com/baeldung/spring/SecurityJsonViewControllerAdvice.java b/spring-security-mvc-jsonview/src/main/java/com/baeldung/spring/SecurityJsonViewControllerAdvice.java
@@ -31,6 +31,7 @@ protected void beforeBodyWriteInternal(MappingJacksonValue bodyContainer, MediaT
                     .collect(Collectors.toList());
             if (jsonViews.size() == 1) {
                 bodyContainer.setSerializationView(jsonViews.get(0));
+                return;
             }
             throw new IllegalArgumentException("Ambiguous @JsonView declaration for roles "+ authorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));
         }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ protected void beforeBodyWriteInternal(MappingJacksonValue bodyContainer, MediaT`
`31`	`31`	`.collect(Collectors.toList());`
`32`	`32`	`if (jsonViews.size() == 1) {`
`33`	`33`	`bodyContainer.setSerializationView(jsonViews.get(0));`
	`34`	`+ return;`
`34`	`35`	`}`
`35`	`36`	`throw new IllegalArgumentException("Ambiguous @JsonView declaration for roles "+ authorities.stream().map(GrantedAuthority::getAuthority).collect(Collectors.joining(",")));`
`36`	`37`	`}`