diff --git a/spring-5-rest-docs/.gitignore b/spring-5-rest-docs/.gitignore new file mode 100644 index 0000000000..dec013dfa4 --- /dev/null +++ b/spring-5-rest-docs/.gitignore @@ -0,0 +1,12 @@ +#folders# +.idea +/target +/neoDb* +/data +/src/main/webapp/WEB-INF/classes +*/META-INF/* + +# Packaged files # +*.jar +*.war +*.ear \ No newline at end of file diff --git a/spring-5-rest-docs/README.md b/spring-5-rest-docs/README.md new file mode 100644 index 0000000000..02c018a07c --- /dev/null +++ b/spring-5-rest-docs/README.md @@ -0,0 +1,8 @@ +## Spring 5 REST Docs + +This module contains articles about Spring 5 + +### Relevant Articles + +- [Introduction to Spring REST Docs](https://www.baeldung.com/spring-rest-docs) +- [Document Query Parameters with Spring REST Docs](https://www.baeldung.com/spring-rest-document-query-parameters) diff --git a/spring-5-rest-docs/pom.xml b/spring-5-rest-docs/pom.xml new file mode 100644 index 0000000000..c1f5dc0681 --- /dev/null +++ b/spring-5-rest-docs/pom.xml @@ -0,0 +1,118 @@ + + + 4.0.0 + spring-5 + 0.0.1-SNAPSHOT + spring-5 + jar + spring 5 sample project about new features + + + com.baeldung + parent-boot-3 + 0.0.1-SNAPSHOT + ../parent-boot-3 + + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-hateoas + + + com.h2database + h2 + runtime + + + org.springframework + spring-test + + + org.springframework.security + spring-security-test + test + + + org.junit.jupiter + junit-jupiter-api + + + + org.springframework.restdocs + spring-restdocs-mockmvc + test + + + org.springframework.restdocs + spring-restdocs-restassured + test + + + org.springframework.restdocs + spring-restdocs-webtestclient + test + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + com.baeldung.Spring5Application + JAR + + + + org.asciidoctor + asciidoctor-maven-plugin + ${asciidoctor-plugin.version} + + + generate-docs + package + + process-asciidoc + + + html + book + + ${snippetsDirectory} + + src/docs/asciidocs + target/generated-docs + + + + + + + + + 2.2.6 + ${project.build.directory}/generated-snippets + true + + + \ No newline at end of file diff --git a/spring-5/src/docs/asciidocs/api-guide.adoc b/spring-5-rest-docs/src/docs/asciidocs/api-guide.adoc similarity index 100% rename from spring-5/src/docs/asciidocs/api-guide.adoc rename to spring-5-rest-docs/src/docs/asciidocs/api-guide.adoc diff --git a/spring-5/src/main/java/com/baeldung/queryparamdoc/Application.java b/spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/Application.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/queryparamdoc/Application.java rename to spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/Application.java diff --git a/spring-5/src/main/java/com/baeldung/queryparamdoc/Book.java b/spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/Book.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/queryparamdoc/Book.java rename to spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/Book.java diff --git a/spring-5/src/main/java/com/baeldung/queryparamdoc/BookController.java b/spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/BookController.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/queryparamdoc/BookController.java rename to spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/BookController.java diff --git a/spring-5/src/main/java/com/baeldung/queryparamdoc/BookService.java b/spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/BookService.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/queryparamdoc/BookService.java rename to spring-5-rest-docs/src/main/java/com/baeldung/queryparamdoc/BookService.java diff --git a/spring-5/src/main/java/com/baeldung/restdocs/CRUDController.java b/spring-5-rest-docs/src/main/java/com/baeldung/restdocs/CRUDController.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/restdocs/CRUDController.java rename to spring-5-rest-docs/src/main/java/com/baeldung/restdocs/CRUDController.java diff --git a/spring-5/src/main/java/com/baeldung/restdocs/CrudInput.java b/spring-5-rest-docs/src/main/java/com/baeldung/restdocs/CrudInput.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/restdocs/CrudInput.java rename to spring-5-rest-docs/src/main/java/com/baeldung/restdocs/CrudInput.java diff --git a/spring-5/src/main/java/com/baeldung/restdocs/IndexController.java b/spring-5-rest-docs/src/main/java/com/baeldung/restdocs/IndexController.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/restdocs/IndexController.java rename to spring-5-rest-docs/src/main/java/com/baeldung/restdocs/IndexController.java diff --git a/spring-5/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java b/spring-5-rest-docs/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java similarity index 100% rename from spring-5/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java rename to spring-5-rest-docs/src/main/java/com/baeldung/restdocs/SpringRestDocsApplication.java diff --git a/spring-5/src/test/java/com/baeldung/queryparamdoc/BookControllerMvcIntegrationTest.java b/spring-5-rest-docs/src/test/java/com/baeldung/queryparamdoc/BookControllerMvcIntegrationTest.java similarity index 100% rename from spring-5/src/test/java/com/baeldung/queryparamdoc/BookControllerMvcIntegrationTest.java rename to spring-5-rest-docs/src/test/java/com/baeldung/queryparamdoc/BookControllerMvcIntegrationTest.java diff --git a/spring-5/src/test/java/com/baeldung/queryparamdoc/BookControllerReactiveIntegrationTest.java b/spring-5-rest-docs/src/test/java/com/baeldung/queryparamdoc/BookControllerReactiveIntegrationTest.java similarity index 100% rename from spring-5/src/test/java/com/baeldung/queryparamdoc/BookControllerReactiveIntegrationTest.java rename to spring-5-rest-docs/src/test/java/com/baeldung/queryparamdoc/BookControllerReactiveIntegrationTest.java diff --git a/spring-5/src/test/java/com/baeldung/queryparamdoc/BookControllerRestAssuredIntegrationTest.java b/spring-5-rest-docs/src/test/java/com/baeldung/queryparamdoc/BookControllerRestAssuredIntegrationTest.java similarity index 100% rename from spring-5/src/test/java/com/baeldung/queryparamdoc/BookControllerRestAssuredIntegrationTest.java rename to spring-5-rest-docs/src/test/java/com/baeldung/queryparamdoc/BookControllerRestAssuredIntegrationTest.java diff --git a/spring-5/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit4IntegrationTest.java b/spring-5-rest-docs/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit4IntegrationTest.java similarity index 100% rename from spring-5/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit4IntegrationTest.java rename to spring-5-rest-docs/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit4IntegrationTest.java diff --git a/spring-5/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit5IntegrationTest.java b/spring-5-rest-docs/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit5IntegrationTest.java similarity index 100% rename from spring-5/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit5IntegrationTest.java rename to spring-5-rest-docs/src/test/java/com/baeldung/restdocs/ApiDocumentationJUnit5IntegrationTest.java diff --git a/spring-5/README.md b/spring-5/README.md index d1487913ac..9af8bdfaf2 100644 --- a/spring-5/README.md +++ b/spring-5/README.md @@ -6,9 +6,7 @@ This module contains articles about Spring 5 - [Spring 5 Functional Bean Registration](https://www.baeldung.com/spring-5-functional-beans) - [The SpringJUnitConfig and SpringJUnitWebConfig Annotations in Spring 5](https://www.baeldung.com/spring-5-junit-config) -- [Introduction to Spring REST Docs](https://www.baeldung.com/spring-rest-docs) - [Spring ResponseStatusException](https://www.baeldung.com/spring-response-status-exception) - [Spring Assert Statements](https://www.baeldung.com/spring-assert) - [Difference between context:annotation-config vs context:component-scan](https://www.baeldung.com/spring-contextannotation-contextcomponentscan) - [Configuring a Hikari Connection Pool with Spring Boot](https://www.baeldung.com/spring-boot-hikari) -- [Document Query Parameters with Spring REST Docs](https://www.baeldung.com/spring-rest-document-query-parameters) diff --git a/spring-5/pom.xml b/spring-5/pom.xml index d66f0fa01f..46c13cd28c 100644 --- a/spring-5/pom.xml +++ b/spring-5/pom.xml @@ -131,36 +131,11 @@ JAR - - org.asciidoctor - asciidoctor-maven-plugin - ${asciidoctor-plugin.version} - - - generate-docs - package - - process-asciidoc - - - html - book - - ${snippetsDirectory} - - src/docs/asciidocs - target/generated-docs - - - - 1.0 - 2.2.6 - ${project.build.directory}/generated-snippets 5.1.0 true 2.0.1