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:50 UTC
[camel-kafka-connector] 04/09: Ensure file input streams are closed
after use
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);