Minor cleanup.

marthursson · marthursson · commit 086497d66eae · 2013-11-18T14:54:43.000+01:00
diff --git a/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java b/core/src/main/java/org/springframework/ldap/config/ContextSourceParser.java
@@ -197,7 +197,7 @@ private void populatePoolValidationProperties(BeanDefinitionBuilder builder, Ele
             try {
                 nonTransientExceptionClasses.add(ClassUtils.getDefaultClassLoader().loadClass(className));
             } catch (ClassNotFoundException e) {
-                throw new IllegalArgumentException(String.format("%s is not a valid class name", className));
+                throw new IllegalArgumentException(String.format("%s is not a valid class name", className), e);
             }
         }
 
diff --git a/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java b/core/src/main/java/org/springframework/ldap/core/DistinguishedName.java
@@ -15,6 +15,7 @@
  */
 package org.springframework.ldap.core;
 
+import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.slf4j.Logger;
@@ -536,7 +537,7 @@ public Object clone() {
 		}
 		catch (CloneNotSupportedException e) {
 			log.error("CloneNotSupported thrown from superclass - this should not happen");
-			throw new RuntimeException("Fatal error in clone", e);
+			throw new UncategorizedLdapException("Fatal error in clone", e);
 		}
 	}
 
diff --git a/core/src/main/java/org/springframework/ldap/core/LdapOperations.java b/core/src/main/java/org/springframework/ldap/core/LdapOperations.java
@@ -1811,7 +1811,7 @@ boolean authenticate(String base, String filter, String password,
      * @throws org.springframework.ldap.NamingException on error.
      * @since 2.0
      */
-    public <T> List<T> find(Name base, Filter filter, SearchControls searchControls, Class<T> clazz);
+    <T> List<T> find(Name base, Filter filter, SearchControls searchControls, Class<T> clazz);
 
     /**
      * Search for entries in the LDAP directory. The referenced class must have object-directory
diff --git a/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java b/core/src/main/java/org/springframework/ldap/core/NameAwareAttribute.java
@@ -163,7 +163,7 @@ public void initValuesAsNames() {
                     newValuesAsNames.put(LdapUtils.newLdapName(s), s);
                 } catch (InvalidNameException e) {
                     throw new IllegalArgumentException("This instance has values that are not valid distinguished names; " +
-                            "cannot handle Name values");
+                            "cannot handle Name values", e);
                 }
             } else {
                 throw new IllegalArgumentException("This instance has non-string attribute values; " +
diff --git a/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java b/core/src/main/java/org/springframework/ldap/filter/BinaryLogicalFilter.java
@@ -27,7 +27,7 @@
  */
 public abstract class BinaryLogicalFilter extends AbstractFilter {
 
-	protected List<Filter> queryList = new LinkedList<Filter>();
+	private List<Filter> queryList = new LinkedList<Filter>();
 
 	public StringBuffer encode(StringBuffer buff) {
 		if (queryList.size() <= 0) {
@@ -47,7 +47,7 @@ else if (queryList.size() == 1) {
 			buff.append("(").append(getLogicalOperator());
 
             for (Filter query : queryList) {
-                buff = query.encode(buff);
+                query.encode(buff);
             }
 
 			buff.append(")");
diff --git a/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java b/core/src/main/java/org/springframework/ldap/filter/WhitespaceWildcardsFilter.java
@@ -49,11 +49,8 @@ protected String encodeValue(String value) {
 			return "*";
 		}
 
-		// trim value, we will add in stars first and last anywhay
-		value = value.trim();
-
 		// filter encode so that any stars etc. are preserved
-		String filterEncoded = LdapEncoder.filterEncode(value);
+		String filterEncoded = LdapEncoder.filterEncode(value.trim());
 
 		// Now replace all whitespace with stars
 		Matcher m = starReplacePattern.matcher(filterEncoded);
diff --git a/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java b/core/src/main/java/org/springframework/ldap/odm/core/impl/DefaultObjectDirectoryMapper.java
@@ -130,7 +130,7 @@ private EntityData addManagedClass(Class<?> managedClass) {
             managedClass.getConstructor();
         } catch (NoSuchMethodException e) {
             throw new InvalidEntryException(String.format(
-                    "The class %1$s must have a zero argument constructor to be an Entry", managedClass));
+                    "The class %1$s must have a zero argument constructor to be an Entry", managedClass), e);
         }
 
         // Check we have all of the necessary converters for the class
diff --git a/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java b/odm/src/main/java/org/springframework/ldap/odm/tools/SchemaToJava.java
@@ -316,9 +316,9 @@ private static File makeOutputFile(String outputDir, String packageName, String
             directory.mkdirs();
             outputFile.createNewFile();
         } catch (SecurityException se) {
-            throw new IOException(String.format("Can't write to output file %1$s", outputFile.getAbsoluteFile()));
+            throw new IOException(String.format("Can't write to output file %1$s", outputFile.getAbsoluteFile()), se);
         } catch (IOException ioe) {
-            throw new IOException(String.format("Can't write to output file %1$s", outputFile.getAbsoluteFile()));
+            throw new IOException(String.format("Can't write to output file %1$s", outputFile.getAbsoluteFile()), ioe);
         }
         
         return outputFile;
diff --git a/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java b/test-support/src/main/java/org/springframework/ldap/test/LdapTestUtils.java
@@ -19,7 +19,10 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.directory.server.core.DefaultDirectoryService;
 import org.apache.directory.server.protocol.shared.store.LdifFileLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.core.io.Resource;
+import org.springframework.ldap.UncategorizedLdapException;
 import org.springframework.ldap.core.ContextSource;
 import org.springframework.ldap.core.LdapAttributes;
 import org.springframework.ldap.core.support.DefaultDirObjectFactory;
@@ -46,6 +49,7 @@
  * @author Mattias Hellborg Arthursson
  */
 public final class LdapTestUtils {
+    private final static Logger logger = LoggerFactory.getLogger(LdapTestUtils.class);
 
     public static final String DEFAULT_PRINCIPAL = "uid=admin,ou=system";
     public static final String DEFAULT_PASSWORD = "secret";
@@ -103,7 +107,7 @@ public static void startEmbeddedServer(int port, String defaultPartitionSuffix,
         try {
             embeddedServer = EmbeddedLdapServer.newEmbeddedServer(defaultPartitionName, defaultPartitionSuffix, port);
         } catch (Exception e) {
-            throw new RuntimeException("Failed to start embedded server");
+            throw new UncategorizedLdapException("Failed to start embedded server", e);
         }
     }
 
@@ -190,7 +194,7 @@ public static void clearSubContexts(DirContext ctx, Name name) throws NamingExce
                 }
             }
         } catch (NamingException e) {
-            e.printStackTrace();
+            logger.debug("Error cleaning sub-contexts", e);
         } finally {
             try {
                 enumeration.close();
@@ -254,7 +258,7 @@ private static void loadLdif(DirContext context, Name rootNode, Resource ldifFil
                 context.bind(dn, null, record);
             }
         } catch (Exception e) {
-            throw new RuntimeException("Failed to populate LDIF", e);
+            throw new UncategorizedLdapException("Failed to populate LDIF", e);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ private void populatePoolValidationProperties(BeanDefinitionBuilder builder, Ele`
`197`	`197`	`try {`
`198`	`198`	`nonTransientExceptionClasses.add(ClassUtils.getDefaultClassLoader().loadClass(className));`
`199`	`199`	`} catch (ClassNotFoundException e) {`
`200`		`- throw new IllegalArgumentException(String.format("%s is not a valid class name", className));`
	`200`	`+ throw new IllegalArgumentException(String.format("%s is not a valid class name", className), e);`
`201`	`201`	`}`
`202`	`202`	`}`
`203`	`203`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`	`package org.springframework.ldap.core;`
`17`	`17`
	`18`	`+import org.springframework.ldap.UncategorizedLdapException;`
`18`	`19`	`import org.springframework.util.ObjectUtils;`
`19`	`20`	`import org.springframework.util.StringUtils;`
`20`	`21`	`import org.slf4j.Logger;`
`@@ -536,7 +537,7 @@ public Object clone() {`
`536`	`537`	`}`
`537`	`538`	`catch (CloneNotSupportedException e) {`
`538`	`539`	`log.error("CloneNotSupported thrown from superclass - this should not happen");`
`539`		`- throw new RuntimeException("Fatal error in clone", e);`
	`540`	`+ throw new UncategorizedLdapException("Fatal error in clone", e);`
`540`	`541`	`}`
`541`	`542`	`}`
`542`	`543`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public void initValuesAsNames() {`
`163`	`163`	`newValuesAsNames.put(LdapUtils.newLdapName(s), s);`
`164`	`164`	`} catch (InvalidNameException e) {`
`165`	`165`	`throw new IllegalArgumentException("This instance has values that are not valid distinguished names; " +`
`166`		`- "cannot handle Name values");`
	`166`	`+ "cannot handle Name values", e);`
`167`	`167`	`}`
`168`	`168`	`} else {`
`169`	`169`	`throw new IllegalArgumentException("This instance has non-string attribute values; " +`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ private EntityData addManagedClass(Class<?> managedClass) {`
`130`	`130`	`managedClass.getConstructor();`
`131`	`131`	`} catch (NoSuchMethodException e) {`
`132`	`132`	`throw new InvalidEntryException(String.format(`
`133`		`- "The class %1$s must have a zero argument constructor to be an Entry", managedClass));`
	`133`	`+ "The class %1$s must have a zero argument constructor to be an Entry", managedClass), e);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Check we have all of the necessary converters for the class`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,10 @@`
`19`	`19`	`import org.apache.commons.io.IOUtils;`
`20`	`20`	`import org.apache.directory.server.core.DefaultDirectoryService;`
`21`	`21`	`import org.apache.directory.server.protocol.shared.store.LdifFileLoader;`
	`22`	`+import org.slf4j.Logger;`
	`23`	`+import org.slf4j.LoggerFactory;`
`22`	`24`	`import org.springframework.core.io.Resource;`
	`25`	`+import org.springframework.ldap.UncategorizedLdapException;`
`23`	`26`	`import org.springframework.ldap.core.ContextSource;`
`24`	`27`	`import org.springframework.ldap.core.LdapAttributes;`
`25`	`28`	`import org.springframework.ldap.core.support.DefaultDirObjectFactory;`
`@@ -46,6 +49,7 @@`
`46`	`49`	`* @author Mattias Hellborg Arthursson`
`47`	`50`	`*/`
`48`	`51`	`public final class LdapTestUtils {`
	`52`	`+ private final static Logger logger = LoggerFactory.getLogger(LdapTestUtils.class);`
`49`	`53`
`50`	`54`	`public static final String DEFAULT_PRINCIPAL = "uid=admin,ou=system";`
`51`	`55`	`public static final String DEFAULT_PASSWORD = "secret";`
`@@ -103,7 +107,7 @@ public static void startEmbeddedServer(int port, String defaultPartitionSuffix,`
`103`	`107`	`try {`
`104`	`108`	`embeddedServer = EmbeddedLdapServer.newEmbeddedServer(defaultPartitionName, defaultPartitionSuffix, port);`
`105`	`109`	`} catch (Exception e) {`
`106`		`- throw new RuntimeException("Failed to start embedded server");`
	`110`	`+ throw new UncategorizedLdapException("Failed to start embedded server", e);`
`107`	`111`	`}`
`108`	`112`	`}`
`109`	`113`
`@@ -190,7 +194,7 @@ public static void clearSubContexts(DirContext ctx, Name name) throws NamingExce`
`190`	`194`	`}`
`191`	`195`	`}`
`192`	`196`	`} catch (NamingException e) {`
`193`		`- e.printStackTrace();`
	`197`	`+ logger.debug("Error cleaning sub-contexts", e);`
`194`	`198`	`} finally {`
`195`	`199`	`try {`
`196`	`200`	`enumeration.close();`
`@@ -254,7 +258,7 @@ private static void loadLdif(DirContext context, Name rootNode, Resource ldifFil`
`254`	`258`	`context.bind(dn, null, record);`
`255`	`259`	`}`
`256`	`260`	`} catch (Exception e) {`
`257`		`- throw new RuntimeException("Failed to populate LDIF", e);`
	`261`	`+ throw new UncategorizedLdapException("Failed to populate LDIF", e);`
`258`	`262`	`}`
`259`	`263`	`}`
`260`	`264`