You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/12/02 08:30:54 UTC
[camel-k-runtime] branch master updated: Add type information to
catalog
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/master by this push:
new f9d62a3 Add type information to catalog
f9d62a3 is described below
commit f9d62a3cea6be36ab2fb982d7c96e001374c5d45
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Dec 2 07:03:10 2019 +0000
Add type information to catalog
---
.../camel/k/tooling/maven/GenerateCatalogMojo.java | 4 ++++
.../camel/k/tooling/maven/model/CamelArtifact.java | 16 ++++++++++++++++
.../tooling/maven/model/CatalogComponentDefinition.java | 9 +++++++++
.../tooling/maven/model/CatalogDataFormatDefinition.java | 9 +++++++++
.../k/tooling/maven/model/CatalogLanguageDefinition.java | 9 +++++++++
...cessorTest.java => AbstractCatalogProcessorTest.java} | 2 +-
.../tooling/maven/processors/CatalogProcessor3Test.java | 2 +-
7 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
index 8b3650f..e3144b4 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
@@ -247,6 +247,8 @@ public class GenerateCatalogMojo extends AbstractMojo {
.filter(Objects::nonNull)
.forEach(artifact::createScheme);
+ artifact.addJavaType(definition.getJavaType());
+
return artifact;
});
}
@@ -268,6 +270,7 @@ public class GenerateCatalogMojo extends AbstractMojo {
}
artifact.addLanguage(definition.getName());
+ artifact.addJavaType(definition.getJavaType());
return artifact;
});
@@ -290,6 +293,7 @@ public class GenerateCatalogMojo extends AbstractMojo {
}
artifact.addDataformats(definition.getName());
+ artifact.addJavaType(definition.getJavaType());
return artifact;
});
diff --git a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
index b1a29c9..7c2b16f 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
+++ b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
@@ -27,6 +27,7 @@ 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<>();
@@ -34,6 +35,7 @@ public class CamelArtifact extends Artifact {
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 class CamelArtifact extends Artifact {
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/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
index dafa9b3..7cb6566 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
+++ b/tooling/camel-k-maven-plugin/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 final class CatalogComponentDefinition {
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/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
index bce59c6..01b43cd 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
+++ b/tooling/camel-k-maven-plugin/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 final class CatalogDataFormatDefinition {
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/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
index 81c6862..7c9134b 100644
--- a/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
+++ b/tooling/camel-k-maven-plugin/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 final class CatalogLanguageDefinition {
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/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCatalogProcessorTest.java
similarity index 95%
rename from tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
rename to tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCatalogProcessorTest.java
index 84503be..f47f0ce 100644
--- a/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
+++ b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCatalogProcessorTest.java
@@ -19,7 +19,7 @@ package org.apache.camel.k.tooling.maven.processors;
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/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
index 857a5d6..6f581bb 100644
--- a/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
+++ b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
@@ -28,7 +28,7 @@ import org.junit.jupiter.api.Test;
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();