You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/04/04 18:36:24 UTC
[camel] branch main updated: fixed throw lists - removed specific exceptions if more generic ones are declared (#9809)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 b4fa052f692 fixed throw lists - removed specific exceptions if more generic ones are declared (#9809)
b4fa052f692 is described below
commit b4fa052f69225adad933a1bedf989c7e844d3200
Author: dk2k <dk...@users.noreply.github.com>
AuthorDate: Tue Apr 4 21:36:14 2023 +0300
fixed throw lists - removed specific exceptions if more generic ones are declared (#9809)
Co-authored-by: dk2k <dk...@ya.ru>
---
.../apache/camel/component/aws2/sqs/AmazonSQSClientMock.java | 5 ++---
.../org/apache/camel/converter/crypto/PGPDataFormatTest.java | 3 +--
.../apache/camel/component/netty/http/ProxyProtocolTest.java | 5 ++---
.../camel/component/netty/SharedSingletonObjectPool.java | 10 ++++------
.../apache/camel/component/salesforce/api/dto/LimitsTest.java | 4 ++--
.../camel/component/salesforce/api/dto/RecentItemTest.java | 3 +--
.../salesforce/api/dto/approval/ApprovalResultTest.java | 3 +--
.../tarfile/TarAggregationStrategyEmptyFirstFileTest.java | 3 +--
.../component/whatsapp/integration/WhatsAppServiceIT.java | 6 ++----
.../apache/camel/support/jsse/BaseSSLContextParameters.java | 7 +++----
10 files changed, 19 insertions(+), 30 deletions(-)
diff --git a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
index fda14af0d9f..3d68ed19002 100644
--- a/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
+++ b/components/camel-aws/camel-aws2-sqs/src/test/java/org/apache/camel/component/aws2/sqs/AmazonSQSClientMock.java
@@ -48,7 +48,6 @@ import software.amazon.awssdk.services.sqs.model.ListQueuesResponse;
import software.amazon.awssdk.services.sqs.model.Message;
import software.amazon.awssdk.services.sqs.model.PurgeQueueRequest;
import software.amazon.awssdk.services.sqs.model.PurgeQueueResponse;
-import software.amazon.awssdk.services.sqs.model.QueueDoesNotExistException;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
@@ -209,7 +208,7 @@ public class AmazonSQSClientMock implements SqsClient {
@Override
public DeleteQueueResponse deleteQueue(DeleteQueueRequest deleteQueueRequest)
- throws AwsServiceException, SdkClientException, SqsException {
+ throws AwsServiceException, SdkClientException {
if (deleteQueueRequest.queueUrl() == null) {
throw SqsException.builder().message("Queue name must be specified.").build();
}
@@ -277,7 +276,7 @@ public class AmazonSQSClientMock implements SqsClient {
@Override
public GetQueueUrlResponse getQueueUrl(GetQueueUrlRequest getQueueUrlRequest)
- throws QueueDoesNotExistException, AwsServiceException, SdkClientException, SqsException {
+ throws AwsServiceException, SdkClientException {
return GetQueueUrlResponse.builder()
.queueUrl("https://queue.amazonaws.com/queue/camel-836")
.build();
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
index 5dae97cf028..2917a09c3a3 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
@@ -330,8 +330,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
}
void createEncryptedNonCompressedData(ByteArrayOutputStream bos, String keyringPath)
- throws Exception, IOException, PGPException,
- UnsupportedEncodingException {
+ throws Exception {
PGPEncryptedDataGenerator encGen = new PGPEncryptedDataGenerator(
new JcePGPDataEncryptorBuilder(SymmetricKeyAlgorithmTags.CAST5)
.setSecureRandom(new SecureRandom()).setProvider(getProvider()));
diff --git a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
index 041874b5699..7da6ebc74f6 100644
--- a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
+++ b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/ProxyProtocolTest.java
@@ -22,7 +22,6 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.net.HttpURLConnection;
import java.net.InetSocketAddress;
-import java.net.MalformedURLException;
import java.net.Proxy;
import java.net.URL;
import java.nio.charset.StandardCharsets;
@@ -232,7 +231,7 @@ public class ProxyProtocolTest {
}
}
- private static InputStream request(final String url) throws IOException, MalformedURLException {
+ private static InputStream request(final String url) throws IOException {
final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", PROXY_PORT));
final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(proxy);
@@ -246,7 +245,7 @@ public class ProxyProtocolTest {
}
private static InputStream request(final String url, final String payload, final String contentType)
- throws IOException, MalformedURLException {
+ throws IOException {
final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress("localhost", PROXY_PORT));
final HttpURLConnection connection = (HttpURLConnection) new URL(url).openConnection(proxy);
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/SharedSingletonObjectPool.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/SharedSingletonObjectPool.java
index aee680c3190..c04330c440f 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/SharedSingletonObjectPool.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/SharedSingletonObjectPool.java
@@ -16,8 +16,6 @@
*/
package org.apache.camel.component.netty;
-import java.util.NoSuchElementException;
-
import org.apache.commons.pool2.ObjectPool;
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.PooledObjectFactory;
@@ -41,14 +39,14 @@ public class SharedSingletonObjectPool<T> implements ObjectPool<T> {
}
@Override
- public void addObject() throws Exception, IllegalStateException, UnsupportedOperationException {
+ public void addObject() throws Exception {
// noop
}
@Override
- public synchronized T borrowObject() throws Exception, NoSuchElementException, IllegalStateException {
+ public synchronized T borrowObject() throws Exception {
if (t != null) {
- // ensure the object is validate before we borrow it
+ // ensure the object is validated before we borrow it
if (!factory.validateObject(t)) {
invalidateObject(t.getObject());
LOG.info("Recreating new connection as current connection is invalid: {}", t);
@@ -62,7 +60,7 @@ public class SharedSingletonObjectPool<T> implements ObjectPool<T> {
}
@Override
- public void clear() throws Exception, UnsupportedOperationException {
+ public void clear() throws Exception {
t = null;
}
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/LimitsTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/LimitsTest.java
index b17a66b6a2f..b601d727205 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/LimitsTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/LimitsTest.java
@@ -48,7 +48,7 @@ public class LimitsTest {
}
@Test
- public void shouldDeserializeFromSalesforceGeneratedJSON() throws JsonProcessingException, IOException {
+ public void shouldDeserializeFromSalesforceGeneratedJSON() throws IOException {
final ObjectMapper mapper = JsonUtils.createObjectMapper();
final Object read = mapper.readerFor(Limits.class)
@@ -66,7 +66,7 @@ public class LimitsTest {
}
@Test
- public void shouldDeserializeWithUnsupportedKeys() throws JsonProcessingException, IOException {
+ public void shouldDeserializeWithUnsupportedKeys() throws IOException {
final ObjectMapper mapper = JsonUtils.createObjectMapper();
final Limits withUnsupported
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java
index 4638900e22b..843a9c88969 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/RecentItemTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.salesforce.api.dto;
import java.io.IOException;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.component.salesforce.api.utils.JsonUtils;
import org.junit.jupiter.api.Test;
@@ -31,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
public class RecentItemTest {
@Test
- public void shouldDeserializeFromJSON() throws JsonProcessingException, IOException {
+ public void shouldDeserializeFromJSON() throws IOException {
final ObjectMapper mapper = JsonUtils.createObjectMapper();
final Object read = mapper.readerFor(RecentItem.class).readValue("{ \n" + //
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalResultTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalResultTest.java
index 9648311f61b..0501d591eb4 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalResultTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalResultTest.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.salesforce.api.dto.approval;
import java.io.IOException;
import java.util.Iterator;
-import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.component.salesforce.api.dto.approval.ApprovalResult.Result;
import org.apache.camel.component.salesforce.api.utils.JsonUtils;
@@ -34,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
public class ApprovalResultTest {
@Test
- public void shouldDeserializeFromJson() throws JsonProcessingException, IOException {
+ public void shouldDeserializeFromJson() throws IOException {
final String json = "["//
+ "{"//
+ "\"actorIds\":[\"0050Y000000u5NOQAY\"],"//
diff --git a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java
index 37e91a92460..45cd5a7a1d5 100644
--- a/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java
+++ b/components/camel-tarfile/src/test/java/org/apache/camel/processor/aggregate/tarfile/TarAggregationStrategyEmptyFirstFileTest.java
@@ -18,7 +18,6 @@ package org.apache.camel.processor.aggregate.tarfile;
import java.io.File;
import java.io.FileInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Iterator;
@@ -122,7 +121,7 @@ public class TarAggregationStrategyEmptyFirstFileTest extends CamelTestSupport {
};
}
- private static Map<String, String> readTar(File file) throws FileNotFoundException, IOException {
+ private static Map<String, String> readTar(File file) throws IOException {
Map<String, String> content = new TreeMap<>();
TarArchiveInputStream tin = new TarArchiveInputStream(new FileInputStream(file));
try {
diff --git a/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/integration/WhatsAppServiceIT.java b/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/integration/WhatsAppServiceIT.java
index 663f47b75de..714b9a71336 100644
--- a/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/integration/WhatsAppServiceIT.java
+++ b/components/camel-whatsapp/src/test/java/org/apache/camel/component/whatsapp/integration/WhatsAppServiceIT.java
@@ -22,8 +22,6 @@ import java.net.URISyntaxException;
import java.time.LocalDate;
import java.util.List;
-import com.fasterxml.jackson.core.exc.StreamReadException;
-import com.fasterxml.jackson.databind.DatabindException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.camel.component.whatsapp.WhatsAppTestSupport;
import org.apache.camel.component.whatsapp.model.Address;
@@ -184,7 +182,7 @@ public class WhatsAppServiceIT extends WhatsAppTestSupport {
}
@Test
- public void testMediaUploadVideoWithInputStream() throws URISyntaxException {
+ public void testMediaUploadVideoWithInputStream() {
UploadMediaRequest uploadMediaRequest = new UploadMediaRequest();
UploadMedia uploadMedia = new UploadMedia(
"sample.mp4",
@@ -210,7 +208,7 @@ public class WhatsAppServiceIT extends WhatsAppTestSupport {
}
@Test
- public void testTemplateMessage() throws StreamReadException, DatabindException, IOException {
+ public void testTemplateMessage() throws IOException {
TemplateMessageRequest request
= MAPPER.readValue(WhatsAppServiceIT.class.getResourceAsStream("/template-message.json"),
TemplateMessageRequest.class);
diff --git a/core/camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java
index cbb7fe502f7..1c1bdbe0879 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/jsse/BaseSSLContextParameters.java
@@ -20,7 +20,6 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
-import java.net.UnknownHostException;
import java.security.GeneralSecurityException;
import java.security.KeyManagementException;
import java.security.SecureRandom;
@@ -1043,12 +1042,12 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
public Socket createSocket(
Socket s, String host,
int port, boolean autoClose)
- throws IOException, UnknownHostException {
+ throws IOException {
return configureSocket(sslSocketFactory.createSocket(s, host, port, autoClose));
}
@Override
- public Socket createSocket(String host, int port) throws IOException, UnknownHostException {
+ public Socket createSocket(String host, int port) throws IOException {
return configureSocket(sslSocketFactory.createSocket(host, port));
}
@@ -1056,7 +1055,7 @@ public abstract class BaseSSLContextParameters extends JsseParameters {
public Socket createSocket(
String host, int port,
InetAddress localHost, int localPort)
- throws IOException, UnknownHostException {
+ throws IOException {
return configureSocket(sslSocketFactory.createSocket(host, port, localHost, localPort));
}