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

fixed build; revised generic declarations

This commit is contained in:
Juergen Hoeller 2009-05-19 22:31:31 +00:00
parent 41c8352e16
commit fc1df58e2b
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,9 +50,9 @@ import org.springframework.util.StringUtils;
*/ */
public class AnnotationJmxAttributeSource implements JmxAttributeSource { public class AnnotationJmxAttributeSource implements JmxAttributeSource {
public ManagedResource getManagedResource(Class beanClass) throws InvalidMetadataException { public ManagedResource getManagedResource(Class<?> beanClass) throws InvalidMetadataException {
org.springframework.jmx.export.annotation.ManagedResource ann = org.springframework.jmx.export.annotation.ManagedResource ann =
((Class<?>) beanClass).getAnnotation(org.springframework.jmx.export.annotation.ManagedResource.class); beanClass.getAnnotation(org.springframework.jmx.export.annotation.ManagedResource.class);
if (ann == null) { if (ann == null) {
return null; return null;
} }
@ -77,10 +77,8 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource {
} }
return managedAttribute; return managedAttribute;
} }
@Override public ManagedMetric getManagedMetric(Method method) throws InvalidMetadataException {
public ManagedMetric getManagedMetric(Method method)
throws InvalidMetadataException {
org.springframework.jmx.export.annotation.ManagedMetric ann = org.springframework.jmx.export.annotation.ManagedMetric ann =
AnnotationUtils.getAnnotation(method, org.springframework.jmx.export.annotation.ManagedMetric.class); AnnotationUtils.getAnnotation(method, org.springframework.jmx.export.annotation.ManagedMetric.class);
if (ann == null) { if (ann == null) {
@ -129,8 +127,8 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource {
return result; return result;
} }
public ManagedNotification[] getManagedNotifications(Class clazz) throws InvalidMetadataException { public ManagedNotification[] getManagedNotifications(Class<?> clazz) throws InvalidMetadataException {
ManagedNotifications notificationsAnn = (ManagedNotifications) clazz.getAnnotation(ManagedNotifications.class); ManagedNotifications notificationsAnn = clazz.getAnnotation(ManagedNotifications.class);
if(notificationsAnn == null) { if(notificationsAnn == null) {
return new ManagedNotification[0]; return new ManagedNotification[0];
} }
@ -138,7 +136,6 @@ public class AnnotationJmxAttributeSource implements JmxAttributeSource {
ManagedNotification[] result = new ManagedNotification[notifications.length]; ManagedNotification[] result = new ManagedNotification[notifications.length];
for (int i = 0; i < notifications.length; i++) { for (int i = 0; i < notifications.length; i++) {
Annotation notification = notifications[i]; Annotation notification = notifications[i];
ManagedNotification managedNotification = new ManagedNotification(); ManagedNotification managedNotification = new ManagedNotification();
AnnotationBeanUtils.copyPropertiesToBean(notification, managedNotification); AnnotationBeanUtils.copyPropertiesToBean(notification, managedNotification);
result[i] = managedNotification; result[i] = managedNotification;

6
org.springframework.context/src/main/java/org/springframework/jmx/export/metadata/JmxAttributeSource.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2005 the original author or authors. * Copyright 2002-2009 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.
@ -38,7 +38,7 @@ public interface JmxAttributeSource {
* @return the attribute, or <code>null</code> if not found * @return the attribute, or <code>null</code> if not found
* @throws InvalidMetadataException in case of invalid attributes * @throws InvalidMetadataException in case of invalid attributes
*/ */
ManagedResource getManagedResource(Class clazz) throws InvalidMetadataException; ManagedResource getManagedResource(Class<?> clazz) throws InvalidMetadataException;
/** /**
* Implementations should return an instance of <code>ManagedAttribute</code> * Implementations should return an instance of <code>ManagedAttribute</code>
@ -88,7 +88,7 @@ public interface JmxAttributeSource {
* @return the notification information * @return the notification information
* @throws InvalidMetadataException in the case of invalid metadata * @throws InvalidMetadataException in the case of invalid metadata
*/ */
ManagedNotification[] getManagedNotifications(Class clazz) throws InvalidMetadataException; ManagedNotification[] getManagedNotifications(Class<?> clazz) throws InvalidMetadataException;