[SPR-5859] @ManagedOperation can now be used on getters/setters

Author: Rob Harrop

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

@@ -87,11 +87,6 @@ public ManagedMetric getManagedMetric(Method method) throws InvalidMetadataExcep
 	}
 
 	public ManagedOperation getManagedOperation(Method method) throws InvalidMetadataException {
-		PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
-		if (pd != null) {
-			throw new InvalidMetadataException(
-					"The ManagedOperation attribute is not valid for JavaBean properties. Use ManagedAttribute instead.");
-		}
 		Annotation ann = AnnotationUtils.findAnnotation(method, org.springframework.jmx.export.annotation.ManagedOperation.class);
 		if (ann == null) {
 			return null;

org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractReflectiveMBeanInfoAssembler.java

@@ -355,7 +355,9 @@ protected ModelMBeanOperationInfo[] getOperationInfo(Object managedBean, String
 					info.setDescriptor(desc);
 				}
 			}
-			else if (includeOperation(method, beanKey)) {
+
+			// allow getters and setters to be marked as operations directly
+			if (info == null && includeOperation(method, beanKey)) {
 				info = createModelMBeanOperationInfo(method, method.getName(), beanKey);
 				Descriptor desc = info.getDescriptor();
 				desc.setField(FIELD_ROLE, ROLE_OPERATION);

org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/MetadataMBeanInfoAssembler.java

@@ -156,11 +156,11 @@ protected boolean includeWriteAttribute(Method method, String beanKey) {
 	protected boolean includeOperation(Method method, String beanKey) {
 		PropertyDescriptor pd = BeanUtils.findPropertyForMethod(method);
 		if (pd != null) {
-			return hasManagedAttribute(method);
-		}
-		else {
-			return hasManagedOperation(method);
+			if(hasManagedAttribute(method)) {
+				return true;
+			}
 		}
+		return hasManagedOperation(method);
 	}
 
 	/**

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java

@@ -42,6 +42,12 @@ public void testOperationFromInterface() throws Exception {
 		assertNotNull(op);
 	}
 
+	public void testOperationOnGetter() throws Exception {
+		ModelMBeanInfo inf = getMBeanInfoFromAssembler();
+		ModelMBeanOperationInfo op = inf.getOperation("getExpensiveToCalculate");
+		assertNotNull(op);
+	}
+
 	protected JmxAttributeSource getAttributeSource() {
 		return new AnnotationJmxAttributeSource();
 	}
@@ -65,6 +71,6 @@ protected int getExpectedAttributeCount() {
 
 	@Override
 	protected int getExpectedOperationCount() {
-		return super.getExpectedOperationCount() + 3;
+		return super.getExpectedOperationCount() + 4;
 	}
 }

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java

@@ -110,4 +110,6 @@ public int getCacheEntries() {
 		return 3;
 	}
 
+	
+
 }

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestSubBean.java

@@ -48,4 +48,8 @@ public void setColour(String colour) {
 
 	public void fromInterface() {
 	}
+
+	public int getExpensiveToCalculate() {
+		return Integer.MAX_VALUE;
+	}
 }

org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/IAnnotationTestBean.java

@@ -29,4 +29,7 @@ public interface IAnnotationTestBean {
 
 	@ManagedOperation
 	void fromInterface();
+
+	@ManagedOperation
+	int getExpensiveToCalculate();
 }