This is an automated email from the ASF dual-hosted git repository. dmvolod pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit f480c096f993de0da5466b463f59f796fe250d26 Author: Dmitry Volodin <dmvo...@gmail.com> AuthorDate: Tue Jun 12 01:45:01 2018 +0300 CAMEL-12564: cleanup tests --- .../org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java | 4 ++-- .../org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java | 4 ++-- .../org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java | 4 ++-- .../org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java | 4 ++-- .../java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java | 2 -- .../org/apache/camel/component/grpc/GrpcProducerSecurityTest.java | 2 +- .../org/apache/camel/component/grpc/GrpcProducerStreamingTest.java | 2 -- .../java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java | 4 ---- 8 files changed, 9 insertions(+), 17 deletions(-) diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java index 54506e1..f96e2fc 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerAggregationTest.java @@ -50,8 +50,8 @@ public class GrpcConsumerAggregationTest extends CamelTestSupport { @Before public void startGrpcChannels() { - syncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext(true).build(); - asyncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext(true).build(); + syncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_SYNC_REQUEST_TEST_PORT).usePlaintext().build(); + asyncRequestChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build(); blockingStub = PingPongGrpc.newBlockingStub(syncRequestChannel); nonBlockingStub = PingPongGrpc.newStub(syncRequestChannel); asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel); diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java index 3bf1507..482b6ec 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerConcurrentTest.java @@ -63,7 +63,7 @@ public class GrpcConsumerConcurrentTest extends CamelTestSupport { @Override public void run() { final CountDownLatch latch = new CountDownLatch(1); - ManagedChannel asyncRequestChannel = NettyChannelBuilder.forAddress("localhost", GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext(true).build(); + ManagedChannel asyncRequestChannel = NettyChannelBuilder.forAddress("localhost", GRPC_ASYNC_REQUEST_TEST_PORT).usePlaintext().build(); PingPongGrpc.PingPongStub asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel); PongResponseStreamObserver responseObserver = new PongResponseStreamObserver(latch); @@ -102,7 +102,7 @@ public class GrpcConsumerConcurrentTest extends CamelTestSupport { int instanceId = createId(); final CountDownLatch latch = new CountDownLatch(1); ManagedChannel asyncRequestChannel = NettyChannelBuilder.forAddress("localhost", GRPC_HEADERS_TEST_PORT).userAgent(GRPC_USER_AGENT_PREFIX + instanceId) - .usePlaintext(true).build(); + .usePlaintext().build(); PingPongGrpc.PingPongStub asyncNonBlockingStub = PingPongGrpc.newStub(asyncRequestChannel); PongResponseStreamObserver responseObserver = new PongResponseStreamObserver(latch); diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java index 46ebf04..a7537d9 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java @@ -48,8 +48,8 @@ public class GrpcConsumerPropagationTest extends CamelTestSupport { @Before public void startGrpcChannels() { - asyncOnNextChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_NEXT_REQUEST_TEST_PORT).usePlaintext(true).build(); - asyncOnCompletedChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_COMPLETED_REQUEST_TEST_PORT).usePlaintext(true).build(); + asyncOnNextChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_NEXT_REQUEST_TEST_PORT).usePlaintext().build(); + asyncOnCompletedChannel = ManagedChannelBuilder.forAddress("localhost", GRPC_ASYNC_COMPLETED_REQUEST_TEST_PORT).usePlaintext().build(); asyncOnNextStub = PingPongGrpc.newStub(asyncOnNextChannel); asyncOnCompletedStub = PingPongGrpc.newStub(asyncOnCompletedChannel); } diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java index ee53b5d..0f57164 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java @@ -74,8 +74,8 @@ public class GrpcConsumerSecurityTest extends CamelTestSupport { .build()) .build(); - jwtCorrectChannel = NettyChannelBuilder.forAddress("localhost", GRPC_JWT_CORRECT_TEST_PORT).usePlaintext(true).build(); - jwtIncorrectChannel = NettyChannelBuilder.forAddress("localhost", GRPC_JWT_INCORRECT_TEST_PORT).usePlaintext(true).build(); + jwtCorrectChannel = NettyChannelBuilder.forAddress("localhost", GRPC_JWT_CORRECT_TEST_PORT).usePlaintext().build(); + jwtIncorrectChannel = NettyChannelBuilder.forAddress("localhost", GRPC_JWT_INCORRECT_TEST_PORT).usePlaintext().build(); tlsAsyncStub = PingPongGrpc.newStub(tlsChannel); jwtCorrectAsyncStub = PingPongGrpc.newStub(jwtCorrectChannel).withCallCredentials(new JwtCallCredentials(correctJwtToken)); diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java index b106059..c98b2ea 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerAsyncTest.java @@ -209,7 +209,6 @@ public class GrpcProducerAsyncTest extends CamelTestSupport { @Override public StreamObserver<PingRequest> pingAsyncSync(StreamObserver<PongResponse> responseObserver) { - @SuppressWarnings({"unchecked", "rawtypes"}) StreamObserver<PingRequest> requestObserver = new StreamObserver<PingRequest>() { @Override @@ -233,7 +232,6 @@ public class GrpcProducerAsyncTest extends CamelTestSupport { @Override public StreamObserver<PingRequest> pingAsyncAsync(StreamObserver<PongResponse> responseObserver) { - @SuppressWarnings({"unchecked", "rawtypes"}) StreamObserver<PingRequest> requestObserver = new StreamObserver<PingRequest>() { @Override diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java index 3b2b753..0ecedae 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSecurityTest.java @@ -121,7 +121,7 @@ public class GrpcProducerSecurityTest extends CamelTestSupport { PingRequest pingRequest = PingRequest.newBuilder().setPingName(GRPC_TEST_PING_VALUE).setPingId(GRPC_TEST_PING_ID).build(); try { - Object pongResponse = template.requestBody("direct:grpc-incorrect-jwt", pingRequest); + template.requestBody("direct:grpc-incorrect-jwt", pingRequest); } catch (Exception e) { assertNotNull(e); assertTrue(e.getCause().getCause() instanceof StatusRuntimeException); diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java index 1f1cc58..e8d549d 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerStreamingTest.java @@ -132,8 +132,6 @@ public class GrpcProducerStreamingTest extends CamelTestSupport { @Override public StreamObserver<PingRequest> pingAsyncAsync(StreamObserver<PongResponse> responseObserver) { - - @SuppressWarnings({"unchecked", "rawtypes"}) StreamObserver<PingRequest> requestObserver = new StreamObserver<PingRequest>() { private List<PingRequest> streamRequests = new LinkedList<>(); diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java index 58f5415..7b2fbd3 100644 --- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java +++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcProducerSyncTest.java @@ -18,17 +18,13 @@ package org.apache.camel.component.grpc; import java.io.IOException; import java.util.List; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; -import io.grpc.BindableService; import io.grpc.Server; import io.grpc.ServerBuilder; import io.grpc.stub.StreamObserver; -import org.apache.camel.Exchange; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.support.SynchronizationAdapter; import org.apache.camel.test.AvailablePortFinder; import org.apache.camel.test.junit4.CamelTestSupport; -- To stop receiving notification emails like this one, please contact dmvo...@apache.org.