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

AutodetectCapableMBeanInfoAssembler signature consistently refers to Class<?> (SPR-7405)

This commit is contained in:
Juergen Hoeller 2010-07-29 20:29:32 +00:00
parent c3a639f07d
commit faad0f4bb1
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AbstractMBeanInfoAssembler.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -102,7 +102,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
* @return the bean class to expose * @return the bean class to expose
* @see JmxUtils#getClassToExpose(Object) * @see JmxUtils#getClassToExpose(Object)
*/ */
protected Class getClassToExpose(Object managedBean) { protected Class<?> getClassToExpose(Object managedBean) {
return JmxUtils.getClassToExpose(managedBean); return JmxUtils.getClassToExpose(managedBean);
} }
@ -113,7 +113,7 @@ public abstract class AbstractMBeanInfoAssembler implements MBeanInfoAssembler {
* @return the bean class to expose * @return the bean class to expose
* @see JmxUtils#getClassToExpose(Class) * @see JmxUtils#getClassToExpose(Class)
*/ */
protected Class getClassToExpose(Class beanClass) { protected Class<?> getClassToExpose(Class<?> beanClass) {
return JmxUtils.getClassToExpose(beanClass); return JmxUtils.getClassToExpose(beanClass);
} }

4
org.springframework.context/src/main/java/org/springframework/jmx/export/assembler/AutodetectCapableMBeanInfoAssembler.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2005 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -37,6 +37,6 @@ public interface AutodetectCapableMBeanInfoAssembler extends MBeanInfoAssembler
* @param beanClass the class of the bean (might be a proxy class) * @param beanClass the class of the bean (might be a proxy class)
* @param beanName the name of the bean in the bean factory * @param beanName the name of the bean in the bean factory
*/ */
boolean includeBean(Class beanClass, String beanName); boolean includeBean(Class<?> beanClass, String beanName);
} }

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2010 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -18,7 +18,6 @@ package org.springframework.jmx.export.assembler;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import javax.management.Descriptor; import javax.management.Descriptor;
import javax.management.MBeanParameterInfo; import javax.management.MBeanParameterInfo;
import javax.management.modelmbean.ModelMBeanNotificationInfo; import javax.management.modelmbean.ModelMBeanNotificationInfo;
@ -115,7 +114,7 @@ public class MetadataMBeanInfoAssembler extends AbstractReflectiveMBeanInfoAssem
* @param beanClass the class of the bean * @param beanClass the class of the bean
* @param beanName the name of the bean in the bean factory * @param beanName the name of the bean in the bean factory
*/ */
public boolean includeBean(Class beanClass, String beanName) { public boolean includeBean(Class<?> beanClass, String beanName) {
return (this.attributeSource.getManagedResource(getClassToExpose(beanClass)) != null); return (this.attributeSource.getManagedResource(getClassToExpose(beanClass)) != null);
} }