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 19:59:03 UTC
svn commit: r804732 - in /camel/trunk/components/camel-web/src:
main/java/org/apache/camel/web/resources/
test/java/org/apache/camel/web/groovy/
Author: hadrian
Date: Sun Aug 16 17:59:03 2009
New Revision: 804732
URL: http://svn.apache.org/viewvc?rev=804732&view=rev
Log:
Las checkstyle fixes.
Modified:
camel/trunk/components/camel-web/src/main/java/org/apache/camel/web/resources/RouteResource.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/GroovyRendererTestSupport.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTest.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTestSupport.java
camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java
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=804732&r1=804731&r2=804732&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 17:59:03 2009
@@ -16,9 +16,6 @@
*/
package org.apache.camel.web.resources;
-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;
@@ -43,6 +40,11 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
+import com.sun.jersey.api.representation.Form;
+import com.sun.jersey.api.view.Viewable;
+
+import groovy.lang.GroovyClassLoader;
+
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.DefaultCamelContext;
@@ -245,7 +247,7 @@
// load the definition class into a RouteBuilder instance
GroovyClassLoader classLoader = new GroovyClassLoader();
- Class clazz = classLoader.parseClass(route);
+ Class<?> clazz = classLoader.parseClass(route);
RouteBuilder builder = (RouteBuilder)clazz.newInstance();
LOG.info("Loaded builder: " + builder);
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=804732&r1=804731&r2=804732&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 17:59:03 2009
@@ -20,6 +20,7 @@
import java.util.List;
import junit.framework.TestCase;
+import groovy.lang.GroovyClassLoader;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
@@ -29,14 +30,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import groovy.lang.GroovyClassLoader;
-
/**
* An abstract class that provides basic support for GroovyRenderer test
*/
-public abstract class GroovyRendererTestSupport extends TestCase {
- private final static Log LOG = LogFactory.getLog(GroovyRendererTestSupport.class);
-
+public abstract class GroovyRendererTestSupport extends TestCase {
private final String header = GroovyRenderer.HEADER;
private final String footer = GroovyRenderer.FOOTER;
@@ -95,5 +92,4 @@
context.addRoutes(builder);
}
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java?rev=804732&r1=804731&r2=804732&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/MulticastDSLTest.java Sun Aug 16 17:59:03 2009
@@ -23,9 +23,9 @@
public class MulticastDSLTest extends GroovyRendererTestSupport {
public void testMulticast() throws Exception {
- String DSL = "from(\"direct:a\").multicast().to(\"mock:x\", \"mock:y\", \"mock:z\")";
+ String dsl = "from(\"direct:a\").multicast().to(\"mock:x\", \"mock:y\", \"mock:z\")";
String expected = "from(\"direct:a\").multicast().to(\"mock:x\").to(\"mock:y\").to(\"mock:z\")";
- assertEquals(expected, render(DSL));
+ assertEquals(expected, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java?rev=804732&r1=804731&r2=804732&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/NormalizerDSLTest.java Sun Aug 16 17:59:03 2009
@@ -23,7 +23,10 @@
public class NormalizerDSLTest extends GroovyRendererTestSupport {
public void testNormalizer() throws Exception {
- String dsl = "from(\"direct:start\").choice().when().xpath(\"/employee\").to(\"bean:normalizer?method=employeeToPerson\").when().xpath(\"/customer\").to(\"bean:normalizer?method=customerToPerson\").end().to(\"mock:result\")";
+ String dsl = "from(\"direct:start\").choice()"
+ + ".when().xpath(\"/employee\").to(\"bean:normalizer?method=employeeToPerson\")"
+ + ".when().xpath(\"/customer\").to(\"bean:normalizer?method=customerToPerson\")"
+ + ".end().to(\"mock:result\")";
assertEquals(dsl, render(dsl));
}
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java?rev=804732&r1=804731&r2=804732&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/OnCompletionDSLTest.java Sun Aug 16 17:59:03 2009
@@ -23,14 +23,21 @@
public class OnCompletionDSLTest extends GroovyRendererTestSupport {
public void testOnCompletionAndIntercept() throws Exception {
- String dsl = "intercept().to(\"mock:intercept\");from(\"direct:start\").onCompletion().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
+ String dsl = "intercept().to(\"mock:intercept\");"
+ + "from(\"direct:start\").onCompletion().to(\"log:sync\").to(\"mock:sync\").end().to(\"mock:result\")";
assertEquals(dsl, render(dsl));
}
public void testOnCompletionAndInterceptAndOnException() throws Exception {
- String dsl = "intercept().to(\"mock:intercept\");onCompletion().to(\"log:global\").to(\"mock:sync\");onException(Exception.class).to(\"mock:exception\");from(\"direct:start\").to(\"mock:result\")";
+ String dsl = "intercept().to(\"mock:intercept\");"
+ + "onCompletion().to(\"log:global\").to(\"mock:sync\");"
+ + "onException(Exception.class).to(\"mock:exception\");"
+ + "from(\"direct:start\").to(\"mock:result\")";
// the order is changed
- String expected = "onException(Exception.class).to(\"mock:exception\");intercept().to(\"mock:intercept\");onCompletion().to(\"log:global\").to(\"mock:sync\");from(\"direct:start\").to(\"mock:result\")";
+ String expected = "onException(Exception.class).to(\"mock:exception\");"
+ + "intercept().to(\"mock:intercept\");"
+ + "onCompletion().to(\"log:global\").to(\"mock:sync\");"
+ + "from(\"direct:start\").to(\"mock:result\")";
assertEquals(expected, render(dsl));
}
@@ -46,7 +53,11 @@
}
public void testOnCompletionMoreGlobal() throws Exception {
- String dsl = "onCompletion().to(\"log:global\").to(\"mock:sync\");onCompletion().to(\"log:global\").to(\"mock:two\");onCompletion().onCompleteOnly().to(\"log:global\").to(\"mock:complete\");onCompletion().onFailureOnly().to(\"log:global\").to(\"mock:failure\");from(\"direct:start\").to(\"mock:result\")";
+ String dsl = "onCompletion().to(\"log:global\").to(\"mock:sync\");"
+ + "onCompletion().to(\"log:global\").to(\"mock:two\");"
+ + "onCompletion().onCompleteOnly().to(\"log:global\").to(\"mock:complete\");"
+ + "onCompletion().onFailureOnly().to(\"log:global\").to(\"mock:failure\");"
+ + "from(\"direct:start\").to(\"mock:result\")";
assertEquals(dsl, render(dsl));
}
@@ -56,7 +67,8 @@
}
public void testOnCompletionRouteScopeOverrideGlobalScope() throws Exception {
- String dsl = "onCompletion().to(\"log:global\").to(\"mock:global\");from(\"direct:start\").onCompletion().to(\"log:route\").to(\"mock:sync\").end().to(\"mock:result\")";
+ String dsl = "onCompletion().to(\"log:global\").to(\"mock:global\");"
+ + "from(\"direct:start\").onCompletion().to(\"log:route\").to(\"mock:sync\").end().to(\"mock:result\")";
// the global onCompletion is removed
String expected = "from(\"direct:start\").onCompletion().to(\"log:route\").to(\"mock:sync\").end().to(\"mock:result\")";
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTest.java?rev=804732&r1=804731&r2=804732&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTest.java Sun Aug 16 17:59:03 2009
@@ -17,11 +17,10 @@
package org.apache.camel.web.groovy;
-import static org.apache.camel.builder.Builder.constant;
-import static org.apache.camel.builder.PredicateBuilder.in;
import org.apache.camel.Predicate;
import org.apache.camel.builder.PredicateBuilder;
-import org.apache.camel.web.util.PredicateRenderer;
+
+import static org.apache.camel.builder.PredicateBuilder.in;
/**
*
@@ -123,7 +122,8 @@
assertMatch(expectedPredicate, predicate);
}
- public void _testIsInstanceOf() throws Exception {
+ // TODO: fix this test!
+ public void fixmeTestIsInstanceOf() throws Exception {
String expectedPredicate = "header(\"name\").isNull()";
Predicate predicate = header("name").isNull();
assertMatch(expectedPredicate, predicate);
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTestSupport.java?rev=804732&r1=804731&r2=804732&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTestSupport.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/PredicateRendererTestSupport.java Sun Aug 16 17:59:03 2009
@@ -29,6 +29,13 @@
*/
public class PredicateRendererTestSupport extends TestCase {
+ protected void assertMatch(String expectedPredicate, Predicate predicate) throws Exception {
+ StringBuilder sb = new StringBuilder();
+ PredicateRenderer.render(sb, predicate);
+
+ assertEquals(expectedPredicate, sb.toString());
+ }
+
protected static ValueBuilder body() {
return Builder.body();
}
@@ -52,12 +59,4 @@
protected static Predicate or(Predicate p1, Predicate p2) {
return PredicateBuilder.or(p1, p2);
}
-
- protected void assertMatch(String expectedPredicate, Predicate predicate) throws Exception {
- StringBuilder sb = new StringBuilder();
- PredicateRenderer.render(sb, predicate);
-
- assertEquals(expectedPredicate, sb.toString());
- }
-
}
Modified: camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java?rev=804732&r1=804731&r2=804732&view=diff
==============================================================================
--- camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java (original)
+++ camel/trunk/components/camel-web/src/test/java/org/apache/camel/web/groovy/SplitDSLTest.java Sun Aug 16 17:59:03 2009
@@ -37,7 +37,8 @@
assertEquals(dsl, render(dsl));
}
- public void _testSplitXPath() throws Exception {
+ // TODO: fix this test!
+ public void fixmeTestSplitXPath() throws Exception {
String dsl = "from(\"direct:start\").split(xpath(\"//foo/bar\")).convertBodyTo(String.class).to(\"mock:result\")";
assertEquals(dsl, render(dsl));
}