Merge pull request #8561 from Maiklins/BAEL-20884-move-spring-boot-rest

BAEL-20884 move spring boot rest

pom.xml

@@ -637,6 +637,7 @@
                 <module>spring-bom</module>
 
                 <module>spring-boot</module>
+                <module>spring-boot-modules</module>
                 <module>spring-boot-admin</module>
                 <module>spring-boot-angular</module>
                 <module>spring-boot-artifacts</module>
@@ -669,7 +670,6 @@
                 <module>spring-boot-properties</module>
                 <module>spring-boot-property-exp</module>
 
-                <module>spring-boot-rest</module>
                 <module>spring-boot-runtime</module>
                 <module>spring-boot-runtime/disabling-console-jul</module>
                 <module>spring-boot-runtime/disabling-console-log4j2</module>
@@ -1178,6 +1178,7 @@
                 <module>spring-bom</module>
 
                 <module>spring-boot</module>
+                <module>spring-boot-modules</module>
                 <module>spring-boot-admin</module>
                 <module>spring-boot-angular</module>
                 <module>spring-boot-artifacts</module>

spring-boot-modules/README.md

@@ -0,0 +1,3 @@
+## Spring Boot Modules
+
+This module contains various modules of Spring Boot

spring-boot-modules/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.baeldung.spring-boot-modules</groupId>
+    <artifactId>spring-boot-modules</artifactId>
+    <name>spring-boot-modules</name>
+    <packaging>pom</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <modules>
+        <module>spring-boot-rest</module>
+    </modules>
+
+</project>

spring-boot-modules/spring-boot-rest/pom.xml

@@ -13,7 +13,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-2</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../../parent-boot-2</relativePath>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-rest/src/test/java/com/baeldung/springhateoas/CustomerControllerIntegrationTest.java

@@ -70,7 +70,7 @@ public class CustomerControllerIntegrationTest {
 
         this.mvc.perform(get("/customers/" + DEFAULT_CUSTOMER_ID + "/orders").accept(MediaTypes.HAL_JSON_VALUE))
             .andExpect(status().isOk())
-            .andExpect(jsonPath("$._embedded.orderList[0]._links.self.href",
+            .andExpect(jsonPath("$._embedded.orders[0]._links.self.href",
                 is("http://localhost/customers/customer1/order1")))
             .andExpect(jsonPath("$._links.self.href", is("http://localhost/customers/customer1/orders")));
     }
@@ -89,8 +89,8 @@ public class CustomerControllerIntegrationTest {
         this.mvc.perform(get("/customers/").accept(MediaTypes.HAL_JSON_VALUE))
             .andExpect(status().isOk())
             .andExpect(
-                jsonPath("$._embedded.customerList[0]._links.self.href", is("http://localhost/customers/customer1")))
+                jsonPath("$._embedded.customers[0]._links.self.href", is("http://localhost/customers/customer1")))
-            .andExpect(jsonPath("$._embedded.customerList[0]._links.allOrders.href",
+            .andExpect(jsonPath("$._embedded.customers[0]._links.allOrders.href",
                 is("http://localhost/customers/customer1/orders")))
             .andExpect(jsonPath("$._links.self.href", is("http://localhost/customers")));
     }