From a3c493c36827e0b78ffab8b26231ace2f143a33f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 19 Jul 2016 08:30:15 +0100 Subject: [PATCH] Remove another interface from user API --- .../StubRunnerBackupAutoConfiguration.java | 8 ---- .../ContractVerifierCamelConfiguration.java | 10 +--- .../ContractVerifierCamelMessageBuilder.java | 5 +- .../camel/ContractVerifierCamelMessaging.java | 7 +-- ...tractVerifierIntegrationConfiguration.java | 16 ++----- ...ractVerifierIntegrationMessageBuilder.java | 5 +- .../ContractVerifierIntegrationMessaging.java | 6 +-- .../ContractVerifierMessageBuilder.java | 34 -------------- ...NoOpContractVerifierAutoConfiguration.java | 9 ---- .../NoOpContractVerifierMessageBuilder.java | 34 -------------- ...ntractVerifierStreamAutoConfiguration.java | 12 +---- .../ContractVerifierStreamMessageBuilder.java | 5 +- .../ContractVerifierStreamMessaging.java | 46 +++++++++++-------- 13 files changed, 41 insertions(+), 156 deletions(-) delete mode 100644 spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/ContractVerifierMessageBuilder.java delete mode 100644 spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierMessageBuilder.java diff --git a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java index a3cfbbf0c0..77457c7674 100644 --- a/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java +++ b/spring-cloud-contract-stub-runner/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/server/StubRunnerBackupAutoConfiguration.java @@ -17,10 +17,8 @@ package org.springframework.cloud.contract.stubrunner.server; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -37,12 +35,6 @@ public class StubRunnerBackupAutoConfiguration { return new NoOpContractVerifierMessaging(); } - @Bean - @ConditionalOnMissingBean - public ContractVerifierMessageBuilder contractVerifierMessageBuilder() { - return new NoOpContractVerifierMessageBuilder(); - } - @Bean public ContractVerifierMessaging contractVerifierMessaging( ContractVerifierMessageExchange exchange) { diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java index 13fae8ff8f..9e73958645 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelConfiguration.java @@ -19,7 +19,6 @@ package org.springframework.cloud.contract.verifier.messaging.camel; import org.apache.camel.CamelContext; import org.apache.camel.Message; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; @@ -36,13 +35,8 @@ public class ContractVerifierCamelConfiguration { @Bean ContractVerifierMessageExchange contractVerifierMessageExchange( - CamelContext context, ContractVerifierMessageBuilder builder) { - return new ContractVerifierCamelMessaging(context, builder); - } - - @Bean - ContractVerifierMessageBuilder contractVerifierMessageBuilder() { - return new ContractVerifierCamelMessageBuilder(); + CamelContext context) { + return new ContractVerifierCamelMessaging(context); } @Bean diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java index a35e0052ca..221e23cb97 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessageBuilder.java @@ -20,15 +20,12 @@ import java.util.Map; import org.apache.camel.Message; import org.apache.camel.impl.DefaultMessage; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; /** * @author Marcin Grzejszczak */ -public class ContractVerifierCamelMessageBuilder implements - ContractVerifierMessageBuilder { +public class ContractVerifierCamelMessageBuilder { - @Override public Message create(T payload, Map headers) { DefaultMessage message = new DefaultMessage(); message.setBody(payload); diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessaging.java index c3aa47ac8a..fc62ae221c 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-camel/src/main/java/org/springframework/cloud/contract/verifier/messaging/camel/ContractVerifierCamelMessaging.java @@ -28,7 +28,6 @@ import org.apache.camel.impl.DefaultExchange; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.stereotype.Component; @@ -43,13 +42,11 @@ public class ContractVerifierCamelMessaging implements ContractVerifierCamelMessaging.class); private final CamelContext context; - private final ContractVerifierMessageBuilder builder; + private final ContractVerifierCamelMessageBuilder builder = new ContractVerifierCamelMessageBuilder(); @Autowired - @SuppressWarnings("unchecked") - public ContractVerifierCamelMessaging(CamelContext context, ContractVerifierMessageBuilder contractVerifierMessageBuilder) { + public ContractVerifierCamelMessaging(CamelContext context) { this.context = context; - this.builder = contractVerifierMessageBuilder; } @Override diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java index daf553ee9c..2a55cc6872 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationConfiguration.java @@ -17,7 +17,6 @@ package org.springframework.cloud.contract.verifier.messaging.integration; import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; @@ -36,15 +35,8 @@ public class ContractVerifierIntegrationConfiguration { @Bean public ContractVerifierMessageExchange> contractVerifierMessageExchange( - ApplicationContext applicationContext, - ContractVerifierMessageBuilder> contractVerifierMessageBuilder) { - return new ContractVerifierIntegrationMessaging(applicationContext, - contractVerifierMessageBuilder); - } - - @Bean - public ContractVerifierMessageBuilder> contractVerifierMessageBuilder() { - return new ContractVerifierIntegrationMessageBuilder(); + ApplicationContext applicationContext) { + return new ContractVerifierIntegrationMessaging(applicationContext); } @Bean @@ -56,8 +48,7 @@ public class ContractVerifierIntegrationConfiguration { class ContractVerifierHelper extends ContractVerifierMessaging> { - public ContractVerifierHelper( - ContractVerifierMessageExchange> exchange) { + public ContractVerifierHelper(ContractVerifierMessageExchange> exchange) { super(exchange); } @@ -66,4 +57,3 @@ class ContractVerifierHelper extends ContractVerifierMessaging> { return new ContractVerifierMessage(receive.getPayload(), receive.getHeaders()); } } - diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java index c502ffb74c..a7f306b4af 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessageBuilder.java @@ -18,7 +18,6 @@ package org.springframework.cloud.contract.verifier.messaging.integration; import java.util.Map; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.MessageBuilder; @@ -26,10 +25,8 @@ import org.springframework.messaging.support.MessageBuilder; /** * @author Marcin Grzejszczak */ -public class ContractVerifierIntegrationMessageBuilder implements - ContractVerifierMessageBuilder> { +public class ContractVerifierIntegrationMessageBuilder { - @Override public Message create(T payload, Map headers) { return MessageBuilder.createMessage(payload, new MessageHeaders(headers)); } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java index 9e0076f258..0e30e6680b 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-integration/src/main/java/org/springframework/cloud/contract/verifier/messaging/integration/ContractVerifierIntegrationMessaging.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.context.ApplicationContext; import org.springframework.messaging.Message; @@ -41,12 +40,11 @@ public class ContractVerifierIntegrationMessaging implements ContractVerifierIntegrationMessaging.class); private final ApplicationContext context; - private final ContractVerifierMessageBuilder> builder; + private final ContractVerifierIntegrationMessageBuilder builder = new ContractVerifierIntegrationMessageBuilder(); @Autowired - public ContractVerifierIntegrationMessaging(ApplicationContext context, ContractVerifierMessageBuilder> contractVerifierMessageBuilder) { + public ContractVerifierIntegrationMessaging(ApplicationContext context) { this.context = context; - this.builder = contractVerifierMessageBuilder; } @Override diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/ContractVerifierMessageBuilder.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/ContractVerifierMessageBuilder.java deleted file mode 100644 index e44fb310f1..0000000000 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/ContractVerifierMessageBuilder.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2013-2016 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.contract.verifier.messaging; - -import java.util.Map; - -/** - * Contract for creation of (@link ContractVerifierMessage}. You can create a message from - * payload and headers or from some type (e.g. Spring Messaging Message). - * - * @author Marcin Grzejszczak - */ -public interface ContractVerifierMessageBuilder { - - /** - * Creates a {@link ContractVerifierMessage} from payload and headers - */ - M create(T payload, Map headers); - -} diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java index 113070e75e..5517204f18 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java @@ -18,11 +18,8 @@ package org.springframework.cloud.contract.verifier.messaging.noop; import org.springframework.boot.autoconfigure.AutoConfigureOrder; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessageBuilder; -import org.springframework.cloud.contract.verifier.messaging.noop.NoOpContractVerifierMessaging; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -40,12 +37,6 @@ public class NoOpContractVerifierAutoConfiguration { return new NoOpContractVerifierMessaging(); } - @Bean - @ConditionalOnMissingBean - public ContractVerifierMessageBuilder contractVerifierMessageBuilder() { - return new NoOpContractVerifierMessageBuilder(); - } - @Bean @ConditionalOnMissingBean public ContractVerifierMessaging contractVerifierMessaging( diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierMessageBuilder.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierMessageBuilder.java deleted file mode 100644 index 39e1a3c10b..0000000000 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-messaging-core/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierMessageBuilder.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2013-2016 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.cloud.contract.verifier.messaging.noop; - -import java.util.Map; - -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; - -/** - * @author Marcin Grzejszczak - */ -public class NoOpContractVerifierMessageBuilder - implements ContractVerifierMessageBuilder { - - @Override - public Object create(T o, Map headers) { - return o; - } - -} diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java index bac9659b49..17ddef43e5 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamAutoConfiguration.java @@ -18,7 +18,6 @@ package org.springframework.cloud.contract.verifier.messaging.stream; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessage; import org.springframework.cloud.contract.verifier.messaging.internal.ContractVerifierMessaging; @@ -38,15 +37,8 @@ public class ContractVerifierStreamAutoConfiguration { @Bean ContractVerifierMessageExchange> contractVerifierMessageExchange( - ApplicationContext applicationContext, - ContractVerifierMessageBuilder> contractVerifierMessageBuilder) { - return new ContractVerifierStreamMessaging(applicationContext, - contractVerifierMessageBuilder); - } - - @Bean - ContractVerifierMessageBuilder> contractVerifierMessageBuilder() { - return new ContractVerifierStreamMessageBuilder(); + ApplicationContext applicationContext) { + return new ContractVerifierStreamMessaging(applicationContext); } @Bean diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java index 0ff7d77b84..a78124a8be 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessageBuilder.java @@ -18,7 +18,6 @@ package org.springframework.cloud.contract.verifier.messaging.stream; import java.util.Map; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.support.MessageBuilder; @@ -26,10 +25,8 @@ import org.springframework.messaging.support.MessageBuilder; /** * @author Marcin Grzejszczak */ -public class ContractVerifierStreamMessageBuilder implements - ContractVerifierMessageBuilder> { +public class ContractVerifierStreamMessageBuilder { - @Override public Message create(T payload, Map headers) { return MessageBuilder.createMessage(payload, new MessageHeaders(headers)); } diff --git a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessaging.java b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessaging.java index 0113a484af..fed3e7d089 100644 --- a/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessaging.java +++ b/spring-cloud-contract-verifier/spring-cloud-contract-verifier-messaging/spring-cloud-contract-verifier-stream/src/main/java/org/springframework/cloud/contract/verifier/messaging/stream/ContractVerifierStreamMessaging.java @@ -22,7 +22,6 @@ import java.util.concurrent.TimeUnit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder; import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageExchange; import org.springframework.cloud.stream.config.BindingProperties; import org.springframework.cloud.stream.config.ChannelBindingServiceProperties; @@ -34,20 +33,20 @@ import org.springframework.messaging.MessageChannel; /** * @author Marcin Grzejszczak */ -public class ContractVerifierStreamMessaging implements - ContractVerifierMessageExchange> { +public class ContractVerifierStreamMessaging + implements ContractVerifierMessageExchange> { - private static final Logger log = LoggerFactory.getLogger(ContractVerifierStreamMessaging.class); + private static final Logger log = LoggerFactory + .getLogger(ContractVerifierStreamMessaging.class); private final ApplicationContext context; private final MessageCollector messageCollector; - private final ContractVerifierMessageBuilder> builder; + private final ContractVerifierStreamMessageBuilder builder = new ContractVerifierStreamMessageBuilder(); @Autowired - public ContractVerifierStreamMessaging(ApplicationContext context, ContractVerifierMessageBuilder> builder) { + public ContractVerifierStreamMessaging(ApplicationContext context) { this.context = context; this.messageCollector = context.getBean(MessageCollector.class); - this.builder = builder; } @Override @@ -58,11 +57,13 @@ public class ContractVerifierStreamMessaging implements @Override public void send(Message message, String destination) { try { - MessageChannel messageChannel = context.getBean(resolvedDestination(destination), MessageChannel.class); + MessageChannel messageChannel = context + .getBean(resolvedDestination(destination), MessageChannel.class); messageChannel.send(message); - } catch (Exception e) { - log.error("Exception occurred while trying to send a message [" + message + "] " + - "to a channel with name [" + destination + "]", e); + } + catch (Exception e) { + log.error("Exception occurred while trying to send a message [" + message + + "] " + "to a channel with name [" + destination + "]", e); throw e; } } @@ -70,25 +71,32 @@ public class ContractVerifierStreamMessaging implements @Override public Message receive(String destination, long timeout, TimeUnit timeUnit) { try { - MessageChannel messageChannel = context.getBean(resolvedDestination(destination), MessageChannel.class); + MessageChannel messageChannel = context + .getBean(resolvedDestination(destination), MessageChannel.class); return messageCollector.forChannel(messageChannel).poll(timeout, timeUnit); - } catch (Exception e) { - log.error("Exception occurred while trying to read a message from " + - " a channel with name [" + destination + "]", e); + } + catch (Exception e) { + log.error("Exception occurred while trying to read a message from " + + " a channel with name [" + destination + "]", e); throw new RuntimeException(e); } } private String resolvedDestination(String destination) { - ChannelBindingServiceProperties channelBindingServiceProperties = context.getBean(ChannelBindingServiceProperties.class); + ChannelBindingServiceProperties channelBindingServiceProperties = context + .getBean(ChannelBindingServiceProperties.class); String resolvedDestination = destination; - for (Map.Entry entry : channelBindingServiceProperties.getBindings().entrySet()) { + for (Map.Entry entry : channelBindingServiceProperties + .getBindings().entrySet()) { if (entry.getValue().getDestination().equals(destination)) { - log.debug("Found a channel named [{}] with destination [{}]", entry.getKey(), destination); + log.debug("Found a channel named [{}] with destination [{}]", + entry.getKey(), destination); return entry.getKey(); } } - log.debug("No destination named [{}] was found. Assuming that the destination equals the channel name", destination); + log.debug( + "No destination named [{}] was found. Assuming that the destination equals the channel name", + destination); return resolvedDestination; }