Polishing

(cherry picked from commit 16325c2)

Author: jhoeller

spring-context/src/main/java/org/springframework/jndi/JndiPropertySource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2011 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -69,9 +69,9 @@ public JndiPropertySource(String name, JndiLocatorDelegate jndiLocator) {
 		super(name, jndiLocator);
 	}
 
+
 	/**
-	 * {@inheritDoc}
-	 * <p>This implementation looks up and returns the value associated with the given
+	 * This implementation looks up and returns the value associated with the given
 	 * name from the underlying {@link JndiLocatorDelegate}. If a {@link NamingException}
 	 * is thrown during the call to {@link JndiLocatorDelegate#lookup(String)}, returns
 	 * {@code null} and issues a DEBUG-level log statement with the exception message.
@@ -80,12 +80,16 @@ public JndiPropertySource(String name, JndiLocatorDelegate jndiLocator) {
 	public Object getProperty(String name) {
 		try {
 			Object value = this.source.lookup(name);
-			logger.debug("JNDI lookup for name [" + name + "] returned: [" + value + "]");
+			if (logger.isDebugEnabled()) {
+				logger.debug("JNDI lookup for name [" + name + "] returned: [" + value + "]");
+			}
 			return value;
 		}
 		catch (NamingException ex) {
-			logger.debug("JNDI lookup for name [" + name + "] threw NamingException " +
-					"with message: " + ex.getMessage() + ". Returning null.");
+			if (logger.isDebugEnabled()) {
+				logger.debug("JNDI lookup for name [" + name + "] threw NamingException " +
+						"with message: " + ex.getMessage() + ". Returning null.");
+			}
 			return null;
 		}
 	}

spring-context/src/test/java/org/springframework/context/support/EnvironmentSecurityManagerIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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,10 +16,6 @@
 
 package org.springframework.context.support;
 
-import static java.lang.String.format;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
 import java.security.AccessControlException;
 import java.security.Permission;
 import java.util.Map;
@@ -35,6 +31,10 @@
 import org.springframework.core.env.StandardEnvironmentTests;
 import org.springframework.stereotype.Component;
 
+import static java.lang.String.format;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
 /**
  * Tests integration between Environment and SecurityManagers. See SPR-9970.
  *
@@ -43,8 +43,10 @@
 public class EnvironmentSecurityManagerIntegrationTests {
 
 	private SecurityManager originalSecurityManager;
+
 	private Map<String, String> env;
 
+
 	@Before
 	public void setUp() {
 		originalSecurityManager = System.getSecurityManager();
@@ -58,16 +60,16 @@ public void tearDown() {
 		System.setSecurityManager(originalSecurityManager);
 	}
 
+
 	@Test
 	public void securityManagerDisallowsAccessToSystemEnvironmentButAllowsAccessToIndividualKeys() {
 		SecurityManager securityManager = new SecurityManager() {
 			@Override
 			public void checkPermission(Permission perm) {
-				// disallowing access to System#getenv means that our
+				// Disallowing access to System#getenv means that our
 				// ReadOnlySystemAttributesMap will come into play.
 				if ("getenv.*".equals(perm.getName())) {
-					throw new AccessControlException(
-							"Accessing the system environment is disallowed");
+					throw new AccessControlException("Accessing the system environment is disallowed");
 				}
 			}
 		};
@@ -84,18 +86,17 @@ public void securityManagerDisallowsAccessToSystemEnvironmentAndDisallowsAccessT
 		SecurityManager securityManager = new SecurityManager() {
 			@Override
 			public void checkPermission(Permission perm) {
-				// disallowing access to System#getenv means that our
+				// Disallowing access to System#getenv means that our
 				// ReadOnlySystemAttributesMap will come into play.
 				if ("getenv.*".equals(perm.getName())) {
-					throw new AccessControlException(
-							"Accessing the system environment is disallowed");
+					throw new AccessControlException("Accessing the system environment is disallowed");
 				}
-				// disallowing access to the spring.profiles.active property means that
+				// Disallowing access to the spring.profiles.active property means that
 				// the BeanDefinitionReader won't be able to determine which profiles are
 				// active. We should see an INFO-level message in the console about this
 				// and as a result, any components marked with a non-default profile will
 				// be ignored.
-				if (("getenv."+AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME).equals(perm.getName())) {
+				if (("getenv." + AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME).equals(perm.getName())) {
 					throw new AccessControlException(
 							format("Accessing system environment variable [%s] is disallowed",
 									AbstractEnvironment.ACTIVE_PROFILES_PROPERTY_NAME));
@@ -110,8 +111,10 @@ public void checkPermission(Permission perm) {
 		assertThat(bf.containsBean("c1"), is(false));
 	}
 
+
 	@Component("c1")
 	@Profile("p1")
 	static class C1 {
 	}
+
 }

spring-context/src/test/java/org/springframework/jndi/SimpleNamingContextTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -214,52 +214,53 @@ public void testCreateInitialContext() throws Exception {
 		assertEquals(ctx.lookup(name), o2);
 	}
 
-}
 
-class StubDataSource implements DataSource {
+	static class StubDataSource implements DataSource {
 
-	@Override
-	public Connection getConnection() throws SQLException {
-		return null;
-	}
+		@Override
+		public Connection getConnection() throws SQLException {
+			return null;
+		}
 
-	@Override
-	public Connection getConnection(String username, String password) throws SQLException {
-		return null;
-	}
+		@Override
+		public Connection getConnection(String username, String password) throws SQLException {
+			return null;
+		}
 
-	@Override
-	public PrintWriter getLogWriter() throws SQLException {
-		return null;
-	}
+		@Override
+		public PrintWriter getLogWriter() throws SQLException {
+			return null;
+		}
 
-	@Override
-	public int getLoginTimeout() throws SQLException {
-		return 0;
-	}
+		@Override
+		public int getLoginTimeout() throws SQLException {
+			return 0;
+		}
 
-	@Override
-	public void setLogWriter(PrintWriter arg0) throws SQLException {
+		@Override
+		public void setLogWriter(PrintWriter arg0) throws SQLException {
 
-	}
+		}
 
-	@Override
-	public void setLoginTimeout(int arg0) throws SQLException {
+		@Override
+		public void setLoginTimeout(int arg0) throws SQLException {
 
-	}
+		}
 
-	@Override
-	public boolean isWrapperFor(Class<?> arg0) throws SQLException {
-		return false;
-	}
+		@Override
+		public boolean isWrapperFor(Class<?> arg0) throws SQLException {
+			return false;
+		}
 
-	@Override
-	public <T> T unwrap(Class<T> arg0) throws SQLException {
-		return null;
-	}
+		@Override
+		public <T> T unwrap(Class<T> arg0) throws SQLException {
+			return null;
+		}
 
-	@Override
-	public Logger getParentLogger() {
-		return null;
+		@Override
+		public Logger getParentLogger() {
+			return null;
+		}
 	}
+
 }

spring-context/src/test/java/org/springframework/tests/mock/jndi/SimpleNamingContextBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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,7 +17,6 @@
 package org.springframework.tests.mock.jndi;
 
 import java.util.Hashtable;
-
 import javax.naming.Context;
 import javax.naming.NamingException;
 import javax.naming.spi.InitialContextFactory;
@@ -40,9 +39,9 @@
  *
  * <p>There are various choices for DataSource implementations:
  * <ul>
- * <li>SingleConnectionDataSource (using the same Connection for all getConnection calls);
- * <li>DriverManagerDataSource (creating a new Connection on each getConnection call);
- * <li>Apache's Jakarta Commons DBCP offers BasicDataSource (a real pool).
+ * <li>{@code SingleConnectionDataSource} (using the same Connection for all getConnection calls)
+ * <li>{@code DriverManagerDataSource} (creating a new Connection on each getConnection call)
+ * <li>Apache's Jakarta Commons DBCP offers {@code org.apache.commons.dbcp.BasicDataSource} (a real pool)
  * </ul>
  *
  * <p>Typical usage in bootstrap code:
@@ -77,7 +76,6 @@
  * @see SimpleNamingContext
  * @see org.springframework.jdbc.datasource.SingleConnectionDataSource
  * @see org.springframework.jdbc.datasource.DriverManagerDataSource
- * @see org.apache.commons.dbcp.BasicDataSource
  */
 public class SimpleNamingContextBuilder implements InitialContextFactoryBuilder {
 
@@ -197,7 +195,7 @@ public InitialContextFactory createInitialContextFactory(Hashtable<?,?> environm
 		if (activated == null && environment != null) {
 			Object icf = environment.get(Context.INITIAL_CONTEXT_FACTORY);
 			if (icf != null) {
-				Class<?> icfClass = null;
+				Class<?> icfClass;
 				if (icf instanceof Class) {
 					icfClass = (Class<?>) icf;
 				}
@@ -216,10 +214,7 @@ else if (icf instanceof String) {
 					return (InitialContextFactory) icfClass.newInstance();
 				}
 				catch (Throwable ex) {
-					IllegalStateException ise =
-							new IllegalStateException("Cannot instantiate specified InitialContextFactory: " + icf);
-					ise.initCause(ex);
-					throw ise;
+					throw new IllegalStateException("Cannot instantiate specified InitialContextFactory: " + icf, ex);
 				}
 			}
 		}