This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 3a82e8f6fea7b3ba1d6009524626a2fac78561b2
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Aug 14 15:20:00 2019 +0200
Fix merge conflicts
---
.../pulsar/PulsarConsumerAcknowledgementTest.java | 2 +-
.../pulsar/PulsarConsumerNoAcknowledgementTest.java | 2 +-
.../pulsar/PulsarCustomMessageReceiptTest.java | 17 +++++++++--------
.../pulsar/PulsarNegativeAcknowledgementTest.java | 4 ++--
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
index 5f45684..0ce2dcc 100644
---
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
+++
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerAcknowledgementTest.java
@@ -53,7 +53,7 @@ public class PulsarConsumerAcknowledgementTest extends
PulsarTestSupport {
@EndpointInject(uri = "mock:result")
private MockEndpoint to;
- Producer<String> producer;
+ private Producer<String> producer;
@Before
public void setup() throws Exception {
diff --git
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
index 6f68fc1..1cb5527 100644
---
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
+++
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarConsumerNoAcknowledgementTest.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.pulsar;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.CamelContext;
+
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
diff --git
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
index e579b59..24a9132 100644
---
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
+++
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarCustomMessageReceiptTest.java
@@ -16,14 +16,8 @@
*/
package org.apache.camel.component.pulsar;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.atLeast;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.mockito.Mockito.when;
-
import java.util.concurrent.TimeUnit;
+
import org.apache.camel.Endpoint;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
@@ -41,6 +35,13 @@ import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
public class PulsarCustomMessageReceiptTest extends PulsarTestSupport {
private static final Logger LOGGER =
LoggerFactory.getLogger(PulsarCustomMessageReceiptTest.class);
@@ -63,7 +64,7 @@ public class PulsarCustomMessageReceiptTest extends
PulsarTestSupport {
@EndpointInject(uri = "mock:result")
private MockEndpoint to;
- Producer<String> producer;
+ private Producer<String> producer;
@Before
public void setup() throws Exception {
diff --git
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarNegativeAcknowledgementTest.java
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarNegativeAcknowledgementTest.java
index ebee09e..abb76a0 100644
---
a/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarNegativeAcknowledgementTest.java
+++
b/components/camel-pulsar/src/test/java/org/apache/camel/component/pulsar/PulsarNegativeAcknowledgementTest.java
@@ -16,12 +16,12 @@
*/
package org.apache.camel.component.pulsar;
-import static org.mockito.Mockito.mock;
-
import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.MessageId;
import org.junit.Test;
+import static org.mockito.Mockito.mock;
+
public class PulsarNegativeAcknowledgementTest {
@Test(expected = UnsupportedOperationException.class)
