From fa0fc453650380943ee7646f5e79e9c171bdf2a7 Mon Sep 17 00:00:00 2001
From: Josh Cummings <josh.cummings@gmail.com>
Date: Tue, 9 May 2023 16:28:01 -0600
Subject: [PATCH] Address JavaFormat Violations in Ldif

Issue gh-743
---
 .../ldap/ldif/parser/LdifParser.java          | 15 +++---
 .../DefaultAttributeValidationPolicy.java     |  8 +--
 .../ldap/schema/BasicSchemaSpecification.java | 52 ++++++++++---------
 3 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
index 562c429d..05fe1862 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/parser/LdifParser.java
@@ -221,8 +221,9 @@ public class LdifParser implements Parser, InitializingBean {
 	}
 
 	public void close() throws IOException {
-		if (this.resource.isOpen())
+		if (this.resource.isOpen()) {
 			this.reader.close();
+		}
 	}
 
 	public void reset() throws IOException {
@@ -319,8 +320,8 @@ public class LdifParser implements Parser, InitializingBean {
 									"Record [dn: " + record.getDN() + "] does not conform to specification.");
 						}
 					}
-					catch (NamingException e) {
-						LOG.error("Error adding attribute to record", e);
+					catch (NamingException ex) {
+						LOG.error("Error adding attribute to record", ex);
 						return null;
 					}
 				}
@@ -372,11 +373,11 @@ public class LdifParser implements Parser, InitializingBean {
 				}
 			}
 		}
-		catch (NamingException e) {
-			LOG.error("Error adding attribute to record", e);
+		catch (NamingException ex) {
+			LOG.error("Error adding attribute to record", ex);
 		}
-		catch (NoSuchElementException e) {
-			LOG.error("Error adding attribute to record", e);
+		catch (NoSuchElementException ex) {
+			LOG.error("Error adding attribute to record", ex);
 		}
 	}
 
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
index 13df054c..dfaa0ab5 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/ldif/support/DefaultAttributeValidationPolicy.java
@@ -393,8 +393,8 @@ public class DefaultAttributeValidationPolicy implements AttributeValidationPoli
 				return new LdapAttribute(id, LdapEncoder.parseBase64Binary(value), options, this.ordered);
 			}
 		}
-		catch (IllegalArgumentException e) {
-			throw new InvalidAttributeFormatException(e);
+		catch (IllegalArgumentException ex) {
+			throw new InvalidAttributeFormatException(ex);
 		}
 	}
 
@@ -412,8 +412,8 @@ public class DefaultAttributeValidationPolicy implements AttributeValidationPoli
 				return new LdapAttribute(id, new URI(value), options, this.ordered);
 			}
 		}
-		catch (URISyntaxException e) {
-			throw new InvalidAttributeFormatException(e);
+		catch (URISyntaxException ex) {
+			throw new InvalidAttributeFormatException(ex);
 		}
 	}
 
diff --git a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java
index 382ec683..eff21682 100644
--- a/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java
+++ b/ldif/ldif-core/src/main/java/org/springframework/ldap/schema/BasicSchemaSpecification.java
@@ -44,35 +44,37 @@ public class BasicSchemaSpecification implements Specification<LdapAttributes> {
 	 * @throws NamingException
 	 */
 	public boolean isSatisfiedBy(LdapAttributes record) throws NamingException {
-		if (record != null) {
+		if (record == null) {
+			return false;
+		}
 
-			// DN is required.
-			LdapName dn = record.getName();
-			if (dn != null) {
+		// DN is required.
+		LdapName dn = record.getName();
+		if (dn == null) {
+			return false;
+		}
 
-				// objectClass definition is required.
-				if (record.get("objectClass") != null) {
+		// objectClass definition is required.
+		if (record.get("objectClass") == null) {
+			return false;
+		}
 
-					// Naming attribute is required.
-					Rdn rdn = dn.getRdn(dn.size() - 1);
-					if (record.get(rdn.getType()) != null) {
-						Object object = record.get(rdn.getType()).get();
+		// Naming attribute is required.
+		Rdn rdn = dn.getRdn(dn.size() - 1);
+		if (record.get(rdn.getType()) == null) {
+			return false;
+		}
 
-						if (object instanceof String) {
-							String value = (String) object;
-							if (((String) rdn.getValue()).equalsIgnoreCase(value)) {
-								return true;
-							}
-						}
-						else if (object instanceof byte[]) {
-							String rdnValue = LdapEncoder.printBase64Binary(((String) rdn.getValue()).getBytes());
-							String attributeValue = LdapEncoder.printBase64Binary((byte[]) object);
-							if (rdnValue.equals(attributeValue))
-								return true;
-						}
-					}
-				}
-			}
+		Object object = record.get(rdn.getType()).get();
+
+		if (object instanceof String) {
+			String value = (String) object;
+			return ((String) rdn.getValue()).equalsIgnoreCase(value);
+		}
+		else if (object instanceof byte[]) {
+			String rdnValue = LdapEncoder.printBase64Binary(((String) rdn.getValue()).getBytes());
+			String attributeValue = LdapEncoder.printBase64Binary((byte[]) object);
+			return rdnValue.equals(attributeValue);
 		}
 
 		return false;