From edf463d7152a8eb8f471419b394b59531f57d27a Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Wed, 28 Aug 2019 16:05:52 +0200 Subject: [PATCH] Fixed the samples --- .../standalone/dsl/http-client/build.gradle | 2 ++ .../java/com/example/loan/Application.java | 3 ++ .../Listener.java} | 15 +-------- .../example/{sink => loan}/SensorData.java | 2 +- .../{sink => loan}/MessageConsumedTests.java | 4 +-- ...ifierSampleStreamSinkApplicationTests.java | 33 ------------------- .../standalone/dsl/http-server/build.gradle | 2 +- .../example/fraud/MyProcessorListener.java | 1 + 8 files changed, 11 insertions(+), 51 deletions(-) rename samples/standalone/dsl/http-client/src/main/java/com/example/{sink/ContractVerifierSampleStreamSinkApplication.java => loan/Listener.java} (69%) rename samples/standalone/dsl/http-client/src/main/java/com/example/{sink => loan}/SensorData.java (97%) rename samples/standalone/dsl/http-client/src/test/java/com/example/{sink => loan}/MessageConsumedTests.java (92%) delete mode 100644 samples/standalone/dsl/http-client/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle index aa2c6b87a4..a698d36ff5 100644 --- a/samples/standalone/dsl/http-client/build.gradle +++ b/samples/standalone/dsl/http-client/build.gradle @@ -36,7 +36,9 @@ dependencyManagement { dependencies { compile("org.springframework.boot:spring-boot-starter-web") compile("org.springframework.boot:spring-boot-starter-actuator") + compile("org.springframework.cloud:spring-cloud-starter-stream-rabbit") + testCompile("org.springframework.cloud:spring-cloud-stream-test-support") testCompile "org.springframework.cloud:spring-cloud-starter-contract-stub-runner" testCompile "org.springframework.cloud:spring-cloud-starter-contract-verifier" } diff --git a/samples/standalone/dsl/http-client/src/main/java/com/example/loan/Application.java b/samples/standalone/dsl/http-client/src/main/java/com/example/loan/Application.java index 8c680cb15e..2e8784fb9d 100644 --- a/samples/standalone/dsl/http-client/src/main/java/com/example/loan/Application.java +++ b/samples/standalone/dsl/http-client/src/main/java/com/example/loan/Application.java @@ -18,8 +18,11 @@ package com.example.loan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.stream.annotation.EnableBinding; +import org.springframework.cloud.stream.messaging.Sink; @SpringBootApplication +@EnableBinding(Sink.class) public class Application { public static void main(String[] args) { diff --git a/samples/standalone/dsl/http-client/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java b/samples/standalone/dsl/http-client/src/main/java/com/example/loan/Listener.java similarity index 69% rename from samples/standalone/dsl/http-client/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java rename to samples/standalone/dsl/http-client/src/main/java/com/example/loan/Listener.java index a254502b6a..40fd3dc28b 100644 --- a/samples/standalone/dsl/http-client/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java +++ b/samples/standalone/dsl/http-client/src/main/java/com/example/loan/Listener.java @@ -14,25 +14,12 @@ * limitations under the License. */ -package com.example.sink; +package com.example.loan; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.stream.annotation.EnableBinding; import org.springframework.cloud.stream.annotation.StreamListener; import org.springframework.cloud.stream.messaging.Sink; import org.springframework.stereotype.Component; -@SpringBootApplication -@EnableBinding(Sink.class) -public class ContractVerifierSampleStreamSinkApplication { - - public static void main(String[] args) { - SpringApplication.run(ContractVerifierSampleStreamSinkApplication.class, args); - } - -} - @Component class Listener { diff --git a/samples/standalone/dsl/http-client/src/main/java/com/example/sink/SensorData.java b/samples/standalone/dsl/http-client/src/main/java/com/example/loan/SensorData.java similarity index 97% rename from samples/standalone/dsl/http-client/src/main/java/com/example/sink/SensorData.java rename to samples/standalone/dsl/http-client/src/main/java/com/example/loan/SensorData.java index 8e80fcdd6e..2408e85a8c 100644 --- a/samples/standalone/dsl/http-client/src/main/java/com/example/sink/SensorData.java +++ b/samples/standalone/dsl/http-client/src/main/java/com/example/loan/SensorData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.sink; +package com.example.loan; /** * @author Marius Bogoevici diff --git a/samples/standalone/dsl/http-client/src/test/java/com/example/sink/MessageConsumedTests.java b/samples/standalone/dsl/http-client/src/test/java/com/example/loan/MessageConsumedTests.java similarity index 92% rename from samples/standalone/dsl/http-client/src/test/java/com/example/sink/MessageConsumedTests.java rename to samples/standalone/dsl/http-client/src/test/java/com/example/loan/MessageConsumedTests.java index cbeab135b6..79752aaddf 100644 --- a/samples/standalone/dsl/http-client/src/test/java/com/example/sink/MessageConsumedTests.java +++ b/samples/standalone/dsl/http-client/src/test/java/com/example/loan/MessageConsumedTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.example.sink; +package com.example.loan; import org.junit.Test; import org.junit.runner.RunWith; @@ -34,7 +34,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @RunWith(SpringJUnit4ClassRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.NONE, properties = "spring.cloud.stream.bindings.input.destination=sensor-data") -@AutoConfigureStubRunner(stubsMode = StubRunnerProperties.StubsMode.LOCAL) +@AutoConfigureStubRunner(ids = "com.example:http-server-dsl", stubsMode = StubRunnerProperties.StubsMode.LOCAL) public class MessageConsumedTests { @Autowired diff --git a/samples/standalone/dsl/http-client/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java b/samples/standalone/dsl/http-client/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java deleted file mode 100644 index f7cc243575..0000000000 --- a/samples/standalone/dsl/http-client/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2013-2019 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 - * - * https://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.sink; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -@RunWith(SpringJUnit4ClassRunner.class) -@SpringBootTest -public class ContractVerifierSampleStreamSinkApplicationTests { - - @Test - public void contextLoads() { - } - -} diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index ffbdadf3d2..9a82dcc928 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -45,7 +45,7 @@ dependencyManagement { contracts { packageWithBaseClasses = 'com.example.fraud' - convertToYaml = true +// convertToYaml = true } dependencies { diff --git a/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/MyProcessorListener.java b/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/MyProcessorListener.java index 9d98b44e25..0b3df55a65 100644 --- a/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/MyProcessorListener.java +++ b/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/MyProcessorListener.java @@ -62,6 +62,7 @@ class MyProcessorListener { void listen(byte[] payload) { log.info("Got the message!"); if (!Arrays.equals(payload, this.expectedInput)) { + log.error("Input payload size is [" + payload.length + "] and the expected one is [" + this.expectedInput.length + "]"); throw new IllegalStateException("Wrong input"); } this.processor.output()