SEC-2915: Updated Java Code Formatting

data/src/main/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtension.java

@@ -27,13 +27,17 @@ import java.util.Map;
 
 /**
  * <p>
- * By defining this object as a Bean, Spring Security is exposed as SpEL expressions for creating Spring Data
- * queries.
+ * By defining this object as a Bean, Spring Security is exposed as SpEL expressions for
+ * creating Spring Data queries.
  * </p>
  *
- * <p>With Java based configuration, we can define the bean using the following:</p>
+ * <p>
+ * With Java based configuration, we can define the bean using the following:
+ * </p>
  *
- * <p>For example, if you return a UserDetails that extends the following User object:</p>
+ * <p>
+ * For example, if you return a UserDetails that extends the following User object:
+ * </p>
  *
  * <pre>
  * @Entity
@@ -41,11 +45,13 @@ import java.util.Map;
  *     @GeneratedValue(strategy = GenerationType.AUTO)
  *     @Id
  *     private Long id;
- *
+ * 
  *     ...
  * </pre>
  *
- * <p>And you have a Message object that looks like the following:</p>
+ * <p>
+ * And you have a Message object that looks like the following:
+ * </p>
  *
  * <pre>
  * @Entity
@@ -53,64 +59,67 @@ import java.util.Map;
  *     @Id
  *     @GeneratedValue(strategy = GenerationType.AUTO)
  *     private Long id;
- *
+ * 
  *     @OneToOne
  *     private User to;
- *
+ * 
  *     ...
  * </pre>
  *
- * You can use the following {@code Query} annotation to search for only messages that are to the current user:
+ * You can use the following {@code Query} annotation to search for only messages that are
+ * to the current user:
  *
  * <pre>
- * @Repository
+ * &#064;Repository
  * public interface SecurityMessageRepository extends MessageRepository {
- *
- *     @Query("select m from Message m where m.to.id = ?#{ principal?.id }")
- *     List<Message> findAll();
+ * 
+ * 	&#064;Query(&quot;select m from Message m where m.to.id = ?#{ principal?.id }&quot;)
+ * 	List&lt;Message&gt; findAll();
  * }
  * </pre>
  *
- * This works because the principal in this instance is a User which has an id field on it.
+ * This works because the principal in this instance is a User which has an id field on
+ * it.
  *
  * @since 4.0
  * @author Rob Winch
  */
 public class SecurityEvaluationContextExtension extends EvaluationContextExtensionSupport {
-    private Authentication authentication;
+	private Authentication authentication;
 
-    /**
-     * Creates a new instance that uses the current {@link Authentication} found on the
-     * {@link org.springframework.security.core.context.SecurityContextHolder}.
-     */
-    public SecurityEvaluationContextExtension() {
-    }
+	/**
+	 * Creates a new instance that uses the current {@link Authentication} found on the
+	 * {@link org.springframework.security.core.context.SecurityContextHolder}.
+	 */
+	public SecurityEvaluationContextExtension() {
+	}
 
-    /**
-     * Creates a new instance that always uses the same {@link Authentication} object.
-     *
-     * @param authentication the {@link Authentication} to use
-     */
-    public SecurityEvaluationContextExtension(Authentication authentication) {
-        this.authentication = authentication;
-    }
+	/**
+	 * Creates a new instance that always uses the same {@link Authentication} object.
+	 *
+	 * @param authentication the {@link Authentication} to use
+	 */
+	public SecurityEvaluationContextExtension(Authentication authentication) {
+		this.authentication = authentication;
+	}
 
-    public String getExtensionId() {
-        return "security";
-    }
+	public String getExtensionId() {
+		return "security";
+	}
 
-    @Override
-    public Object getRootObject() {
-        Authentication authentication = getAuthentication();
-        return new SecurityExpressionRoot(authentication) {};
-    }
+	@Override
+	public Object getRootObject() {
+		Authentication authentication = getAuthentication();
+		return new SecurityExpressionRoot(authentication) {
+		};
+	}
 
-    private Authentication getAuthentication() {
-        if(authentication != null) {
-            return authentication;
-        }
+	private Authentication getAuthentication() {
+		if (authentication != null) {
+			return authentication;
+		}
 
-        SecurityContext context = SecurityContextHolder.getContext();
-        return context.getAuthentication();
-    }
+		SecurityContext context = SecurityContextHolder.getContext();
+		return context.getAuthentication();
+	}
 }

data/src/test/java/org/springframework/security/data/repository/query/SecurityEvaluationContextExtensionTests.java

@@ -25,51 +25,55 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import static org.fest.assertions.Assertions.assertThat;
 
 public class SecurityEvaluationContextExtensionTests {
-    SecurityEvaluationContextExtension securityExtension;
+	SecurityEvaluationContextExtension securityExtension;
 
-    @Before
-    public void setup() {
-        securityExtension = new SecurityEvaluationContextExtension();
-    }
+	@Before
+	public void setup() {
+		securityExtension = new SecurityEvaluationContextExtension();
+	}
 
-    @After
-    public void cleanup() {
-        SecurityContextHolder.clearContext();
-    }
+	@After
+	public void cleanup() {
+		SecurityContextHolder.clearContext();
+	}
 
-    @Test(expected = IllegalArgumentException.class)
-    public void getRootObjectSecurityContextHolderAuthenticationNull() {
-        getRoot().getAuthentication();
-    }
+	@Test(expected = IllegalArgumentException.class)
+	public void getRootObjectSecurityContextHolderAuthenticationNull() {
+		getRoot().getAuthentication();
+	}
 
-    @Test
-    public void getRootObjectSecurityContextHolderAuthentication() {
-        TestingAuthenticationToken authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(authentication);
+	@Test
+	public void getRootObjectSecurityContextHolderAuthentication() {
+		TestingAuthenticationToken authentication = new TestingAuthenticationToken(
+				"user", "password", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
-        assertThat(getRoot().getAuthentication()).isSameAs(authentication);
-    }
+		assertThat(getRoot().getAuthentication()).isSameAs(authentication);
+	}
 
-    @Test
-    public void getRootObjectExplicitAuthenticationOverridesSecurityContextHolder() {
-        TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit", "password", "ROLE_EXPLICIT");
-        securityExtension = new SecurityEvaluationContextExtension(explicit);
+	@Test
+	public void getRootObjectExplicitAuthenticationOverridesSecurityContextHolder() {
+		TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit",
+				"password", "ROLE_EXPLICIT");
+		securityExtension = new SecurityEvaluationContextExtension(explicit);
 
-        TestingAuthenticationToken authentication = new TestingAuthenticationToken("user", "password", "ROLE_USER");
-        SecurityContextHolder.getContext().setAuthentication(authentication);
+		TestingAuthenticationToken authentication = new TestingAuthenticationToken(
+				"user", "password", "ROLE_USER");
+		SecurityContextHolder.getContext().setAuthentication(authentication);
 
-        assertThat(getRoot().getAuthentication()).isSameAs(explicit);
-    }
+		assertThat(getRoot().getAuthentication()).isSameAs(explicit);
+	}
 
-    @Test
-    public void getRootObjectExplicitAuthentication() {
-        TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit", "password", "ROLE_EXPLICIT");
-        securityExtension = new SecurityEvaluationContextExtension(explicit);
+	@Test
+	public void getRootObjectExplicitAuthentication() {
+		TestingAuthenticationToken explicit = new TestingAuthenticationToken("explicit",
+				"password", "ROLE_EXPLICIT");
+		securityExtension = new SecurityEvaluationContextExtension(explicit);
 
-        assertThat(getRoot().getAuthentication()).isSameAs(explicit);
-    }
+		assertThat(getRoot().getAuthentication()).isSameAs(explicit);
+	}
 
-    private SecurityExpressionRoot getRoot() {
-        return (SecurityExpressionRoot) securityExtension.getRootObject();
-    }
+	private SecurityExpressionRoot getRoot() {
+		return (SecurityExpressionRoot) securityExtension.getRootObject();
+	}
 }