Author: hadrian
Date: Wed Jul 7 15:00:08 2010
New Revision: 961398
URL: http://svn.apache.org/viewvc?rev=961398&view=rev
Log:
CAMEL-2716. A bit of cleanup
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=961398&r1=961397&r2=961398&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
Wed Jul 7 15:00:08 2010
@@ -1159,8 +1159,8 @@ public class DefaultCamelContext extends
private void startServices(Object service) throws Exception {
// it can be a collection so ensure we look inside it
- if (service instanceof Collection) {
- for (Object element : (Collection)service) {
+ if (service instanceof Collection<?>) {
+ for (Object element : (Collection<?>)service) {
startServices(element);
}
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java?rev=961398&r1=961397&r2=961398&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/DefaultManagementLifecycleStrategy.java
Wed Jul 7 15:00:08 2010
@@ -88,6 +88,7 @@ import org.apache.commons.logging.LogFac
* @see org.apache.camel.spi.ManagementStrategy
* @version $Revision$
*/
+...@suppresswarnings("deprecation")
public class DefaultManagementLifecycleStrategy implements LifecycleStrategy,
Service, CamelContextAware {
private static final Log LOG =
LogFactory.getLog(DefaultManagementLifecycleStrategy.class);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java?rev=961398&r1=961397&r2=961398&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/management/ManagedManagementStrategy.java
Wed Jul 7 15:00:08 2010
@@ -33,7 +33,6 @@ import org.apache.camel.management.mbean
import org.apache.camel.management.mbean.ManagedThreadPool;
import org.apache.camel.management.mbean.ManagedTracer;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.spi.EventNotifier;
import org.apache.camel.spi.ManagementAgent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=961398&r1=961397&r2=961398&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
Wed Jul 7 15:00:08 2010
@@ -57,7 +57,7 @@ public class JmxInstrumentationUsingDefa
resolveMandatoryEndpoint("mock:end", MockEndpoint.class);
- Set s = mbsc.queryNames(new ObjectName(domainName +
":type=endpoints,*"), null);
+ Set<ObjectName> s = mbsc.queryNames(new ObjectName(domainName +
":type=endpoints,*"), null);
assertEquals("Could not find 2 endpoints: " + s, 2, s.size());
s = mbsc.queryNames(new ObjectName(domainName + ":type=context,*"),
null);
@@ -87,10 +87,10 @@ public class JmxInstrumentationUsingDefa
}
protected void verifyCounter(MBeanServerConnection beanServer, ObjectName
name) throws Exception {
- Set s = beanServer.queryNames(name, null);
+ Set<ObjectName> s = beanServer.queryNames(name, null);
assertEquals("Found mbeans: " + s, 1, s.size());
- Iterator iter = s.iterator();
+ Iterator<ObjectName> iter = s.iterator();
ObjectName pcob = (ObjectName)iter.next();
Long valueofNumExchanges = (Long)beanServer.getAttribute(pcob,
"ExchangesTotal");
@@ -160,31 +160,26 @@ public class JmxInstrumentationUsingDefa
}
@Override
+ protected void setUp() throws Exception {
+ releaseMBeanServers();
+ super.setUp();
+ Thread.sleep(sleepForConnection);
+ mbsc = getMBeanConnection();
+ }
+
+ @Override
protected void tearDown() throws Exception {
+ super.tearDown();
releaseMBeanServers();
mbsc = null;
- super.tearDown();
}
- @SuppressWarnings("unchecked")
protected void releaseMBeanServers() {
- List<MBeanServer> servers =
- (List<MBeanServer>)MBeanServerFactory.findMBeanServer(null);
-
- for (MBeanServer server : servers) {
+ for (MBeanServer server :
(List<MBeanServer>)MBeanServerFactory.findMBeanServer(null)) {
MBeanServerFactory.releaseMBeanServer(server);
}
}
- @Override
- protected void setUp() throws Exception {
- releaseMBeanServers();
- super.setUp();
- Thread.sleep(sleepForConnection);
- mbsc = getMBeanConnection();
- }
-
-
protected MBeanServerConnection getMBeanConnection() throws Exception {
if (mbsc == null) {
mbsc = ManagementFactory.getPlatformMBeanServer();
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java?rev=961398&r1=961397&r2=961398&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDualCamelContextTest.java
Wed Jul 7 15:00:08 2010
@@ -47,6 +47,11 @@ public class ManagedDualCamelContextTest
CamelContext camel2 = createCamelContext();
camel2.start();
+ // Ensure JMX is enabled for this test so the
ManagedManagementStrategy.class
+ // If other tests cleaned up the environment properly the following
assertions will be true with the default settings
+ assertIsInstanceOf(ManagedManagementStrategy.class,
camel1.getManagementStrategy());
+ assertIsInstanceOf(ManagedManagementStrategy.class,
camel2.getManagementStrategy());
+
MBeanServer mbeanServer1 =
camel1.getManagementStrategy().getManagementAgent().getMBeanServer();
Set<ObjectName> set = mbeanServer1.queryNames(new
ObjectName("*:context=localhost/camel-1,type=components,*"), null);
assertEquals(2, set.size());
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java?rev=961398&r1=961397&r2=961398&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
Wed Jul 7 15:00:08 2010
@@ -62,7 +62,7 @@ public class MultiInstanceProcessorTest
resolveMandatoryEndpoint("mock:end", MockEndpoint.class);
- Set s = mbsc.queryNames(new ObjectName(domainName +
":type=endpoints,*"), null);
+ Set<ObjectName> s = mbsc.queryNames(new ObjectName(domainName +
":type=endpoints,*"), null);
assertEquals("Could not find 2 endpoints: " + s, 2, s.size());
s = mbsc.queryNames(new ObjectName(domainName + ":type=context,*"),
null);
@@ -85,5 +85,4 @@ public class MultiInstanceProcessorTest
verifyCounter(mbsc, new ObjectName(domainName + ":type=routes,*"));
}
-
}
