Add type information to catalog

apache · Dec 2, 2019 · f9d62a3 · f9d62a3
1 parent f7aeec6
commit f9d62a3
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 2 deletions.
diff --git a/...el-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/...el-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
@@ -247,6 +247,8 @@ private void processComponents(org.apache.camel.catalog.CamelCatalog catalog, Ma
                     .filter(Objects::nonNull)
                     .forEach(artifact::createScheme);
 
+                artifact.addJavaType(definition.getJavaType());
+
                 return artifact;
             });
         }
@@ -268,6 +270,7 @@ private void processLanguages(org.apache.camel.catalog.CamelCatalog catalog, Map
                 }
 
                 artifact.addLanguage(definition.getName());
+                artifact.addJavaType(definition.getJavaType());
 
                 return artifact;
             });
@@ -290,6 +293,7 @@ private void processDataFormats(org.apache.camel.catalog.CamelCatalog catalog, M
                 }
 
                 artifact.addDataformats(definition.getName());
+                artifact.addJavaType(definition.getJavaType());
 
                 return artifact;
             });

diff --git a/...el-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java b/...el-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
@@ -27,13 +27,15 @@ public class CamelArtifact extends Artifact {
     private List<String> dataformats;
     private List<Artifact> dependencies;
     private List<Artifact> exclusions;
+    private List<String> javaTypes;
 
     public CamelArtifact() {
         this.schemes = new ArrayList<>();
         this.languages = new ArrayList<>();
         this.dataformats = new ArrayList<>();
         this.dependencies = new ArrayList<>();
         this.exclusions = new ArrayList<>();
+        this.javaTypes = new ArrayList<>();
     }
 
     public void setSchemes(List<CamelScheme> schemes) {
@@ -151,6 +153,20 @@ public void addExclusion(String groupId, String artifactId) {
         addExclusion(artifact);
     }
 
+    public List<String> getJavaTypes() {
+        return javaTypes;
+    }
+
+    public void setJavaTypes(List<String> javaTypes) {
+        this.javaTypes = javaTypes;
+    }
+
+    public void addJavaType(String javaType) {
+        if (!this.javaTypes.contains(javaType)) {
+            this.javaTypes.add(javaType);
+        }
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

diff --git a/...ugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java b/...ugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
@@ -30,6 +30,7 @@ public final class CatalogComponentDefinition {
     private String artifactId;
     private String version;
     private String alternativeSchemes;
+    private String javaType;
 
     public Stream<String> getSchemes() {
         String schemeIDs = StringUtils.trimToEmpty(alternativeSchemes);
@@ -80,6 +81,14 @@ public void setAlternativeSchemes(String alternativeSchemes) {
         this.alternativeSchemes = alternativeSchemes;
     }
 
+    public String getJavaType() {
+        return javaType;
+    }
+
+    public void setJavaType(String javaType) {
+        this.javaType = javaType;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Container {
         private CatalogComponentDefinition delegate;

diff --git a/...gin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java b/...gin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
@@ -26,6 +26,7 @@ public final class CatalogDataFormatDefinition {
     private String groupId;
     private String artifactId;
     private String version;
+    private String javaType;
 
     public String getName() {
         return name;
@@ -59,6 +60,14 @@ public void setVersion(String version) {
         this.version = version;
     }
 
+    public String getJavaType() {
+        return javaType;
+    }
+
+    public void setJavaType(String javaType) {
+        this.javaType = javaType;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Container {
         private CatalogDataFormatDefinition delegate;

diff --git a/...lugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java b/...lugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
@@ -26,6 +26,7 @@ public final class CatalogLanguageDefinition {
     private String groupId;
     private String artifactId;
     private String version;
+    private String javaType;
 
     public String getName() {
         return name;
@@ -59,6 +60,14 @@ public void setVersion(String version) {
         this.version = version;
     }
 
+    public String getJavaType() {
+        return javaType;
+    }
+
+    public void setJavaType(String javaType) {
+        this.javaType = javaType;
+    }
+
     @JsonIgnoreProperties(ignoreUnknown = true)
     public static final class Container {
         private CatalogLanguageDefinition delegate;

diff --git a/...ocessors/AbstractCataloProcessorTest.java → ...cessors/AbstractCatalogProcessorTest.java b/...ocessors/AbstractCataloProcessorTest.java → ...cessors/AbstractCatalogProcessorTest.java
@@ -19,7 +19,7 @@
 import org.apache.camel.catalog.CamelCatalog;
 import org.apache.camel.catalog.DefaultCamelCatalog;
 
-public abstract class AbstractCataloProcessorTest {
+public abstract class AbstractCatalogProcessorTest {
     protected CamelCatalog versionCamelCatalog(String version) {
         return new DefaultCamelCatalog() {
             @Override

diff --git a/...ugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java b/...ugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
@@ -28,7 +28,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class CatalogProcessor3Test extends AbstractCataloProcessorTest {
+public class CatalogProcessor3Test extends AbstractCatalogProcessorTest {
     @Test
     public void testAcceptHyphen() {
         CatalogProcessor3x cp3 = new CatalogProcessor3x();