From 7fad0cd730e86f256f50c6b63913ec0552edc985 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Thu, 14 Jul 2016 13:50:23 +0100 Subject: [PATCH] Remove unused classes --- ...ontractVerifierSpringMessageBuilder.groovy | 51 ---------- .../ContractVerifierSpringMessaging.groovy | 93 ------------------- ...ManualContractVerifierConfiguration.groovy | 35 ------- .../com/example/config/SpringMessage.groovy | 68 -------------- 4 files changed, 247 deletions(-) delete mode 100644 samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy delete mode 100644 samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy delete mode 100644 samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy delete mode 100644 samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy deleted file mode 100644 index b92f23c0d3..0000000000 --- a/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessageBuilder.groovy +++ /dev/null @@ -1,51 +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 com.example.config - -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder -import org.springframework.jms.core.MessageCreator - -import javax.jms.JMSException -import javax.jms.Message -import javax.jms.Session -/** - * @author Marcin Grzejszczak - */ -public class ContractVerifierSpringMessageBuilder implements ContractVerifierMessageBuilder { - - @Override - public ContractVerifierMessage create(final T payload, final Map headers) { - MessageCreator messageCreator = new MessageCreator() { - @Override - public Message createMessage(Session session) throws JMSException { - Message message = session.createObjectMessage(payload); - headers.entrySet().each { Map.Entry entry -> - message.setObjectProperty(entry.key, entry.value) - } - return message - } - }; - - return new SpringMessage<>(messageCreator) - } - - @Override - public ContractVerifierMessage create(Message message) { - return new SpringMessage<>(message); - } -} diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy deleted file mode 100644 index 83be926169..0000000000 --- a/samples/samples-messaging-spring/src/test/groovy/com/example/config/ContractVerifierSpringMessaging.groovy +++ /dev/null @@ -1,93 +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 com.example.config - -import org.slf4j.Logger -import org.slf4j.LoggerFactory -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessageBuilder -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging -import org.springframework.jms.core.JmsTemplate -import org.springframework.stereotype.Component - -import javax.jms.Message -import java.util.concurrent.TimeUnit -/** - * @author Marcin Grzejszczak - */ -@Component -public class ContractVerifierSpringMessaging implements ContractVerifierMessaging { - - private static final Logger log = LoggerFactory.getLogger(ContractVerifierSpringMessaging.class); - - private final JmsTemplate jmsTemplate; - private final ContractVerifierMessageBuilder builder; - - @Autowired - @SuppressWarnings("unchecked") - public ContractVerifierSpringMessaging(ContractVerifierMessageBuilder builder, JmsTemplate jmsTemplate) { - this.builder = builder - this.jmsTemplate = jmsTemplate - } - - @Override - @SuppressWarnings("unchecked") - public void send(T payload, Map headers, String destination) { - send(builder.create(payload, headers), destination); - } - - @Override - public void send(ContractVerifierMessage message, String destination) { - try { - jmsTemplate.send(destination, ((SpringMessage) message).messageCreator) - } catch (Exception e) { - log.error("Exception occurred while trying to send a message [" + message + "] " + - "to a channel with name [" + destination + "]", e); - throw e; - } - } - - @Override - @SuppressWarnings("unchecked") - public ContractVerifierMessage receiveMessage(String destination, long timeout, TimeUnit timeUnit) { - try { - return builder.create(jmsTemplate.receive(destination)); - } catch (Exception e) { - log.error("Exception occurred while trying to read a message from " + - " a channel with name [" + destination + "]", e); - throw new RuntimeException(e); - } - } - - @Override - public ContractVerifierMessage receiveMessage(String destination) { - return receiveMessage(destination, 5, TimeUnit.SECONDS); - } - - @Override - @SuppressWarnings("unchecked") - public ContractVerifierMessage create(T t, Map headers) { - return builder.create(t, headers); - } - - @Override - @SuppressWarnings("unchecked") - public ContractVerifierMessage create(Message message) { - return builder.create(message); - } -} diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy deleted file mode 100644 index 4831213664..0000000000 --- a/samples/samples-messaging-spring/src/test/groovy/com/example/config/ManualContractVerifierConfiguration.groovy +++ /dev/null @@ -1,35 +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 com.example.config - -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessaging -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import org.springframework.jms.core.JmsTemplate - -/** - * @author Marcin Grzejszczak - */ -@Configuration -class ManualContractVerifierConfiguration { - - @Bean - ContractVerifierMessaging contractVerifierMessaging(JmsTemplate jmsTemplate) { - return new ContractVerifierSpringMessaging(new ContractVerifierSpringMessageBuilder(), jmsTemplate); - } - -} diff --git a/samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy b/samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy deleted file mode 100644 index f8596e087a..0000000000 --- a/samples/samples-messaging-spring/src/test/groovy/com/example/config/SpringMessage.groovy +++ /dev/null @@ -1,68 +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 com.example.config - -import org.springframework.cloud.contract.verifier.messaging.ContractVerifierMessage -import org.springframework.jms.core.MessageCreator - -import javax.jms.Message -import javax.jms.ObjectMessage -/** - * @author Marcin Grzejszczak - */ -public class SpringMessage implements ContractVerifierMessage { - - private final ObjectMessage messageDelegate; - final MessageCreator messageCreator; - - public SpringMessage(Message messageDelegate) { - this.messageDelegate = (ObjectMessage) messageDelegate; - this.messageCreator = null - } - - public SpringMessage(MessageCreator messageCreator) { - this.messageDelegate = null; - this.messageCreator = messageCreator - } - - @Override - public T getPayload() { - return messageDelegate.getObject(); - } - - @Override - public Map getHeaders() { - Map headers = [:] - def enumeration = messageDelegate.propertyNames - while(enumeration.hasMoreElements()) { - String propertyName = enumeration.nextElement() - headers << [(propertyName) : messageDelegate.getObjectProperty(propertyName)] - } - return headers - } - - @Override - Object getHeader(String key) { - return getHeaders().get(key) - } - - @Override - public Message convert() { - return messageDelegate; - } - -}