diff --git a/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java b/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java index 0bb249b814..8e87ed3028 100644 --- a/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java +++ b/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java @@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class BaeldungController { - - @RequestMapping(method={RequestMethod.GET},value={"/hello"}) - public String sayHello(HttpServletResponse response){ + + @RequestMapping(method = { RequestMethod.GET }, value = { "/hello" }) + public String sayHello(HttpServletResponse response) { return "hello"; } - - @RequestMapping(method={RequestMethod.POST},value={"/baeldung"}) - public String sayHelloPost(HttpServletResponse response){ + + @RequestMapping(method = { RequestMethod.POST }, value = { "/baeldung" }) + public String sayHelloPost(HttpServletResponse response) { return "hello"; } diff --git a/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java b/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java index d490b23aa2..ecb8909de9 100644 --- a/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java +++ b/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java @@ -6,14 +6,14 @@ import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.web.SpringBootServletInitializer; @SpringBootApplication -public class SpringDemoApplication extends SpringBootServletInitializer{ +public class SpringDemoApplication extends SpringBootServletInitializer { - public static void main(String[] args) { - SpringApplication.run(SpringDemoApplication.class, args); - } - - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application){ + public static void main(String[] args) { + SpringApplication.run(SpringDemoApplication.class, args); + } + + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { return application.sources(SpringDemoApplication.class); } } diff --git a/spring-cucumber/src/main/java/com/baeldung/VersionController.java b/spring-cucumber/src/main/java/com/baeldung/VersionController.java index 7c72a78a05..f673f0e31f 100644 --- a/spring-cucumber/src/main/java/com/baeldung/VersionController.java +++ b/spring-cucumber/src/main/java/com/baeldung/VersionController.java @@ -6,9 +6,9 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class VersionController { - - @RequestMapping(method={RequestMethod.GET},value={"/version"}) - public String getVersion(){ - return "1.0"; - } + + @RequestMapping(method = { RequestMethod.GET }, value = { "/version" }) + public String getVersion() { + return "1.0"; + } } diff --git a/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java b/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java index 3e950709b3..c31a35b271 100644 --- a/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java @@ -4,8 +4,7 @@ import cucumber.api.CucumberOptions; import cucumber.api.junit.Cucumber; import org.junit.runner.RunWith; - @RunWith(Cucumber.class) @CucumberOptions(features = "src/test/resources") -public class CucumberTest{ +public class CucumberTest { } \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java b/spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java index 1ea72868eb..ab8a9c55b2 100644 --- a/spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java +++ b/spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java @@ -7,28 +7,27 @@ import org.springframework.web.client.RequestCallback; import java.io.IOException; import java.util.Map; - -public class HeaderSettingRequestCallback implements RequestCallback{ - final Map requestHeaders; +public class HeaderSettingRequestCallback implements RequestCallback { + final Map requestHeaders; private String body; - public HeaderSettingRequestCallback(final Map headers){ + public HeaderSettingRequestCallback(final Map headers) { this.requestHeaders = headers; } - public void setBody(final String postBody ){ + public void setBody(final String postBody) { this.body = postBody; } @Override - public void doWithRequest(ClientHttpRequest request) throws IOException{ + public void doWithRequest(ClientHttpRequest request) throws IOException { final HttpHeaders clientHeaders = request.getHeaders(); - for( final Map.Entry entry : requestHeaders.entrySet() ){ - clientHeaders.add(entry.getKey(),entry.getValue()); + for (final Map.Entry entry : requestHeaders.entrySet()) { + clientHeaders.add(entry.getKey(), entry.getValue()); } - if( null != body ){ - request.getBody().write( body.getBytes() ); + if (null != body) { + request.getBody().write(body.getBytes()); } } } \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/OtherDefs.java b/spring-cucumber/src/test/java/com/baeldung/OtherDefs.java index 428343d06a..edbc14f319 100644 --- a/spring-cucumber/src/test/java/com/baeldung/OtherDefs.java +++ b/spring-cucumber/src/test/java/com/baeldung/OtherDefs.java @@ -3,15 +3,14 @@ package com.baeldung; import cucumber.api.java.en.Given; import cucumber.api.java.en.When; - -public class OtherDefs extends SpringIntegrationTest{ +public class OtherDefs extends SpringIntegrationTest { @When("^the client calls /baeldung$") - public void the_client_issues_POST_hello() throws Throwable{ + public void the_client_issues_POST_hello() throws Throwable { executePost("http://localhost:8080/baeldung"); } - + @Given("^the client calls /hello$") - public void the_client_issues_GET_hello() throws Throwable{ + public void the_client_issues_GET_hello() throws Throwable { executeGet("http://localhost:8080/hello"); } } \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java b/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java index 6890faf8b5..4c0125e9b4 100644 --- a/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java +++ b/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java @@ -7,28 +7,27 @@ import java.io.StringWriter; import org.apache.commons.io.IOUtils; import org.springframework.http.client.ClientHttpResponse; - -public class ResponseResults{ +public class ResponseResults { private final ClientHttpResponse theResponse; private final String body; - protected ResponseResults(final ClientHttpResponse response) throws IOException{ + protected ResponseResults(final ClientHttpResponse response) throws IOException { this.theResponse = response; final InputStream bodyInputStream = response.getBody(); - if (null == bodyInputStream){ + if (null == bodyInputStream) { this.body = "{}"; - }else{ + } else { final StringWriter stringWriter = new StringWriter(); IOUtils.copy(bodyInputStream, stringWriter); this.body = stringWriter.toString(); } } - protected ClientHttpResponse getTheResponse(){ + protected ClientHttpResponse getTheResponse() { return theResponse; } - protected String getBody(){ + protected String getBody() { return body; } } \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java index 5c85dc9400..8ef22eae6d 100644 --- a/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java @@ -16,87 +16,80 @@ import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.ResponseExtractor; import org.springframework.web.client.RestTemplate; - //@RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = SpringDemoApplication.class, loader = SpringApplicationContextLoader.class) @WebAppConfiguration @IntegrationTest public class SpringIntegrationTest { - protected static ResponseResults latestResponse = null; + protected static ResponseResults latestResponse = null; - protected RestTemplate restTemplate = null; + protected RestTemplate restTemplate = null; - protected void executeGet(String url) throws IOException{ - final Map headers = new HashMap<>(); - headers.put("Accept","application/json"); - final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers); - final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler(); + protected void executeGet(String url) throws IOException { + final Map headers = new HashMap<>(); + headers.put("Accept", "application/json"); + final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers); + final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler(); - if (restTemplate == null){ - restTemplate = new RestTemplate(); - } + if (restTemplate == null) { + restTemplate = new RestTemplate(); + } - restTemplate.setErrorHandler(errorHandler); - latestResponse = restTemplate.execute(url, - HttpMethod.GET, - requestCallback, - new ResponseExtractor(){ - @Override - public ResponseResults extractData(ClientHttpResponse response) throws IOException { - if (errorHandler.hadError){ - return (errorHandler.getResults()); - } else{ - return (new ResponseResults(response)); - } - } - }); + restTemplate.setErrorHandler(errorHandler); + latestResponse = restTemplate.execute(url, HttpMethod.GET, requestCallback, new ResponseExtractor() { + @Override + public ResponseResults extractData(ClientHttpResponse response) throws IOException { + if (errorHandler.hadError) { + return (errorHandler.getResults()); + } else { + return (new ResponseResults(response)); + } + } + }); - } - - protected void executePost(String url) throws IOException{ - final Map headers = new HashMap<>(); - headers.put("Accept","application/json"); - final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers); - final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler(); + } - if (restTemplate == null){ - restTemplate = new RestTemplate(); - } + protected void executePost(String url) throws IOException { + final Map headers = new HashMap<>(); + headers.put("Accept", "application/json"); + final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers); + final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler(); - restTemplate.setErrorHandler(errorHandler); - latestResponse = restTemplate.execute(url, - HttpMethod.POST, - requestCallback, - new ResponseExtractor(){ - @Override - public ResponseResults extractData(ClientHttpResponse response) throws IOException { - if (errorHandler.hadError){ - return (errorHandler.getResults()); - } else{ - return (new ResponseResults(response)); - } - } - }); + if (restTemplate == null) { + restTemplate = new RestTemplate(); + } - } + restTemplate.setErrorHandler(errorHandler); + latestResponse = restTemplate.execute(url, HttpMethod.POST, requestCallback, new ResponseExtractor() { + @Override + public ResponseResults extractData(ClientHttpResponse response) throws IOException { + if (errorHandler.hadError) { + return (errorHandler.getResults()); + } else { + return (new ResponseResults(response)); + } + } + }); - private class ResponseResultErrorHandler implements ResponseErrorHandler{ - private ResponseResults results = null; - private Boolean hadError = false; + } - private ResponseResults getResults(){ - return results; - } + private class ResponseResultErrorHandler implements ResponseErrorHandler { + private ResponseResults results = null; + private Boolean hadError = false; - @Override - public boolean hasError(ClientHttpResponse response) throws IOException{ - hadError = response.getRawStatusCode() >= 400; - return hadError; - } + private ResponseResults getResults() { + return results; + } - @Override - public void handleError(ClientHttpResponse response) throws IOException { - results = new ResponseResults(response); - } - } + @Override + public boolean hasError(ClientHttpResponse response) throws IOException { + hadError = response.getRawStatusCode() >= 400; + return hadError; + } + + @Override + public void handleError(ClientHttpResponse response) throws IOException { + results = new ResponseResults(response); + } + } } \ No newline at end of file diff --git a/spring-cucumber/src/test/java/com/baeldung/StepDefs.java b/spring-cucumber/src/test/java/com/baeldung/StepDefs.java index 3ed25bb09b..e796476608 100644 --- a/spring-cucumber/src/test/java/com/baeldung/StepDefs.java +++ b/spring-cucumber/src/test/java/com/baeldung/StepDefs.java @@ -8,21 +8,21 @@ import org.springframework.http.HttpStatus; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.is; -public class StepDefs extends SpringIntegrationTest{ - - @When("^the client calls /version$") - public void the_client_issues_GET_version() throws Throwable{ +public class StepDefs extends SpringIntegrationTest { + + @When("^the client calls /version$") + public void the_client_issues_GET_version() throws Throwable { executeGet("http://localhost:8080/version"); } @Then("^the client receives status code of (\\d+)$") - public void the_client_receives_status_code_of(int statusCode) throws Throwable{ + public void the_client_receives_status_code_of(int statusCode) throws Throwable { final HttpStatus currentStatusCode = latestResponse.getTheResponse().getStatusCode(); - assertThat("status code is incorrect : "+ latestResponse.getBody(), currentStatusCode.value(), is(statusCode) ); + assertThat("status code is incorrect : " + latestResponse.getBody(), currentStatusCode.value(), is(statusCode)); } @And("^the client receives server version (.+)$") - public void the_client_receives_server_version_body(String version) throws Throwable{ - assertThat(latestResponse.getBody(), is(version)) ; + public void the_client_receives_server_version_body(String version) throws Throwable { + assertThat(latestResponse.getBody(), is(version)); } } \ No newline at end of file