formatting and fixes

Issue #1058

Signed-off-by: etrandafir93 <[email protected]>

Author: etrandafir93

test-support/src/main/java/org/springframework/ldap/test/AttributeCheckAttributesMapper.java

@@ -22,11 +22,9 @@
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-import org.springframework.ldap.core.AttributesMapper;
+import junit.framework.Assert;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
+import org.springframework.ldap.core.AttributesMapper;
 
 /**
  * Dummy AttributesMapper for testing purposes to check that the received Attributes are
@@ -43,17 +41,16 @@ public class AttributeCheckAttributesMapper implements AttributesMapper<Object>
 	private String[] absentAttributes = new String[0];
 
 	public Object mapFromAttributes(Attributes attributes) throws NamingException {
-		assertEquals(this.expectedAttributes.length,
-				this.expectedValues.length,
-				"Values and attributes need to have the same length ");
+		Assert.assertEquals("Values and attributes need to have the same length ", this.expectedAttributes.length,
+				this.expectedValues.length);
 		for (int i = 0; i < this.expectedAttributes.length; i++) {
 			Attribute attribute = attributes.get(this.expectedAttributes[i]);
-			assertNotNull(attribute, "Attribute " + this.expectedAttributes[i] + " was not present");
-			assertEquals(this.expectedValues[i], attribute.get());
+			Assert.assertNotNull("Attribute " + this.expectedAttributes[i] + " was not present", attribute);
+			Assert.assertEquals(this.expectedValues[i], attribute.get());
 		}
 
 		for (String absentAttribute : this.absentAttributes) {
-			assertNull(attributes.get(absentAttribute));
+			Assert.assertNull(attributes.get(absentAttribute));
 		}
 
 		return new Object();

test-support/src/main/java/org/springframework/ldap/test/AttributeCheckContextMapper.java

@@ -18,14 +18,11 @@
 
 import java.util.Arrays;
 
-import org.springframework.ldap.core.ContextMapper;
+import junit.framework.Assert;
 
+import org.springframework.ldap.core.ContextMapper;
 import org.springframework.ldap.core.DirContextAdapter;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 /**
  * Dummy ContextMapper for testing purposes to check that the received Attributes are the
  * expected ones.
@@ -42,17 +39,16 @@ public class AttributeCheckContextMapper implements ContextMapper<DirContextAdap
 
 	public DirContextAdapter mapFromContext(Object ctx) {
 		DirContextAdapter adapter = (DirContextAdapter) ctx;
-		assertEquals(this.expectedAttributes.length,
-				this.expectedValues.length,
-				"Values and attributes need to have the same length ");
+		Assert.assertEquals("Values and attributes need to have the same length ", this.expectedAttributes.length,
+				this.expectedValues.length);
 		for (int i = 0; i < this.expectedAttributes.length; i++) {
 			String attributeValue = adapter.getStringAttribute(this.expectedAttributes[i]);
-			assertNotNull(attributeValue, "Attribute " + this.expectedAttributes[i] + " was not present");
-			assertEquals(this.expectedValues[i], attributeValue);
+			Assert.assertNotNull("Attribute " + this.expectedAttributes[i] + " was not present", attributeValue);
+			Assert.assertEquals(this.expectedValues[i], attributeValue);
 		}
 
 		for (String absentAttribute : this.absentAttributes) {
-			assertNull(adapter.getStringAttribute(absentAttribute));
+			Assert.assertNull(adapter.getStringAttribute(absentAttribute));
 		}
 
 		return adapter;

test-support/src/test/java/org/springframework/ldap/test/EmbeddedLdapServerFactoryBeanTests.java

@@ -21,10 +21,9 @@
 import javax.naming.NamingException;
 import javax.naming.directory.Attributes;
 
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
 import org.junit.jupiter.api.Test;
-import org.springframework.ldap.core.AttributesMapper;
+
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.query.LdapQueryBuilder;
 
@@ -39,12 +38,12 @@ void serverStartup() throws Exception {
 		assertThat(ldapTemplate).isNotNull();
 
 		List<String> list = ldapTemplate.search(LdapQueryBuilder.query().where("objectclass").is("person"),
-				new AttributesMapper<>() {
-					public String mapFromAttributes(Attributes attrs) throws NamingException {
-						return (String) attrs.get("cn").get();
-					}
-				});
+				this::mapFromAttributes);
 		assertThat(5).isEqualTo(list.size());
 	}
 
+	private String mapFromAttributes(Attributes attrs) throws NamingException {
+		return (String) attrs.get("cn").get();
+	}
+
 }

test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerFactoryBeanTests.java

@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.query.LdapQueryBuilder;
 
@@ -49,12 +48,12 @@ void serverStartup() throws Exception {
 		assertThat(ldapTemplate).isNotNull();
 
 		List<String> list = ldapTemplate.search(LdapQueryBuilder.query().where("objectclass").is("person"),
-				new AttributesMapper<>() {
-					public String mapFromAttributes(Attributes attrs) throws NamingException {
-						return (String) attrs.get("cn").get();
-					}
-				});
+				this::mapFromAttributes);
 		assertThat(list.size()).isEqualTo(5);
 	}
 
+	private String mapFromAttributes(Attributes attrs) throws NamingException {
+		return (String) attrs.get("cn").get();
+	}
+
 }

test-support/src/test/java/org/springframework/ldap/test/unboundid/EmbeddedLdapServerTests.java

@@ -31,7 +31,6 @@
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.core.support.LdapContextSource;
 import org.springframework.ldap.query.LdapQueryBuilder;
@@ -140,11 +139,7 @@ void shouldBuildLdapServerAndApplyCustomConfiguration() throws IOException {
 			server.start();
 
 			ldapTemplate("dc=jayway,dc=se", this.port)
-				.search(LdapQueryBuilder.query().where("objectclass").is("person"), new AttributesMapper<>() {
-					public String mapFromAttributes(Attributes attrs) throws NamingException {
-						return (String) attrs.get("cn").get();
-					}
-				});
+				.search(LdapQueryBuilder.query().where("objectclass").is("person"), this::mapFromAttributes);
 		}
 
 		assertThat(Path.of(tempLogFile))
@@ -185,4 +180,8 @@ static LdapTemplate ldapTemplate(String base, int port) {
 		return new LdapTemplate(ctx);
 	}
 
+	private String mapFromAttributes(Attributes attrs) throws NamingException {
+		return (String) attrs.get("cn").get();
+	}
+
 }

test-support/src/test/java/org/springframework/ldap/test/unboundid/TestContextSourceFactoryBeanTests.java

@@ -25,7 +25,6 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.ldap.core.AttributesMapper;
 import org.springframework.ldap.core.LdapTemplate;
 import org.springframework.ldap.query.LdapQueryBuilder;
 
@@ -49,12 +48,12 @@ void serverStartup() throws Exception {
 		assertThat(ldapTemplate).isNotNull();
 
 		List<String> list = ldapTemplate.search(LdapQueryBuilder.query().where("objectclass").is("person"),
-				new AttributesMapper<>() {
-					public String mapFromAttributes(Attributes attrs) throws NamingException {
-						return (String) attrs.get("cn").get();
-					}
-				});
+				this::mapFromAttributes);
 		assertThat(list.size()).isEqualTo(5);
 	}
 
+	private String mapFromAttributes(Attributes attrs) throws NamingException {
+		return (String) attrs.get("cn").get();
+	}
+
 }