root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Add interface-based detection test 

Add a test that explicitely validates that `@ManagedResource` and friends
can be set on an interface.

Issue: SPR-13138
This commit is contained in:
Stephane Nicoll 2016-01-18 14:14:17 +01:00
parent a112557dc4
commit eb49f3c225
4 changed files with 127 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
spring-context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java
View File

@ -1,17 +1,17 @@
/*
* Copyright 2002-2013 the original author or authors.
* Copyright 2002-2016 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
* 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.
* 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.jmx.export.annotation;
@ -58,6 +58,30 @@ public class AnnotationMetadataAssemblerTests extends AbstractMetadataAssemblerT
assertNotNull(op);
}
@Test
public void testRegistrationOnInterface() throws Exception {
Object bean = getContext().getBean("testInterfaceBean");
ModelMBeanInfo inf = getAssembler().getMBeanInfo(bean, "bean:name=interfaceTestBean");
assertNotNull(inf);
assertEquals("My Managed Bean", inf.getDescription());
ModelMBeanOperationInfo op = inf.getOperation("foo");
assertNotNull("foo operation not exposed", op);
assertEquals("invoke foo", op.getDescription());
assertNull("doNotExpose operation should not be exposed", inf.getOperation("doNotExpose"));
ModelMBeanAttributeInfo attr = inf.getAttribute("Bar");
assertNotNull("bar attribute not exposed", attr);
assertEquals("Bar description", attr.getDescription());
ModelMBeanAttributeInfo attr2 = inf.getAttribute("CacheEntries");
assertNotNull("cacheEntries attribute not exposed", attr2);
assertEquals("Metric Type should be COUNTER", "COUNTER",
attr2.getDescriptor().getFieldValue("metricType"));
}
@Override
protected JmxAttributeSource getAttributeSource() {
return new AnnotationJmxAttributeSource();

38
spring-context/src/test/java/org/springframework/jmx/export/annotation/AnotherAnnotationTestBean.java Normal file
View File

@ -0,0 +1,38 @@
/*
* Copyright 2002-2016 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.jmx.export.annotation;
import org.springframework.jmx.support.MetricType;
/**
* @author Stephane Nicoll
*/
@ManagedResource(objectName = "bean:name=interfaceTestBean", description = "My Managed Bean")
public interface AnotherAnnotationTestBean {
@ManagedOperation(description = "invoke foo")
void foo();
@ManagedAttribute(description = "Bar description")
String getBar();
void setBar(String bar);
@ManagedMetric(description = "a metric", metricType = MetricType.COUNTER)
int getCacheEntries();
}

49
spring-context/src/test/java/org/springframework/jmx/export/annotation/AnotherAnnotationTestBeanImpl.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright 2002-2016 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.jmx.export.annotation;
/**
* @author Stephane Nicoll
*/
class AnotherAnnotationTestBeanImpl implements AnotherAnnotationTestBean {
private String bar;
@Override
public void foo() {
}
public void doNotExpose() {
}
@Override
public String getBar() {
return this.bar;
}
@Override
public void setBar(String bar) {
this.bar = bar;
}
@Override
public int getCacheEntries() {
return 42;
}
}

20
spring-context/src/test/resources/org/springframework/jmx/export/annotation/annotations.xml
View File

@ -20,26 +20,22 @@
</bean>
<bean id="testBean" class="org.springframework.jmx.export.annotation.AnnotationTestSubBean">
<property name="name">
<value>TEST</value>
</property>
<property name="age">
<value>100</value>
</property>
<property name="name" value="TEST"/>
<property name="age" value="100"/>
</bean>
<bean id="testInterfaceBean" class="org.springframework.jmx.export.annotation.AnotherAnnotationTestBeanImpl">
<property name="bar" value="Init value"/>
</bean>
<bean id="attributeSource" class="org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource"/>
<bean id="metadataNamingStrategy" class="org.springframework.jmx.export.naming.MetadataNamingStrategy">
<property name="attributeSource">
<ref bean="attributeSource"/>
</property>
<property name="attributeSource" ref="attributeSource"/>
</bean>
<bean id="metadataAssembler" class="org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler">
<property name="attributeSource">
<ref bean="attributeSource"/>
</property>
<property name="attributeSource" ref="attributeSource"/>
</bean>
</beans>