@Bean definitions override scanned classes, plus check whether overriding is actually allowed

Issue: SPR-9567
Issue: SPR-9682

spring-context/src/test/java/example/scannable_implicitbasepackage/ComponentScanAnnotatedConfigWithImplicitBasePackage.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -13,8 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package example.scannable_implicitbasepackage;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
 
@@ -24,4 +26,10 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 @ComponentScan
 public class ComponentScanAnnotatedConfigWithImplicitBasePackage {
+
+	@Bean  // override of scanned class
+	public ConfigurableComponent configurableComponent() {
+		return new ConfigurableComponent(true);
+	}
+
 }

spring-context/src/test/java/example/scannable_implicitbasepackage/ConfigurableComponent.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2002-2015 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
+ *
+ *      http://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 example.scannable_implicitbasepackage;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author Juergen Hoeller
+ */
+@Component
+public class ConfigurableComponent {
+
+	private final boolean flag;
+
+	public ConfigurableComponent() {
+		this(false);
+	}
+
+	public ConfigurableComponent(boolean flag) {
+		this.flag = flag;
+	}
+
+	public boolean isFlag() {
+		return this.flag;
+	}
+
+}

spring-context/src/test/java/example/scannable_implicitbasepackage/ScannedComponent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package example.scannable_implicitbasepackage;
 
 import org.springframework.stereotype.Component;