This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit dbf0a782bb2f1f4fec37ea26cc6759985b4fca33 Author: Claus Ibsen <[email protected]> AuthorDate: Wed May 6 10:31:52 2020 +0200 CAMEL-14867: Add deprecatedSince to tooling model --- .../src/main/java/org/apache/camel/tooling/model/BaseModel.java | 9 +++++++++ .../src/main/java/org/apache/camel/tooling/model/JsonMapper.java | 4 +++- .../camel/maven/packaging/EndpointSchemaGeneratorMojo.java | 1 + .../org/apache/camel/maven/packaging/PackageDataFormatMojo.java | 1 + .../org/apache/camel/maven/packaging/PackageLanguageMojo.java | 1 + .../java/org/apache/camel/maven/packaging/PackageOtherMojo.java | 1 + 6 files changed, 16 insertions(+), 1 deletion(-) diff --git a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/BaseModel.java b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/BaseModel.java index 4027210..96e2898 100644 --- a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/BaseModel.java +++ b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/BaseModel.java @@ -29,6 +29,7 @@ public abstract class BaseModel<O extends BaseOptionModel> { protected String javaType; protected String label; protected boolean deprecated; + protected String deprecatedSince; protected String deprecationNote; protected final List<O> options = new ArrayList<>(); protected SupportLevel supportLevel; @@ -96,6 +97,14 @@ public abstract class BaseModel<O extends BaseOptionModel> { this.deprecationNote = deprecationNote; } + public String getDeprecatedSince() { + return deprecatedSince; + } + + public void setDeprecatedSince(String deprecatedSince) { + this.deprecatedSince = deprecatedSince; + } + public String getJavaType() { return javaType; } diff --git a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java index 6c78e55..3a8c041 100644 --- a/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java +++ b/tooling/camel-tooling-model/src/main/java/org/apache/camel/tooling/model/JsonMapper.java @@ -301,6 +301,7 @@ public final class JsonMapper { obj.put("title", model.getTitle()); obj.put("description", model.getDescription()); obj.put("deprecated", model.isDeprecated()); + obj.put("deprecatedSince", model.getDeprecatedSince()); obj.put("deprecationNote", model.getDeprecationNote()); obj.put("firstVersion", model.getFirstVersion()); obj.put("label", model.getLabel()); @@ -326,7 +327,8 @@ public final class JsonMapper { model.setFirstVersion(mobj.getString("firstVersion")); model.setLabel(mobj.getString("label")); model.setDeprecated(mobj.getBooleanOrDefault("deprecated", false)); - model.setDeprecationNote(mobj.getString("label")); + model.setDeprecatedSince(mobj.getString("deprecatedSince")); + model.setDeprecationNote(mobj.getString("deprecationNote")); model.setJavaType(mobj.getString("javaType")); model.setSupportLevel(SupportLevel.safeValueOf(mobj.getString("supportLevel"))); model.setNativeSupported(mobj.getBooleanOrDefault("nativeSupported", false)); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java index 5c2447b..ba4f4b1 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java @@ -504,6 +504,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo { deprecationNote = endpointClassElement.getAnnotation(Metadata.class).deprecationNote(); } model.setDeprecationNote(deprecationNote); + model.setDeprecatedSince(project.getProperties().getProperty("deprecatedSince")); // these information is not available at compile time and we enrich // these later during the camel-package-maven-plugin 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 853ca19..3014619 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 @@ -252,6 +252,7 @@ public class PackageDataFormatMojo extends AbstractGeneratorMojo { model.setLabel(def.getLabel()); model.setDeprecated(def.isDeprecated()); model.setDeprecationNote(def.getDeprecationNote()); + model.setDeprecatedSince(project.getProperties().getProperty("deprecatedSince")); model.setJavaType(javaType.getCanonicalName()); model.setModelName(def.getName()); model.setModelJavaType(def.getJavaType()); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java index d15c589..4eb33eb 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageLanguageMojo.java @@ -204,6 +204,7 @@ public class PackageLanguageMojo extends AbstractGeneratorMojo { model.setLabel(def.getLabel()); model.setDeprecated(def.isDeprecated()); model.setDeprecationNote(def.getDeprecationNote()); + model.setDeprecatedSince(project.getProperties().getProperty("deprecatedSince")); model.setJavaType(javaType.getCanonicalName()); model.setModelName(def.getName()); model.setModelJavaType(def.getJavaType()); diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java index cca4a01..0be13a4 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java +++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageOtherMojo.java @@ -116,6 +116,7 @@ public class PackageOtherMojo extends AbstractGeneratorMojo { model.setVersion(project.getVersion()); model.setDescription(project.getDescription()); model.setDeprecated(project.getName() != null && project.getName().contains("(deprecated)")); + model.setDeprecatedSince(project.getProperties().getProperty("deprecatedSince")); model.setFirstVersion(project.getProperties().getProperty("firstVersion")); model.setLabel(project.getProperties().getProperty("label")); String title = project.getProperties().getProperty("title");
