You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2013/01/22 22:57:29 UTC
svn commit: r1437208 - in /camel/trunk:
components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/
components/camel-jms/src/test/java/org/apache/camel/component/jms/
components/camel-solr/src/test/java/org/apache/camel/component/solr/ exa...
Author: bvahdat
Date: Tue Jan 22 21:57:29 2013
New Revision: 1437208
URL: http://svn.apache.org/viewvc?rev=1437208&view=rev
Log:
Fixed CS and removed some obsolete code from the camel-jms test code.
Modified:
camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
camel/trunk/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
Modified: camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java (original)
+++ camel/trunk/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/TemporaryQueueReplyManager.java Tue Jan 22 21:57:29 2013
@@ -183,8 +183,8 @@ public class TemporaryQueueReplyManager
@Override
public void onException(JMSException exception) {
// capture exceptions, and schedule a refresh of the ReplyTo destination
- log.warn("Exception inside the DMLC for Temporary ReplyTo Queue for destination " + endpoint.getDestinationName() +
- ", refreshing ReplyTo destination", exception);
+ log.warn("Exception inside the DMLC for Temporary ReplyTo Queue for destination " + endpoint.getDestinationName()
+ + ", refreshing ReplyTo destination", exception);
destResolver.scheduleRefresh();
// serve as a proxy for any exception listener the user may have set explicitly
if (delegate != null) {
@@ -198,8 +198,7 @@ public class TemporaryQueueReplyManager
private TemporaryQueue queue;
private AtomicBoolean refreshWanted = new AtomicBoolean(false);
- public Destination resolveDestinationName(Session session, String destinationName, boolean pubSubDomain)
- throws JMSException {
+ public Destination resolveDestinationName(Session session, String destinationName, boolean pubSubDomain) throws JMSException {
// use a temporary queue to gather the reply message
synchronized (refreshWanted) {
if (queue == null || refreshWanted.compareAndSet(true, false)) {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java Tue Jan 22 21:57:29 2013
@@ -23,11 +23,6 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.jms.ConnectionFactory;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.broker.TransportConnection;
import org.apache.activemq.pool.PooledConnectionFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
@@ -45,7 +40,6 @@ import static org.apache.camel.component
public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupport {
private Map<String, AtomicInteger> msgsPerThread = new ConcurrentHashMap<String, AtomicInteger>();
- private BrokerService broker;
private PooledConnectionFactory connectionFactory;
@Test
@@ -90,20 +84,8 @@ public class JmsRequestReplyTempQueueMul
executor.shutdownNow();
}
- public void startBroker() throws Exception {
- String brokerName = "test-broker-" + System.currentTimeMillis();
- String brokerUri = "vm://" + brokerName;
- broker = new BrokerService();
- broker.setBrokerName(brokerName);
- broker.setBrokerId(brokerName);
- broker.addConnector(brokerUri);
- broker.setPersistent(false);
- broker.start();
- }
-
protected CamelContext createCamelContext() throws Exception {
CamelContext camelContext = super.createCamelContext();
- //startBroker();
connectionFactory = (PooledConnectionFactory) CamelJmsTestHelper.createConnectionFactory();
camelContext.addComponent("jms", jmsComponentAutoAcknowledge(connectionFactory));
@@ -116,26 +98,22 @@ public class JmsRequestReplyTempQueueMul
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:start")
- .inOut("jms:queue:foo?concurrentConsumers=10&maxConcurrentConsumers=20&recoveryInterval=10")
- .process(new Processor() {
- @Override
- public void process(Exchange exchange) throws Exception {
- String threadName = Thread.currentThread().getName();
- synchronized (msgsPerThread) {
- AtomicInteger count = msgsPerThread.get(threadName);
- if (count == null) {
- count = new AtomicInteger(0);
- msgsPerThread.put(threadName, count);
- }
- count.incrementAndGet();
+ from("seda:start").inOut("jms:queue:foo?concurrentConsumers=10&maxConcurrentConsumers=20&recoveryInterval=10").process(new Processor() {
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ String threadName = Thread.currentThread().getName();
+ synchronized (msgsPerThread) {
+ AtomicInteger count = msgsPerThread.get(threadName);
+ if (count == null) {
+ count = new AtomicInteger(0);
+ msgsPerThread.put(threadName, count);
}
+ count.incrementAndGet();
}
- })
- .to("mock:result");
+ }
+ }).to("mock:result");
- from("jms:queue:foo?concurrentConsumers=20&recoveryInterval=10")
- .setBody(simple("Reply >>> ${body}"));
+ from("jms:queue:foo?concurrentConsumers=20&recoveryInterval=10").setBody(simple("Reply >>> ${body}"));
}
};
}
Modified: camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java (original)
+++ camel/trunk/components/camel-solr/src/test/java/org/apache/camel/component/solr/SolrSpringTest.java Tue Jan 22 21:57:29 2013
@@ -18,8 +18,6 @@ package org.apache.camel.component.solr;
import java.io.File;
import java.util.Arrays;
-import static org.junit.Assert.assertEquals;
-
import org.apache.camel.Produce;
import org.apache.camel.ProducerTemplate;
import org.apache.solr.client.solrj.SolrQuery;
@@ -38,6 +36,8 @@ import org.springframework.test.annotati
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+import static org.junit.Assert.assertEquals;
+
@ContextConfiguration (locations = {"/SolrSpringTest-context.xml"})
public class SolrSpringTest extends AbstractJUnit4SpringContextTests {
Modified: camel/trunk/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java (original)
+++ camel/trunk/examples/camel-example-sql/src/main/java/org/apache/camel/example/sql/DatabaseBean.java Tue Jan 22 21:57:29 2013
@@ -41,13 +41,13 @@ public class DatabaseBean {
public void create() throws Exception {
JdbcTemplate jdbc = new JdbcTemplate(dataSource);
- String sql = "create table orders (\n" +
- " id integer primary key,\n" +
- " item varchar(10),\n" +
- " amount varchar(5),\n" +
- " description varchar(30),\n" +
- " processed boolean\n" +
- ")";
+ String sql = "create table orders (\n"
+ + " id integer primary key,\n"
+ + " item varchar(10),\n"
+ + " amount varchar(5),\n"
+ + " description varchar(30),\n"
+ + " processed boolean\n"
+ + ")";
LOG.info("Creating table orders ...");
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/AbstractRouteCommand.java Tue Jan 22 21:57:29 2013
@@ -36,9 +36,9 @@ public abstract class AbstractRouteComma
public void setCamelController(CamelController camelController) {
this.camelController = camelController;
}
-
+
public abstract void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception;
-
+
public Object doExecute() throws Exception {
List<Route> camelRoutes = camelController.getRoutes(context, RegexUtil.wildcardAsRegex(route));
if (camelRoutes == null || camelRoutes.isEmpty()) {
@@ -48,13 +48,13 @@ public abstract class AbstractRouteComma
for (Route camelRoute : camelRoutes) {
CamelContext camelContext = camelRoute.getRouteContext().getCamelContext();
// Setting thread context classloader to the bundle classloader to enable
- // legacy code that relies on it
+ // legacy code that relies on it
ClassLoader oldClassloader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(camelContext.getApplicationContextClassLoader());
try {
- executeOnRoute(camelContext, camelRoute);
+ executeOnRoute(camelContext, camelRoute);
} finally {
- Thread.currentThread().setContextClassLoader(oldClassloader);
+ Thread.currentThread().setContextClassLoader(oldClassloader);
}
}
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextInfo.java Tue Jan 22 21:57:29 2013
@@ -89,7 +89,7 @@ public class ContextInfo extends OsgiCom
System.out.println(StringEscapeUtils.unescapeJava("\tExchanges Failed: " + exchangesFailed));
Long minProcessingTime = (Long) mBeanServer.getAttribute(contextMBean, "MinProcessingTime");
System.out.println(StringEscapeUtils.unescapeJava("\tMin Processing Time: " + minProcessingTime + "ms"));
- Long maxProcessingTime = (Long) mBeanServer.getAttribute(contextMBean, "MaxProcessingTime");
+ Long maxProcessingTime = (Long) mBeanServer.getAttribute(contextMBean, "MaxProcessingTime");
System.out.println(StringEscapeUtils.unescapeJava("\tMax Processing Time: " + maxProcessingTime + "ms"));
Long meanProcessingTime = (Long) mBeanServer.getAttribute(contextMBean, "MeanProcessingTime");
System.out.println(StringEscapeUtils.unescapeJava("\tMean Processing Time: " + meanProcessingTime + "ms"));
@@ -182,7 +182,7 @@ public class ContextInfo extends OsgiCom
for (String language : camelContext.getLanguageNames()) {
System.out.println(StringEscapeUtils.unescapeJava("\t" + language));
}
-
+
return null;
}
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/ContextList.java Tue Jan 22 21:57:29 2013
@@ -34,7 +34,7 @@ public class ContextList extends OsgiCom
private static final String NAME_COLUMN_LABEL = "Name";
private static final String STATUS_COLUMN_LABEL = "Status";
private static final String UPTIME_COLUMN_LABEL = "Uptime";
- private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
+ private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
private static final String DEFAULT_FIELD_PREAMBLE = "[ ";
private static final String DEFAULT_FIELD_POSTAMBLE = " ]";
private static final String DEFAULT_HEADER_PREAMBLE = " ";
@@ -51,7 +51,7 @@ public class ContextList extends OsgiCom
protected Object doExecute() throws Exception {
final List<CamelContext> camelContexts = camelController.getCamelContexts();
- final Map<String, Integer> columnWidths = computeColumnWidths(camelContexts);
+ final Map<String, Integer> columnWidths = computeColumnWidths(camelContexts);
final String headerFormat = buildFormatString(columnWidths, true);
final String rowFormat = buildFormatString(columnWidths, false);
final PrintStream out = System.out;
@@ -77,10 +77,10 @@ public class ContextList extends OsgiCom
for (final CamelContext camelContext : camelContexts) {
final String name = camelContext.getName();
maxNameLen = java.lang.Math.max(maxNameLen, name == null ? 0 : name.length());
-
+
final String status = camelContext.getStatus().toString();
maxStatusLen = java.lang.Math.max(maxStatusLen, status == null ? 0 : status.length());
-
+
final String uptime = camelContext.getUptime();
maxUptimeLen = java.lang.Math.max(maxUptimeLen, uptime == null ? 0 : uptime.length());
}
@@ -99,7 +99,7 @@ public class ContextList extends OsgiCom
final String fieldPostamble;
final int columnWidthIncrement;
- if (isHeader) {
+ if (isHeader) {
fieldPreamble = DEFAULT_HEADER_PREAMBLE;
fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
} else {
@@ -107,7 +107,7 @@ public class ContextList extends OsgiCom
fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
}
columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
-
+
final int nameLen = java.lang.Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
final int statusLen = java.lang.Math.min(columnWidths.get(STATUS_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
final int uptimeLen = java.lang.Math.min(columnWidths.get(UPTIME_COLUMN_LABEL) + columnWidthIncrement, MAX_COLUMN_WIDTH);
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteResume.java Tue Jan 22 21:57:29 2013
@@ -26,10 +26,9 @@ import org.apache.felix.gogo.commands.Co
@Command(scope = "camel", name = "route-resume", description = "Resume a Camel route or a group of routes.")
public class RouteResume extends AbstractRouteCommand {
- @Override
- public void executeOnRoute(CamelContext camelContext, Route camelRoute)
- throws Exception {
- camelContext.resumeRoute(camelRoute.getId());
- }
+ @Override
+ public void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception {
+ camelContext.resumeRoute(camelRoute.getId());
+ }
}
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStart.java Tue Jan 22 21:57:29 2013
@@ -26,9 +26,9 @@ import org.apache.felix.gogo.commands.Co
@Command(scope = "camel", name = "route-start", description = "Start a Camel route or a group of routes")
public class RouteStart extends AbstractRouteCommand {
- @Override
- public void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception {
- camelContext.startRoute(camelRoute.getId());
- }
+ @Override
+ public void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception {
+ camelContext.startRoute(camelRoute.getId());
+ }
}
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteStop.java Tue Jan 22 21:57:29 2013
@@ -26,9 +26,9 @@ import org.apache.felix.gogo.commands.Co
@Command(scope = "camel", name = " route-stop", description = "Stop a Camel route or a group of routes.")
public class RouteStop extends AbstractRouteCommand {
- @Override
- public void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception {
- camelContext.stopRoute(camelRoute.getId());
- }
+ @Override
+ public void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception {
+ camelContext.stopRoute(camelRoute.getId());
+ }
}
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteSuspend.java Tue Jan 22 21:57:29 2013
@@ -26,9 +26,9 @@ import org.apache.felix.gogo.commands.Co
@Command(scope = "camel", name = " route-suspend", description = "Suspend a Camel route or a group of routes.")
public class RouteSuspend extends AbstractRouteCommand {
- @Override
- public void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception {
- camelContext.suspendRoute(camelRoute.getId());
- }
+ @Override
+ public void executeOnRoute(CamelContext camelContext, Route camelRoute) throws Exception {
+ camelContext.suspendRoute(camelRoute.getId());
+ }
}
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java?rev=1437208&r1=1437207&r2=1437208&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java (original)
+++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/internal/CamelControllerImpl.java Tue Jan 22 21:57:29 2013
@@ -28,7 +28,6 @@ import org.osgi.framework.ServiceReferen
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Implementation of <code>CamelController</code>.
*/
@@ -89,7 +88,7 @@ public class CamelControllerImpl impleme
}
return null;
}
-
+
public List<Route> getRoutes(String camelContextName, String filter) {
List<Route> routes = null;
if (camelContextName != null) {