Makes the code compile

This commit is contained in:
Marcin Grzejszczak
2022-01-18 10:38:46 +01:00
parent dffe488857
commit 1bedfd188e
31 changed files with 359 additions and 325 deletions

View File

@@ -20,12 +20,11 @@ import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.ObjectMessage;
import javax.jms.StreamMessage;
import javax.jms.TextMessage;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.ObjectMessage;
import jakarta.jms.StreamMessage;
import jakarta.jms.TextMessage;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

View File

@@ -21,10 +21,10 @@ import java.util.Collections;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import javax.jms.BytesMessage;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
import jakarta.jms.BytesMessage;
import jakarta.jms.JMSException;
import jakarta.jms.Message;
import jakarta.jms.Session;
import org.springframework.cloud.contract.verifier.converter.YamlContract;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifier;

View File

@@ -23,8 +23,8 @@ import org.apache.commons.logging.LogFactory;
import org.springframework.cloud.contract.verifier.converter.YamlContract;
import org.springframework.cloud.contract.verifier.messaging.MessageVerifierSender;
import org.springframework.cloud.stream.binding.BinderAwareChannelResolver;
import org.springframework.context.ApplicationContext;
import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageChannel;
@@ -39,7 +39,7 @@ class StreamStubMessageSender implements MessageVerifierSender<Message<?>> {
private final ContractVerifierStreamMessageBuilder builder = new ContractVerifierStreamMessageBuilder();
private BinderAwareChannelResolver resolver;
private BeanFactoryChannelResolver resolver;
StreamStubMessageSender(ApplicationContext context) {
this.context = context;
@@ -63,9 +63,9 @@ class StreamStubMessageSender implements MessageVerifierSender<Message<?>> {
}
}
private BinderAwareChannelResolver resolver() {
private BeanFactoryChannelResolver resolver() {
if (this.resolver == null) {
this.resolver = context.getBean(BinderAwareChannelResolver.class);
this.resolver = context.getBean(BeanFactoryChannelResolver.class);
}
return this.resolver;
}

View File

@@ -16,10 +16,9 @@
package org.springframework.cloud.contract.verifier.messaging.jms;
import javax.jms.JMSException;
import javax.jms.Session;
import javax.jms.TextMessage;
import jakarta.jms.JMSException;
import jakarta.jms.Session;
import jakarta.jms.TextMessage;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;