From b2809f8d77258fbc0b7667304c00bf8c923e4161 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Fri, 18 Nov 2022 14:46:10 +0100 Subject: [PATCH] NoOpStub messages is typed --- .../cloud/contract/stubrunner/BatchStubRunnerFactory.java | 4 ++-- .../cloud/contract/stubrunner/StubRunner.java | 2 +- .../noop/NoOpContractVerifierAutoConfiguration.java | 6 +++--- .../verifier/messaging/noop/NoOpStubMessages.java | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java index a16d126151..c325f1f148 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/BatchStubRunnerFactory.java @@ -35,7 +35,7 @@ public class BatchStubRunnerFactory { private final MessageVerifierSender contractVerifierMessaging; public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions) { - this(stubRunnerOptions, new NoOpStubMessages()); + this(stubRunnerOptions, new NoOpStubMessages<>()); } public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, MessageVerifierSender verifier) { @@ -43,7 +43,7 @@ public class BatchStubRunnerFactory { } public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader) { - this(stubRunnerOptions, stubDownloader, new NoOpStubMessages()); + this(stubRunnerOptions, stubDownloader, new NoOpStubMessages<>()); } public BatchStubRunnerFactory(StubRunnerOptions stubRunnerOptions, StubDownloader stubDownloader, diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java index 6a337eccaf..54d3c4a5da 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/StubRunner.java @@ -56,7 +56,7 @@ public class StubRunner implements StubRunning { public StubRunner(StubRunnerOptions stubRunnerOptions, String repositoryPath, StubConfiguration stubsConfiguration) { - this(stubRunnerOptions, repositoryPath, stubsConfiguration, new NoOpStubMessages()); + this(stubRunnerOptions, repositoryPath, stubsConfiguration, new NoOpStubMessages<>()); } public StubRunner(StubRunnerOptions stubRunnerOptions, String repositoryPath, StubConfiguration stubsConfiguration, diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java index 2f75fcdf05..012876acde 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpContractVerifierAutoConfiguration.java @@ -39,13 +39,13 @@ public class NoOpContractVerifierAutoConfiguration { @Bean @ConditionalOnMissingBean(MessageVerifier.class) - public NoOpStubMessages contractVerifierMessageExchange() { - return new NoOpStubMessages(); + public NoOpStubMessages contractVerifierMessageExchange() { + return new NoOpStubMessages<>(); } @Bean @ConditionalOnMissingBean(ContractVerifierMessaging.class) - public ContractVerifierMessaging contractVerifierMessaging(NoOpStubMessages messages) { + public ContractVerifierMessaging contractVerifierMessaging(NoOpStubMessages messages) { return new ContractVerifierMessaging<>(messages, messages); } diff --git a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java index cc9ecd15a2..2294fa15da 100644 --- a/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java +++ b/spring-cloud-contract-verifier/src/main/java/org/springframework/cloud/contract/verifier/messaging/noop/NoOpStubMessages.java @@ -25,10 +25,10 @@ import org.springframework.cloud.contract.verifier.messaging.MessageVerifier; /** * @author Marcin Grzejszczak */ -public class NoOpStubMessages implements MessageVerifier { +public class NoOpStubMessages implements MessageVerifier { @Override - public void send(Object message, String destination, YamlContract contract) { + public void send(U message, String destination, YamlContract contract) { } @Override @@ -36,12 +36,12 @@ public class NoOpStubMessages implements MessageVerifier { } @Override - public Object receive(String destination, long timeout, TimeUnit timeUnit, YamlContract contract) { + public U receive(String destination, long timeout, TimeUnit timeUnit, YamlContract contract) { return null; } @Override - public Object receive(String destination, YamlContract contract) { + public U receive(String destination, YamlContract contract) { return null; }