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/04/21 17:45:20 UTC
camel git commit: CAMEL-11183: Fixed CS
Repository: camel
Updated Branches:
refs/heads/master 82264a3b6 -> ab257b945
CAMEL-11183: Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ab257b94
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ab257b94
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ab257b94
Branch: refs/heads/master
Commit: ab257b945e3102f729afde20c68d2209a4fed13c
Parents: 82264a3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Apr 21 19:35:42 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Apr 21 19:35:42 2017 +0200
----------------------------------------------------------------------
.../maven/packaging/PackageDataFormatMojo.java | 90 +++++++++++---------
.../camel/maven/packaging/PackageHelper.java | 25 +++---
.../packaging/PrepareCatalogKarafMojo.java | 9 +-
.../maven/packaging/PrepareCatalogMojo.java | 11 ++-
.../packaging/PrepareCatalogSpringBootMojo.java | 9 +-
5 files changed, 80 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ab257b94/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 2a4d029..ad8ef3f 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -168,49 +168,8 @@ public class PackageDataFormatMojo extends AbstractMojo {
is = new FileInputStream(new File(core, "org/apache/camel/model/dataformat/" + modelName + ".json"));
}
String json = loadText(is);
- DataFormatModel dataFormatModel = new DataFormatModel();
- dataFormatModel.setName(name);
- dataFormatModel.setTitle("");
- dataFormatModel.setModelName(modelName);
- dataFormatModel.setLabel("");
- dataFormatModel.setDescription(project.getDescription());
- dataFormatModel.setJavaType(javaType);
- dataFormatModel.setGroupId(project.getGroupId());
- dataFormatModel.setArtifactId(project.getArtifactId());
- dataFormatModel.setVersion(project.getVersion());
-
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("title")) {
- String title = row.get("title");
- dataFormatModel.setTitle(asModelTitle(name, title));
- }
- if (row.containsKey("label")) {
- dataFormatModel.setLabel(row.get("label"));
- }
- if (row.containsKey("deprecated")) {
- dataFormatModel.setDeprecated(row.get("deprecated"));
- }
- if (row.containsKey("javaType")) {
- dataFormatModel.setModelJavaType(row.get("javaType"));
- }
- if (row.containsKey("firstVersion")) {
- dataFormatModel.setFirstVersion(row.get("firstVersion"));
- }
- // override description for camel-core, as otherwise its too generic
- if ("camel-core".equals(project.getArtifactId())) {
- if (row.containsKey("description")) {
- dataFormatModel.setDescription(row.get("description"));
- }
- }
- }
-
- // first version special for json
- String firstVersion = prepareJsonFirstVersion(name);
- if (firstVersion != null) {
- dataFormatModel.setFirstVersion(firstVersion);
- }
+ DataFormatModel dataFormatModel = extractDataFormatModel(project, json, modelName, name, javaType);
log.debug("Model " + dataFormatModel);
// build json schema for the data format
@@ -291,6 +250,53 @@ public class PackageDataFormatMojo extends AbstractMojo {
}
}
+ private static DataFormatModel extractDataFormatModel(MavenProject project, String json, String modelName, String name, String javaType) throws Exception {
+ DataFormatModel dataFormatModel = new DataFormatModel();
+ dataFormatModel.setName(name);
+ dataFormatModel.setTitle("");
+ dataFormatModel.setModelName(modelName);
+ dataFormatModel.setLabel("");
+ dataFormatModel.setDescription(project.getDescription());
+ dataFormatModel.setJavaType(javaType);
+ dataFormatModel.setGroupId(project.getGroupId());
+ dataFormatModel.setArtifactId(project.getArtifactId());
+ dataFormatModel.setVersion(project.getVersion());
+
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("title")) {
+ String title = row.get("title");
+ dataFormatModel.setTitle(asModelTitle(name, title));
+ }
+ if (row.containsKey("label")) {
+ dataFormatModel.setLabel(row.get("label"));
+ }
+ if (row.containsKey("deprecated")) {
+ dataFormatModel.setDeprecated(row.get("deprecated"));
+ }
+ if (row.containsKey("javaType")) {
+ dataFormatModel.setModelJavaType(row.get("javaType"));
+ }
+ if (row.containsKey("firstVersion")) {
+ dataFormatModel.setFirstVersion(row.get("firstVersion"));
+ }
+ // override description for camel-core, as otherwise its too generic
+ if ("camel-core".equals(project.getArtifactId())) {
+ if (row.containsKey("description")) {
+ dataFormatModel.setDescription(row.get("description"));
+ }
+ }
+ }
+
+ // first version special for json
+ String firstVersion = prepareJsonFirstVersion(name);
+ if (firstVersion != null) {
+ dataFormatModel.setFirstVersion(firstVersion);
+ }
+
+ return dataFormatModel;
+ }
+
private static String prepareBindyProperties(String name, String properties) {
String bindy = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\"";
String bindyCsv = "\"enum\": [ \"Csv\", \"Fixed\", \"KeyValue\" ], \"deprecated\": \"false\", \"secret\": \"false\", \"defaultValue\": \"Csv\"";
http://git-wip-us.apache.org/repos/asf/camel/blob/ab257b94/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
index 53cc0ec..5eb94c5 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageHelper.java
@@ -151,7 +151,7 @@ public final class PackageHelper {
@Override
public boolean accept(File pathname) {
// skip camel-jetty9 as its a duplicate of camel-jetty
- if ("camel-jetty9".equals(pathname)) {
+ if ("camel-jetty9".equals(pathname.getName())) {
return false;
}
return pathname.isDirectory() || pathname.getName().endsWith(".json");
@@ -162,17 +162,22 @@ public final class PackageHelper {
@Override
public boolean accept(File pathname) {
- if ("camel-core-osgi".equals(pathname)
- || "camel-core-xml".equals(pathname)
- || "camel-http-common".equals(pathname)
- || "camel-jetty".equals(pathname)
- || "camel-jetty-common".equals(pathname)
- || "camel-linkedin".equals(pathname)
- || "camel-olingo2".equals(pathname)
- || "camel-salesforce".equals(pathname)) {
+ String name = pathname.getName();
+ boolean special = "camel-core-osgi".equals(name)
+ || "camel-core-xml".equals(name)
+ || "camel-box".equals(name)
+ || "camel-http-common".equals(name)
+ || "camel-jetty".equals(name)
+ || "camel-jetty-common".equals(name);
+ boolean special2 = "camel-linkedin".equals(name)
+ || "camel-olingo2".equals(name)
+ || "camel-olingo4".equals(name)
+ || "camel-salesforce".equals(name);
+ if (special || special2) {
return false;
}
- return pathname.isDirectory() || pathname.getName().endsWith(".json");
+
+ return pathname.isDirectory() || name.endsWith(".json");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ab257b94/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
index 0b6f930..f98d4f3 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
@@ -391,16 +391,17 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
// skip these special cases
// (camel-jetty is a placeholder, as camel-jetty9 is the actual component)
- if ("camel-core-osgi".equals(dir.getName())
+ boolean special = "camel-core-osgi".equals(dir.getName())
|| "camel-core-xml".equals(dir.getName())
|| "camel-box".equals(dir.getName())
|| "camel-http-common".equals(dir.getName())
|| "camel-jetty".equals(dir.getName())
- || "camel-jetty-common".equals(dir.getName())
- || "camel-linkedin".equals(dir.getName())
+ || "camel-jetty-common".equals(dir.getName());
+ boolean special2 = "camel-linkedin".equals(dir.getName())
|| "camel-olingo2".equals(dir.getName())
|| "camel-olingo4".equals(dir.getName())
- || "camel-salesforce".equals(dir.getName())) {
+ || "camel-salesforce".equals(dir.getName());
+ if (special || special2) {
continue;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ab257b94/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 39df2e2..1701390 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -320,6 +320,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
printModelsReport(jsonFiles, duplicateJsonFiles, missingLabels, usedLabels, missingJavaDoc);
}
+ // CHECKSTYLE:OFF
protected Set<String> executeComponents() throws MojoExecutionException, MojoFailureException {
getLog().info("Copying all Camel component json descriptors");
@@ -533,6 +534,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
return answer;
}
+ // CHECKSTYLE:ON
protected Set<String> executeDataFormats() throws MojoExecutionException, MojoFailureException {
getLog().info("Copying all Camel dataformat json descriptors");
@@ -792,16 +794,17 @@ public class PrepareCatalogMojo extends AbstractMojo {
// skip these special cases
// (camel-jetty is a placeholder, as camel-jetty9 is the actual component)
- if ("camel-core-osgi".equals(dir.getName())
+ boolean special = "camel-core-osgi".equals(dir.getName())
|| "camel-core-xml".equals(dir.getName())
|| "camel-box".equals(dir.getName())
|| "camel-http-common".equals(dir.getName())
|| "camel-jetty".equals(dir.getName())
- || "camel-jetty-common".equals(dir.getName())
- || "camel-linkedin".equals(dir.getName())
+ || "camel-jetty-common".equals(dir.getName());
+ boolean special2 = "camel-linkedin".equals(dir.getName())
|| "camel-olingo2".equals(dir.getName())
|| "camel-olingo4".equals(dir.getName())
- || "camel-salesforce".equals(dir.getName())) {
+ || "camel-salesforce".equals(dir.getName());
+ if (special || special2) {
continue;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/ab257b94/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
index 74bcdbf..dc17b64 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
@@ -423,16 +423,17 @@ public class PrepareCatalogSpringBootMojo extends AbstractMojo {
// skip these special cases
// (camel-jetty is a placeholder, as camel-jetty9 is the actual component)
- if ("camel-core-osgi".equals(dir.getName())
+ boolean special = "camel-core-osgi".equals(dir.getName())
|| "camel-core-xml".equals(dir.getName())
|| "camel-box".equals(dir.getName())
|| "camel-http-common".equals(dir.getName())
|| "camel-jetty".equals(dir.getName())
- || "camel-jetty-common".equals(dir.getName())
- || "camel-linkedin".equals(dir.getName())
+ || "camel-jetty-common".equals(dir.getName());
+ boolean special2 = "camel-linkedin".equals(dir.getName())
|| "camel-olingo2".equals(dir.getName())
|| "camel-olingo4".equals(dir.getName())
- || "camel-salesforce".equals(dir.getName())) {
+ || "camel-salesforce".equals(dir.getName());
+ if (special || special2) {
continue;
}