iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting work

This commit is contained in:
eugenp 2016-08-02 12:34:08 +03:00
parent 52445091db
commit e83b4b8523
9 changed files with 105 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cucumber/src/main/java/com/baeldung/BaeldungController.java
View File

@ -9,13 +9,13 @@ 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";
}

4
spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java
View File

@ -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){
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(SpringDemoApplication.class);
}
}

4
spring-cucumber/src/main/java/com/baeldung/VersionController.java
View File

@ -7,8 +7,8 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
public class VersionController {
@RequestMapping(method={RequestMethod.GET},value={"/version"})
public String getVersion(){
@RequestMapping(method = { RequestMethod.GET }, value = { "/version" })
public String getVersion() {
return "1.0";
}
}

3
spring-cucumber/src/test/java/com/baeldung/CucumberTest.java
View File

@ -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 {
}

19
spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java
View File

@ -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<String,String> requestHeaders;
public class HeaderSettingRequestCallback implements RequestCallback {
final Map<String, String> requestHeaders;
private String body;
public HeaderSettingRequestCallback(final Map<String, String> headers){
public HeaderSettingRequestCallback(final Map<String, String> 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<String,String> entry : requestHeaders.entrySet() ){
clientHeaders.add(entry.getKey(),entry.getValue());
for (final Map.Entry<String, String> 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());
}
}
}

7
spring-cucumber/src/test/java/com/baeldung/OtherDefs.java
View File

@ -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");
}
}

13
spring-cucumber/src/test/java/com/baeldung/ResponseResults.java
View File

@ -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;
}
}

41
spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java
View File

@ -16,7 +16,6 @@ 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
@ -26,26 +25,23 @@ public class SpringIntegrationTest {
protected RestTemplate restTemplate = null;
protected void executeGet(String url) throws IOException{
final Map<String,String> headers = new HashMap<>();
headers.put("Accept","application/json");
protected void executeGet(String url) throws IOException {
final Map<String, String> headers = new HashMap<>();
headers.put("Accept", "application/json");
final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();
if (restTemplate == null){
if (restTemplate == null) {
restTemplate = new RestTemplate();
}
restTemplate.setErrorHandler(errorHandler);
latestResponse = restTemplate.execute(url,
HttpMethod.GET,
requestCallback,
new ResponseExtractor<ResponseResults>(){
latestResponse = restTemplate.execute(url, HttpMethod.GET, requestCallback, new ResponseExtractor<ResponseResults>() {
@Override
public ResponseResults extractData(ClientHttpResponse response) throws IOException {
if (errorHandler.hadError){
if (errorHandler.hadError) {
return (errorHandler.getResults());
} else{
} else {
return (new ResponseResults(response));
}
}
@ -53,26 +49,23 @@ public class SpringIntegrationTest {
}
protected void executePost(String url) throws IOException{
final Map<String,String> headers = new HashMap<>();
headers.put("Accept","application/json");
protected void executePost(String url) throws IOException {
final Map<String, String> headers = new HashMap<>();
headers.put("Accept", "application/json");
final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();
if (restTemplate == null){
if (restTemplate == null) {
restTemplate = new RestTemplate();
}
restTemplate.setErrorHandler(errorHandler);
latestResponse = restTemplate.execute(url,
HttpMethod.POST,
requestCallback,
new ResponseExtractor<ResponseResults>(){
latestResponse = restTemplate.execute(url, HttpMethod.POST, requestCallback, new ResponseExtractor<ResponseResults>() {
@Override
public ResponseResults extractData(ClientHttpResponse response) throws IOException {
if (errorHandler.hadError){
if (errorHandler.hadError) {
return (errorHandler.getResults());
} else{
} else {
return (new ResponseResults(response));
}
}
@ -80,16 +73,16 @@ public class SpringIntegrationTest {
}
private class ResponseResultErrorHandler implements ResponseErrorHandler{
private class ResponseResultErrorHandler implements ResponseErrorHandler {
private ResponseResults results = null;
private Boolean hadError = false;
private ResponseResults getResults(){
private ResponseResults getResults() {
return results;
}
@Override
public boolean hasError(ClientHttpResponse response) throws IOException{
public boolean hasError(ClientHttpResponse response) throws IOException {
hadError = response.getRawStatusCode() >= 400;
return hadError;
}

12
spring-cucumber/src/test/java/com/baeldung/StepDefs.java
View File

@ -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{
public class StepDefs extends SpringIntegrationTest {
@When("^the client calls /version$")
public void the_client_issues_GET_version() throws Throwable{
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));
}
}