You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ri...@apache.org on 2012/04/02 22:02:32 UTC
svn commit: r1308518 - in /camel/trunk/components:
camel-gson/src/test/java/org/apache/camel/component/gson/
camel-jackson/src/test/java/org/apache/camel/component/jackson/
Author: rickette
Date: Mon Apr 2 20:02:32 2012
New Revision: 1308518
URL: http://svn.apache.org/viewvc?rev=1308518&view=rev
Log:
CAMEL-5135: snippet tags for documentation
Modified:
camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/Views.java
Modified: camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java?rev=1308518&r1=1308517&r2=1308518&view=diff
==============================================================================
--- camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java (original)
+++ camel/trunk/components/camel-gson/src/test/java/org/apache/camel/component/gson/GsonMarshalExclusionTest.java Mon Apr 2 20:02:32 2012
@@ -81,6 +81,7 @@ public class GsonMarshalExclusionTest ex
}
}
+ //START SNIPPET: strategy
/**
* Strategy to exclude {@link ExcludeAge} annotated fields
*/
@@ -96,6 +97,7 @@ public class GsonMarshalExclusionTest ex
return false;
}
}
+ //END SNIPPET: strategy
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
@@ -108,7 +110,9 @@ public class GsonMarshalExclusionTest ex
from("direct:inPojoExcludeWeight").marshal(weightExclusionFormat);
from("direct:backPojoExcludeWeight").unmarshal(weightExclusionFormat).to("mock:reversePojoExcludeWeight");
+ //START SNIPPET: format
GsonDataFormat ageExclusionFormat = new GsonDataFormat(TestPojoExclusion.class, new AgeExclusionStrategy());
+ //END SNIPPET: format
from("direct:inPojoExcludeAge").marshal(ageExclusionFormat);
from("direct:backPojoExcludeAge").unmarshal(ageExclusionFormat).to("mock:reversePojoExcludeAge");
}
Modified: camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java?rev=1308518&r1=1308517&r2=1308518&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java (original)
+++ camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/JacksonMarshalViewTest.java Mon Apr 2 20:02:32 2012
@@ -68,11 +68,14 @@ public class JacksonMarshalViewTest exte
@Override
public void configure() throws Exception {
+ //START SNIPPET: format
JacksonDataFormat ageViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Age.class);
+ //START SNIPPET: format
from("direct:inPojoAgeView").marshal(ageViewFormat);
from("direct:backPojoAgeView").unmarshal(ageViewFormat).to("mock:reversePojoAgeView");
JacksonDataFormat weightViewFormat = new JacksonDataFormat(TestPojoView.class, Views.Weight.class);
+
from("direct:inPojoWeightView").marshal(weightViewFormat);
from("direct:backPojoWeightView").unmarshal(weightViewFormat).to("mock:reversePojoWeightView");
}
Modified: camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java?rev=1308518&r1=1308517&r2=1308518&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java (original)
+++ camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/TestPojoView.java Mon Apr 2 20:02:32 2012
@@ -20,11 +20,18 @@ import org.codehaus.jackson.map.annotate
public class TestPojoView {
+ //START SNIPPET: jsonview
+
+ @JsonView(Views.Age.class)
private int age = 30;
+
private int height = 190;
+
+ @JsonView(Views.Weight.class)
private int weight = 70;
- @JsonView(Views.Age.class)
+ //END SNIPPET: jsonview
+
public int getAge() {
return age;
}
@@ -41,7 +48,6 @@ public class TestPojoView {
this.height = height;
}
- @JsonView(Views.Weight.class)
public int getWeight() {
return weight;
}
Modified: camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/Views.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/Views.java?rev=1308518&r1=1308517&r2=1308518&view=diff
==============================================================================
--- camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/Views.java (original)
+++ camel/trunk/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/Views.java Mon Apr 2 20:02:32 2012
@@ -16,8 +16,10 @@
*/
package org.apache.camel.component.jackson;
+//START SNIPPET: marker
public class Views {
static class Weight { }
static class Age { }
}
+//END SNIPPET: marker