Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-1497: remove object name map in JMX

Browse Source
This commit is contained in:
Dave Syer
2010-11-09 11:14:30 +00:00
parent bd1373ecff
commit b9dbb20982
2 changed files with 1 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java
View File

@@ -13,7 +13,6 @@
package org.springframework.integration.monitor;
import java.lang.reflect.Field;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -24,7 +23,6 @@ import java.util.concurrent.locks.ReentrantLock;
import org.aopalliance.aop.Advice;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.aop.Advisor;
import org.springframework.aop.PointcutAdvisor;
import org.springframework.aop.TargetSource;
@@ -50,7 +48,6 @@ import org.springframework.jmx.export.MBeanExporter;
import org.springframework.jmx.export.annotation.AnnotationJmxAttributeSource;
import org.springframework.jmx.export.annotation.ManagedAttribute;
import org.springframework.jmx.export.annotation.ManagedMetric;
import org.springframework.jmx.export.annotation.ManagedOperation;
import org.springframework.jmx.export.annotation.ManagedResource;
import org.springframework.jmx.export.assembler.MetadataMBeanInfoAssembler;
import org.springframework.jmx.export.naming.MetadataNamingStrategy;
@@ -85,7 +82,7 @@ import org.springframework.util.ReflectionUtils;
*/
@ManagedResource
public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostProcessor, BeanFactoryAware,
BeanClassLoaderAware, SmartLifecycle, ObjectNameLocator {
BeanClassLoaderAware, SmartLifecycle {
private static final Log logger = LogFactory.getLog(IntegrationMBeanExporter.class);
@@ -111,8 +108,6 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
private Map<String, MessageSourceMetrics> sourcesByName = new HashMap<String, MessageSourceMetrics>();
private Map<String, String> objectNamesByName = new HashMap<String, String>();
private ClassLoader beanClassLoader;
private volatile boolean autoStartup = true;
@@ -290,7 +285,6 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
registerChannels();
registerHandlers();
registerSources();
logger.info("Summary on start: " + objectNamesByName);
}
@Override
@@ -344,16 +338,6 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
return channelsByName.keySet().toArray(new String[0]);
}
@ManagedOperation(description = "Get the JMX object name (as a String) for the specified Spring bean name")
public String getObjectName(String beanName) {
return objectNamesByName.get(beanName);
}
@ManagedAttribute(description = "Get a map from Spring bean names to JMX object names registered by this exporter")
public Map<String, String> getObjectNames() {
return Collections.unmodifiableMap(objectNamesByName);
}
public Statistics getHandlerDuration(String name) {
if (handlersByName.containsKey(name)) {
return handlersByName.get(name).getDuration();
@@ -397,7 +381,6 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
logger.info("Registering MessageChannel " + name);
if (name != null) {
channelsByName.put(name, monitor);
objectNamesByName.put(name, beanKey);
}
registerBeanNameOrInstance(monitor, beanKey);
}
@@ -413,7 +396,6 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
String beanKey = getHandlerBeanKey(monitor);
if (name != null) {
handlersByName.put(name, monitor);
objectNamesByName.put(name, beanKey);
}
registerBeanNameOrInstance(monitor, beanKey);
}
@@ -429,7 +411,6 @@ public class IntegrationMBeanExporter extends MBeanExporter implements BeanPostP
String beanKey = getSourceBeanKey(monitor);
if (name != null) {
sourcesByName.put(name, monitor);
objectNamesByName.put(name, beanKey);
}
registerBeanNameOrInstance(monitor, beanKey);
}

41
spring-integration-jmx/src/main/java/org/springframework/integration/monitor/ObjectNameLocator.java
View File

@@ -1,41 +0,0 @@
/*
* Copyright 2002-2010 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.integration.monitor;
import java.util.Map;
/**
* Locator interface for mapping bean names to JMX object names.
*
* @author Dave Syer
*
* @since 2.0
*
*/
public interface ObjectNameLocator {
/**
* @param beanName the bean name to query
* @return a String representation of the corresponding JMX object name (or null if there is none)
*/
String getObjectName(String beanName);
/**
* @return a map of all the known bean and object names
*/
Map<String, String> getObjectNames();
}