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 2022/04/25 12:10:24 UTC
[camel] branch main updated (438ce8c3592 -> e85ca506c17)
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 438ce8c3592 CAMEL-17963: added resume support for Cassandra CQL
new 493c3065b7e CAMEL-17894: cleanup unused exceptions in tooling
new 16789ff6bbd CAMEL-17894: replace older loop formats with newer ones
new b1f2b2334a3 CAMEL-17894: replace unnecessary explicit type arguments
new cc3e8b2bd6f CAMEL-17894: colapse similar catch statements
new a5a1ecc9ccb CAMEL-17894: avoid reading file attributes multiple times
new bf1898d712a (chores) tooling: formatting fixes
new e85ca506c17 CAMEL-17894: avoid unnecessarily creating an arraylist
The 7 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:
.../maven/bom/generator/BomGeneratorMojo.java | 4 +---
.../camel/maven/AbstractGeneratorMojoTest.java | 3 +--
.../camel/maven/CamelSpringNamespaceTest.java | 6 ++---
.../maven/EipDocumentationEnricherMojoTest.java | 8 +++----
.../java/org/apache/camel/maven/ResourceUtils.java | 2 +-
.../java/org/apache/camel/maven/XmlHelperTest.java | 4 ++--
.../maven/plugins/javadoc/AbstractJavadocMojo.java | 5 ++---
.../org/apache/camel/maven/PrepareFatJarMojo.java | 5 +----
.../main/java/org/apache/camel/maven/RunMojo.java | 14 +++---------
.../packaging/AbstractGenerateConfigurerMojo.java | 6 +----
.../maven/packaging/AbstractGenerateMojo.java | 26 +++++++++++++++++-----
.../packaging/UpdateEagerClassloadedHelper.java | 3 +--
.../camel/maven/packaging/UpdateMainHelper.java | 4 +---
.../maven/packaging/UpdateSensitizeHelper.java | 4 +---
.../camel/maven/packaging/EndpointHelperTest.java | 2 +-
.../generator/openapi/AbstractGenerateMojo.java | 2 +-
16 files changed, 44 insertions(+), 54 deletions(-)
[camel] 07/07: CAMEL-17894: avoid unnecessarily creating an arraylist
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e85ca506c17f281e42662425fd2bc16eda0ca517
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 12:56:43 2022 +0200
CAMEL-17894: avoid unnecessarily creating an arraylist
---
.../java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
index 1a4cd0c3d9f..a07c79ec5cf 100644
--- a/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
+++ b/tooling/maven/camel-javadoc-plugin/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java
@@ -2197,10 +2197,9 @@ public abstract class AbstractJavadocMojo
for ( Path sourcePath : sourcePaths )
{
- List<String> files = new ArrayList<>();
File sourceDirectory = sourcePath.toFile();
- files.addAll( JavadocUtil.getFilesFromSource( sourceDirectory, sourceFileIncludes, sourceFileExcludes,
- excludedPackages ) );
+ final List<String> files = getFilesFromSource(sourceDirectory, sourceFileIncludes, sourceFileExcludes,
+ excludedPackages);
if ( source != null && JavaVersion.parse( source ).isBefore( "9" )
&& files.remove( "module-info.java" ) )
[camel] 02/07: CAMEL-17894: replace older loop formats with newer ones
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 16789ff6bbde9129eb8770101d9708d920ccfeaa
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 11:52:27 2022 +0200
CAMEL-17894: replace older loop formats with newer ones
---
.../org/apache/camel/maven/PrepareFatJarMojo.java | 7 ++-----
.../src/main/java/org/apache/camel/maven/RunMojo.java | 19 ++++++-------------
.../packaging/AbstractGenerateConfigurerMojo.java | 7 ++-----
3 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java
index a35a0db2703..6f576f5ab78 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java
@@ -187,13 +187,10 @@ public class PrepareFatJarMojo extends AbstractMojo {
// MEXEC-17
dependencies.addAll(getAllNonTestScopedDependencies());
- Iterator<Artifact> iter = dependencies.iterator();
- while (iter.hasNext()) {
- Artifact classPathElement = iter.next();
-
+ for (Artifact classPathElement : dependencies) {
if (getLog().isDebugEnabled()) {
getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
}
File file = classPathElement.getFile();
if (file != null) {
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index eadc6b5d835..50f57ddd15b 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -712,22 +712,19 @@ public class RunMojo extends AbstractExecMojo {
}
try {
- Iterator<Artifact> iter = this.determineRelevantPluginDependencies().iterator();
- while (iter.hasNext()) {
- Artifact classPathElement = iter.next();
-
+ for (Artifact classPathElement : this.determineRelevantPluginDependencies()) {
// we must skip org.osgi.core, otherwise we get a
// java.lang.NoClassDefFoundError: org.osgi.vendor.framework property not set
if (classPathElement.getArtifactId().equals("org.osgi.core")) {
if (getLog().isDebugEnabled()) {
getLog().debug("Skipping org.osgi.core -> " + classPathElement.getGroupId() + "/"
- + classPathElement.getArtifactId() + "/" + classPathElement.getVersion());
+ + classPathElement.getArtifactId() + "/" + classPathElement.getVersion());
}
continue;
}
getLog().debug("Adding plugin dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
path.add(classPathElement.getFile().toURI().toURL());
}
} catch (MalformedURLException e) {
@@ -818,11 +815,9 @@ public class RunMojo extends AbstractExecMojo {
// MEXEC-17
dependencies.addAll(getAllNonTestScopedDependencies());
- Iterator<Artifact> iter = dependencies.iterator();
- while (iter.hasNext()) {
- Artifact classPathElement = iter.next();
+ for (Artifact classPathElement : dependencies) {
getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
File file = classPathElement.getFile();
if (file != null) {
path.add(file.toURI().toURL());
@@ -855,9 +850,7 @@ public class RunMojo extends AbstractExecMojo {
private Collection<Artifact> getAllDependencies() throws MojoExecutionException {
List<Artifact> artifacts = new ArrayList<>();
- for (Iterator<?> dependencies = project.getDependencies().iterator(); dependencies.hasNext();) {
- Dependency dependency = (Dependency) dependencies.next();
-
+ for (Dependency dependency : project.getDependencies()) {
String groupId = dependency.getGroupId();
String artifactId = dependency.getArtifactId();
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index 2cc465c118a..e465bdec61e 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -238,13 +238,10 @@ public abstract class AbstractGenerateConfigurerMojo extends AbstractGeneratorMo
// MEXEC-17
dependencies.addAll(getAllNonTestScopedDependencies());
- Iterator<Artifact> iter = dependencies.iterator();
- while (iter.hasNext()) {
- Artifact classPathElement = iter.next();
-
+ for (Artifact classPathElement : dependencies) {
if (getLog().isDebugEnabled()) {
getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
}
File file = classPathElement.getFile();
[camel] 06/07: (chores) tooling: formatting fixes
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit bf1898d712aaa13f43073d105aa7f531ad03067b
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 12:52:06 2022 +0200
(chores) tooling: formatting fixes
---
.../java/org/apache/camel/maven/AbstractGeneratorMojoTest.java | 1 -
.../src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java | 2 +-
.../src/main/java/org/apache/camel/maven/RunMojo.java | 7 +++----
.../camel/maven/packaging/AbstractGenerateConfigurerMojo.java | 3 +--
.../apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java | 1 -
.../java/org/apache/camel/maven/packaging/UpdateMainHelper.java | 1 -
.../org/apache/camel/maven/packaging/UpdateSensitizeHelper.java | 1 -
7 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
index bcf19ec1d1f..9ac6453a279 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
@@ -23,7 +23,6 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.model.Build;
import org.apache.maven.model.Model;
import org.apache.maven.project.MavenProject;
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java
index 6f576f5ab78..6bf704f0e6e 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/PrepareFatJarMojo.java
@@ -190,7 +190,7 @@ public class PrepareFatJarMojo extends AbstractMojo {
for (Artifact classPathElement : dependencies) {
if (getLog().isDebugEnabled()) {
getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
}
File file = classPathElement.getFile();
if (file != null) {
diff --git a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
index 50f57ddd15b..fb1cfe51741 100644
--- a/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
+++ b/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
@@ -26,7 +26,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.List;
import java.util.Properties;
import java.util.Set;
@@ -718,13 +717,13 @@ public class RunMojo extends AbstractExecMojo {
if (classPathElement.getArtifactId().equals("org.osgi.core")) {
if (getLog().isDebugEnabled()) {
getLog().debug("Skipping org.osgi.core -> " + classPathElement.getGroupId() + "/"
- + classPathElement.getArtifactId() + "/" + classPathElement.getVersion());
+ + classPathElement.getArtifactId() + "/" + classPathElement.getVersion());
}
continue;
}
getLog().debug("Adding plugin dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
path.add(classPathElement.getFile().toURI().toURL());
}
} catch (MalformedURLException e) {
@@ -817,7 +816,7 @@ public class RunMojo extends AbstractExecMojo {
for (Artifact classPathElement : dependencies) {
getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
File file = classPathElement.getFile();
if (file != null) {
path.add(file.toURI().toURL());
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
index e465bdec61e..13da6783601 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateConfigurerMojo.java
@@ -28,7 +28,6 @@ import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -241,7 +240,7 @@ public abstract class AbstractGenerateConfigurerMojo extends AbstractGeneratorMo
for (Artifact classPathElement : dependencies) {
if (getLog().isDebugEnabled()) {
getLog().debug("Adding project dependency artifact: " + classPathElement.getArtifactId()
- + " to classpath");
+ + " to classpath");
}
File file = classPathElement.getFile();
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
index 2bfbf8c5897..2f0411ac571 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
@@ -28,7 +28,6 @@ import org.apache.camel.maven.packaging.generics.JandexStore;
import org.apache.camel.tooling.util.PackageHelper;
import org.apache.camel.tooling.util.Strings;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.jboss.jandex.AnnotationInstance;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java
index 1347ad22d92..9acf51fffec 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java
@@ -20,7 +20,6 @@ import java.io.File;
import org.apache.camel.tooling.util.FileUtil;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
index 22e03f857d0..61bb0d11941 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
@@ -37,7 +37,6 @@ import org.apache.camel.tooling.util.Strings;
import org.apache.camel.util.json.JsonObject;
import org.apache.camel.util.json.Jsoner;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
[camel] 01/07: CAMEL-17894: cleanup unused exceptions in tooling
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 493c3065b7e2e252012171fc7f61371f26957d68
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 11:49:23 2022 +0200
CAMEL-17894: cleanup unused exceptions in tooling
---
.../java/org/apache/camel/maven/AbstractGeneratorMojoTest.java | 2 +-
.../java/org/apache/camel/maven/CamelSpringNamespaceTest.java | 6 +++---
.../org/apache/camel/maven/EipDocumentationEnricherMojoTest.java | 8 ++++----
.../src/test/java/org/apache/camel/maven/ResourceUtils.java | 2 +-
.../src/test/java/org/apache/camel/maven/XmlHelperTest.java | 4 ++--
.../camel/maven/packaging/UpdateEagerClassloadedHelper.java | 2 +-
.../java/org/apache/camel/maven/packaging/UpdateMainHelper.java | 3 +--
.../org/apache/camel/maven/packaging/UpdateSensitizeHelper.java | 3 +--
.../java/org/apache/camel/maven/packaging/EndpointHelperTest.java | 2 +-
9 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
index 8c9b20bccdf..bcf19ec1d1f 100644
--- a/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
+++ b/tooling/maven/camel-api-component-maven-plugin/src/test/java/org/apache/camel/maven/AbstractGeneratorMojoTest.java
@@ -65,7 +65,7 @@ public abstract class AbstractGeneratorMojoTest {
mojo.componentPackage = COMPONENT_PACKAGE;
mojo.project = new MavenProject((Model) null) {
@Override
- public List getTestClasspathElements() throws DependencyResolutionRequiredException {
+ public List getTestClasspathElements() {
return Collections.EMPTY_LIST;
}
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java
index 1aa035237c0..11cdae6178e 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/CamelSpringNamespaceTest.java
@@ -27,14 +27,14 @@ public class CamelSpringNamespaceTest {
private CamelSpringNamespace camelSpringNamespace = new CamelSpringNamespace();
@Test
- public void testSchemaNamespace() throws Exception {
+ public void testSchemaNamespace() {
assertEquals(Constants.XML_SCHEMA_NAMESPACE_URI,
camelSpringNamespace.getNamespaceURI(Constants.XML_SCHEMA_NAMESPACE_PREFIX));
assertNull(camelSpringNamespace.getNamespaceURI("unregisterdPrefix"));
}
@Test
- public void testGetPrefix() throws Exception {
+ public void testGetPrefix() {
try {
camelSpringNamespace.getPrefix(Constants.XML_SCHEMA_NAMESPACE_URI);
fail("UnsupportedOperationException expected");
@@ -44,7 +44,7 @@ public class CamelSpringNamespaceTest {
}
@Test
- public void testGetPrefixes() throws Exception {
+ public void testGetPrefixes() {
try {
camelSpringNamespace.getPrefixes(Constants.XML_SCHEMA_NAMESPACE_URI);
fail("UnsupportedOperationException expected");
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
index ee4a52ca056..f8762d1da25 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/EipDocumentationEnricherMojoTest.java
@@ -40,14 +40,14 @@ public class EipDocumentationEnricherMojoTest {
private File mockInputSchema;
@BeforeEach
- public void setUp() throws Exception {
+ public void setUp() {
eipDocumentationEnricherMojo.camelCoreModelDir = mockCamelCore;
eipDocumentationEnricherMojo.inputCamelSchemaFile = mockInputSchema;
eipDocumentationEnricherMojo.pathToModelDir = "sub/path";
}
@Test
- public void testExecuteCamelCoreIsNull() throws Exception {
+ public void testExecuteCamelCoreIsNull() {
eipDocumentationEnricherMojo.camelCoreModelDir = null;
when(mockInputSchema.exists()).thenReturn(true);
@@ -62,7 +62,7 @@ public class EipDocumentationEnricherMojoTest {
}
@Test
- public void testExecuteInputCamelSchemaIsNotAFile() throws Exception {
+ public void testExecuteInputCamelSchemaIsNotAFile() {
when(mockInputSchema.exists()).thenReturn(true);
when(mockInputSchema.isFile()).thenReturn(false);
@@ -75,7 +75,7 @@ public class EipDocumentationEnricherMojoTest {
}
@Test
- public void testExecutePathToModelDirIsNull() throws Exception {
+ public void testExecutePathToModelDirIsNull() {
eipDocumentationEnricherMojo.pathToModelDir = null;
try {
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
index f381553899e..b212f580960 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/ResourceUtils.java
@@ -24,7 +24,7 @@ public final class ResourceUtils {
// noop
}
- public static File getResourceAsFile(String pathToFile) throws Exception {
+ public static File getResourceAsFile(String pathToFile) {
return new File(ResourceUtils.class.getClassLoader().getResource(pathToFile).getFile());
}
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java
index 95d01553a7b..bfbc5df06db 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/XmlHelperTest.java
@@ -34,12 +34,12 @@ public class XmlHelperTest {
}
@Test
- public void testBuildXPath() throws Exception {
+ public void testBuildXPath() {
assertNotNull(XmlHelper.buildXPath(new CamelSpringNamespace()));
}
@Test
- public void testBuildXPathNullPointerExpected() throws Exception {
+ public void testBuildXPathNullPointerExpected() {
try {
XmlHelper.buildXPath(null);
fail("NullPointerException expected");
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
index 3d5ec2d6c82..2bfbf8c5897 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateEagerClassloadedHelper.java
@@ -56,7 +56,7 @@ public class UpdateEagerClassloadedHelper extends AbstractGeneratorMojo {
protected File baseDir;
@Override
- public void execute() throws MojoExecutionException, MojoFailureException {
+ public void execute() throws MojoExecutionException {
File mainDir = findCamelDirectory(baseDir, "core/camel-main");
if (mainDir == null) {
getLog().debug("No core/camel-main folder found, skipping execution");
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java
index 706c8588f48..1347ad22d92 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateMainHelper.java
@@ -42,10 +42,9 @@ public class UpdateMainHelper extends AbstractGeneratorMojo {
* Execute goal.
*
* @throws MojoExecutionException execution of the main class or one of the threads it generated failed.
- * @throws MojoFailureException something bad happened...
*/
@Override
- public void execute() throws MojoExecutionException, MojoFailureException {
+ public void execute() throws MojoExecutionException {
File camelDir = findCamelDirectory(baseDir, "core/camel-main");
if (camelDir == null) {
getLog().debug("No core/camel-main folder found, skipping execution");
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
index a70179983f6..22e03f857d0 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/UpdateSensitizeHelper.java
@@ -66,10 +66,9 @@ public class UpdateSensitizeHelper extends AbstractGeneratorMojo {
* Execute goal.
*
* @throws MojoExecutionException execution of the main class or one of the threads it generated failed.
- * @throws MojoFailureException something bad happened...
*/
@Override
- public void execute() throws MojoExecutionException, MojoFailureException {
+ public void execute() throws MojoExecutionException {
File camelDir = findCamelDirectory(baseDir, "core/camel-util");
if (camelDir == null) {
getLog().debug("No core/camel-util folder found, skipping execution");
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
index c7a9a8932be..60c81009381 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
@@ -67,7 +67,7 @@ public class EndpointHelperTest {
}
@Test
- public void testRE() throws Exception {
+ public void testRE() {
Pattern copyRE = Pattern.compile("(\\[\\[.*)|(= .*)|(//.*)");
Pattern attrRE = Pattern.compile(":[a-zA-Z0-9_-]*:( .*)?");
[camel] 05/07: CAMEL-17894: avoid reading file attributes multiple times
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a5a1ecc9ccb98f9f62e93ee22aa4988039a14e14
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 12:03:25 2022 +0200
CAMEL-17894: avoid reading file attributes multiple times
---
.../maven/packaging/AbstractGenerateMojo.java | 26 +++++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
index 7f26bf317c3..b7d2ed2ff9f 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/AbstractGenerateMojo.java
@@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@@ -162,9 +163,16 @@ public abstract class AbstractGenerateMojo extends AbstractMojo {
"org.apache.camel_camel-package-maven-plugin_info_xx");
}
- private long lastmod(Path p) {
+ private long isRecentlyModifiedFile(Path p) {
try {
- return Files.getLastModifiedTime(p).toMillis();
+ BasicFileAttributes fileAttributes = Files.readAttributes(p, BasicFileAttributes.class);
+
+ // if it's a directory, we don't care
+ if (fileAttributes.isDirectory()) {
+ return 0;
+ }
+
+ return fileAttributes.lastModifiedTime().toMillis();
} catch (IOException e) {
return 0;
}
@@ -172,11 +180,17 @@ public abstract class AbstractGenerateMojo extends AbstractMojo {
private Stream<String> newer(long lastmod, File file) {
try {
- if (file.isDirectory()) {
- return Files.walk(file.toPath()).filter(Files::isRegularFile).filter(p -> lastmod(p) > lastmod)
+ if (!file.exists()) {
+ return Stream.empty();
+ }
+
+ BasicFileAttributes fileAttributes = Files.readAttributes(file.toPath(), BasicFileAttributes.class);
+
+ if (fileAttributes.isDirectory()) {
+ return Files.walk(file.toPath()).filter(p -> isRecentlyModifiedFile(p) > lastmod)
.map(Path::toString);
- } else if (file.isFile()) {
- if (lastmod(file.toPath()) > lastmod) {
+ } else if (fileAttributes.isRegularFile()) {
+ if (fileAttributes.lastModifiedTime().toMillis() > lastmod) {
if (file.getName().endsWith(".jar")) {
try (ZipFile zf = new ZipFile(file)) {
return zf.stream().filter(ze -> !ze.isDirectory())
[camel] 04/07: CAMEL-17894: colapse similar catch statements
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit cc3e8b2bd6fffee5fc8bc61d6e22a6738cd0824f
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 11:55:35 2022 +0200
CAMEL-17894: colapse similar catch statements
---
.../java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
index 82c016daa55..a0c11df3dcf 100644
--- a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
+++ b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
@@ -142,9 +142,7 @@ public class BomGeneratorMojo extends AbstractMojo {
writePom(pom);
- } catch (MojoFailureException ex) {
- throw ex;
- } catch (MojoExecutionException ex) {
+ } catch (MojoFailureException | MojoExecutionException ex) {
throw ex;
} catch (Exception ex) {
throw new MojoExecutionException("Cannot generate the output BOM file", ex);
[camel] 03/07: CAMEL-17894: replace unnecessary explicit type arguments
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit b1f2b2334a395115c2179c4b85fc1798e95dca88
Author: Otavio Rodolfo Piske <an...@gmail.com>
AuthorDate: Mon Apr 25 11:53:34 2022 +0200
CAMEL-17894: replace unnecessary explicit type arguments
---
.../org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
index 1101c809ea3..c4bc65f49de 100644
--- a/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-openapi-plugin/src/main/java/org/apache/camel/maven/generator/openapi/AbstractGenerateMojo.java
@@ -391,7 +391,7 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
}
private Map<String, String> parse(String urlEncodedAuthStr) {
- Map<String, String> auths = new HashMap<String, String>();
+ Map<String, String> auths = new HashMap<>();
if (isNotEmpty(urlEncodedAuthStr)) {
String[] parts = urlEncodedAuthStr.split(",");
for (String part : parts) {