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

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

@ -8,14 +8,14 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
public class BaeldungController { public class BaeldungController {
@RequestMapping(method={RequestMethod.GET},value={"/hello"}) @RequestMapping(method = { RequestMethod.GET }, value = { "/hello" })
public String sayHello(HttpServletResponse response){ public String sayHello(HttpServletResponse response) {
return "hello"; return "hello";
} }
@RequestMapping(method={RequestMethod.POST},value={"/baeldung"}) @RequestMapping(method = { RequestMethod.POST }, value = { "/baeldung" })
public String sayHelloPost(HttpServletResponse response){ public String sayHelloPost(HttpServletResponse response) {
return "hello"; return "hello";
} }

14
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; import org.springframework.boot.context.web.SpringBootServletInitializer;
@SpringBootApplication @SpringBootApplication
public class SpringDemoApplication extends SpringBootServletInitializer{ public class SpringDemoApplication extends SpringBootServletInitializer {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(SpringDemoApplication.class, args); SpringApplication.run(SpringDemoApplication.class, args);
} }
@Override @Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application){ protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
return application.sources(SpringDemoApplication.class); return application.sources(SpringDemoApplication.class);
} }
} }

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

@ -6,9 +6,9 @@ import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
public class VersionController { public class VersionController {
@RequestMapping(method={RequestMethod.GET},value={"/version"}) @RequestMapping(method = { RequestMethod.GET }, value = { "/version" })
public String getVersion(){ public String getVersion() {
return "1.0"; 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 cucumber.api.junit.Cucumber;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@RunWith(Cucumber.class) @RunWith(Cucumber.class)
@CucumberOptions(features = "src/test/resources") @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.io.IOException;
import java.util.Map; import java.util.Map;
public class HeaderSettingRequestCallback implements RequestCallback {
public class HeaderSettingRequestCallback implements RequestCallback{ final Map<String, String> requestHeaders;
final Map<String,String> requestHeaders;
private String body; private String body;
public HeaderSettingRequestCallback(final Map<String, String> headers){ public HeaderSettingRequestCallback(final Map<String, String> headers) {
this.requestHeaders = headers; this.requestHeaders = headers;
} }
public void setBody(final String postBody ){ public void setBody(final String postBody) {
this.body = postBody; this.body = postBody;
} }
@Override @Override
public void doWithRequest(ClientHttpRequest request) throws IOException{ public void doWithRequest(ClientHttpRequest request) throws IOException {
final HttpHeaders clientHeaders = request.getHeaders(); final HttpHeaders clientHeaders = request.getHeaders();
for( final Map.Entry<String,String> entry : requestHeaders.entrySet() ){ for (final Map.Entry<String, String> entry : requestHeaders.entrySet()) {
clientHeaders.add(entry.getKey(),entry.getValue()); clientHeaders.add(entry.getKey(), entry.getValue());
} }
if( null != body ){ if (null != body) {
request.getBody().write( body.getBytes() ); request.getBody().write(body.getBytes());
} }
} }
} }

9
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.Given;
import cucumber.api.java.en.When; import cucumber.api.java.en.When;
public class OtherDefs extends SpringIntegrationTest {
public class OtherDefs extends SpringIntegrationTest{
@When("^the client calls /baeldung$") @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"); executePost("http://localhost:8080/baeldung");
} }
@Given("^the client calls /hello$") @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"); 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.apache.commons.io.IOUtils;
import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.ClientHttpResponse;
public class ResponseResults {
public class ResponseResults{
private final ClientHttpResponse theResponse; private final ClientHttpResponse theResponse;
private final String body; private final String body;
protected ResponseResults(final ClientHttpResponse response) throws IOException{ protected ResponseResults(final ClientHttpResponse response) throws IOException {
this.theResponse = response; this.theResponse = response;
final InputStream bodyInputStream = response.getBody(); final InputStream bodyInputStream = response.getBody();
if (null == bodyInputStream){ if (null == bodyInputStream) {
this.body = "{}"; this.body = "{}";
}else{ } else {
final StringWriter stringWriter = new StringWriter(); final StringWriter stringWriter = new StringWriter();
IOUtils.copy(bodyInputStream, stringWriter); IOUtils.copy(bodyInputStream, stringWriter);
this.body = stringWriter.toString(); this.body = stringWriter.toString();
} }
} }
protected ClientHttpResponse getTheResponse(){ protected ClientHttpResponse getTheResponse() {
return theResponse; return theResponse;
} }
protected String getBody(){ protected String getBody() {
return body; return body;
} }
} }

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

@ -16,87 +16,80 @@ import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.ResponseExtractor; import org.springframework.web.client.ResponseExtractor;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
//@RunWith(SpringJUnit4ClassRunner.class) //@RunWith(SpringJUnit4ClassRunner.class)
@ContextConfiguration(classes = SpringDemoApplication.class, loader = SpringApplicationContextLoader.class) @ContextConfiguration(classes = SpringDemoApplication.class, loader = SpringApplicationContextLoader.class)
@WebAppConfiguration @WebAppConfiguration
@IntegrationTest @IntegrationTest
public class SpringIntegrationTest { 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{ protected void executeGet(String url) throws IOException {
final Map<String,String> headers = new HashMap<>(); final Map<String, String> headers = new HashMap<>();
headers.put("Accept","application/json"); headers.put("Accept", "application/json");
final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers); final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler(); final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();
if (restTemplate == null){ if (restTemplate == null) {
restTemplate = new RestTemplate(); restTemplate = new RestTemplate();
} }
restTemplate.setErrorHandler(errorHandler); restTemplate.setErrorHandler(errorHandler);
latestResponse = restTemplate.execute(url, latestResponse = restTemplate.execute(url, HttpMethod.GET, requestCallback, new ResponseExtractor<ResponseResults>() {
HttpMethod.GET, @Override
requestCallback, public ResponseResults extractData(ClientHttpResponse response) throws IOException {
new ResponseExtractor<ResponseResults>(){ if (errorHandler.hadError) {
@Override return (errorHandler.getResults());
public ResponseResults extractData(ClientHttpResponse response) throws IOException { } else {
if (errorHandler.hadError){ return (new ResponseResults(response));
return (errorHandler.getResults()); }
} else{ }
return (new ResponseResults(response)); });
}
}
});
} }
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){ protected void executePost(String url) throws IOException {
restTemplate = new RestTemplate(); final Map<String, String> headers = new HashMap<>();
} headers.put("Accept", "application/json");
final HeaderSettingRequestCallback requestCallback = new HeaderSettingRequestCallback(headers);
final ResponseResultErrorHandler errorHandler = new ResponseResultErrorHandler();
restTemplate.setErrorHandler(errorHandler); if (restTemplate == null) {
latestResponse = restTemplate.execute(url, restTemplate = new RestTemplate();
HttpMethod.POST, }
requestCallback,
new ResponseExtractor<ResponseResults>(){
@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.POST, requestCallback, new ResponseExtractor<ResponseResults>() {
@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(){ private class ResponseResultErrorHandler implements ResponseErrorHandler {
return results; private ResponseResults results = null;
} private Boolean hadError = false;
@Override private ResponseResults getResults() {
public boolean hasError(ClientHttpResponse response) throws IOException{ return results;
hadError = response.getRawStatusCode() >= 400; }
return hadError;
}
@Override @Override
public void handleError(ClientHttpResponse response) throws IOException { public boolean hasError(ClientHttpResponse response) throws IOException {
results = new ResponseResults(response); hadError = response.getRawStatusCode() >= 400;
} return hadError;
} }
@Override
public void handleError(ClientHttpResponse response) throws IOException {
results = new ResponseResults(response);
}
}
} }

16
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.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.is;
public class StepDefs extends SpringIntegrationTest{ public class StepDefs extends SpringIntegrationTest {
@When("^the client calls /version$") @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"); executeGet("http://localhost:8080/version");
} }
@Then("^the client receives status code of (\\d+)$") @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(); 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 (.+)$") @And("^the client receives server version (.+)$")
public void the_client_receives_server_version_body(String version) throws Throwable{ public void the_client_receives_server_version_body(String version) throws Throwable {
assertThat(latestResponse.getBody(), is(version)) ; assertThat(latestResponse.getBody(), is(version));
} }
} }