Merge from sbrannen/SPR-11512

* SPR-11512:
  Support annotation attribute aliases and overrides via @AliasFor

Author: sbrannen

spring-context/src/main/java/org/springframework/jmx/export/annotation/AnnotationJmxAttributeSource.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 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.
@@ -32,7 +32,6 @@
 import org.springframework.jmx.export.metadata.ManagedOperation;
 import org.springframework.jmx.export.metadata.ManagedOperationParameter;
 import org.springframework.jmx.export.metadata.ManagedResource;
-import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 
 /**
@@ -66,7 +65,6 @@ public String resolveStringValue(String strVal) {
 		}
 	}
 
-
 	@Override
 	public ManagedResource getManagedResource(Class<?> beanClass) throws InvalidMetadataException {
 		org.springframework.jmx.export.annotation.ManagedResource ann =
@@ -76,13 +74,6 @@ public ManagedResource getManagedResource(Class<?> beanClass) throws InvalidMeta
 		}
 		ManagedResource managedResource = new ManagedResource();
 		AnnotationBeanUtils.copyPropertiesToBean(ann, managedResource, this.embeddedValueResolver);
-		if (!"".equals(ann.value()) && !StringUtils.hasLength(managedResource.getObjectName())) {
-			String value = ann.value();
-			if (this.embeddedValueResolver != null) {
-				value = this.embeddedValueResolver.resolveStringValue(value);
-			}
-			managedResource.setObjectName(value);
-		}
 		return managedResource;
 	}
 

spring-context/src/main/java/org/springframework/jmx/export/annotation/ManagedResource.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.
@@ -23,6 +23,8 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.core.annotation.AliasFor;
+
 /**
  * JDK 1.5+ class-level annotation that indicates to register instances of a
  * class with a JMX server, corresponding to the ManagedResource attribute.
@@ -34,6 +36,7 @@
  *
  * @author Rob Harrop
  * @author Juergen Hoeller
+ * @author Sam Brannen
  * @since 1.2
  * @see org.springframework.jmx.export.metadata.ManagedResource
  */
@@ -44,11 +47,12 @@
 public @interface ManagedResource {
 
 	/**
-	 * The annotation value is equivalent to the {@code objectName}
-	 * attribute, for simple default usage.
+	 * Alias for the {@link #objectName} attribute, for simple default usage.
 	 */
+	@AliasFor(attribute = "objectName")
 	String value() default "";
 
+	@AliasFor(attribute = "value")
 	String objectName() default "";
 
 	String description() default "";

spring-core/src/main/java/org/springframework/core/annotation/AliasFor.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 org.springframework.core.annotation;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * TODO Document @AliasFor.
+ *
+ * @author Sam Brannen
+ * @since 4.2
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface AliasFor {
+
+	String attribute();
+
+	Class<? extends Annotation> annotation() default Annotation.class;
+
+}