Author: davsclaus
Date: Tue Nov 17 09:40:57 2009
New Revision: 881214
URL: http://svn.apache.org/viewvc?rev=881214&view=rev
Log:
Fixed compiler issue and DO NOT overuse generics in the model classes.
camel-scala is now also working again.
Modified:
camel/trunk/components/camel-guice/pom.xml
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/CamelResourceConfig.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.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/ErrorHandlerRenderer.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/JAXBContextResolver.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/ThrowExceptionDefinitionRenderer.java
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/UriCharactersEncoder.java
Modified: camel/trunk/components/camel-guice/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-guice/pom.xml?rev=881214&r1=881213&r2=881214&view=diff
==============================================================================
--- camel/trunk/components/camel-guice/pom.xml (original)
+++ camel/trunk/components/camel-guice/pom.xml Tue Nov 17 09:40:57 2009
@@ -66,6 +66,8 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <!-- requires a newer version than the parent using 4.4 -->
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<dependency>
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,16 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.model.AggregateDefinition;
import org.apache.camel.model.ProcessorDefinition;
-/**
- *
- */
public final class AggregateDefinitionRenderer {
+
private AggregateDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java?rev=881214&r1=881213&r2=881214&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CamelResourceConfig.java
Tue Nov 17 09:40:57 2009
@@ -32,6 +32,7 @@
* @version $Revision$
*/
public class CamelResourceConfig extends PackagesResourceConfig {
+
public CamelResourceConfig() {
super(createProperties());
}
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java?rev=881214&r1=881213&r2=881214&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/CatchDefinitionRenderer.java
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.util.List;
@@ -22,10 +21,8 @@
import org.apache.camel.model.CatchDefinition;
import org.apache.camel.model.ProcessorDefinition;
-/**
- *
- */
public final class CatchDefinitionRenderer {
+
private CatchDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
@@ -33,8 +30,8 @@
public static void render(StringBuilder buffer, ProcessorDefinition<?>
processor) {
CatchDefinition catchDef = (CatchDefinition)processor;
buffer.append(".").append(catchDef.getShortName()).append("(");
- List<Class<? extends Throwable>> exceptions =
catchDef.getExceptionClasses();
- for (Class<? extends Throwable> clazz : exceptions) {
+ List<Class> exceptions = catchDef.getExceptionClasses();
+ for (Class clazz : exceptions) {
buffer.append(clazz.getSimpleName()).append(".class");
if (clazz != exceptions.get(exceptions.size() - 1)) {
buffer.append(", ");
@@ -48,8 +45,8 @@
buffer.append(".handled(").append(handled).append(")");
}
- List<ProcessorDefinition<?>> branches = catchDef.getOutputs();
- for (ProcessorDefinition<?> branch : branches) {
+ List<ProcessorDefinition> branches = catchDef.getOutputs();
+ for (ProcessorDefinition branch : branches) {
SendDefinitionRenderer.render(buffer, branch);
}
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.model.ChoiceDefinition;
@@ -22,10 +21,8 @@
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.WhenDefinition;
-/**
- *
- */
public final class ChoiceDefinitionRenderer {
+
private ChoiceDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.model.ConvertBodyDefinition;
@@ -24,6 +23,7 @@
*
*/
public final class ConvertBodyDefinitionRenderer {
+
private ConvertBodyDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ErrorHandlerRenderer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ErrorHandlerRenderer.java?rev=881214&r1=881213&r2=881214&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ErrorHandlerRenderer.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ErrorHandlerRenderer.java
Tue Nov 17 09:40:57 2009
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.processor.RedeliveryPolicy;
-/**
- *
- */
public final class ErrorHandlerRenderer {
+
private ErrorHandlerRenderer() {
// Utility class, no public or protected default constructor
}
@@ -36,9 +33,9 @@
// render the redelivery policy
RedeliveryPolicy redelivery = deadLetter.getRedeliveryPolicy();
- int maxRediliveries = redelivery.getMaximumRedeliveries();
- if (maxRediliveries != 0) {
-
buffer.append(".maximumRedeliveries(").append(maxRediliveries).append(")");
+ int maxRedeliveries = redelivery.getMaximumRedeliveries();
+ if (maxRedeliveries != 0) {
+
buffer.append(".maximumRedeliveries(").append(maxRedeliveries).append(")");
}
long redeliverDelay = redelivery.getRedeliverDelay();
if (redeliverDelay != 1000) {
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.builder.ExpressionClause;
@@ -38,10 +37,8 @@
import org.apache.camel.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.spi.IdempotentRepository;
-/**
- *
- */
public final class ExpressionNodeRenderer {
+
private ExpressionNodeRenderer() {
// Utility class, no public or protected default constructor
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.builder.ExpressionClause;
@@ -22,19 +21,14 @@
import org.apache.camel.model.language.MethodCallExpression;
import org.apache.camel.model.language.XPathExpression;
-/**
- *
- */
public final class ExpressionRenderer {
+
private ExpressionRenderer() {
// Utility class, no public or protected default constructor
}
/**
* a common render method to process the expressionDefinition
- *
- * @param buffer
- * @param expression
*/
public static void render(StringBuilder buffer, ExpressionDefinition
expression) {
@@ -57,9 +51,6 @@
/**
* Render a constant: constant("")
- *
- * @param expression
- * @param buffer
*/
public static void renderConstant(StringBuilder buffer,
ExpressionDefinition expression) {
renderConstant(buffer, expression.getExpressionValue().toString());
@@ -67,9 +58,6 @@
/**
* Render a constant: constant("")
- *
- * @param expression
- * @param buffer
*/
public static void renderConstant(StringBuilder buffer, String expression)
{
if (buffer.toString().endsWith(")")) {
@@ -80,9 +68,6 @@
/**
* Render an expression clause
- *
- * @param buffer
- * @param expression
*/
private static void renderExpressionClause(StringBuilder buffer,
ExpressionClause expression) {
if (expression.getLanguage() != null) {
@@ -121,9 +106,6 @@
/**
* Render a simple expression: header(foo) -> header("foo")
* tokenize(header(foo), ,) -> header("foo").tokenize(",")
- *
- * @param buffer
- * @param expression
*/
public static void renderExpression(StringBuilder buffer, String
expression) {
if (!expression.contains(",")) {
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -41,7 +41,7 @@
*/
public static void renderRoute(StringBuilder buffer, RouteDefinition
route) {
List<FromDefinition> inputs = route.getInputs();
- List<ProcessorDefinition<?>> outputs = route.getOutputs();
+ List<ProcessorDefinition> outputs = route.getOutputs();
// render the error handler
if (!(route.getErrorHandlerBuilder() instanceof
ErrorHandlerBuilderRef)) {
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java?rev=881214&r1=881213&r2=881214&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/JAXBContextResolver.java
Tue Nov 17 09:40:57 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.web.util;
-
import javax.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider;
import javax.xml.bind.JAXBContext;
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.util.List;
@@ -28,10 +27,8 @@
import org.apache.camel.processor.loadbalancer.StickyLoadBalancer;
import org.apache.camel.processor.loadbalancer.TopicLoadBalancer;
-/**
- *
- */
public final class LoadBalanceDefinitionRenderer {
+
private LoadBalanceDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
@@ -64,8 +61,8 @@
buffer.append(".topic()");
}
- List<ProcessorDefinition<?>> branches = loadB.getOutputs();
- for (ProcessorDefinition<?> branch : branches) {
+ List<ProcessorDefinition> branches = loadB.getOutputs();
+ for (ProcessorDefinition branch : branches) {
ProcessorDefinitionRenderer.render(buffer, branch);
}
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.util.List;
@@ -23,10 +22,8 @@
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.WhenDefinition;
-/**
- *
- */
public final class OnCompletionDefinitionRenderer {
+
private OnCompletionDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
@@ -57,8 +54,8 @@
if (onComplete.getOnFailureOnly()) {
buffer.append(".onFailureOnly()");
}
- List<ProcessorDefinition<?>> branches = onComplete.getOutputs();
- for (ProcessorDefinition<?> branch : branches) {
+ List<ProcessorDefinition> branches = onComplete.getOutputs();
+ for (ProcessorDefinition branch : branches) {
SendDefinitionRenderer.render(buffer, branch);
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.util.List;
@@ -23,10 +22,8 @@
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RedeliveryPolicyDefinition;
-/**
- *
- */
public final class OnExceptionDefinitionRenderer {
+
private OnExceptionDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
@@ -40,8 +37,8 @@
OnExceptionDefinition onException = (OnExceptionDefinition)processor;
buffer.append(processor.getShortName()).append("(");
- List<Class<? extends Throwable>> exceptions =
onException.getExceptionClasses();
- for (Class<? extends Throwable> excep : exceptions) {
+ List<Class> exceptions = onException.getExceptionClasses();
+ for (Class excep : exceptions) {
buffer.append(excep.getSimpleName()).append(".class");
if (excep != exceptions.get(exceptions.size() - 1)) {
buffer.append(", ");
@@ -53,9 +50,9 @@
if (onException.getRedeliveryPolicy() != null) {
RedeliveryPolicyDefinition redelivery =
onException.getRedeliveryPolicy();
if (redelivery.getMaximumRedeliveries() != null) {
- int maxRediliveries = redelivery.getMaximumRedeliveries();
- if (maxRediliveries != 0) {
-
buffer.append(".maximumRedeliveries(").append(maxRediliveries).append(")");
+ int maxRedeliveries = redelivery.getMaximumRedeliveries();
+ if (maxRedeliveries != 0) {
+
buffer.append(".maximumRedeliveries(").append(maxRedeliveries).append(")");
}
}
if (redelivery.getRedeliveryDelay() != null) {
@@ -79,8 +76,8 @@
}
}
- List<ProcessorDefinition<?>> branches = onException.getOutputs();
- for (ProcessorDefinition<?> branch : branches) {
+ List<ProcessorDefinition> branches = onException.getOutputs();
+ for (ProcessorDefinition branch : branches) {
SendDefinitionRenderer.render(buffer, branch);
}
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.util.List;
@@ -49,10 +48,8 @@
import org.apache.camel.model.TryDefinition;
import org.apache.camel.model.UnmarshalDefinition;
-/**
- *
- */
public final class OutputDefinitionRenderer {
+
private OutputDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
@@ -171,8 +168,8 @@
private static void renderFinally(StringBuilder buffer,
OutputDefinition<?> out) {
buffer.append("()");
FinallyDefinition finallyDef = (FinallyDefinition)out;
- List<ProcessorDefinition<?>> branches = finallyDef.getOutputs();
- for (ProcessorDefinition<?> branch : branches) {
+ List<ProcessorDefinition> branches = finallyDef.getOutputs();
+ for (ProcessorDefinition branch : branches) {
SendDefinitionRenderer.render(buffer, branch);
}
buffer.append(".end()");
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.Predicate;
@@ -23,6 +22,7 @@
* render a predicate
*/
public final class PredicateRenderer {
+
private PredicateRenderer() {
// Utility class, no public or protected default constructor
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.util.List;
@@ -37,10 +36,8 @@
import org.apache.camel.model.ThrottleDefinition;
import org.apache.camel.model.ThrowExceptionDefinition;
-/**
- *
- */
public final class ProcessorDefinitionRenderer {
+
private ProcessorDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.util.List;
@@ -23,10 +22,8 @@
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ResequenceDefinition;
-/**
- *
- */
public final class ResequenceDefinitionRenderer {
+
private ResequenceDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,23 +14,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.RoutingSlipDefinition;
-/**
- *
- */
public final class RoutingSlipDefinitionRenderer {
+
private RoutingSlipDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
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("\")");
+
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,17 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SendDefinition;
import org.apache.camel.model.WireTapDefinition;
-/**
- *
- */
public final class SendDefinitionRenderer {
+
private SendDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,16 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ThrottleDefinition;
-/**
- *
- */
public final class ThrottleDefinitionRenderer {
+
private ThrottleDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrowExceptionDefinitionRenderer.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrowExceptionDefinitionRenderer.java?rev=881214&r1=881213&r2=881214&view=diff
==============================================================================
---
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrowExceptionDefinitionRenderer.java
(original)
+++
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/util/ThrowExceptionDefinitionRenderer.java
Tue Nov 17 09:40:57 2009
@@ -14,16 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.ThrowExceptionDefinition;
-/**
- *
- */
public final class ThrowExceptionDefinitionRenderer {
+
private ThrowExceptionDefinitionRenderer() {
// Utility class, no public or protected default constructor
}
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=881214&r1=881213&r2=881214&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
Tue Nov 17 09:40:57 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.web.util;
import java.io.UnsupportedEncodingException;
@@ -23,9 +22,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-/**
- *
- */
public final class UriCharactersEncoder {
private static BitSet unsafeCharacters;
private static final transient Log LOG =
LogFactory.getLog(UriCharactersEncoder.class);