Polishing

(cherry picked from commit 35e247a)

Author: jhoeller

spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java

@@ -174,7 +174,7 @@ void purgeExpiredRegistries() {
 
 	@Override
 	public String toString() {
-		return "local=[" + this.localRegistry +	"], remote=" + this.remoteRegistries + "]";
+		return "local=[" + this.localRegistry +	"], remote=" + this.remoteRegistries;
 	}
 
 
@@ -260,7 +260,6 @@ public String toString() {
 	/**
 	 * SimpUser that can be (de)serialized and broadcast to other servers.
 	 */
-	@SuppressWarnings("unused")
 	private static class TransferSimpUser implements SimpUser {
 
 		private String name;
@@ -274,6 +273,7 @@ private static class TransferSimpUser implements SimpUser {
 		/**
 		 * Default constructor for JSON deserialization.
 		 */
+		@SuppressWarnings("unused")
 		public TransferSimpUser() {
 			this.sessions = new HashSet<>(1);
 		}
@@ -368,7 +368,6 @@ public String toString() {
 	/**
 	 * SimpSession that can be (de)serialized and broadcast to other servers.
 	 */
-	@SuppressWarnings("unused")
 	private static class TransferSimpSession implements SimpSession {
 
 		private String id;
@@ -380,6 +379,7 @@ private static class TransferSimpSession implements SimpSession {
 		/**
 		 * Default constructor for JSON deserialization.
 		 */
+		@SuppressWarnings("unused")
 		public TransferSimpSession() {
 			this.subscriptions = new HashSet<>(4);
 		}

spring-test/src/main/java/org/springframework/test/context/jdbc/SqlScriptsTestExecutionListener.java

@@ -127,11 +127,11 @@ public void afterTestMethod(TestContext testContext) throws Exception {
 	private void executeSqlScripts(TestContext testContext, ExecutionPhase executionPhase) throws Exception {
 		boolean classLevel = false;
 
-		Set<Sql> sqlAnnotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(testContext.getTestMethod(), Sql.class,
-			SqlGroup.class);
+		Set<Sql> sqlAnnotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(
+				testContext.getTestMethod(), Sql.class, SqlGroup.class);
 		if (sqlAnnotations.isEmpty()) {
-			sqlAnnotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(testContext.getTestClass(), Sql.class,
-				SqlGroup.class);
+			sqlAnnotations = AnnotatedElementUtils.getMergedRepeatableAnnotations(
+					testContext.getTestClass(), Sql.class, SqlGroup.class);
 			if (!sqlAnnotations.isEmpty()) {
 				classLevel = true;
 			}
@@ -145,26 +145,24 @@ private void executeSqlScripts(TestContext testContext, ExecutionPhase execution
 	/**
 	 * Execute the SQL scripts configured via the supplied {@link Sql @Sql}
 	 * annotation for the given {@link ExecutionPhase} and {@link TestContext}.
-	 *
 	 * <p>Special care must be taken in order to properly support the configured
 	 * {@link SqlConfig#transactionMode}.
-	 *
 	 * @param sql the {@code @Sql} annotation to parse
 	 * @param executionPhase the current execution phase
 	 * @param testContext the current {@code TestContext}
-	 * @param classLevel {@code true} if {@link Sql @Sql} was declared at the
-	 * class level
+	 * @param classLevel {@code true} if {@link Sql @Sql} was declared at the class level
 	 */
 	private void executeSqlScripts(Sql sql, ExecutionPhase executionPhase, TestContext testContext, boolean classLevel)
 			throws Exception {
+
 		if (executionPhase != sql.executionPhase()) {
 			return;
 		}
 
 		MergedSqlConfig mergedSqlConfig = new MergedSqlConfig(sql.config(), testContext.getTestClass());
 		if (logger.isDebugEnabled()) {
-			logger.debug(String.format("Processing %s for execution phase [%s] and test context %s.", mergedSqlConfig,
-				executionPhase, testContext));
+			logger.debug(String.format("Processing %s for execution phase [%s] and test context %s.",
+					mergedSqlConfig, executionPhase, testContext));
 		}
 
 		final ResourceDatabasePopulator populator = new ResourceDatabasePopulator();
@@ -179,15 +177,13 @@ private void executeSqlScripts(Sql sql, ExecutionPhase executionPhase, TestConte
 		String[] scripts = getScripts(sql, testContext, classLevel);
 		scripts = TestContextResourceUtils.convertToClasspathResourcePaths(testContext.getTestClass(), scripts);
 		List<Resource> scriptResources = TestContextResourceUtils.convertToResourceList(
-			testContext.getApplicationContext(), scripts);
-
-		for (String statement : sql.statements()) {
-			if (StringUtils.hasText(statement)) {
-				statement = statement.trim();
-				scriptResources.add(new ByteArrayResource(statement.getBytes(), "from inlined SQL statement: " + statement));
+				testContext.getApplicationContext(), scripts);
+		for (String stmt : sql.statements()) {
+			if (StringUtils.hasText(stmt)) {
+				stmt = stmt.trim();
+				scriptResources.add(new ByteArrayResource(stmt.getBytes(), "from inlined SQL statement: " + stmt));
 			}
 		}
-
 		populator.setScripts(scriptResources.toArray(new Resource[scriptResources.size()]));
 		if (logger.isDebugEnabled()) {
 			logger.debug("Executing SQL scripts: " + ObjectUtils.nullSafeToString(scriptResources));
@@ -196,47 +192,39 @@ private void executeSqlScripts(Sql sql, ExecutionPhase executionPhase, TestConte
 		String dsName = mergedSqlConfig.getDataSource();
 		String tmName = mergedSqlConfig.getTransactionManager();
 		DataSource dataSource = TestContextTransactionUtils.retrieveDataSource(testContext, dsName);
-		final PlatformTransactionManager transactionManager = TestContextTransactionUtils.retrieveTransactionManager(
-			testContext, tmName);
-		final boolean newTxRequired = mergedSqlConfig.getTransactionMode() == TransactionMode.ISOLATED;
+		PlatformTransactionManager txMgr = TestContextTransactionUtils.retrieveTransactionManager(testContext, tmName);
+		boolean newTxRequired = (mergedSqlConfig.getTransactionMode() == TransactionMode.ISOLATED);
 
-		if (transactionManager == null) {
+		if (txMgr == null) {
 			Assert.state(!newTxRequired, () -> String.format("Failed to execute SQL scripts for test context %s: " +
 					"cannot execute SQL scripts using Transaction Mode " +
 					"[%s] without a PlatformTransactionManager.", testContext, TransactionMode.ISOLATED));
-
 			Assert.state(dataSource != null, () -> String.format("Failed to execute SQL scripts for test context %s: " +
 					"supply at least a DataSource or PlatformTransactionManager.", testContext));
-
 			// Execute scripts directly against the DataSource
 			populator.execute(dataSource);
 		}
 		else {
-			DataSource dataSourceFromTxMgr = getDataSourceFromTransactionManager(transactionManager);
-
+			DataSource dataSourceFromTxMgr = getDataSourceFromTransactionManager(txMgr);
 			// Ensure user configured an appropriate DataSource/TransactionManager pair.
 			if (dataSource != null && dataSourceFromTxMgr != null && !dataSource.equals(dataSourceFromTxMgr)) {
 				throw new IllegalStateException(String.format("Failed to execute SQL scripts for test context %s: " +
 						"the configured DataSource [%s] (named '%s') is not the one associated with " +
 						"transaction manager [%s] (named '%s').", testContext, dataSource.getClass().getName(),
-					dsName, transactionManager.getClass().getName(), tmName));
+						dsName, txMgr.getClass().getName(), tmName));
 			}
-
 			if (dataSource == null) {
 				dataSource = dataSourceFromTxMgr;
-				Assert.state(dataSource != null, () -> String.format("Failed to execute SQL scripts for test context %s: " +
-						"could not obtain DataSource from transaction manager [%s] (named '%s').", testContext,
-						transactionManager.getClass().getName(), tmName));
+				Assert.state(dataSource != null, () -> String.format("Failed to execute SQL scripts for " +
+						"test context %s: could not obtain DataSource from transaction manager [%s] (named '%s').",
+						testContext, txMgr.getClass().getName(), tmName));
 			}
-
 			final DataSource finalDataSource = dataSource;
 			int propagation = (newTxRequired ? TransactionDefinition.PROPAGATION_REQUIRES_NEW :
 					TransactionDefinition.PROPAGATION_REQUIRED);
-
-			TransactionAttribute transactionAttribute = TestContextTransactionUtils.createDelegatingTransactionAttribute(
-				testContext, new DefaultTransactionAttribute(propagation));
-
-			new TransactionTemplate(transactionManager, transactionAttribute).execute(status -> {
+			TransactionAttribute txAttr = TestContextTransactionUtils.createDelegatingTransactionAttribute(
+					testContext, new DefaultTransactionAttribute(propagation));
+			new TransactionTemplate(txMgr, txAttr).execute(status -> {
 				populator.execute(finalDataSource);
 				return null;
 			});
@@ -260,7 +248,7 @@ private DataSource getDataSourceFromTransactionManager(PlatformTransactionManage
 	private String[] getScripts(Sql sql, TestContext testContext, boolean classLevel) {
 		String[] scripts = sql.scripts();
 		if (ObjectUtils.isEmpty(scripts) && ObjectUtils.isEmpty(sql.statements())) {
-			scripts = new String[] { detectDefaultScript(testContext, classLevel) };
+			scripts = new String[] {detectDefaultScript(testContext, classLevel)};
 		}
 		return scripts;
 	}
@@ -286,8 +274,8 @@ private String detectDefaultScript(TestContext testContext, boolean classLevel)
 
 		if (classPathResource.exists()) {
 			if (logger.isInfoEnabled()) {
-				logger.info(String.format("Detected default SQL script \"%s\" for test %s [%s]", prefixedResourcePath,
-					elementType, elementName));
+				logger.info(String.format("Detected default SQL script \"%s\" for test %s [%s]",
+						prefixedResourcePath, elementType, elementName));
 			}
 			return prefixedResourcePath;
 		}

spring-test/src/main/java/org/springframework/test/context/support/ActiveProfilesUtils.java

@@ -86,7 +86,7 @@ static String[] resolveActiveProfiles(Class<?> testClass) {
 			ActiveProfiles annotation = descriptor.synthesizeAnnotation();
 
 			if (logger.isTraceEnabled()) {
-				logger.trace(String.format("Retrieved @ActiveProfiles [%s] for declaring class [%s].",
+				logger.trace(String.format("Retrieved @ActiveProfiles [%s] for declaring class [%s]",
 						annotation, declaringClass.getName()));
 			}
 
@@ -101,15 +101,15 @@ static String[] resolveActiveProfiles(Class<?> testClass) {
 			}
 			catch (Exception ex) {
 				String msg = String.format("Could not instantiate ActiveProfilesResolver of type [%s] " +
-						"for test class [%s].", resolverClass.getName(), rootDeclaringClass.getName());
+						"for test class [%s]", resolverClass.getName(), rootDeclaringClass.getName());
 				logger.error(msg);
 				throw new IllegalStateException(msg, ex);
 			}
 
 			String[] profiles = resolver.resolve(rootDeclaringClass);
 			if (profiles == null) {
 				String msg = String.format(
-						"ActiveProfilesResolver [%s] returned a null array of bean definition profiles.",
+						"ActiveProfilesResolver [%s] returned a null array of bean definition profiles",
 						resolverClass.getName());
 				logger.error(msg);
 				throw new IllegalStateException(msg);

spring-test/src/main/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilder.java

@@ -240,7 +240,7 @@ public MockHttpServletRequestBuilder contentType(String contentType) {
 	 * @param mediaTypes one or more media types
 	 */
 	public MockHttpServletRequestBuilder accept(MediaType... mediaTypes) {
-		Assert.notEmpty(mediaTypes, "No 'Accept' media types");
+		Assert.notEmpty(mediaTypes, "'mediaTypes' must not be empty");
 		this.headers.set("Accept", MediaType.toString(Arrays.asList(mediaTypes)));
 		return this;
 	}
@@ -250,8 +250,8 @@ public MockHttpServletRequestBuilder accept(MediaType... mediaTypes) {
 	 * @param mediaTypes one or more media types
 	 */
 	public MockHttpServletRequestBuilder accept(String... mediaTypes) {
-		Assert.notEmpty(mediaTypes, "No 'Accept' media types");
-		List<MediaType> result = new ArrayList<>(mediaTypes.length);
+		Assert.notEmpty(mediaTypes, "'mediaTypes' must not be empty");
+		List<MediaType> result = new ArrayList<MediaType>(mediaTypes.length);
 		for (String mediaType : mediaTypes) {
 			result.add(MediaType.parseMediaType(mediaType));
 		}

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/ResourceHandlerRegistry.java

@@ -62,10 +62,22 @@ public class ResourceHandlerRegistry {
 	private int order = Integer.MAX_VALUE -1;
 
 
+	/**
+	 * Create a new resource handler registry for the given application context.
+	 * @param applicationContext the Spring application context
+	 * @param servletContext the corresponding Servlet context
+	 */
 	public ResourceHandlerRegistry(ApplicationContext applicationContext, ServletContext servletContext) {
 		this(applicationContext, servletContext, null);
 	}
 
+	/**
+	 * Create a new resource handler registry for the given application context.
+	 * @param applicationContext the Spring application context
+	 * @param servletContext the corresponding Servlet context
+	 * @param contentNegotiationManager the content negotiation manager to use
+	 * @since 4.3
+	 */
 	public ResourceHandlerRegistry(ApplicationContext applicationContext, ServletContext servletContext,
 			ContentNegotiationManager contentNegotiationManager) {