You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/08/16 17:55:42 UTC
svn commit: r804709 - in /camel/trunk/components:
camel-http/src/test/java/org/apache/camel/component/http/
camel-web/src/main/java/org/apache/camel/web/resources/
camel-web/src/main/java/org/apache/camel/web/util/
camel-web/src/test/java/org/apache/ca...
Author: hadrian
Date: Sun Aug 16 15:55:41 2009
New Revision: 804709
URL: http://svn.apache.org/viewvc?rev=804709&view=rev
Log:
Checkstyle fixes
Modified:
camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ChoiceDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ConvertBodyDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/PredicateRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ProcessorDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ResequenceDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/RoutingSlipDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/SendDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrottleDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/UriCharactersEncoder.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java
Modified: camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java (original)
+++ camel/trunk/components/camel-http/src/test/java/org/apache/camel/component/http/HttpsGetTest.java Sun Aug 16 15:55:41 2009
@@ -16,13 +16,7 @@
*/
package org.apache.camel.component.http;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.junit.Before;
public class HttpsGetTest extends HttpGetTest {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java Sun Aug 16 15:55:41 2009
@@ -19,7 +19,6 @@
import com.sun.jersey.api.representation.Form;
import com.sun.jersey.api.view.Viewable;
import groovy.lang.GroovyClassLoader;
-
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
@@ -56,6 +55,7 @@
import org.apache.commons.logging.LogFactory;
import org.jruby.Main;
+
/**
* A single Camel Route which is used to implement one or more
* <a href="http://camel.apache.org/enterprise-integration-patterns.html">Enterprise Integration Paterns</a>
@@ -119,7 +119,7 @@
} else if (language.equalsIgnoreCase(LANGUAGE_GROOVY)) {
StringBuilder buffer = new StringBuilder();
GroovyRenderer.renderRoute(buffer, route);
- return GroovyRenderer.header + buffer.toString() + GroovyRenderer.footer;
+ return GroovyRenderer.HEADER + buffer.toString() + GroovyRenderer.footer;
} else {
return "Unsupported language!";
}
@@ -163,9 +163,10 @@
for (int i = 0; i < routeDefinitions.size(); i++) {
RouteDefinition routeDefinition = routeDefinitions.get(i);
// set id only for the first route
- if (i == 0)
+ if (i == 0) {
routeDefinition.setId(id);
-
+ }
+
// add or update the route
getCamelContext().addRouteDefinitions(Collections.singletonList(routeDefinition));
}
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/AggregateDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -18,15 +18,18 @@
package org.apache.camel.web.util;
import org.apache.camel.model.AggregateDefinition;
-import org.apache.camel.model.ExpressionNode;
import org.apache.camel.model.ProcessorDefinition;
/**
*
*/
-public class AggregateDefinitionRenderer {
+public final class AggregateDefinitionRenderer {
+ private AggregateDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
+
AggregateDefinition aggregate = (AggregateDefinition)processor;
buffer.append(".").append(aggregate.getShortName()).append("()");
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ChoiceDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ChoiceDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ChoiceDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ChoiceDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -25,9 +25,12 @@
/**
*
*/
-public class ChoiceDefinitionRenderer {
+public final class ChoiceDefinitionRenderer {
+ private ChoiceDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
ChoiceDefinition choice = (ChoiceDefinition)processor;
buffer.append(".").append(choice.getShortName()).append("()");
for (WhenDefinition when : choice.getWhenClauses()) {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ConvertBodyDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ConvertBodyDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ConvertBodyDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ConvertBodyDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -23,9 +23,12 @@
/**
*
*/
-public class ConvertBodyDefinitionRenderer {
+public final class ConvertBodyDefinitionRenderer {
+ private ConvertBodyDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
ConvertBodyDefinition convertBody = (ConvertBodyDefinition)processor;
buffer.append(".").append(convertBody.getShortName()).append("(");
if (convertBody.getType().equals("[B")) {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionNodeRenderer.java Sun Aug 16 15:55:41 2009
@@ -38,9 +38,12 @@
/**
*
*/
-public class ExpressionNodeRenderer {
+public final class ExpressionNodeRenderer {
+ private ExpressionNodeRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
ExpressionNode expNode = (ExpressionNode)processor;
ExpressionDefinition expression = expNode.getExpression();
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ExpressionRenderer.java Sun Aug 16 15:55:41 2009
@@ -25,7 +25,10 @@
/**
*
*/
-public class ExpressionRenderer {
+public final class ExpressionRenderer {
+ private ExpressionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
/**
* a common render method to process the expressionDefinition
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/GroovyRenderer.java Sun Aug 16 15:55:41 2009
@@ -28,12 +28,15 @@
/**
* Render routes in Groovy language
*/
-public class GroovyRenderer {
-
- public static final String header = "import org.apache.camel.language.groovy.GroovyRouteBuilder;\nclass GroovyRoute extends GroovyRouteBuilder {\nvoid configure() {\n";
+public final class GroovyRenderer {
+ public static final String HEADER = "import org.apache.camel.language.groovy.GroovyRouteBuilder;\nclass GroovyRoute extends GroovyRouteBuilder {\nvoid configure() {\n";
public static final String footer = "\n}\n}";
+ private GroovyRenderer() {
+ // Utility class, no public or protected default constructor
+ }
+
/**
* render a RouteDefinition
*/
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/LoadBalanceDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -19,11 +19,8 @@
import java.util.List;
-import org.apache.camel.model.ChoiceDefinition;
import org.apache.camel.model.LoadBalanceDefinition;
-import org.apache.camel.model.OtherwiseDefinition;
import org.apache.camel.model.ProcessorDefinition;
-import org.apache.camel.model.WhenDefinition;
import org.apache.camel.processor.loadbalancer.FailOverLoadBalancer;
import org.apache.camel.processor.loadbalancer.LoadBalancer;
import org.apache.camel.processor.loadbalancer.RandomLoadBalancer;
@@ -34,9 +31,12 @@
/**
*
*/
-public class LoadBalanceDefinitionRenderer {
+public final class LoadBalanceDefinitionRenderer {
+ private LoadBalanceDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
LoadBalanceDefinition loadB = (LoadBalanceDefinition)processor;
// buffer.append(".").append(output.getShortName()).append("()");
buffer.append(".").append("loadBalance").append("()");
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnCompletionDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -26,9 +26,12 @@
/**
*
*/
-public class OnCompletionDefinitionRenderer {
+public final class OnCompletionDefinitionRenderer {
+ private OnCompletionDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
// if not a global onCompletion, add a period
boolean notGlobal = buffer.toString().endsWith(")");
if (notGlobal) {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OnExceptionDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -25,9 +25,12 @@
/**
*
*/
-public class OnExceptionDefinitionRenderer {
+public final class OnExceptionDefinitionRenderer {
+ private OnExceptionDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
// if not a global onCompletion, add a period
boolean notGlobal = buffer.toString().endsWith(")");
if (notGlobal) {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/OutputDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -49,10 +49,13 @@
/**
*
*/
-public class OutputDefinitionRenderer {
+public final class OutputDefinitionRenderer {
+ private OutputDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
- OutputDefinition out = (OutputDefinition)processor;
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
+ OutputDefinition<?> out = (OutputDefinition<?>)processor;
boolean notGlobal = buffer.toString().endsWith(")");
if (notGlobal) {
buffer.append(".");
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/PredicateRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/PredicateRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/PredicateRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/PredicateRenderer.java Sun Aug 16 15:55:41 2009
@@ -22,7 +22,10 @@
/**
* render a predicate
*/
-public class PredicateRenderer {
+public final class PredicateRenderer {
+ private PredicateRenderer() {
+ // Utility class, no public or protected default constructor
+ }
public static void render(StringBuilder buffer, Predicate predicate) {
String pre = predicate.toString();
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ProcessorDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ProcessorDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ProcessorDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ProcessorDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -19,7 +19,6 @@
import java.util.List;
-import org.apache.camel.Expression;
import org.apache.camel.model.AggregateDefinition;
import org.apache.camel.model.ChoiceDefinition;
import org.apache.camel.model.ConvertBodyDefinition;
@@ -27,7 +26,6 @@
import org.apache.camel.model.LoadBalanceDefinition;
import org.apache.camel.model.OnCompletionDefinition;
import org.apache.camel.model.OnExceptionDefinition;
-import org.apache.camel.model.OtherwiseDefinition;
import org.apache.camel.model.OutputDefinition;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ResequenceDefinition;
@@ -35,20 +33,16 @@
import org.apache.camel.model.RoutingSlipDefinition;
import org.apache.camel.model.SendDefinition;
import org.apache.camel.model.ThrottleDefinition;
-import org.apache.camel.model.WhenDefinition;
-import org.apache.camel.processor.loadbalancer.FailOverLoadBalancer;
-import org.apache.camel.processor.loadbalancer.LoadBalancer;
-import org.apache.camel.processor.loadbalancer.RandomLoadBalancer;
-import org.apache.camel.processor.loadbalancer.RoundRobinLoadBalancer;
-import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
-import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
/**
*
*/
-public class ProcessorDefinitionRenderer {
+public final class ProcessorDefinitionRenderer {
+ private ProcessorDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
if (processor instanceof AggregateDefinition) {
AggregateDefinitionRenderer.render(buffer, processor);
} else if (processor instanceof ChoiceDefinition) {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ResequenceDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ResequenceDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ResequenceDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ResequenceDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -26,9 +26,12 @@
/**
*
*/
-public class ResequenceDefinitionRenderer {
+public final class ResequenceDefinitionRenderer {
+ private ResequenceDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
ResequenceDefinition resequence = (ResequenceDefinition)processor;
buffer.append(".").append(processor.getShortName()).append("(");
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/RoutingSlipDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/RoutingSlipDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/RoutingSlipDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/RoutingSlipDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -23,9 +23,12 @@
/**
*
*/
-public class RoutingSlipDefinitionRenderer {
+public final class RoutingSlipDefinitionRenderer {
+ private RoutingSlipDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
RoutingSlipDefinition routingSlip = (RoutingSlipDefinition)processor;
buffer.append(".").append(routingSlip.getShortName()).append("(\"").append(routingSlip.getHeaderName()).append("\", \"").append(routingSlip.getUriDelimiter())
.append("\")");
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/SendDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/SendDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/SendDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/SendDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -24,11 +24,14 @@
/**
*
*/
-public class SendDefinitionRenderer {
+public final class SendDefinitionRenderer {
+ private SendDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
buffer.append(".");
- SendDefinition send = (SendDefinition)processor;
+ SendDefinition<?> send = (SendDefinition<?>)processor;
if (send instanceof WireTapDefinition || send.getPattern() == null) {
// for wireTap and simple to
buffer.append(send.getShortName());
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrottleDefinitionRenderer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrottleDefinitionRenderer.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrottleDefinitionRenderer.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrottleDefinitionRenderer.java Sun Aug 16 15:55:41 2009
@@ -23,9 +23,12 @@
/**
*
*/
-public class ThrottleDefinitionRenderer {
+public final class ThrottleDefinitionRenderer {
+ private ThrottleDefinitionRenderer() {
+ // Utility class, no public or protected default constructor
+ }
- public static void render(StringBuilder buffer, ProcessorDefinition processor) {
+ public static void render(StringBuilder buffer, ProcessorDefinition<?> processor) {
ThrottleDefinition throttle = (ThrottleDefinition)processor;
buffer.append(".").append(throttle.getShortName()).append("(").append(throttle.getMaximumRequestsPerPeriod()).append(")");
if (throttle.getTimePeriodMillis() != 1000) {
Modified: camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/UriCharactersEncoder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/UriCharactersEncoder.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/UriCharactersEncoder.java (original)
+++ camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/UriCharactersEncoder.java Sun Aug 16 15:55:41 2009
@@ -20,18 +20,17 @@
import java.io.UnsupportedEncodingException;
import java.util.BitSet;
-import org.apache.camel.util.UnsafeUriCharactersEncoder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
/**
*
*/
-public class UriCharactersEncoder {
+public final class UriCharactersEncoder {
private static BitSet unsafeCharacters;
private static final transient Log LOG = LogFactory.getLog(UriCharactersEncoder.class);
- private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
- 'C', 'D', 'E', 'F'};
+ private static final char[] HEX_DIGITS = {
+ '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
static {
unsafeCharacters = new BitSet(256);
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java?rev=804709&r1=804708&r2=804709&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java Sun Aug 16 15:55:41 2009
@@ -38,7 +38,7 @@
public final Log LOG = LogFactory.getLog(GroovyRendererTestSupport.class);
- private final String header = GroovyRenderer.header;
+ private final String header = GroovyRenderer.HEADER;
private final String footer = GroovyRenderer.footer;