Polishing

spring-context/src/testFixtures/java/org/springframework/context/testfixture/jndi/SimpleNamingContext.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.
@@ -126,7 +126,7 @@ public Object lookup(String lookupName) throws NameNotFoundException {
 		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);
@@ -303,10 +303,10 @@ public Name composeName(Name name, Name prefix) throws NamingException {
 
 	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/mock/jndi/SimpleNamingContext.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.
@@ -303,7 +303,7 @@ public Name composeName(Name name, Name prefix) throws NamingException {
 
 	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 (!proot.isEmpty() && !proot.endsWith("/")) {

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

@@ -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>
@@ -98,7 +96,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
@@ -108,26 +105,28 @@ 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);
 
 		GenericApplicationContext context = createContext();
-
 		ApplicationContext parent = mergedConfig.getParentApplicationContext();
 		if (parent != null) {
 			context.setParent(parent);
 		}
+
 		prepareContext(context);
 		prepareContext(context, mergedConfig);
 		customizeBeanFactory(context.getDefaultListableBeanFactory());
 		loadBeanDefinitions(context, mergedConfig);
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		customizeContext(context);
 		customizeContext(context, mergedConfig);
+
 		context.refresh();
 		context.registerShutdownHook();
+
 		return context;
 	}
 
@@ -147,9 +146,7 @@ protected void validateMergedContextConfiguration(MergedContextConfiguration mer
 
 	/**
 	 * Load a Spring ApplicationContext from the supplied {@code locations}.
-	 *
 	 * <p>Implementation details:
-	 *
 	 * <ul>
 	 * <li>Calls {@link #createContext()} to create a {@link GenericApplicationContext}
 	 * instance.</li>
@@ -168,12 +165,10 @@ protected void validateMergedContextConfiguration(MergedContextConfiguration mer
 	 * <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
@@ -184,28 +179,30 @@ protected void validateMergedContextConfiguration(MergedContextConfiguration mer
 	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 = createContext();
+
 		prepareContext(context);
 		customizeBeanFactory(context.getDefaultListableBeanFactory());
 		createBeanDefinitionReader(context).loadBeanDefinitions(locations);
 		AnnotationConfigUtils.registerAnnotationConfigProcessors(context);
 		customizeContext(context);
+
 		context.refresh();
 		context.registerShutdownHook();
+
 		return context;
 	}
 
 	/**
 	 * Factory method for creating the {@link GenericApplicationContext} used by
 	 * this {@code ContextLoader}.
-	 *
 	 * <p>The default implementation creates a {@code GenericApplicationContext}
 	 * using the default constructor. This method may be overridden in subclasses
 	 * &mdash; for example, to create a {@code GenericApplicationContext} with
 	 * a custom {@link DefaultListableBeanFactory} implementation.
-	 *
 	 * @return a newly instantiated {@code GenericApplicationContext}
 	 * @since 5.2.9
 	 */
@@ -216,10 +213,8 @@ protected GenericApplicationContext createContext() {
 	/**
 	 * 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
 	 * @since 2.5
 	 * @see #loadContext(MergedContextConfiguration)
@@ -235,10 +230,8 @@ protected void prepareContext(GenericApplicationContext context) {
 	/**
 	 * 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}
 	 * @since 2.5
 	 * @see #loadContext(MergedContextConfiguration)
@@ -254,18 +247,15 @@ protected void customizeBeanFactory(DefaultListableBeanFactory beanFactory) {
 	/**
 	 * 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
 	 * @since 3.1
@@ -278,7 +268,6 @@ protected void loadBeanDefinitions(GenericApplicationContext context, MergedCont
 	/**
 	 * 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
@@ -293,10 +282,8 @@ protected void loadBeanDefinitions(GenericApplicationContext context, MergedCont
 	 * 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
 	 * @since 2.5
 	 * @see #loadContext(MergedContextConfiguration)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2018 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.
@@ -76,7 +76,7 @@ public void unknown(RouterFunction<?> routerFunction) {
 	}
 
 	private void indent() {
-		for (int i=0; i < this.indent; i++) {
+		for (int i = 0; i < this.indent; i++) {
 			this.builder.append(' ');
 		}
 	}

spring-webmvc/src/main/java/org/springframework/web/servlet/function/ToStringVisitor.java

@@ -38,6 +38,7 @@ class ToStringVisitor implements RouterFunctions.Visitor, RequestPredicates.Visi
 
 
 	// RouterFunctions.Visitor
+
 	@Override
 	public void startNested(RequestPredicate predicate) {
 		indent();
@@ -74,11 +75,12 @@ public void unknown(RouterFunction<?> routerFunction) {
 	}
 
 	private void indent() {
-		for (int i=0; i < this.indent; i++) {
+		for (int i = 0; i < this.indent; i++) {
 			this.builder.append(' ');
 		}
 	}
 
+
 	// RequestPredicates.Visitor
 
 	@Override
@@ -156,6 +158,7 @@ public void endNegate() {
 	public void unknown(RequestPredicate predicate) {
 		this.builder.append(predicate);
 	}
+
 	@Override
 	public String toString() {
 		String result = this.builder.toString();
@@ -164,4 +167,5 @@ public String toString() {
 		}
 		return result;
 	}
+
 }