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 <[email protected]> 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_-]*:( .*)?");
