Polishing

spring-aop/src/main/java/org/springframework/aop/config/AdviceEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -30,13 +30,14 @@ public class AdviceEntry implements ParseState.Entry {
 
 
 	/**
-	 * Creates a new instance of the {@link AdviceEntry} class.
+	 * Create a new {@code AdviceEntry} instance.
-	 * @param kind the kind of advice represented by this entry (before, after, around, etc.)
+	 * @param kind the kind of advice represented by this entry (before, after, around)
 	 */
 	public AdviceEntry(String kind) {
 		this.kind = kind;
 	}
 
+
 	@Override
 	public String toString() {
 		return "Advice (" + this.kind + ")";

spring-aop/src/main/java/org/springframework/aop/config/AdvisorEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -30,13 +30,14 @@ public class AdvisorEntry implements ParseState.Entry {
 
 
 	/**
-	 * Creates a new instance of the {@link AdvisorEntry} class.
+	 * Create a new {@code AdvisorEntry} instance.
 	 * @param name the bean name of the advisor
 	 */
 	public AdvisorEntry(String name) {
 		this.name = name;
 	}
 
+
 	@Override
 	public String toString() {
 		return "Advisor '" + this.name + "'";

spring-aop/src/main/java/org/springframework/aop/config/AspectEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -34,7 +34,7 @@ public class AspectEntry implements ParseState.Entry {
 
 
 	/**
-	 * Create a new AspectEntry.
+	 * Create a new {@code AspectEntry} instance.
 	 * @param id the id of the aspect element
 	 * @param ref the bean name referenced by this aspect element
 	 */
@@ -43,6 +43,7 @@ public class AspectEntry implements ParseState.Entry {
 		this.ref = ref;
 	}
 
+
 	@Override
 	public String toString() {
 		return "Aspect: " + (StringUtils.hasLength(this.id) ? "id='" + this.id + "'" : "ref='" + this.ref + "'");

spring-aop/src/main/java/org/springframework/aop/config/PointcutEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -28,14 +28,16 @@ public class PointcutEntry implements ParseState.Entry {
 
 	private final String name;
 
+
 	/**
-	 * Creates a new instance of the {@link PointcutEntry} class.
+	 * Create a new {@code PointcutEntry} instance.
 	 * @param name the bean name of the pointcut
 	 */
 	public PointcutEntry(String name) {
 		this.name = name;
 	}
 
+
 	@Override
 	public String toString() {
 		return "Pointcut '" + this.name + "'";

spring-beans/src/main/java/org/springframework/beans/factory/parsing/BeanEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2006 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -24,18 +24,17 @@ package org.springframework.beans.factory.parsing;
  */
 public class BeanEntry implements ParseState.Entry {
 
-	private String beanDefinitionName;
+	private final String beanDefinitionName;
 
 
 	/**
-	 * Creates a new instance of {@link BeanEntry} class.
+	 * Create a new {@code BeanEntry} instance.
 	 * @param beanDefinitionName the name of the associated bean definition
 	 */
 	public BeanEntry(String beanDefinitionName) {
 		this.beanDefinitionName = beanDefinitionName;
 	}
 
-
 	@Override
 	public String toString() {
 		return "Bean '" + this.beanDefinitionName + "'";

spring-beans/src/main/java/org/springframework/beans/factory/parsing/ParseState.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -22,23 +22,17 @@ import org.springframework.lang.Nullable;
 
 /**
  * Simple {@link LinkedList}-based structure for tracking the logical position during
- * a parsing process. {@link Entry entries} are added to the LinkedList at
+ * a parsing process. {@link Entry entries} are added to the LinkedList at each point
- * each point during the parse phase in a reader-specific manner.
+ * during the parse phase in a reader-specific manner.
  *
  * <p>Calling {@link #toString()} will render a tree-style view of the current logical
- * position in the parse phase. This representation is intended for use in
+ * position in the parse phase. This representation is intended for use in error messages.
- * error messages.
  *
  * @author Rob Harrop
  * @since 2.0
  */
 public final class ParseState {
 
-	/**
-	 * Tab character used when rendering the tree-style representation.
-	 */
-	private static final char TAB = '\t';
-
 	/**
 	 * Internal {@link LinkedList} storage.
 	 */
@@ -53,8 +47,8 @@ public final class ParseState {
 	}
 
 	/**
-	 * Create a new {@code ParseState} whose {@link LinkedList} is a {@link Object#clone clone}
+	 * Create a new {@code ParseState} whose {@link LinkedList} is a clone
-	 * of that of the passed in {@code ParseState}.
+	 * of the state in the passed in {@code ParseState}.
 	 */
 	@SuppressWarnings("unchecked")
 	private ParseState(ParseState other) {
@@ -99,16 +93,18 @@ public final class ParseState {
 	 */
 	@Override
 	public String toString() {
-		StringBuilder sb = new StringBuilder();
+		StringBuilder sb = new StringBuilder(64);
-		for (int x = 0; x < this.state.size(); x++) {
+		int i = 0;
-			if (x > 0) {
+		for (ParseState.Entry entry : this.state) {
+			if (i > 0) {
 				sb.append('\n');
-				for (int y = 0; y < x; y++) {
+				for (int j = 0; j < i; j++) {
-					sb.append(TAB);
+					sb.append('\t');
 				}
 				sb.append("-> ");
 			}
-			sb.append(this.state.get(x));
+			sb.append(entry);
+			i++;
 		}
 		return sb.toString();
 	}
@@ -118,7 +114,6 @@ public final class ParseState {
 	 * Marker interface for entries into the {@link ParseState}.
 	 */
 	public interface Entry {
-
 	}
 
 }

spring-beans/src/main/java/org/springframework/beans/factory/parsing/PropertyEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -30,14 +30,12 @@ public class PropertyEntry implements ParseState.Entry {
 
 
 	/**
-	 * Creates a new instance of the {@link PropertyEntry} class.
+	 * Create a new {@code PropertyEntry} instance.
 	 * @param name the name of the JavaBean property represented by this instance
-	 * @throws IllegalArgumentException if the supplied {@code name} is {@code null}
-	 * or consists wholly of whitespace
 	 */
 	public PropertyEntry(String name) {
 		if (!StringUtils.hasText(name)) {
-			throw new IllegalArgumentException("Invalid property name '" + name + "'.");
+			throw new IllegalArgumentException("Invalid property name '" + name + "'");
 		}
 		this.name = name;
 	}

spring-beans/src/main/java/org/springframework/beans/factory/parsing/QualifierEntry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -26,16 +26,21 @@ import org.springframework.util.StringUtils;
  */
 public class QualifierEntry implements ParseState.Entry {
 
-	private String typeName;
+	private final String typeName;
 
 
+	/**
+	 * Create a new {@code QualifierEntry} instance.
+	 * @param typeName the name of the qualifier type
+	 */
 	public QualifierEntry(String typeName) {
 		if (!StringUtils.hasText(typeName)) {
-			throw new IllegalArgumentException("Invalid qualifier type '" + typeName + "'.");
+			throw new IllegalArgumentException("Invalid qualifier type '" + typeName + "'");
 		}
 		this.typeName = typeName;
 	}
 
+
 	@Override
 	public String toString() {
 		return "Qualifier '" + this.typeName + "'";

spring-beans/src/main/java/org/springframework/beans/factory/support/ReplaceOverride.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -38,7 +38,7 @@ public class ReplaceOverride extends MethodOverride {
 
 	private final String methodReplacerBeanName;
 
-	private List<String> typeIdentifiers = new LinkedList<>();
+	private final List<String> typeIdentifiers = new LinkedList<>();
 
 
 	/**
@@ -69,6 +69,7 @@ public class ReplaceOverride extends MethodOverride {
 		this.typeIdentifiers.add(identifier);
 	}
 
+
 	@Override
 	public boolean matches(Method method) {
 		if (!method.getName().equals(getMethodName())) {

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

@@ -122,7 +122,7 @@ public class SimpleNamingContext implements Context {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Static JNDI lookup: [" + name + "]");
 		}
-		if ("".equals(name)) {
+		if (name.isEmpty()) {
 			return new SimpleNamingContext(this.root, this.boundObjects, this.environment);
 		}
 		Object found = this.boundObjects.get(name);
@@ -299,10 +299,10 @@ public class SimpleNamingContext implements Context {
 
 	private abstract static class AbstractNamingEnumeration<T> implements NamingEnumeration<T> {
 
-		private Iterator<T> iterator;
+		private final Iterator<T> iterator;
 
 		private AbstractNamingEnumeration(SimpleNamingContext context, String proot) throws NamingException {
-			if (!"".equals(proot) && !proot.endsWith("/")) {
+			if (!proot.isEmpty() && !proot.endsWith("/")) {
 				proot = proot + "/";
 			}
 			String root = context.root + proot;

spring-core/src/main/java/org/springframework/util/FastByteArrayOutputStream.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -291,7 +291,7 @@ public class FastByteArrayOutputStream extends OutputStream {
 	}
 
 	/**
-	 * Create a new buffer and store it in the LinkedList
+	 * Create a new buffer and store it in the LinkedList.
 	 * <p>Adds a new buffer that can store at least {@code minCapacity} bytes.
 	 */
 	private void addBuffer(int minCapacity) {

spring-core/src/main/java/org/springframework/util/StringUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -76,7 +76,7 @@ public abstract class StringUtils {
 
 	/**
 	 * Check whether the given object (possibly a {@code String}) is empty.
-	 * This is effectly a shortcut for {@code !hasLength(String)}.
+	 * This is effectively a shortcut for {@code !hasLength(String)}.
 	 * <p>This method accepts any Object as an argument, comparing it to
 	 * {@code null} and the empty String. As a consequence, this method
 	 * will never return {@code true} for a non-null non-String object.
@@ -638,6 +638,9 @@ public abstract class StringUtils {
 	 * inner simple dots.
 	 * <p>The result is convenient for path comparison. For other uses,
 	 * notice that Windows separators ("\") are replaced by simple slashes.
+	 * <p><strong>NOTE</strong> that {@code cleanPath} should not be depended
+	 * upon in a security context. Other mechanisms should be used to prevent
+	 * path-traversal issues.
 	 * @param path the original path
 	 * @return the normalized path
 	 */
@@ -687,18 +690,18 @@ public abstract class StringUtils {
 				}
 				else {
 					// Normal path element found.
-					pathElements.add(0, element);
+					pathElements.addFirst(element);
 				}
 			}
 		}
 
 		// Remaining top paths need to be retained.
 		for (int i = 0; i < tops; i++) {
-			pathElements.add(0, TOP_PATH);
+			pathElements.addFirst(TOP_PATH);
 		}
 		// If nothing else left, at least explicitly point to current path.
-		if (pathElements.size() == 1 && "".equals(pathElements.getLast()) && !prefix.endsWith(FOLDER_SEPARATOR)) {
+		if (pathElements.size() == 1 && pathElements.getLast().isEmpty() && !prefix.endsWith(FOLDER_SEPARATOR)) {
-			pathElements.add(0, CURRENT_PATH);
+			pathElements.addFirst(CURRENT_PATH);
 		}
 
 		return prefix + collectionToDelimitedString(pathElements, FOLDER_SEPARATOR);
@@ -736,7 +739,7 @@ public abstract class StringUtils {
 		}
 		Assert.notNull(charset, "Charset must not be null");
 
-		ByteArrayOutputStream bos = new ByteArrayOutputStream(length);
+		ByteArrayOutputStream baos = new ByteArrayOutputStream(length);
 		boolean changed = false;
 		for (int i = 0; i < length; i++) {
 			int ch = source.charAt(i);
@@ -749,7 +752,7 @@ public abstract class StringUtils {
 					if (u == -1 || l == -1) {
 						throw new IllegalArgumentException("Invalid encoded sequence \"" + source.substring(i) + "\"");
 					}
-					bos.write((char) ((u << 4) + l));
+					baos.write((char) ((u << 4) + l));
 					i += 2;
 					changed = true;
 				}
@@ -758,10 +761,10 @@ public abstract class StringUtils {
 				}
 			}
 			else {
-				bos.write(ch);
+				baos.write(ch);
 			}
 		}
-		return (changed ? new String(bos.toByteArray(), charset) : source);
+		return (changed ? new String(baos.toByteArray(), charset) : source);
 	}
 
 	/**
@@ -993,8 +996,8 @@ public abstract class StringUtils {
 	}
 
 	/**
-	 * Trim the elements of the given {@code String} array,
+	 * Trim the elements of the given {@code String} array, calling
-	 * calling {@code String.trim()} on each of them.
+	 * {@code String.trim()} on each non-null element.
 	 * @param array the original {@code String} array (potentially empty)
 	 * @return the resulting array (of the same size) with trimmed elements
 	 */

spring-jms/src/main/java/org/springframework/jms/config/JmsListenerContainerParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -64,10 +64,10 @@ class JmsListenerContainerParser extends AbstractListenerContainerParser {
 
 		String containerType = containerEle.getAttribute(CONTAINER_TYPE_ATTRIBUTE);
 		String containerClass = containerEle.getAttribute(CONTAINER_CLASS_ATTRIBUTE);
-		if (!"".equals(containerClass)) {
+		if (StringUtils.hasLength(containerClass)) {
-			return null; // Not supported
+			return null;  // not supported
 		}
-		else if ("".equals(containerType) || containerType.startsWith("default")) {
+		else if (!StringUtils.hasLength(containerType) || containerType.startsWith("default")) {
 			factoryDef.setBeanClassName("org.springframework.jms.config.DefaultJmsListenerContainerFactory");
 		}
 		else if (containerType.startsWith("simple")) {
@@ -91,10 +91,10 @@ class JmsListenerContainerParser extends AbstractListenerContainerParser {
 
 		String containerType = containerEle.getAttribute(CONTAINER_TYPE_ATTRIBUTE);
 		String containerClass = containerEle.getAttribute(CONTAINER_CLASS_ATTRIBUTE);
-		if (!"".equals(containerClass)) {
+		if (StringUtils.hasLength(containerClass)) {
 			containerDef.setBeanClassName(containerClass);
 		}
-		else if ("".equals(containerType) || containerType.startsWith("default")) {
+		else if (!StringUtils.hasLength(containerType) || containerType.startsWith("default")) {
 			containerDef.setBeanClassName("org.springframework.jms.listener.DefaultMessageListenerContainer");
 		}
 		else if (containerType.startsWith("simple")) {

spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/MutablePersistenceUnitInfo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -62,7 +62,7 @@ public class MutablePersistenceUnitInfo implements SmartPersistenceUnitInfo {
 
 	private final List<String> mappingFileNames = new LinkedList<>();
 
-	private List<URL> jarFileUrls = new LinkedList<>();
+	private final List<URL> jarFileUrls = new LinkedList<>();
 
 	@Nullable
 	private URL persistenceUnitRootUrl;

spring-orm/src/main/java/org/springframework/orm/jpa/support/PersistenceAnnotationBeanPostProcessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -23,7 +23,6 @@ import java.lang.reflect.Member;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -405,8 +404,7 @@ public class PersistenceAnnotationBeanPostProcessor
 		Class<?> targetClass = clazz;
 
 		do {
-			final LinkedList<InjectionMetadata.InjectedElement> currElements =
+			final List<InjectionMetadata.InjectedElement> currElements = new ArrayList<>();
-					new LinkedList<>();
 
 			ReflectionUtils.doWithLocalFields(targetClass, field -> {
 				if (field.isAnnotationPresent(PersistenceContext.class) ||
@@ -461,7 +459,7 @@ public class PersistenceAnnotationBeanPostProcessor
 				unitNameForLookup = this.defaultPersistenceUnitName;
 			}
 			String jndiName = this.persistenceUnits.get(unitNameForLookup);
-			if (jndiName == null && "".equals(unitNameForLookup) && this.persistenceUnits.size() == 1) {
+			if (jndiName == null && unitNameForLookup.isEmpty() && this.persistenceUnits.size() == 1) {
 				jndiName = this.persistenceUnits.values().iterator().next();
 			}
 			if (jndiName != null) {
@@ -494,7 +492,7 @@ public class PersistenceAnnotationBeanPostProcessor
 				unitNameForLookup = this.defaultPersistenceUnitName;
 			}
 			String jndiName = contexts.get(unitNameForLookup);
-			if (jndiName == null && "".equals(unitNameForLookup) && contexts.size() == 1) {
+			if (jndiName == null && unitNameForLookup.isEmpty() && contexts.size() == 1) {
 				jndiName = contexts.values().iterator().next();
 			}
 			if (jndiName != null) {

spring-test/src/main/java/org/springframework/mock/jndi/SimpleNamingContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -122,7 +122,7 @@ public class SimpleNamingContext implements Context {
 		if (logger.isDebugEnabled()) {
 			logger.debug("Static JNDI lookup: [" + name + "]");
 		}
-		if ("".equals(name)) {
+		if (name.isEmpty()) {
 			return new SimpleNamingContext(this.root, this.boundObjects, this.environment);
 		}
 		Object found = this.boundObjects.get(name);
@@ -299,10 +299,10 @@ public class SimpleNamingContext implements Context {
 
 	private abstract static class AbstractNamingEnumeration<T> implements NamingEnumeration<T> {
 
-		private Iterator<T> iterator;
+		private final Iterator<T> iterator;
 
 		private AbstractNamingEnumeration(SimpleNamingContext context, String proot) throws NamingException {
-			if (!"".equals(proot) && !proot.endsWith("/")) {
+			if (!proot.isEmpty() && !proot.endsWith("/")) {
 				proot = proot + "/";
 			}
 			String root = context.root + proot;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -64,9 +64,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 
 	/**
 	 * Load a Spring ApplicationContext from the supplied {@link MergedContextConfiguration}.
-	 *
 	 * <p>Implementation details:
-	 *
 	 * <ul>
 	 * <li>Calls {@link #validateMergedContextConfiguration(MergedContextConfiguration)}
 	 * to allow subclasses to validate the supplied configuration before proceeding.</li>
@@ -97,7 +95,6 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * <li>{@link ConfigurableApplicationContext#refresh Refreshes} the
 	 * context and registers a JVM shutdown hook for it.</li>
 	 * </ul>
-	 *
 	 * @return a new application context
 	 * @see org.springframework.test.context.SmartContextLoader#loadContext(MergedContextConfiguration)
 	 * @see GenericApplicationContext
@@ -107,7 +104,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	public final ConfigurableApplicationContext loadContext(MergedContextConfiguration mergedConfig) throws Exception {
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("Loading ApplicationContext for merged context configuration [%s].",
-				mergedConfig));
+					mergedConfig));
 		}
 
 		validateMergedContextConfiguration(mergedConfig);
@@ -118,6 +115,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 		if (parent != null) {
 			context.setParent(parent);
 		}
+
 		prepareContext(context);
 		prepareContext(context, mergedConfig);
 		customizeBeanFactory(context.getDefaultListableBeanFactory());
@@ -125,8 +123,10 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		customizeContext(context);
 		customizeContext(context, mergedConfig);
+
 		context.refresh();
 		context.registerShutdownHook();
+
 		return context;
 	}
 
@@ -146,9 +146,7 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 
 	/**
 	 * Load a Spring ApplicationContext from the supplied {@code locations}.
-	 *
 	 * <p>Implementation details:
-	 *
 	 * <ul>
 	 * <li>Creates a {@link GenericApplicationContext} instance.</li>
 	 * <li>Calls {@link #prepareContext(GenericApplicationContext)} to allow for customizing the context
@@ -166,12 +164,10 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * <li>{@link ConfigurableApplicationContext#refresh Refreshes} the
 	 * context and registers a JVM shutdown hook for it.</li>
 	 * </ul>
-	 *
 	 * <p><b>Note</b>: this method does not provide a means to set active bean definition
 	 * profiles for the loaded context. See {@link #loadContext(MergedContextConfiguration)}
 	 * and {@link AbstractContextLoader#prepareContext(ConfigurableApplicationContext, MergedContextConfiguration)}
 	 * for an alternative.
-	 *
 	 * @return a new application context
 	 * @see org.springframework.test.context.ContextLoader#loadContext
 	 * @see GenericApplicationContext
@@ -182,26 +178,28 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	public final ConfigurableApplicationContext loadContext(String... locations) throws Exception {
 		if (logger.isDebugEnabled()) {
 			logger.debug(String.format("Loading ApplicationContext for locations [%s].",
-				StringUtils.arrayToCommaDelimitedString(locations)));
+					StringUtils.arrayToCommaDelimitedString(locations)));
 		}
+
 		GenericApplicationContext context = new GenericApplicationContext();
+
 		prepareContext(context);
 		customizeBeanFactory(context.getDefaultListableBeanFactory());
 		createBeanDefinitionReader(context).loadBeanDefinitions(locations);
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		customizeContext(context);
+
 		context.refresh();
 		context.registerShutdownHook();
+
 		return context;
 	}
 
 	/**
 	 * Prepare the {@link GenericApplicationContext} created by this {@code ContextLoader}.
 	 * Called <i>before</i> bean definitions are read.
-	 *
 	 * <p>The default implementation is empty. Can be overridden in subclasses to
 	 * customize {@code GenericApplicationContext}'s standard settings.
-	 *
 	 * @param context the context that should be prepared
 	 * @see #loadContext(MergedContextConfiguration)
 	 * @see #loadContext(String...)
@@ -217,10 +215,8 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	/**
 	 * Customize the internal bean factory of the ApplicationContext created by
 	 * this {@code ContextLoader}.
-	 *
 	 * <p>The default implementation is empty but can be overridden in subclasses
 	 * to customize {@code DefaultListableBeanFactory}'s standard settings.
-	 *
 	 * @param beanFactory the bean factory created by this {@code ContextLoader}
 	 * @see #loadContext(MergedContextConfiguration)
 	 * @see #loadContext(String...)
@@ -236,18 +232,15 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	/**
 	 * Load bean definitions into the supplied {@link GenericApplicationContext context}
 	 * from the locations or classes in the supplied {@code MergedContextConfiguration}.
-	 *
 	 * <p>The default implementation delegates to the {@link BeanDefinitionReader}
 	 * returned by {@link #createBeanDefinitionReader(GenericApplicationContext)} to
 	 * {@link BeanDefinitionReader#loadBeanDefinitions(String) load} the
 	 * bean definitions.
-	 *
 	 * <p>Subclasses must provide an appropriate implementation of
 	 * {@link #createBeanDefinitionReader(GenericApplicationContext)}. Alternatively subclasses
 	 * may provide a <em>no-op</em> implementation of {@code createBeanDefinitionReader()}
 	 * and override this method to provide a custom strategy for loading or
 	 * registering bean definitions.
-	 *
 	 * @param context the context into which the bean definitions should be loaded
 	 * @param mergedConfig the merged context configuration
 	 * @see #loadContext(MergedContextConfiguration)
@@ -260,7 +253,6 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	/**
 	 * Factory method for creating a new {@link BeanDefinitionReader} for loading
 	 * bean definitions into the supplied {@link GenericApplicationContext context}.
-	 *
 	 * @param context the context for which the {@code BeanDefinitionReader}
 	 * should be created
 	 * @return a {@code BeanDefinitionReader} for the supplied context
@@ -275,10 +267,8 @@ public abstract class AbstractGenericContextLoader extends AbstractContextLoader
 	 * Customize the {@link GenericApplicationContext} created by this
 	 * {@code ContextLoader} <i>after</i> bean definitions have been
 	 * loaded into the context but <i>before</i> the context is refreshed.
-	 *
 	 * <p>The default implementation is empty but can be overridden in subclasses
 	 * to customize the application context.
-	 *
 	 * @param context the newly created application context
 	 * @see #loadContext(MergedContextConfiguration)
 	 * @see #loadContext(String...)

spring-tx/src/main/java/org/springframework/transaction/config/TxAdviceBeanDefinitionParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -124,17 +124,17 @@ class TxAdviceBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 				}
 			}
 			if (StringUtils.hasText(readOnly)) {
-				attribute.setReadOnly(Boolean.valueOf(methodEle.getAttribute(READ_ONLY_ATTRIBUTE)));
+				attribute.setReadOnly(Boolean.parseBoolean(methodEle.getAttribute(READ_ONLY_ATTRIBUTE)));
 			}
 
 			List<RollbackRuleAttribute> rollbackRules = new LinkedList<>();
 			if (methodEle.hasAttribute(ROLLBACK_FOR_ATTRIBUTE)) {
 				String rollbackForValue = methodEle.getAttribute(ROLLBACK_FOR_ATTRIBUTE);
-				addRollbackRuleAttributesTo(rollbackRules,rollbackForValue);
+				addRollbackRuleAttributesTo(rollbackRules, rollbackForValue);
 			}
 			if (methodEle.hasAttribute(NO_ROLLBACK_FOR_ATTRIBUTE)) {
 				String noRollbackForValue = methodEle.getAttribute(NO_ROLLBACK_FOR_ATTRIBUTE);
-				addNoRollbackRuleAttributesTo(rollbackRules,noRollbackForValue);
+				addNoRollbackRuleAttributesTo(rollbackRules, noRollbackForValue);
 			}
 			attribute.setRollbackRules(rollbackRules);
 

spring-web/src/main/java/org/springframework/web/util/pattern/RegexPathElement.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 the original author or authors.
+ * Copyright 2002-2020 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.
@@ -40,7 +40,7 @@ class RegexPathElement extends PathElement {
 	private static final String DEFAULT_VARIABLE_PATTERN = "(.*)";
 
 
-	private char[] regex;
+	private final char[] regex;
 
 	private final boolean caseSensitive;
 
@@ -75,7 +75,7 @@ class RegexPathElement extends PathElement {
 				patternBuilder.append(".*");
 				int pos = matcher.start();
 				if (pos < 1 || text.charAt(pos-1) != '.') {
-					// To be compatible with the AntPathMatcher comparator, 
+					// To be compatible with the AntPathMatcher comparator,
 					// '.*' is not considered a wildcard usage
 					this.wildcardCount++;
 				}
@@ -129,14 +129,14 @@ class RegexPathElement extends PathElement {
 
 	@Override
 	public boolean matches(int pathIndex, MatchingContext matchingContext) {
-		String textToMatch = matchingContext.pathElementValue(pathIndex);		
+		String textToMatch = matchingContext.pathElementValue(pathIndex);
 		Matcher matcher = this.pattern.matcher(textToMatch);
 		boolean matches = matcher.matches();
 
 		if (matches) {
 			if (isNoMorePattern()) {
-				if (matchingContext.determineRemainingPath && 
+				if (matchingContext.determineRemainingPath &&
-					(this.variableNames.isEmpty() ? true : textToMatch.length() > 0)) {
+					(this.variableNames.isEmpty() || textToMatch.length() > 0)) {
 					matchingContext.remainingPathIndex = pathIndex + 1;
 					matches = true;
 				}
@@ -176,7 +176,7 @@ class RegexPathElement extends PathElement {
 		}
 		return matches;
 	}
-	
+
 	@Override
 	public int getNormalizedLength() {
 		int varsLength = 0;
@@ -202,6 +202,7 @@ class RegexPathElement extends PathElement {
 	}
 
 
+	@Override
 	public String toString() {
 		return "Regex(" + String.valueOf(this.regex) + ")";
 	}

spring-webflux/src/main/java/org/springframework/web/reactive/function/server/ToStringVisitor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2019 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.
@@ -77,7 +77,7 @@ class ToStringVisitor implements RouterFunctions.Visitor {
 	}
 
 	private void indent() {
-		for (int i=0; i < this.indent; i++) {
+		for (int i = 0; i < this.indent; i++) {
 			this.builder.append(' ');
 		}
 	}