From 4e8d6bea4dfe0aa1d7e845b5120ce7f16496071f Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <hoellerj@vmware.com>
Date: Wed, 4 Nov 2020 16:52:11 +0100
Subject: [PATCH] Fix test code formatting

---
 .../expression/spel/SpelReproTests.java       |  1 -
 .../expression/spel/testresources/Person.java |  6 ++-
 .../spel/testresources/TestAddress.java       | 38 +++++++++++--------
 .../spel/testresources/TestPerson.java        | 38 +++++++++++--------
 4 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
index 23b397b30f..b114826270 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/SpelReproTests.java
@@ -76,7 +76,6 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
  */
 public class SpelReproTests extends AbstractExpressionTests {
 
-
 	@Test
 	public void NPE_SPR5661() {
 		evaluate("joinThreeStrings('a',null,'c')", "anullc", String.class);
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
index 418ff975ed..17939f7a0f 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -16,9 +16,10 @@
 
 package org.springframework.expression.spel.testresources;
 
-///CLOVER:OFF
 public class Person {
+
 	private String privateName;
+
 	Company company;
 
 	public Person(String name) {
@@ -41,4 +42,5 @@ public class Person {
 	public Company getCompany() {
 		return company;
 	}
+
 }
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
index 3bc88ff9f4..7beb41441a 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestAddress.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -19,19 +19,25 @@ package org.springframework.expression.spel.testresources;
 import java.util.List;
 
 public class TestAddress{
-		private String street;
-		private List<String> crossStreets;
-
-		public String getStreet() {
-			return street;
-		}
-		public void setStreet(String street) {
-			this.street = street;
-		}
-		public List<String> getCrossStreets() {
-			return crossStreets;
-		}
-		public void setCrossStreets(List<String> crossStreets) {
-			this.crossStreets = crossStreets;
-		}
+
+	private String street;
+
+	private List<String> crossStreets;
+
+	public String getStreet() {
+		return street;
+	}
+
+	public void setStreet(String street) {
+		this.street = street;
 	}
+
+	public List<String> getCrossStreets() {
+		return crossStreets;
+	}
+
+	public void setCrossStreets(List<String> crossStreets) {
+		this.crossStreets = crossStreets;
+	}
+
+}
diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
index ad1f58480e..e9470f26c8 100644
--- a/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
+++ b/spring-expression/src/test/java/org/springframework/expression/spel/testresources/TestPerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -17,19 +17,25 @@
 package org.springframework.expression.spel.testresources;
 
 public class TestPerson {
-		private String name;
-		private TestAddress address;
-
-		public String getName() {
-			return name;
-		}
-		public void setName(String name) {
-			this.name = name;
-		}
-		public TestAddress getAddress() {
-			return address;
-		}
-		public void setAddress(TestAddress address) {
-			this.address = address;
-		}
+
+	private String name;
+
+	private TestAddress address;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
 	}
+
+	public TestAddress getAddress() {
+		return address;
+	}
+
+	public void setAddress(TestAddress address) {
+		this.address = address;
+	}
+
+}