From 1f922f49b0be938664777e18ee37504acaf61613 Mon Sep 17 00:00:00 2001
From: Christian Dupuis <cdupuis@gopivotal.com>
Date: Thu, 7 Nov 2013 12:47:50 +0100
Subject: [PATCH] Switch to placeholders in conditional expressions; Ensure
 that Crsh auto configuration works without Spring Security

---
 .../autoconfigure/CrshAutoConfiguration.java  | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
index 7c02a7728d..e7f51f7846 100644
--- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
+++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/CrshAutoConfiguration.java
@@ -108,39 +108,33 @@ public class CrshAutoConfiguration {
 	private CrshProperties properties;
 
 	@Bean
-	@ConditionalOnExpression("#{environment['shell.auth'] == 'jaas'}")
+	@ConditionalOnExpression("'${shell.auth:simple}' == 'jaas'")
 	@ConditionalOnMissingBean({ AuthenticationProperties.class })
 	public AuthenticationProperties jaasAuthenticationProperties() {
 		return new JaasAuthenticationProperties();
 	}
 
 	@Bean
-	@ConditionalOnExpression("#{environment['shell.auth'] == 'key'}")
+	@ConditionalOnExpression("'${shell.auth:simple}' == 'key'")
 	@ConditionalOnMissingBean({ AuthenticationProperties.class })
 	public AuthenticationProperties keyAuthenticationProperties() {
 		return new KeyAuthenticationProperties();
 	}
 
 	@Bean
-	@ConditionalOnExpression("#{environment['shell.auth'] == 'simple'}")
+	@ConditionalOnExpression("'${shell.auth:simple}' == 'simple'")
 	@ConditionalOnMissingBean({ AuthenticationProperties.class })
 	public AuthenticationProperties simpleAuthenticationProperties() {
 		return new SimpleAuthenticationProperties();
 	}
 
 	@Bean
-	@ConditionalOnExpression("#{environment['shell.auth'] == 'spring'}")
+	@ConditionalOnExpression("'${shell.auth:simple}' == 'spring'")
 	@ConditionalOnMissingBean({ AuthenticationProperties.class })
 	public AuthenticationProperties SpringAuthenticationProperties() {
 		return new SpringAuthenticationProperties();
 	}
 
-	@Bean
-	@ConditionalOnBean({ AuthenticationManager.class })
-	public CRaSHPlugin<?> shellAuthenticationManager() {
-		return new AuthenticationManagerAdapter();
-	}
-
 	@Bean
 	@ConditionalOnMissingBean({ PluginLifeCycle.class })
 	public PluginLifeCycle shellBootstrap() {
@@ -149,6 +143,17 @@ public class CrshAutoConfiguration {
 		return bs;
 	}
 
+	@Configuration
+	@ConditionalOnBean({ AuthenticationManager.class })
+	public static class ShellAuthenticationManager {
+
+		@Bean
+		public CRaSHPlugin<?> shellAuthenticationManager() {
+			return new AuthenticationManagerAdapter();
+		}
+
+	}
+
 	public static class CrshBootstrap extends PluginLifeCycle {
 
 		@Autowired