You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/08/21 07:57:58 UTC
[camel] 03/20: basic structure any23
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit d2ff724f8cc669adb06089aaec2ffdbbef5738ca
Author: Roberto Flores <be...@gmail.com>
AuthorDate: Sun Jun 9 15:33:46 2019 -0500
basic structure any23
---
.../TidyMarkupDataFormatAsDomNodeTest.java | 2 +-
.../TidyMarkupDataFormatWithUnmarshalTypeTest.java | 4 ++--
.../{tagsoup => any23}/TidyMarkupTestSupport.java | 2 +-
.../any23DataFormatBasicTest.java} | 24 +++++++++++-----------
.../camel/model/dataformat/Any23DataFormat.java | 4 ++++
5 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupDataFormatAsDomNodeTest.java
similarity index 98%
rename from components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
rename to components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupDataFormatAsDomNodeTest.java
index 06aa8ae..1f38ff2 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsDomNodeTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupDataFormatAsDomNodeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.tagsoup;
+package org.apache.camel.dataformat.any23;
import java.io.File;
import java.util.List;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatWithUnmarshalTypeTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupDataFormatWithUnmarshalTypeTest.java
similarity index 90%
rename from components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatWithUnmarshalTypeTest.java
rename to components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupDataFormatWithUnmarshalTypeTest.java
index 77ed3ae..a99664e 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatWithUnmarshalTypeTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupDataFormatWithUnmarshalTypeTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.tagsoup;
+package org.apache.camel.dataformat.any23;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
@@ -22,7 +22,7 @@ import org.apache.camel.model.dataformat.TidyMarkupDataFormat;
/*
* This just tests whether this dataformat is available to UnmarshalType
*/
-public class TidyMarkupDataFormatWithUnmarshalTypeTest extends TidyMarkupDataFormatAsStringTest {
+public class TidyMarkupDataFormatWithUnmarshalTypeTest extends any23DataFormatBasicTest {
@Override
protected RouteBuilder createRouteBuilder() {
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupTestSupport.java
similarity index 98%
rename from components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
rename to components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupTestSupport.java
index 2b53585..7048373 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupTestSupport.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/TidyMarkupTestSupport.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.tagsoup;
+package org.apache.camel.dataformat.any23;
import java.io.BufferedReader;
import java.io.File;
diff --git a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/any23DataFormatBasicTest.java
similarity index 73%
rename from components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
rename to components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/any23DataFormatBasicTest.java
index 83e672c..e0305bd 100644
--- a/components/camel-any23/src/test/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormatAsStringTest.java
+++ b/components/camel-any23/src/test/java/org/apache/camel/dataformat/any23/any23DataFormatBasicTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.tagsoup;
+package org.apache.camel.dataformat.any23;
import java.io.File;
import java.util.List;
@@ -29,36 +29,36 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
-public class TidyMarkupDataFormatAsStringTest extends CamelTestSupport {
+public class any23DataFormatBasicTest extends CamelTestSupport {
@Test
public void testUnMarshalToStringOfXml() throws Exception {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- String badHtml = TidyMarkupTestSupport.loadFileAsString(new File(
- "src/test/resources/org/apache/camel/dataformat/tagsoup/testfile1.html"));
- String evilHtml = TidyMarkupTestSupport.loadFileAsString(new File(
- "src/test/resources/org/apache/camel/dataformat/tagsoup/testfile2-evilHtml.html"));
+ // String badHtml = TidyMarkupTestSupport.loadFileAsString(new File(
+ // "src/test/resources/org/apache/camel/dataformat/any23/testfile1.html"));
+ // String evilHtml = TidyMarkupTestSupport.loadFileAsString(new File(
+ // "src/test/resources/org/apache/camel/dataformat/any23/testfile2-evilHtml.html"));
- template.sendBody("direct:start", badHtml);
- template.sendBody("direct:start", evilHtml);
+ template.sendBody("direct:start", "");
+ // template.sendBody("direct:start", evilHtml);
resultEndpoint.assertIsSatisfied();
List<Exchange> list = resultEndpoint.getReceivedExchanges();
for (Exchange exchange : list) {
try {
Message in = exchange.getIn();
- Node tidyMarkup = in.getBody(Node.class);
+ // Node tidyMarkup = in.getBody(Node.class);
- log.debug("Received " + tidyMarkup);
- assertNotNull("Should be able to convert received body to a string", tidyMarkup);
+ // log.debug("Received " + tidyMarkup);
+ // assertNotNull("Should be able to convert received body to a string", tidyMarkup);
} catch (Exception e) {
fail("Failed to convert the resulting String to XML: " + e.getLocalizedMessage());
}
}
- }
+ }
@Override
protected RouteBuilder createRouteBuilder() {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
index 7dde517..af3596a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/dataformat/Any23DataFormat.java
@@ -35,5 +35,9 @@ import org.apache.camel.spi.Metadata;
@XmlAccessorType(XmlAccessType.FIELD)
public class Any23DataFormat extends DataFormatDefinition {
+ public Any23DataFormat() {
+ super("any23");
+
+ }
}
\ No newline at end of file