You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/09/24 20:03:49 UTC
[05/19] camel git commit: CAMEL-10969: Output connector json in
pretty print mode
CAMEL-10969: Output connector json in pretty print mode
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/29dd5501
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/29dd5501
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/29dd5501
Branch: refs/heads/master
Commit: 29dd55010590ca7bc9763fe959f8834ea9793480
Parents: 3bbf91e
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Sep 24 11:40:32 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Sep 24 22:03:21 2017 +0200
----------------------------------------------------------------------
.../org/apache/camel/maven/connector/ConnectorMojo.java | 12 +++++++++---
.../camel/maven/connector/util/JSonSchemaHelper.java | 6 +++---
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/29dd5501/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
----------------------------------------------------------------------
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
index 169dc12..b32ee70 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/ConnectorMojo.java
@@ -74,6 +74,12 @@ public class ConnectorMojo extends AbstractJarMojo {
@Parameter(defaultValue = "false")
private boolean includeGitUrl;
+ /**
+ * Whether to output JSon connector schema files in pretty print mode or not
+ */
+ @Parameter(defaultValue = "true")
+ private boolean prettyPrint;
+
private CamelCatalog catalog = new DefaultCamelCatalog();
@Override
@@ -162,14 +168,14 @@ public class ConnectorMojo extends AbstractJarMojo {
FileOutputStream fos = new FileOutputStream(out, false);
// output as pretty print
- String pretty = prettyPrint(newJson);
- fos.write(pretty.getBytes());
+ newJson = prettyPrint ? prettyPrint(newJson) : newJson;
+ fos.write(newJson.getBytes());
fos.close();
// also write the file in the root folder so its easier to find that for tooling
out = new File(classesDirectory, "camel-connector-schema.json");
fos = new FileOutputStream(out, false);
- fos.write(pretty.getBytes());
+ fos.write(newJson.getBytes());
fos.close();
if (generateToSources) {
http://git-wip-us.apache.org/repos/asf/camel/blob/29dd5501/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
----------------------------------------------------------------------
diff --git a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
index 92984a1..7babd1c 100644
--- a/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
+++ b/connectors/camel-connector-maven-plugin/src/main/java/org/apache/camel/maven/connector/util/JSonSchemaHelper.java
@@ -159,12 +159,12 @@ public final class JSonSchemaHelper {
sb.append(" }");
- // output in pretty print
- return prettyPrint(sb.toString());
+ return sb.toString();
}
/**
- * Pretty print the json
+ * Pretty print the json.
+ *
* @param json existing json
* @return output in pretty printed format
*/