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
The following commit(s) were added to refs/heads/main by this push:
new 9a329c80465 (chores) camel-core: remove unused exceptions
9a329c80465 is described below
commit 9a329c8046505b444a8b58b53dc0b23603b163b6
Author: Otavio Rodolfo Piske <[email protected]>
AuthorDate: Wed Sep 27 15:00:06 2023 +0200
(chores) camel-core: remove unused exceptions
Removed unused exception declarations in private methods
---
.../apache/camel/impl/engine/DefaultComponentResolver.java | 7 +------
.../camel/impl/engine/DefaultConfigurerResolver.java | 7 +------
.../impl/engine/DefaultPackageScanResourceResolver.java | 4 +---
.../impl/engine/DefaultSupervisingRouteController.java | 2 +-
.../camel/impl/engine/DefaultUriFactoryResolver.java | 7 +------
.../camel/impl/cloud/DefaultServiceCallProcessor.java | 2 +-
.../camel/impl/cloud/ServiceCallProcessorFactory.java | 3 +--
.../main/java/org/apache/camel/processor/Resequencer.java | 2 +-
.../java/org/apache/camel/processor/RestBindingAdvice.java | 2 +-
.../apache/camel/processor/SendDynamicAwareResolver.java | 4 +---
.../org/apache/camel/reifier/rest/RestBindingReifier.java | 2 +-
.../camel/core/xml/AbstractCamelContextFactoryBean.java | 6 ++----
.../main/java/org/apache/camel/main/BaseMainSupport.java | 14 +++++---------
13 files changed, 18 insertions(+), 44 deletions(-)
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java
index aae8fcc1088..0e1b9b11316 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultComponentResolver.java
@@ -16,11 +16,8 @@
*/
package org.apache.camel.impl.engine;
-import java.io.IOException;
-
import org.apache.camel.CamelContext;
import org.apache.camel.Component;
-import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.spi.ComponentResolver;
import org.apache.camel.spi.FactoryFinder;
import org.slf4j.Logger;
@@ -49,8 +46,6 @@ public class DefaultComponentResolver implements
ComponentResolver {
// not found
return null;
}
- } catch (NoFactoryAvailableException e) {
- return null;
} catch (Exception e) {
throw new IllegalArgumentException("Invalid URI, no Component
registered for scheme: " + name, e);
}
@@ -68,7 +63,7 @@ public class DefaultComponentResolver implements
ComponentResolver {
}
}
- private Class<?> findComponent(String name, CamelContext context) throws
IOException {
+ private Class<?> findComponent(String name, CamelContext context) {
if (factoryFinder == null) {
factoryFinder =
context.getCamelContextExtension().getFactoryFinder(RESOURCE_PATH);
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
index 5e6f13d4a33..a99fcbc1e6f 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultConfigurerResolver.java
@@ -16,11 +16,8 @@
*/
package org.apache.camel.impl.engine;
-import java.io.IOException;
-
import org.apache.camel.CamelContext;
import org.apache.camel.ExtendedCamelContext;
-import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.spi.ConfigurerResolver;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.PropertyConfigurer;
@@ -111,8 +108,6 @@ public class DefaultConfigurerResolver implements
ConfigurerResolver {
}
}
}
- } catch (NoFactoryAvailableException e) {
- return null;
} catch (Exception e) {
throw new IllegalArgumentException("Invalid URI, no Configurer
registered for scheme: " + name, e);
}
@@ -154,7 +149,7 @@ public class DefaultConfigurerResolver implements
ConfigurerResolver {
}
}
- private Class<?> findConfigurer(String name, CamelContext context) throws
IOException {
+ private Class<?> findConfigurer(String name, CamelContext context) {
if (factoryFinder == null) {
factoryFinder =
context.getCamelContextExtension().getFactoryFinder(ConfigurerResolver.RESOURCE_PATH);
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
index c88dda352c7..563a6c09b9d 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultPackageScanResourceResolver.java
@@ -18,7 +18,6 @@ package org.apache.camel.impl.engine;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
@@ -261,8 +260,7 @@ public class DefaultPackageScanResourceResolver extends
BasePackageScanResolver
String subPattern,
String parent,
File location,
- Set<Resource> resources)
- throws FileNotFoundException {
+ Set<Resource> resources) {
File[] files = location.listFiles();
if (files == null || files.length == 0) {
return;
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
index a80559c84de..2f0e72ed0e5 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultSupervisingRouteController.java
@@ -430,7 +430,7 @@ public class DefaultSupervisingRouteController extends
DefaultRouteController im
}
}
- private void startNonSupervisedRoutes() throws Exception {
+ private void startNonSupervisedRoutes() {
if (!isRunAllowed()) {
return;
}
diff --git
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
index 0e82e954962..404a3808810 100644
---
a/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
+++
b/core/camel-base-engine/src/main/java/org/apache/camel/impl/engine/DefaultUriFactoryResolver.java
@@ -16,12 +16,10 @@
*/
package org.apache.camel.impl.engine;
-import java.io.IOException;
import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
-import org.apache.camel.NoFactoryAvailableException;
import org.apache.camel.spi.EndpointUriFactory;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.UriFactoryResolver;
@@ -69,9 +67,6 @@ public class DefaultUriFactoryResolver implements
CamelContextAware, UriFactoryR
Class<?> type;
try {
type = findFactory(name + "-endpoint", context);
- } catch (NoFactoryAvailableException e) {
- // its optional so its okay
- type = null;
} catch (Exception e) {
throw new IllegalArgumentException("Invalid URI, no
EndpointUriFactory registered for scheme: " + name, e);
}
@@ -97,7 +92,7 @@ public class DefaultUriFactoryResolver implements
CamelContextAware, UriFactoryR
return answer;
}
- private Class<?> findFactory(String name, CamelContext context) throws
IOException {
+ private Class<?> findFactory(String name, CamelContext context) {
if (factoryFinder == null) {
factoryFinder =
context.getCamelContextExtension().getFactoryFinder(RESOURCE_PATH);
}
diff --git
a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
index 13f34f209ba..81a71fb4e59 100644
---
a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
+++
b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
@@ -192,7 +192,7 @@ public class DefaultServiceCallProcessor extends
AsyncProcessorSupport {
}
}
- private boolean execute(ServiceDefinition service, Exchange exchange,
AsyncCallback callback) throws Exception {
+ private boolean execute(ServiceDefinition service, Exchange exchange,
AsyncCallback callback) {
final Message message = exchange.getIn();
final String host = service.getHost();
final int port = service.getPort();
diff --git
a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
index 9e3b033f7df..10bb57b23e3 100644
---
a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
+++
b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/ServiceCallProcessorFactory.java
@@ -286,8 +286,7 @@ public class ServiceCallProcessorFactory extends
TypedProcessorFactory<ServiceCa
// ******************************************
private ServiceChooser retrieveServiceChooser(
- CamelContext camelContext, Function<CamelContext,
ServiceCallConfigurationDefinition> function)
- throws Exception {
+ CamelContext camelContext, Function<CamelContext,
ServiceCallConfigurationDefinition> function) {
ServiceChooser answer = null;
ServiceCallConfigurationDefinition config =
function.apply(camelContext);
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
index 7bf6b6a95d0..0375a20e41b 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/Resequencer.java
@@ -552,7 +552,7 @@ public class Resequencer extends AsyncProcessorSupport
implements Navigate<Proce
}
}
- private void sendExchanges() throws Exception {
+ private void sendExchanges() {
Iterator<Exchange> iter = collection.iterator();
while (iter.hasNext()) {
Exchange exchange = iter.next();
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
index e711d332ec0..ee00c09db3e 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
@@ -163,7 +163,7 @@ public class RestBindingAdvice implements
CamelInternalProcessorAdvice<Map<Strin
return false;
}
- private void unmarshal(Exchange exchange, Map<String, Object> state)
throws Exception {
+ private void unmarshal(Exchange exchange, Map<String, Object> state) {
boolean isXml = false;
boolean isJson = false;
diff --git
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
index 6bf215137f3..b27700f0a40 100644
---
a/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
+++
b/core/camel-core-processor/src/main/java/org/apache/camel/processor/SendDynamicAwareResolver.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.processor;
-import java.io.IOException;
-
import org.apache.camel.CamelContext;
import org.apache.camel.spi.FactoryFinder;
import org.apache.camel.spi.SendDynamicAware;
@@ -59,7 +57,7 @@ public class SendDynamicAwareResolver {
return null;
}
- private Class<?> findFactory(String name, CamelContext context) throws
IOException {
+ private Class<?> findFactory(String name, CamelContext context) {
if (factoryFinder == null) {
factoryFinder =
context.getCamelContextExtension().getFactoryFinder(RESOURCE_PATH);
}
diff --git
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
index 2fde750ffb1..9840cab3459 100644
---
a/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
+++
b/core/camel-core-reifier/src/main/java/org/apache/camel/reifier/rest/RestBindingReifier.java
@@ -193,7 +193,7 @@ public class RestBindingReifier extends AbstractReifier {
setAdditionalConfiguration(config, outJson, "json.out.");
}
- private void setAdditionalConfiguration(RestConfiguration config,
DataFormat dataFormat, String prefix) throws Exception {
+ private void setAdditionalConfiguration(RestConfiguration config,
DataFormat dataFormat, String prefix) {
if (config.getDataFormatProperties() != null &&
!config.getDataFormatProperties().isEmpty()) {
// must use a copy as otherwise the options gets removed during
// introspection setProperties
diff --git
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 9bc0441cd5f..be4901a08f4 100644
---
a/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++
b/core/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -1360,10 +1360,8 @@ public abstract class AbstractCamelContextFactoryBean<T
extends ModelCamelContex
*
* @param context the camel context
* @return the profile
- * @throws Exception is thrown if error creating the profile
*/
- private ThreadPoolProfile asThreadPoolProfile(CamelContext context,
ThreadPoolProfileDefinition definition)
- throws Exception {
+ private ThreadPoolProfile asThreadPoolProfile(CamelContext context,
ThreadPoolProfileDefinition definition) {
ThreadPoolProfile answer = new ThreadPoolProfile();
answer.setId(definition.getId());
answer.setDefaultProfile(CamelContextHelper.parseBoolean(context,
definition.getDefaultProfile()));
@@ -1474,7 +1472,7 @@ public abstract class AbstractCamelContextFactoryBean<T
extends ModelCamelContex
}
}
- private String[] normalizePackages(T context, List<String> unnormalized)
throws Exception {
+ private String[] normalizePackages(T context, List<String> unnormalized) {
List<String> packages = new ArrayList<>();
for (String name : unnormalized) {
// it may use property placeholders
diff --git
a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
index 715669b8102..fa1f087dee3 100644
--- a/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
+++ b/core/camel-main/src/main/java/org/apache/camel/main/BaseMainSupport.java
@@ -1169,8 +1169,7 @@ public abstract class BaseMainSupport extends BaseService
{
private void setRouteTemplateProperties(
CamelContext camelContext, OrderedLocationProperties
routeTemplateProperties,
- OrderedLocationProperties autoConfiguredProperties)
- throws Exception {
+ OrderedLocationProperties autoConfiguredProperties) {
// store the route template parameters as a source and register it on
the camel context
PropertiesRouteTemplateParametersSource source = new
PropertiesRouteTemplateParametersSource();
@@ -1193,8 +1192,7 @@ public abstract class BaseMainSupport extends BaseService
{
private void setHealthCheckProperties(
CamelContext camelContext, OrderedLocationProperties
healthCheckProperties,
- OrderedLocationProperties autoConfiguredProperties)
- throws Exception {
+ OrderedLocationProperties autoConfiguredProperties) {
HealthConfigurationProperties health =
mainConfigurationProperties.health();
@@ -1301,8 +1299,7 @@ public abstract class BaseMainSupport extends BaseService
{
private void setDevConsoleProperties(
CamelContext camelContext, OrderedLocationProperties properties,
- boolean failIfNotSet, OrderedLocationProperties
autoConfiguredProperties)
- throws Exception {
+ boolean failIfNotSet, OrderedLocationProperties
autoConfiguredProperties) {
// make defensive copy as we mutate the map
Set<String> keys = new LinkedHashSet<>(properties.asMap().keySet());
@@ -1348,8 +1345,7 @@ public abstract class BaseMainSupport extends BaseService
{
private void setVaultProperties(
CamelContext camelContext, OrderedLocationProperties properties,
- boolean failIfNotSet, OrderedLocationProperties
autoConfiguredProperties)
- throws Exception {
+ boolean failIfNotSet, OrderedLocationProperties
autoConfiguredProperties) {
if (mainConfigurationProperties.hasVaultConfiguration()) {
camelContext.setVaultConfiguration(mainConfigurationProperties.vault());
@@ -1854,7 +1850,7 @@ public abstract class BaseMainSupport extends BaseService
{
return answer;
}
- private static MainHttpServerFactory
resolveMainHttpServerFactory(CamelContext camelContext) throws Exception {
+ private static MainHttpServerFactory
resolveMainHttpServerFactory(CamelContext camelContext) {
// lookup in service registry first
MainHttpServerFactory answer =
camelContext.getRegistry().findSingleByType(MainHttpServerFactory.class);
if (answer == null) {
