You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2021/02/24 13:27:46 UTC
[camel-kafka-connector] branch camel-master updated (7cd6d97 ->
7e7bdcf)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git.
from 7cd6d97 The count of transforms, converter and aggregation strategy seems to be broken for docs - Regen
new 4409b13 Use isEmpty for emptiness check as it's a bit more idiomatic
new c428800 Remove unnecessary close calls which are handled by try-with-resources
new 8d6d2a0 Rename the avroData bytes to avoid confusion with the member variable also named avroData
new f0326c9 Ensure file input streams are closed after use
new bb5224f Avoid a very unlikely NPE if the overridePomFile flag is null
new cb00dc5 Avoid type specification on constructors when possible
new 4c55fb3 Provide better details if unable to delete the Maven artifact file
new 86dd160 Avoid hard-coded separators and they can cause portability problems
new 7e7bdcf Remove unnecessary toString for getAbsolutePath() which already returns a String
The 9 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.
Summary of changes:
.../SinkPojoToSchemaAndStructTransform.java | 5 ++--
.../maven/docs/UpdateDocComponentsListMojo.java | 8 ++---
.../maven/CamelKafkaConnectorCreateMojo.java | 2 +-
.../maven/CamelKafkaConnectorUpdateMojo.java | 35 ++++++++++++++--------
.../maven/GenerateCamelKafkaConnectorsMojo.java | 6 +++-
.../maven/utils/JsonMapperKafkaConnector.java | 6 ++--
.../kafkaconnector/maven/utils/MavenUtils.java | 11 +++----
7 files changed, 44 insertions(+), 29 deletions(-)
[camel-kafka-connector] 09/09: Remove unnecessary toString for
getAbsolutePath() which already returns a String
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 7e7bdcf21788320fe3d06d866cc5c21285326748
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:53:11 2021 +0100
Remove unnecessary toString for getAbsolutePath() which already returns a String
---
.../camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
index 8a20072..dba04b2 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
@@ -512,21 +512,21 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
Collection<File> aggStrategiesElements = FileUtils.listFiles(file, new RegexFileFilter(".*AggregationStrategy.java"), DirectoryFileFilter.DIRECTORY);
for (File p : convertersElements) {
String filePath = p.getCanonicalPath();
- String f = StringUtils.removeStart(filePath, connectorDir.getAbsolutePath().toString() + "/src/main/java/");
+ String f = StringUtils.removeStart(filePath, connectorDir.getAbsolutePath() + "/src/main/java/");
String finalElement = StringUtils.replace(f, File.separator, ".");
String finalPath = StringUtils.removeEnd(finalElement, ".java");
convertersList.add(finalPath);
}
for (File p : transformElements) {
String filePath = p.getCanonicalPath();
- String f = StringUtils.removeStart(filePath, connectorDir.getAbsolutePath().toString() + "/src/main/java/");
+ String f = StringUtils.removeStart(filePath, connectorDir.getAbsolutePath() + "/src/main/java/");
String finalElement = StringUtils.replace(f, File.separator, ".");
String finalPath = StringUtils.removeEnd(finalElement, ".java");
transformsList.add(finalPath);
}
for (File p : aggStrategiesElements) {
String filePath = p.getCanonicalPath();
- String f = StringUtils.removeStart(filePath, connectorDir.getAbsolutePath().toString() + "/src/main/java/");
+ String f = StringUtils.removeStart(filePath, connectorDir.getAbsolutePath() + "/src/main/java/");
String finalElement = StringUtils.replace(f, File.separator, ".");
String finalPath = StringUtils.removeEnd(finalElement, ".java");
aggregationStrategiesList.add(finalPath);
[camel-kafka-connector] 04/09: Ensure file input streams are closed
after use
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit f0326c9abb1d3b0ec04764cf1836811f336f8ea1
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:37:20 2021 +0100
Ensure file input streams are closed after use
---
.../maven/CamelKafkaConnectorUpdateMojo.java | 17 ++++++++++++++---
.../maven/GenerateCamelKafkaConnectorsMojo.java | 6 +++++-
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
index ae99dcb..5f2b536 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
@@ -244,7 +244,11 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
// excluded dependencies
Set<String> configExclusions = new HashSet<>();
Properties properties = new Properties();
- properties.load(new FileInputStream(rm.getResourceAsFile(fixDependenciesProperties)));
+
+ try (InputStream stream = new FileInputStream(rm.getResourceAsFile(fixDependenciesProperties))) {
+ properties.load(stream);
+ }
+
String artExcl = properties.getProperty(EXCLUDE_DEPENDENCY_PROPERTY_PREFIX + getMainDepArtifactId());
getLog().debug("Configured exclusions: " + artExcl);
if (artExcl != null && artExcl.trim().length() > 0) {
@@ -266,7 +270,10 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
private void fixAdditionalDependencies(Document pom, String additionalDependencies) throws Exception {
Properties properties = new Properties();
- properties.load(new FileInputStream(rm.getResourceAsFile(fixDependenciesProperties)));
+
+ try (InputStream stream = new FileInputStream(rm.getResourceAsFile(fixDependenciesProperties))) {
+ properties.load(stream);
+ }
Set<String> deps = new TreeSet<>();
deps.addAll(MavenUtils.csvToSet(properties.getProperty(getMainDepArtifactId())));
@@ -374,7 +381,11 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
String packageName = "org.apache.camel.kafkaconnector." + RESERVED_WORDS_SUBSTITUTION_MAP.getOrDefault(sanitizedName.replace("-", ""), sanitizedName.replace("-", ""));
Map<String, String> additionalProperties = new HashMap<>();
Properties properties = new Properties();
- properties.load(new FileInputStream(rm.getResourceAsFile(fixDependenciesProperties)));
+
+ try (InputStream stream = new FileInputStream(rm.getResourceAsFile(fixDependenciesProperties))) {
+ properties.load(stream);
+ }
+
String commonPropertyValue = properties.getProperty(ADDITIONAL_COMMON_PROPERTIES_PROPERTY_PREFIX + getMainDepArtifactId());
getLog().debug("Additional common connector properties: " + commonPropertyValue);
addProperties(additionalProperties, commonPropertyValue);
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java
index f3a6551..cd4be57 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/GenerateCamelKafkaConnectorsMojo.java
@@ -133,7 +133,11 @@ public class GenerateCamelKafkaConnectorsMojo extends AbstractCamelKafkaConnecto
String additionalDependencies = "";
final Properties properties = new Properties();
- properties.load(new FileInputStream(rm.getResourceAsFile("project.properties")));
+
+ try (InputStream stream = new FileInputStream(rm.getResourceAsFile("project.properties"))) {
+ properties.load(stream);
+ }
+
for (String component : filteredComponents) {
String cJson = cc.componentJSonSchema(component);
ComponentModel cm = JsonMapper.generateComponentModel(cJson);
[camel-kafka-connector] 03/09: Rename the avroData bytes to avoid
confusion with the member variable also named avroData
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 8d6d2a066d185605ee1049d69fd21fdcaaa1987a
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:35:30 2021 +0100
Rename the avroData bytes to avoid confusion with the member variable also named avroData
---
.../kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
index 0ccc6fc..0da7ca4 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
@@ -79,10 +79,10 @@ public class SinkPojoToSchemaAndStructTransform<R extends ConnectRecord<R>> impl
writer.write(avroGenericRecord, encoder);
encoder.flush();
- byte[] avroData = out.toByteArray();
+ byte[] avroDataBytes = out.toByteArray();
pojo = objectReader
.with(new AvroSchema(avroGenericRecord.getSchema()))
- .readValue(avroData);
+ .readValue(avroDataBytes);
LOG.debug("Pojo of class {} created: {}", pojo.getClass(), pojo);
} catch (IOException e) {
throw new ConnectException("Error in generating POJO from Struct.", e);
[camel-kafka-connector] 01/09: Use isEmpty for emptiness check as
it's a bit more idiomatic
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 4409b13bcfa0e52ae4b51a4843396aeb113efeeb
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:26:56 2021 +0100
Use isEmpty for emptiness check as it's a bit more idiomatic
---
.../kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java | 6 +++---
.../camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java | 4 ++--
.../camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java | 6 +++---
.../org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
index 4b22b49..2ca59b6 100644
--- a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
+++ b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
@@ -123,10 +123,10 @@ public class UpdateDocComponentsListMojo extends AbstractMojo {
if (file.isDirectory()) {
Collection sinkConnector = FileUtils.listFiles(file, new RegexFileFilter(".*SinkTask.*"), DirectoryFileFilter.DIRECTORY);
Collection sourceConnector = FileUtils.listFiles(file, new RegexFileFilter(".*SourceTask.*"), DirectoryFileFilter.DIRECTORY);
- if (sinkConnector.size() > 0 || sourceConnector.size() > 0) {
+ if (!sinkConnector.isEmpty() || !sourceConnector.isEmpty()) {
CamelKafkaConnectorTableOptionModel singleConnector = new CamelKafkaConnectorTableOptionModel();
singleConnector.setName(file.getName());
- if (sinkConnector.size() > 0) {
+ if (!sinkConnector.isEmpty()) {
singleConnector.setSink(true);
String connectorFinal = StringUtils.removeEnd(file.getName(), "kafka-connector");
if (connectorFinal.equalsIgnoreCase("camel-coap-tcp-")) {
@@ -139,7 +139,7 @@ public class UpdateDocComponentsListMojo extends AbstractMojo {
singleConnector.setDocsSink(XREF_CONNECTOR_LINK_PREFIX + connectorFinal + SINK_CONNECTOR_LINK_SUFFIX_ADOC);
}
}
- if (sourceConnector.size() > 0) {
+ if (!sourceConnector.isEmpty()) {
singleConnector.setSource(true);
String connectorFinal = StringUtils.removeEnd(file.getName(), "kafka-connector");
if (connectorFinal.equalsIgnoreCase("camel-coap-tcp-")) {
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
index a494a7d..ae99dcb 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
@@ -258,7 +258,7 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
libsToRemove.addAll(loggingImpl);
libsToRemove.addAll(configExclusions);
- if (libsToRemove.size() > 0) {
+ if (!libsToRemove.isEmpty()) {
getLog().info("Camel-kafka-connector: the following dependencies will be removed from the connector: " + libsToRemove);
MavenUtils.addExclusionsToDependency(pom, getMainDepArtifactId(), libsToRemove, GENERATED_SECTION_START, GENERATED_SECTION_END);
}
@@ -288,7 +288,7 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
deps.addAll(globalProps);
}
- if (deps.size() > 0) {
+ if (!deps.isEmpty()) {
getLog().debug("The following dependencies will be added to the starter: " + deps);
MavenUtils.addDependencies(pom, deps, GENERATED_SECTION_START, GENERATED_SECTION_END);
}
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java
index a03241a..6c3a70b 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/JsonMapperKafkaConnector.java
@@ -43,13 +43,13 @@ public final class JsonMapperKafkaConnector {
JsonObject wrapper = new JsonObject();
wrapper.put("connector", obj);
wrapper.put("properties", asJsonObject(model.getOptions()));
- if (model.getConverters().size() > 0) {
+ if (!model.getConverters().isEmpty()) {
wrapper.put("converters", new JsonArray(model.getConverters()));
}
- if (model.getTransforms().size() > 0) {
+ if (!model.getTransforms().isEmpty()) {
wrapper.put("transforms", new JsonArray(model.getTransforms()));
}
- if (model.getAggregationStrategies().size() > 0) {
+ if (!model.getAggregationStrategies().isEmpty()) {
wrapper.put("aggregationStrategies", new JsonArray(model.getAggregationStrategies()));
}
return wrapper;
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
index 1e26f4e..0a560a7 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
@@ -182,7 +182,7 @@ public final class MavenUtils {
XPath xpath = XPathFactory.newInstance().newXPath();
Node dependencies = ((NodeList) xpath.compile("/project/dependencies").evaluate(pom, XPathConstants.NODESET)).item(0);
- if (deps.size() > 0) {
+ if (!deps.isEmpty()) {
dependencies.appendChild(pom.createComment(generatedSectionStartMarker));
for (String dep : deps) {
Element dependency = pom.createElement("dependency");
[camel-kafka-connector] 06/09: Avoid type specification on
constructors when possible
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit cb00dc5bca54deb49959c4839e0a6569e68d1dd0
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:41:47 2021 +0100
Avoid type specification on constructors when possible
---
.../camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java | 2 +-
.../camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
index 2ca59b6..579764c 100644
--- a/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
+++ b/tooling/camel-kafka-connector-docs-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/docs/UpdateDocComponentsListMojo.java
@@ -113,7 +113,7 @@ public class UpdateDocComponentsListMojo extends AbstractMojo {
protected void executeComponentsReadme() throws MojoExecutionException, MojoFailureException {
CamelKafkaConnectorTableModel tableModel = new CamelKafkaConnectorTableModel();
- ArrayList<CamelKafkaConnectorTableOptionModel> options = new ArrayList<CamelKafkaConnectorTableOptionModel>();
+ ArrayList<CamelKafkaConnectorTableOptionModel> options = new ArrayList<>();
if (connectorsDir != null && connectorsDir.isDirectory()) {
File[] files = connectorsDir.listFiles();
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
index 5f2b536..6ae3e1a 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
@@ -437,7 +437,7 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
throw new UnsupportedOperationException("Connector type not supported: " + ct + " must be one of " + ConnectorType.SINK + ", " + ConnectorType.SOURCE);
}
- List<CamelKafkaConnectorOptionModel> listOptions = new ArrayList<CamelKafkaConnectorOptionModel>();
+ List<CamelKafkaConnectorOptionModel> listOptions = new ArrayList<>();
model.getEndpointPathOptions().stream().filter(filterEndpointOptions)
.forEachOrdered(epo -> addConnectorOptions(sanitizedName, ct, javaClassConnectorConfig, confMethod, "PATH", ctLowercaseName, "path", epo, listOptions));
model.getEndpointParameterOptions().stream().filter(filterEndpointOptions)
[camel-kafka-connector] 02/09: Remove unnecessary close calls which
are handled by try-with-resources
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit c4288001926c5728176221ddedf88d5533a4f8a6
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:33:05 2021 +0100
Remove unnecessary close calls which are handled by try-with-resources
---
.../kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java | 1 -
.../java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java | 1 -
2 files changed, 2 deletions(-)
diff --git a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
index b9a59cb..0ccc6fc 100644
--- a/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
+++ b/core/src/main/java/org/apache/camel/kafkaconnector/transforms/SinkPojoToSchemaAndStructTransform.java
@@ -80,7 +80,6 @@ public class SinkPojoToSchemaAndStructTransform<R extends ConnectRecord<R>> impl
encoder.flush();
byte[] avroData = out.toByteArray();
- out.close();
pojo = objectReader
.with(new AvroSchema(avroGenericRecord.getSchema()))
.readValue(avroData);
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
index 0a560a7..91a77cd 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
@@ -125,7 +125,6 @@ public final class MavenUtils {
String oldContent = IOUtils.toString(fr);
if (!newContent.equals(oldContent)) {
log.debug("Writing new file " + file.getAbsolutePath());
- fr.close();
} else {
log.debug("File " + file.getAbsolutePath() + " has been left unchanged");
write = false;
[camel-kafka-connector] 07/09: Provide better details if unable to
delete the Maven artifact file
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 4c55fb32ac4e05e9be5acb98d9ed167d466ffb75
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:46:28 2021 +0100
Provide better details if unable to delete the Maven artifact file
---
.../org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
index 91a77cd..f79f7ba 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/MavenUtils.java
@@ -27,6 +27,7 @@ import java.io.StringWriter;
import java.net.MalformedURLException;
import java.net.URL;
import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -302,9 +303,10 @@ public final class MavenUtils {
String relativePath = baseDir.toPath().relativize(targetFile.toPath()).toString();
File mainArtifactFile = new File(baseDir, relativePath);
if (mainArtifactFile.exists()) {
- boolean deleted = mainArtifactFile.delete();
- if (!deleted) {
- throw new IllegalStateException("Cannot delete file " + mainArtifactFile);
+ try {
+ Files.delete(mainArtifactFile.toPath());
+ } catch (IOException e) {
+ throw new IllegalStateException("Cannot delete file " + mainArtifactFile, e);
}
}
}
[camel-kafka-connector] 08/09: Avoid hard-coded separators and they
can cause portability problems
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit 86dd16014db88886400f4b93753b75d0608710a3
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:50:20 2021 +0100
Avoid hard-coded separators and they can cause portability problems
---
.../camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
index 6ae3e1a..8a20072 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorUpdateMojo.java
@@ -447,7 +447,7 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
confMethod.setBody(confMethod.getBody() + "return conf;");
- String javaClassConnectorConfigFileName = packageName.replaceAll("\\.", "\\/") + "/" + javaClassConnectorConfigName + ".java";
+ String javaClassConnectorConfigFileName = packageName.replaceAll("\\.", "\\/") + File.separator + javaClassConnectorConfigName + ".java";
MavenUtils.writeSourceIfChanged(javaClassConnectorConfig, javaClassConnectorConfigFileName, false, connectorDir, rm.getResourceAsFile(javaFilesHeader));
// Camel{sanitizedName}{Sink,Source}Task.java
@@ -475,7 +475,7 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
}
getDefaultConfigMethod.setBody(getDefaultConfigMethod.getBody() + "}};\n");
getDefaultConfigMethod.addAnnotation(Override.class);
- String javaClassTaskFileName = packageName.replaceAll("\\.", "\\/") + "/" + javaClassTaskName + ".java";
+ String javaClassTaskFileName = packageName.replaceAll("\\.", "\\/") + File.separator + javaClassTaskName + ".java";
MavenUtils.writeSourceIfChanged(javaClassTask, javaClassTaskFileName, false, connectorDir, rm.getResourceAsFile(javaFilesHeader));
// Camel{sanitizedName}{Sink,Source}Connector.java
@@ -495,7 +495,7 @@ public class CamelKafkaConnectorUpdateMojo extends AbstractCamelKafkaConnectorMo
javaClassConnector.addMethod().setConstructor(false).setName("taskClass").setPublic().setReturnType("Class<? extends Task>")
.setBody("return Camel" + StringUtils.capitalize(sanitizedName.replace("-", "")) + ctCapitalizedName + "Task.class;").addAnnotation(Override.class);
- String javaClassConnectorFileName = packageName.replaceAll("\\.", "\\/") + "/" + javaClassConnectorName + ".java";
+ String javaClassConnectorFileName = packageName.replaceAll("\\.", "\\/") + File.separator + javaClassConnectorName + ".java";
MavenUtils.writeSourceIfChanged(javaClassConnector, javaClassConnectorFileName, false, connectorDir, rm.getResourceAsFile(javaFilesHeader));
List<String> convertersList = new ArrayList<>();
[camel-kafka-connector] 05/09: Avoid a very unlikely NPE if the
overridePomFile flag is null
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch camel-master
in repository https://gitbox.apache.org/repos/asf/camel-kafka-connector.git
commit bb5224f5c6252b78a72d8ddd8fc2bffec5fef90d
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Wed Feb 24 11:39:09 2021 +0100
Avoid a very unlikely NPE if the overridePomFile flag is null
---
.../camel/kafkaconnector/maven/CamelKafkaConnectorCreateMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorCreateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorCreateMojo.java
index 5c95b52..ad92b69 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorCreateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorCreateMojo.java
@@ -84,7 +84,7 @@ public class CamelKafkaConnectorCreateMojo extends AbstractCamelKafkaConnectorMo
if (directory.exists()) {
if (directory.isDirectory()) {
getLog().info("Connector " + name + " already exists since a sub directory named: " + directory.getName() + " already exists.");
- if (overridePomFile) {
+ if (Boolean.TRUE.equals(overridePomFile)) {
getLog().info("Since overridePomFile is " + overridePomFile + " regenerating pom file for connector:" + name + " in directory named: " + directory.getName());
generateAndWritePom(sanitizedName, directory);
addConnectorAsProjectSubmodule(sanitizedName);