You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by "davsclaus (via GitHub)" <gi...@apache.org> on 2023/06/16 05:38:35 UTC
[GitHub] [camel] davsclaus commented on a diff in pull request #10388: CAMEL-18793: add prettyBody to simple language
davsclaus commented on code in PR #10388:
URL: https://github.com/apache/camel/pull/10388#discussion_r1231793735
##########
core/camel-xml-jaxp-util/src/test/resources/log4j2.properties:
##########
@@ -0,0 +1,32 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+appender.console.type = Console
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-xml-jaxp-test.log
Review Comment:
camel-xml-jaxp-util-test.log
##########
core/camel-core-languages/src/main/java/org/apache/camel/language/csimple/CSimpleHelper.java:
##########
@@ -163,6 +165,30 @@ public static String bodyOneLine(Exchange exchange) {
return body;
}
+ public static String prettyBody(Exchange exchange) {
+ String body = exchange.getIn().getBody(String.class);
+
+ if (body == null) {
+ return null;
+ } else if (body.startsWith("{") && body.endsWith("}") || body.startsWith("[") && body.endsWith("]")) {
+ body = Jsoner.prettyPrint(body.trim()); //json
+ } else if (body.startsWith("<") && body.endsWith(">")) {
+ return CSimpleHelper.prettyXml(body.trim()); //xml
+ }
+
+ return body;
+ }
+
+ private static String prettyXml(String rawXml) {
+ try {
+ boolean includeDeclaration = rawXml.startsWith("<?xml");
+ return XmlPrettyPrinter.pettyPrint(rawXml, 2, includeDeclaration);
+ } catch (Exception e) {
+ e.printStackTrace();
Review Comment:
remove this dumping stacktrace
##########
core/camel-xml-jaxp-util/pom.xml:
##########
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>core</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-xml-jaxp-util</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: XML JAXP Util</name>
+ <description>Camel XML JAXP Util</description>
+
+ <properties>
+ <firstVersion>3.0.0</firstVersion>
Review Comment:
4.0.0
##########
core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java:
##########
@@ -2036,4 +2038,42 @@ public String toString() {
};
}
+ /**
+ * Returns the expression for the message body as pretty formatted string
+ */
+ public static Expression prettyBodyExpression() {
+ return new ExpressionAdapter() {
+ @Override
+ public Object evaluate(Exchange exchange) {
+ String body = exchange.getIn().getBody(String.class);
+
+ if (body == null) {
+ return null;
+ } else if (body.startsWith("{") && body.endsWith("}") || body.startsWith("[") && body.endsWith("]")) {
+ return Jsoner.prettyPrint(body); //json
+ } else if(body.startsWith("<") && body.endsWith(">")) {
+ return ExpressionBuilder.prettyXml(body); //xml
+
+ }
+
+ return body;
+ }
+
+ @Override
+ public String toString() {
+ return "prettyBody()";
+ }
+ };
+ }
+
+ private static String prettyXml(String rawXml) {
+ try {
+ boolean includeDeclaration = rawXml.startsWith("<?xml");
+ return XmlPrettyPrinter.pettyPrint(rawXml, 2, includeDeclaration);
+ } catch (Exception e) {
+ e.printStackTrace();
Review Comment:
remove
##########
core/camel-core-languages/pom.xml:
##########
@@ -51,6 +51,11 @@
<artifactId>camel-support</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-xml-jaxp</artifactId>
Review Comment:
should it not be camel-xml-jaxp-util
##########
core/camel-xml-jaxp-util/pom.xml:
##########
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>core</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-xml-jaxp-util</artifactId>
+ <packaging>jar</packaging>
+ <name>Camel :: XML JAXP Util</name>
+ <description>Camel XML JAXP Util</description>
+
+ <properties>
+ <firstVersion>3.0.0</firstVersion>
+ <label>core,xml</label>
+ <camel-prepare-component>true</camel-prepare-component>
Review Comment:
I dont think this is needed as this is just util
##########
core/camel-support/src/main/java/org/apache/camel/support/builder/ExpressionBuilder.java:
##########
@@ -2036,4 +2038,42 @@ public String toString() {
};
}
+ /**
+ * Returns the expression for the message body as pretty formatted string
+ */
+ public static Expression prettyBodyExpression() {
+ return new ExpressionAdapter() {
+ @Override
+ public Object evaluate(Exchange exchange) {
+ String body = exchange.getIn().getBody(String.class);
+
+ if (body == null) {
+ return null;
+ } else if (body.startsWith("{") && body.endsWith("}") || body.startsWith("[") && body.endsWith("]")) {
+ return Jsoner.prettyPrint(body); //json
+ } else if(body.startsWith("<") && body.endsWith(">")) {
Review Comment:
fix checkstyle on code,
run install -P format,fastinstall
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@camel.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org