From e0fc7aeca81e7e2619909999bc58f276f0211cb8 Mon Sep 17 00:00:00 2001 From: Olga Maciaszek-Sharma Date: Wed, 29 May 2019 20:50:34 +0200 Subject: [PATCH] Remove charset from pact sample contract media type. Switch to explicitly returning charset media type for other samples. --- .../src/main/java/com/example/fraud/FraudNameController.java | 5 +++-- .../resources/contracts/fraud/shouldMarkClientAsFraud.json | 2 +- .../contracts/fraud/shouldMarkClientAsNotFraud.json | 2 +- .../resources/contracts/fraud/shouldReturnDrunksStats.json | 2 +- .../resources/contracts/fraud/shouldReturnFraudStats.json | 2 +- .../java/com/example/fraud/FraudDetectionController.java | 3 ++- .../src/main/java/com/example/fraud/FraudNameController.java | 3 ++- .../main/java/com/example/fraud/FraudStatsController.java | 5 +++-- 8 files changed, 14 insertions(+), 10 deletions(-) diff --git a/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudNameController.java b/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudNameController.java index db3dae321f..ef47266f25 100644 --- a/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudNameController.java +++ b/samples/standalone/dsl/http-server/src/main/java/com/example/fraud/FraudNameController.java @@ -16,6 +16,7 @@ package com.example.fraud; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PutMapping; @@ -40,7 +41,7 @@ class FraudNameController { this.fraudVerifier = fraudVerifier; } - @PutMapping(value = "/frauds/name") + @PutMapping(value = "/frauds/name", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) public NameResponse checkByName(@RequestBody NameRequest request) { boolean fraud = this.fraudVerifier.isFraudByName(request.getName()); if (fraud) { @@ -50,7 +51,7 @@ class FraudNameController { "Don't worry " + request.getName() + " you're not a fraud"); } - @GetMapping(value = "/frauds/name") + @GetMapping(value = "/frauds/name", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) public String checkByName(@CookieValue("name") String value, @CookieValue("name2") String value2) { return value + " " + value2; diff --git a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.json b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.json index 3135fef8f4..4539a5feba 100644 --- a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.json +++ b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsFraud.json @@ -54,7 +54,7 @@ "response": { "status": 200, "headers": { - "Content-Type": "application/vnd.fraud.v1+json;charset=UTF-8" + "Content-Type": "application/vnd.fraud.v1+json" }, "body": { "fraudCheckStatus": "FRAUD", diff --git a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.json b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.json index 0d1825a800..094a024381 100644 --- a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.json +++ b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldMarkClientAsNotFraud.json @@ -22,7 +22,7 @@ "response": { "status": 200, "headers": { - "Content-Type": "application/vnd.fraud.v1+json;charset=UTF-8" + "Content-Type": "application/vnd.fraud.v1+json" }, "body": { "fraudCheckStatus": "OK", diff --git a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnDrunksStats.json b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnDrunksStats.json index e53984d8f9..76456c8563 100644 --- a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnDrunksStats.json +++ b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnDrunksStats.json @@ -15,7 +15,7 @@ "response": { "status": 200, "headers": { - "Content-Type": "application/vnd.fraud.v1+json;charset=UTF-8" + "Content-Type": "application/vnd.fraud.v1+json" }, "body": { "count": 100 diff --git a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.json b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.json index 3cf184c343..616d2da583 100644 --- a/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.json +++ b/samples/standalone/pact/pact-http-server/src/test/resources/contracts/fraud/shouldReturnFraudStats.json @@ -15,7 +15,7 @@ "response": { "status": 200, "headers": { - "Content-Type": "application/vnd.fraud.v1+json;charset=UTF-8" + "Content-Type": "application/vnd.fraud.v1+json" }, "body": { "count": 200 diff --git a/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudDetectionController.java b/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudDetectionController.java index 7652f55cc3..8d3cf42c86 100644 --- a/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudDetectionController.java +++ b/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudDetectionController.java @@ -22,6 +22,7 @@ import com.example.fraud.model.FraudCheck; import com.example.fraud.model.FraudCheckResult; import com.example.fraud.model.FraudCheckStatus; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -38,7 +39,7 @@ public class FraudDetectionController { private static final BigDecimal MAX_AMOUNT = new BigDecimal("5000"); // tag::server_api[] - @RequestMapping(value = "/fraudcheck", method = PUT) + @RequestMapping(value = "/fraudcheck", method = PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE) public FraudCheckResult fraudCheck(@RequestBody FraudCheck fraudCheck) { // end::server_api[] // tag::new_impl[] diff --git a/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudNameController.java b/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudNameController.java index 9d5db11ac9..f56dd2fd41 100644 --- a/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudNameController.java +++ b/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudNameController.java @@ -16,6 +16,7 @@ package com.example.fraud; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -38,7 +39,7 @@ class FraudNameController { this.fraudVerifier = fraudVerifier; } - @PutMapping(value = "/frauds/name") + @PutMapping(value = "/frauds/name", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) public NameResponse checkByName(@RequestBody NameRequest request) { boolean fraud = this.fraudVerifier.isFraudByName(request.getName()); if (fraud) { diff --git a/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudStatsController.java b/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudStatsController.java index f54667c620..43f2a66fbc 100644 --- a/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudStatsController.java +++ b/samples/standalone/yml/http-server/src/main/java/com/example/fraud/FraudStatsController.java @@ -16,6 +16,7 @@ package com.example.fraud; +import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; @@ -40,12 +41,12 @@ public class FraudStatsController { this.statsProvider = statsProvider; } - @GetMapping(value = "/frauds") + @GetMapping(value = "/frauds", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) public Response countAllFrauds() { return new Response(this.statsProvider.count(FraudType.ALL)); } - @GetMapping(value = "/drunks") + @GetMapping(value = "/drunks", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) public Response countAllDrunks() { return new Response(this.statsProvider.count(FraudType.DRUNKS)); }