You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/02/27 17:39:44 UTC
[camel-kafka-connector] branch camel-3.1.0 created (now 678933f)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-3.1.0
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
at 678933f First attemp to update to version 3.1.0
This branch includes the following new commits:
new 3359c9c Upgrade Camel to version 3.1.0
new 678933f First attemp to update to version 3.1.0
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[camel-kafka-connector] 02/02: First attemp to update to version
3.1.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.1.0
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 678933f5a423e3ff3ea084e471540f8131882db1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 27 18:39:12 2020 +0100
First attemp to update to version 3.1.0
---
.../kafkaconnector/utils/CamelMainSupport.java | 4 ++
.../maven/AbstractSpringBootGenerator.java | 5 +-
.../maven/PrepareCatalogSpringBootMojo.java | 2 -
.../maven/SpringBootAutoConfigurationMojo.java | 70 ++++++++++------------
4 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
index e09265f..5ca5076 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/utils/CamelMainSupport.java
@@ -203,6 +203,10 @@ public class CamelMainSupport {
public void afterStop(BaseMainSupport main) {
}
+
+ @Override
+ public void beforeConfigure(BaseMainSupport main) {
+ }
}
private class CamelContextStarter implements Runnable {
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
index bde2791..b0d3318 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
@@ -33,6 +33,7 @@ import java.util.jar.JarFile;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
+import org.apache.camel.tooling.util.PackageHelper;
import org.apache.commons.io.IOUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.AbstractMojo;
@@ -44,8 +45,6 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
public abstract class AbstractSpringBootGenerator extends AbstractMojo {
/**
@@ -145,7 +144,7 @@ public abstract class AbstractSpringBootGenerator extends AbstractMojo {
protected static String loadJson(JarFile jar, JarEntry je) {
try (InputStream is = jar.getInputStream(je)) {
- return loadText(is);
+ return PackageHelper.loadText(is);
} catch (IOException e) {
throw new IOError(e);
}
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
index 285d0b6..1680c46 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
@@ -37,8 +37,6 @@ import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
/**
* Prepares the Spring Boot provider camel catalog to include component it supports
*/
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index a1b90d9..9efd723 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.springboot.maven;
+import static org.apache.camel.maven.packaging.AbstractGeneratorMojo.updateResource;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -45,24 +47,23 @@ import java.util.zip.ZipEntry;
import javax.annotation.Generated;
import javax.xml.bind.annotation.XmlTransient;
-import org.apache.camel.maven.packaging.JSonSchemaHelper;
-import org.apache.camel.maven.packaging.model.ComponentModel;
-import org.apache.camel.maven.packaging.model.ComponentOptionModel;
-import org.apache.camel.maven.packaging.model.DataFormatModel;
-import org.apache.camel.maven.packaging.model.DataFormatOptionModel;
-import org.apache.camel.maven.packaging.model.EndpointOptionModel;
-import org.apache.camel.maven.packaging.model.LanguageModel;
-import org.apache.camel.maven.packaging.model.LanguageOptionModel;
-import org.apache.camel.maven.packaging.model.OtherModel;
-import org.apache.camel.maven.packaging.model.OtherOptionModel;
-import org.apache.camel.maven.packaging.srcgen.Annotation;
-import org.apache.camel.maven.packaging.srcgen.GenericType;
-import org.apache.camel.maven.packaging.srcgen.JavaClass;
-import org.apache.camel.maven.packaging.srcgen.Method;
-import org.apache.camel.maven.packaging.srcgen.Property;
import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
+import org.apache.camel.tooling.model.BaseOptionModel;
+import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.ComponentModel.ComponentOptionModel;
+import org.apache.camel.tooling.model.ComponentModel.EndpointOptionModel;
+import org.apache.camel.tooling.model.DataFormatModel;
+import org.apache.camel.tooling.model.DataFormatModel.DataFormatOptionModel;
+import org.apache.camel.tooling.model.LanguageModel;
+import org.apache.camel.tooling.model.LanguageModel.LanguageOptionModel;
+import org.apache.camel.tooling.model.OtherModel;
+import org.apache.camel.tooling.util.srcgen.Annotation;
+import org.apache.camel.tooling.util.srcgen.GenericType;
+import org.apache.camel.tooling.util.srcgen.JavaClass;
+import org.apache.camel.tooling.util.srcgen.Method;
+import org.apache.camel.tooling.util.srcgen.Property;
import org.apache.commons.io.FileUtils;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
@@ -89,15 +90,6 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Scope;
-import static org.apache.camel.maven.packaging.AbstractGeneratorMojo.updateResource;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyDefaultValue;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyDescriptionValue;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyJavaType;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyType;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getSafeValue;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.parseJsonSchema;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
/**
* Generate Spring Boot auto configuration files for Camel components and data
* formats.
@@ -322,7 +314,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
commonClass.getJavaDoc().setFullText(doc);
commonClass.addAnnotation(Generated.class).setStringValue("value", SpringBootAutoConfigurationMojo.class.getName());
- for (OtherOptionModel option : model.getOptions()) {
+ for (BaseOptionModel option : model.getOptions()) {
String type = option.getJavaType();
String name = option.getName();
@@ -340,16 +332,16 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
if (!Strings.isBlank(option.getDescription())) {
prop.getField().getJavaDoc().setFullText(option.getDescription());
}
- if (!Strings.isBlank(option.getDefaultValue())) {
+ if (!Strings.isBlank((String) option.getDefaultValue())) {
if ("java.lang.String".equals(type)) {
- prop.getField().setStringInitializer(option.getDefaultValue());
+ prop.getField().setStringInitializer((String) option.getDefaultValue());
} else if ("long".equals(type) || "java.lang.Long".equals(type)) {
// the value should be a Long number
String value = option.getDefaultValue() + "L";
prop.getField().setLiteralInitializer(value);
} else if ("integer".equals(option.getType()) || "boolean".equals(option.getType())) {
- prop.getField().setLiteralInitializer(option.getDefaultValue());
- } else if (!Strings.isBlank(option.getEnums())) {
+ prop.getField().setLiteralInitializer((String) option.getDefaultValue());
+ } else if (!Strings.isBlank(option.getEnums().toString())) {
String enumShortName = type.substring(type.lastIndexOf(".") + 1);
prop.getField().setLiteralInitializer(enumShortName + "." + option.getDefaultValue());
commonClass.addImport(model.getJavaType());
@@ -421,7 +413,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
}
javaClass.getJavaDoc().setFullText(doc);
- for (OtherOptionModel option : model.getOptions()) {
+ for (BaseOptionModel option : model.getOptions()) {
String type = option.getJavaType();
String name = option.getName();
@@ -446,16 +438,16 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
if (!Strings.isBlank(option.getDescription())) {
prop.getField().getJavaDoc().setFullText(option.getDescription());
}
- if (!Strings.isBlank(option.getDefaultValue())) {
+ if (!Strings.isBlank((String) option.getDefaultValue())) {
if ("java.lang.String".equals(type)) {
- prop.getField().setStringInitializer(option.getDefaultValue());
+ prop.getField().setStringInitializer((String) option.getDefaultValue());
} else if ("long".equals(type) || "java.lang.Long".equals(type)) {
// the value should be a Long number
String value = option.getDefaultValue() + "L";
prop.getField().setLiteralInitializer(value);
} else if ("integer".equals(option.getType()) || "boolean".equals(option.getType())) {
- prop.getField().setLiteralInitializer(option.getDefaultValue());
- } else if (!Strings.isBlank(option.getEnums())) {
+ prop.getField().setLiteralInitializer((String) option.getDefaultValue());
+ } else if (!Strings.isBlank(option.getEnums().toString())) {
String enumShortName = type.substring(type.lastIndexOf(".") + 1);
prop.getField().setLiteralInitializer(enumShortName + "." + option.getDefaultValue());
javaClass.addImport(model.getJavaType());
@@ -725,7 +717,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
// and therefore there is no problem, eg
// camel.component.jdbc.data-source = myDataSource
// where the type would have been javax.sql.DataSource
- boolean complex = isComplexType(option) && !isNestedProperty && Strings.isBlank(option.getEnums());
+ boolean complex = isComplexType(option) && !isNestedProperty && Strings.isBlank(option.getEnums().toString());
if (complex) {
// force to use a string type
type = "java.lang.String";
@@ -738,14 +730,14 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
Property prop = javaClass.addProperty(type, option.getName());
if (ADD_NESTED_CONFIGURATION_PROPERTY) {
- if (!type.endsWith(INNER_TYPE_SUFFIX) && type.indexOf('[') == -1 && INCLUDE_INNER_PATTERN.matcher(type).matches() && Strings.isBlank(option.getEnums())
+ if (!type.endsWith(INNER_TYPE_SUFFIX) && type.indexOf('[') == -1 && INCLUDE_INNER_PATTERN.matcher(type).matches() && Strings.isBlank(option.getEnums().toString())
&& (javaClassSource == null || (javaClassSource.isClass() && !javaClassSource.isAbstract()))) {
// add nested configuration annotation for complex
// properties
prop.getField().addAnnotation(NestedConfigurationProperty.class);
}
}
- if ("true".equals(option.getDeprecated())) {
+ if ("true".equals(option.isDeprecated())) {
prop.getField().addAnnotation(Deprecated.class);
prop.getAccessor().addAnnotation(Deprecated.class);
prop.getMutator().addAnnotation(Deprecated.class);
@@ -820,11 +812,11 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
String deprecationNote = null;
if (eom != null) {
prop.getField().getJavaDoc().setText(eom.getDescription());
- prop.getField().setLiteralInitializer(asLiteralDefault(sourceProp.getType(), eom.getDefaultValue()));
+ prop.getField().setLiteralInitializer(asLiteralDefault(sourceProp.getType(), (String) eom.getDefaultValue()));
deprecationNote = eom.getDeprecationNote();
} else if (com != null) {
prop.getField().getJavaDoc().setText(com.getDescription());
- prop.getField().setLiteralInitializer(asLiteralDefault(sourceProp.getType(), com.getDefaultValue()));
+ prop.getField().setLiteralInitializer(asLiteralDefault(sourceProp.getType(), (String) com.getDefaultValue()));
deprecationNote = com.getDeprecationNote();
}
[camel-kafka-connector] 01/02: Upgrade Camel to version 3.1.0
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-3.1.0
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 3359c9ce360d09f0db0c811ea0cae413958547b6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu Feb 27 12:10:30 2020 +0100
Upgrade Camel to version 3.1.0
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9e6d793..7742413 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -43,7 +43,7 @@
<activemq.version>5.15.11</activemq.version>
<kafka.version>2.4.0</kafka.version>
<junit.version>5.6.0</junit.version>
- <camel.version>3.0.1</camel.version>
+ <camel.version>3.1.0</camel.version>
<jackson.version>2.10.2</jackson.version>
<log4j2.version>2.8.2</log4j2.version>
<version.java>1.8</version.java>