Merge branch '1.5.x'

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnBean.java

@@ -29,9 +29,8 @@ import org.springframework.context.annotation.Conditional;
 
 /**
  * {@link Conditional} that only matches when the specified bean classes and/or names are
- * already contained in the {@link BeanFactory}.
+ * already contained in the {@link BeanFactory}. When placed on a {@code @Bean} method,
- * When placed on a {@code @Bean} method, the bean class default to the return type of
+ * the bean class default to the return type of the factory method:
- * the factory method:
  *
  * <pre class="code">
  * &#064;Configuration

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/condition/ConditionalOnMissingBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.
@@ -31,8 +31,8 @@ import org.springframework.context.annotation.Conditional;
  * {@link Conditional} that only matches when the specified bean classes and/or names are
  * not already contained in the {@link BeanFactory}.
  * <p>
- * When placed on a {@code @Bean} method, the bean class default to the return type of
+ * When placed on a {@code @Bean} method, the bean class default to the return type of the
- * the factory method:
+ * factory method:
  *
  * <pre class="code">
  * &#064;Configuration

spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionAutoConfiguration.java

@@ -103,10 +103,8 @@ public class SessionAutoConfiguration {
 							+ "auto-configured, check your configuration (session store "
 							+ "type is '" + storeType.name().toLowerCase() + "')");
 				}
-				else {
+				throw new IllegalArgumentException("No Spring Session store is "
-					throw new IllegalArgumentException("No Spring Session store is "
+						+ "configured: set the 'spring.session.store-type' property");
-							+ "configured: set the 'spring.session.store-type' property");
-				}
 			}
 		}
 

spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2016 the original author or authors.
+ * Copyright 2012-2017 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.