From 9c9a0b23e5100aef0e8faa28ca003d933b4748fb Mon Sep 17 00:00:00 2001 From: eugenp Date: Wed, 27 Jul 2016 13:19:46 +0300 Subject: [PATCH] changing the name of a module --- .../pom.xml | 0 .../java/com/baeldung/BaeldungController.java | 0 .../com/baeldung/SpringDemoApplication.java | 0 .../java/com/baeldung/VersionController.java | 0 .../src/main/resources/application.properties | 0 .../test/java/com/baeldung/CucumberTest.java | 20 +- .../HeaderSettingRequestCallback.java | 66 +++--- .../src/test/java/com/baeldung/OtherDefs.java | 0 .../java/com/baeldung/ResponseResults.java | 66 +++--- .../com/baeldung/SpringIntegrationTest.java | 202 +++++++++--------- .../src/test/java/com/baeldung/StepDefs.java | 54 ++--- .../src/test/resources/baelung.feature | 0 .../src/test/resources/version.feature | 0 13 files changed, 204 insertions(+), 204 deletions(-) rename {spring-cucumber-demo => spring-cucumber}/pom.xml (100%) rename {spring-cucumber-demo => spring-cucumber}/src/main/java/com/baeldung/BaeldungController.java (100%) rename {spring-cucumber-demo => spring-cucumber}/src/main/java/com/baeldung/SpringDemoApplication.java (100%) rename {spring-cucumber-demo => spring-cucumber}/src/main/java/com/baeldung/VersionController.java (100%) rename {spring-cucumber-demo => spring-cucumber}/src/main/resources/application.properties (100%) rename {spring-cucumber-demo => spring-cucumber}/src/test/java/com/baeldung/CucumberTest.java (95%) rename {spring-cucumber-demo => spring-cucumber}/src/test/java/com/baeldung/HeaderSettingRequestCallback.java (96%) rename {spring-cucumber-demo => spring-cucumber}/src/test/java/com/baeldung/OtherDefs.java (100%) rename {spring-cucumber-demo => spring-cucumber}/src/test/java/com/baeldung/ResponseResults.java (96%) rename {spring-cucumber-demo => spring-cucumber}/src/test/java/com/baeldung/SpringIntegrationTest.java (97%) rename {spring-cucumber-demo => spring-cucumber}/src/test/java/com/baeldung/StepDefs.java (97%) rename {spring-cucumber-demo => spring-cucumber}/src/test/resources/baelung.feature (100%) rename {spring-cucumber-demo => spring-cucumber}/src/test/resources/version.feature (100%) diff --git a/spring-cucumber-demo/pom.xml b/spring-cucumber/pom.xml similarity index 100% rename from spring-cucumber-demo/pom.xml rename to spring-cucumber/pom.xml diff --git a/spring-cucumber-demo/src/main/java/com/baeldung/BaeldungController.java b/spring-cucumber/src/main/java/com/baeldung/BaeldungController.java similarity index 100% rename from spring-cucumber-demo/src/main/java/com/baeldung/BaeldungController.java rename to spring-cucumber/src/main/java/com/baeldung/BaeldungController.java diff --git a/spring-cucumber-demo/src/main/java/com/baeldung/SpringDemoApplication.java b/spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java similarity index 100% rename from spring-cucumber-demo/src/main/java/com/baeldung/SpringDemoApplication.java rename to spring-cucumber/src/main/java/com/baeldung/SpringDemoApplication.java diff --git a/spring-cucumber-demo/src/main/java/com/baeldung/VersionController.java b/spring-cucumber/src/main/java/com/baeldung/VersionController.java similarity index 100% rename from spring-cucumber-demo/src/main/java/com/baeldung/VersionController.java rename to spring-cucumber/src/main/java/com/baeldung/VersionController.java diff --git a/spring-cucumber-demo/src/main/resources/application.properties b/spring-cucumber/src/main/resources/application.properties similarity index 100% rename from spring-cucumber-demo/src/main/resources/application.properties rename to spring-cucumber/src/main/resources/application.properties diff --git a/spring-cucumber-demo/src/test/java/com/baeldung/CucumberTest.java b/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java similarity index 95% rename from spring-cucumber-demo/src/test/java/com/baeldung/CucumberTest.java rename to spring-cucumber/src/test/java/com/baeldung/CucumberTest.java index feb340d00d..3e950709b3 100644 --- a/spring-cucumber-demo/src/test/java/com/baeldung/CucumberTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/CucumberTest.java @@ -1,11 +1,11 @@ -package com.baeldung; - -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{ +package com.baeldung; + +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{ } \ No newline at end of file diff --git a/spring-cucumber-demo/src/test/java/com/baeldung/HeaderSettingRequestCallback.java b/spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java similarity index 96% rename from spring-cucumber-demo/src/test/java/com/baeldung/HeaderSettingRequestCallback.java rename to spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java index 719ce59892..1ea72868eb 100644 --- a/spring-cucumber-demo/src/test/java/com/baeldung/HeaderSettingRequestCallback.java +++ b/spring-cucumber/src/test/java/com/baeldung/HeaderSettingRequestCallback.java @@ -1,34 +1,34 @@ -package com.baeldung; - -import org.springframework.http.HttpHeaders; -import org.springframework.http.client.ClientHttpRequest; -import org.springframework.web.client.RequestCallback; - -import java.io.IOException; -import java.util.Map; - - -public class HeaderSettingRequestCallback implements RequestCallback{ - final Map requestHeaders; - - private String body; - - public HeaderSettingRequestCallback(final Map headers){ - this.requestHeaders = headers; - } - - public void setBody(final String postBody ){ - this.body = postBody; - } - - @Override - 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()); - } - if( null != body ){ - request.getBody().write( body.getBytes() ); - } - } +package com.baeldung; + +import org.springframework.http.HttpHeaders; +import org.springframework.http.client.ClientHttpRequest; +import org.springframework.web.client.RequestCallback; + +import java.io.IOException; +import java.util.Map; + + +public class HeaderSettingRequestCallback implements RequestCallback{ + final Map requestHeaders; + + private String body; + + public HeaderSettingRequestCallback(final Map headers){ + this.requestHeaders = headers; + } + + public void setBody(final String postBody ){ + this.body = postBody; + } + + @Override + 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()); + } + if( null != body ){ + request.getBody().write( body.getBytes() ); + } + } } \ No newline at end of file diff --git a/spring-cucumber-demo/src/test/java/com/baeldung/OtherDefs.java b/spring-cucumber/src/test/java/com/baeldung/OtherDefs.java similarity index 100% rename from spring-cucumber-demo/src/test/java/com/baeldung/OtherDefs.java rename to spring-cucumber/src/test/java/com/baeldung/OtherDefs.java diff --git a/spring-cucumber-demo/src/test/java/com/baeldung/ResponseResults.java b/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java similarity index 96% rename from spring-cucumber-demo/src/test/java/com/baeldung/ResponseResults.java rename to spring-cucumber/src/test/java/com/baeldung/ResponseResults.java index c7cee44222..6890faf8b5 100644 --- a/spring-cucumber-demo/src/test/java/com/baeldung/ResponseResults.java +++ b/spring-cucumber/src/test/java/com/baeldung/ResponseResults.java @@ -1,34 +1,34 @@ -package com.baeldung; - -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; - -import org.apache.commons.io.IOUtils; -import org.springframework.http.client.ClientHttpResponse; - - -public class ResponseResults{ - private final ClientHttpResponse theResponse; - private final String body; - - protected ResponseResults(final ClientHttpResponse response) throws IOException{ - this.theResponse = response; - final InputStream bodyInputStream = response.getBody(); - if (null == bodyInputStream){ - this.body = "{}"; - }else{ - final StringWriter stringWriter = new StringWriter(); - IOUtils.copy(bodyInputStream, stringWriter); - this.body = stringWriter.toString(); - } - } - - protected ClientHttpResponse getTheResponse(){ - return theResponse; - } - - protected String getBody(){ - return body; - } +package com.baeldung; + +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; + +import org.apache.commons.io.IOUtils; +import org.springframework.http.client.ClientHttpResponse; + + +public class ResponseResults{ + private final ClientHttpResponse theResponse; + private final String body; + + protected ResponseResults(final ClientHttpResponse response) throws IOException{ + this.theResponse = response; + final InputStream bodyInputStream = response.getBody(); + if (null == bodyInputStream){ + this.body = "{}"; + }else{ + final StringWriter stringWriter = new StringWriter(); + IOUtils.copy(bodyInputStream, stringWriter); + this.body = stringWriter.toString(); + } + } + + protected ClientHttpResponse getTheResponse(){ + return theResponse; + } + + protected String getBody(){ + return body; + } } \ No newline at end of file diff --git a/spring-cucumber-demo/src/test/java/com/baeldung/SpringIntegrationTest.java b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java similarity index 97% rename from spring-cucumber-demo/src/test/java/com/baeldung/SpringIntegrationTest.java rename to spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java index dc78ba8ce3..5c85dc9400 100644 --- a/spring-cucumber-demo/src/test/java/com/baeldung/SpringIntegrationTest.java +++ b/spring-cucumber/src/test/java/com/baeldung/SpringIntegrationTest.java @@ -1,102 +1,102 @@ -package com.baeldung; - -import java.io.IOException; -import java.util.HashMap; -import java.util.Map; - -import org.junit.runner.RunWith; -import org.springframework.boot.test.IntegrationTest; -import org.springframework.boot.test.SpringApplicationContextLoader; -import org.springframework.http.HttpMethod; -import org.springframework.http.client.ClientHttpResponse; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.test.context.web.WebAppConfiguration; -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 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(); - - 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)); - } - } - }); - - } - - 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(); - } - - 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; - } - - @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); - } - } +package com.baeldung; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import org.junit.runner.RunWith; +import org.springframework.boot.test.IntegrationTest; +import org.springframework.boot.test.SpringApplicationContextLoader; +import org.springframework.http.HttpMethod; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +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 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(); + + 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)); + } + } + }); + + } + + 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(); + } + + 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; + } + + @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-demo/src/test/java/com/baeldung/StepDefs.java b/spring-cucumber/src/test/java/com/baeldung/StepDefs.java similarity index 97% rename from spring-cucumber-demo/src/test/java/com/baeldung/StepDefs.java rename to spring-cucumber/src/test/java/com/baeldung/StepDefs.java index 98a55af4c0..3ed25bb09b 100644 --- a/spring-cucumber-demo/src/test/java/com/baeldung/StepDefs.java +++ b/spring-cucumber/src/test/java/com/baeldung/StepDefs.java @@ -1,28 +1,28 @@ -package com.baeldung; - -import cucumber.api.java.en.And; -import cucumber.api.java.en.Then; -import cucumber.api.java.en.When; -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{ - 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{ - final HttpStatus currentStatusCode = latestResponse.getTheResponse().getStatusCode(); - 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)) ; - } +package com.baeldung; + +import cucumber.api.java.en.And; +import cucumber.api.java.en.Then; +import cucumber.api.java.en.When; +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{ + 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{ + final HttpStatus currentStatusCode = latestResponse.getTheResponse().getStatusCode(); + 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)) ; + } } \ No newline at end of file diff --git a/spring-cucumber-demo/src/test/resources/baelung.feature b/spring-cucumber/src/test/resources/baelung.feature similarity index 100% rename from spring-cucumber-demo/src/test/resources/baelung.feature rename to spring-cucumber/src/test/resources/baelung.feature diff --git a/spring-cucumber-demo/src/test/resources/version.feature b/spring-cucumber/src/test/resources/version.feature similarity index 100% rename from spring-cucumber-demo/src/test/resources/version.feature rename to spring-cucumber/src/test/resources/version.feature