Allow ConditionalOnAwsCloudEnvironment to be used on method level.

Fixes gh-389
Closes gh-424

Author: bsamartins

spring-cloud-aws-context/src/main/java/org/springframework/cloud/aws/context/annotation/OnAwsCloudEnvironmentCondition.java

@@ -24,12 +24,13 @@
 /**
  * @author Agim Emruli
  * @author Gleb Schukin
+ * @author Bernardo Martins
  */
 public class OnAwsCloudEnvironmentCondition implements ConfigurationCondition {
 
 	@Override
 	public ConfigurationPhase getConfigurationPhase() {
-		return ConfigurationPhase.PARSE_CONFIGURATION;
+		return ConfigurationPhase.REGISTER_BEAN;
 	}
 
 	@Override

spring-cloud-aws-context/src/test/java/org/springframework/cloud/aws/context/annotation/OnAwsCloudEnvironmentConditionTest.java

@@ -0,0 +1,116 @@
+/*
+ * Copyright 2013-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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.aws.context.annotation;
+
+import org.junit.Test;
+
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Bernardo Martins
+ */
+public class OnAwsCloudEnvironmentConditionTest {
+
+	@Test
+	public void condition_methodAnnotation_shouldNotCreateBeanFoo() {
+		// Arrange & Act
+		AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(
+				ConfigWithConditionalOnAwsCloudEnvironmentAnnotatedBean.class);
+
+		// Assert
+		assertThat(applicationContext.containsBean("foo")).isFalse();
+	}
+
+	@Test
+	public void condition_typeAnnotation_shouldNotCreateBeanFoo() {
+		// Arrange & Act
+		AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(
+				ConfigWithConditionalOnAwsCloudEnvironmentAnnotation.class);
+
+		// Assert
+		assertThat(applicationContext.containsBean("foo")).isFalse();
+	}
+
+	@Test
+	public void condition_methodAnnotation_shouldCreateBeanFoo() {
+		// Arrange & Act
+		AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(
+				ConfigWithConditionalOnMissingAwsCloudEnvironmentAnnotatedBean.class);
+
+		// Assert
+		assertThat(applicationContext.containsBean("foo")).isTrue();
+	}
+
+	@Test
+	public void condition_typeAnnotation_shouldCreateBeanFoo() {
+		// Arrange & Act
+		AnnotationConfigApplicationContext applicationContext = new AnnotationConfigApplicationContext(
+				ConfigWithConditionalOnMissingAwsCloudEnvironmentAnnotation.class);
+
+		// Assert
+		assertThat(applicationContext.containsBean("foo")).isTrue();
+	}
+
+	@Configuration
+	protected static class ConfigWithConditionalOnAwsCloudEnvironmentAnnotatedBean {
+
+		@Bean
+		@ConditionalOnAwsCloudEnvironment
+		public String foo() {
+			return "foo";
+		}
+
+	}
+
+	@Configuration
+	@ConditionalOnAwsCloudEnvironment
+	protected static class ConfigWithConditionalOnAwsCloudEnvironmentAnnotation {
+
+		@Bean
+		public String foo() {
+			return "foo";
+		}
+
+	}
+
+	@Configuration
+	protected static class ConfigWithConditionalOnMissingAwsCloudEnvironmentAnnotatedBean {
+
+		@Bean
+		@ConditionalOnMissingAwsCloudEnvironment
+		public String foo() {
+			return "foo";
+		}
+
+	}
+
+	@Configuration
+	@ConditionalOnMissingAwsCloudEnvironment
+	protected static class ConfigWithConditionalOnMissingAwsCloudEnvironmentAnnotation {
+
+		@Bean
+		public String foo() {
+			return "foo";
+		}
+
+	}
+
+}