Adapt checkpoint to exercise update

bookstore/manifest.yml

@@ -1,7 +1,7 @@
 ---
 applications:
-- name: bookstore-<XXX>
+- name: bookstore
   path: srv/target/bookstore-1.0-SNAPSHOT.jar
   random-route: true
   services:
-  - bookstore-hana-<XXX>
+  - bookstore-hana

bookstore/package.json

@@ -10,13 +10,13 @@
     "deploy": "cds deploy"
   },
   "dependencies": {
-    "@sap/cds": "3.17.4",
+    "@sap/cds": "3.21.2",
     "@sap/capire-products": "file:sap-capire-products-1.0.0.tgz",
     "hdb": "^0.17.1"
   },
   "devDependencies": {
     "@sap/hdi-deploy": "3.7.0",
-    "sqlite3": "^4.1.0"
+    "sqlite3": "^4.1.1"
   },
   "cds": {
     "build": {

bookstore/pom.xml

@@ -16,9 +16,9 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>1.8</jdk.version>
-		<cds.services.version>1.0.1</cds.services.version>
+		<cds.services.version>1.2.0</cds.services.version>
-		<cds4j.version>1.2.1</cds4j.version>
+		<cds4j.version>1.6.0</cds4j.version>
-		<spring.boot.version>2.1.7.RELEASE</spring.boot.version>
+		<spring.boot.version>2.2.3.RELEASE</spring.boot.version>
 
 		<node.version>v10.4.1</node.version>
 		<node.url>https://nodejs.org/dist/</node.url>
@@ -128,6 +128,7 @@
 				<version>${spring.boot.version}</version>
 				<configuration>
 					<skip>true</skip>
+					<fork>false</fork>
 				</configuration>
 			</plugin>
 		</plugins>

bookstore/srv/pom.xml

@@ -94,6 +94,7 @@
 				<version>${cds4j.version}</version>
 				<configuration>
 					<outputDirectory>${project.basedir}/src/gen</outputDirectory>
+					<basePackage>cds.gen</basePackage>
 				</configuration>
 				<executions>
 					<execution>

bookstore/srv/src/main/java/com/sap/teched/cap/bookstore/handlers/OrdersService.java

@@ -19,11 +19,11 @@ import com.sap.cds.services.handler.annotations.Before;
 import com.sap.cds.services.handler.annotations.ServiceName;
 import com.sap.cds.services.persistence.PersistenceService;
 
-import ordersservice.OrderItems;
+import cds.gen.ordersservice.OrderItems;
-import ordersservice.Orders;
+import cds.gen.ordersservice.Orders;
-import sap.capire.bookstore.Books;
+import cds.gen.sap.capire.bookstore.Books;
-import sap.capire.bookstore.Books_;
+import cds.gen.sap.capire.bookstore.Books_;
-import sap.capire.bookstore.OrderItems_;
+import cds.gen.sap.capire.bookstore.OrderItems_;
 
 @Component
 @ServiceName("OrdersService")
@@ -58,7 +58,9 @@ public class OrdersService implements EventHandler {
     @Before(event = CdsService.EVENT_CREATE, entity = "OrdersService.Orders")
     public void validateBookAndDecreaseStockViaOrders(List<Orders> orders) {
         for(Orders order : orders) {
-            validateBookAndDecreaseStock(order.getItems());
+            if(order.getItems() != null) {
+                validateBookAndDecreaseStock(order.getItems());
+            }
         }
     }
 
@@ -80,7 +82,9 @@ public class OrdersService implements EventHandler {
     public void calculateTotal(List<Orders> orders) {
         for (Orders order : orders) {
             // calculate net amount for expanded items
-            calculateNetAmount(order.getItems());
+            if(order.getItems() != null) {
+                calculateNetAmount(order.getItems());
+            }
 
             // get all items of the order
             CqnSelect selItems = Select.from(OrderItems_.class).where(i -> i.parent().ID().eq(order.getId()));

bookstore/srv/src/test/java/com/sap/teched/cap/bookstore/handlers/orderServiceTest.java

@@ -26,7 +26,7 @@ import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.MvcResult;
 
-import sap.capire.bookstore.OrderItems;
+import cds.gen.sap.capire.bookstore.OrderItems;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest

products-service/package.json

@@ -10,10 +10,10 @@
         "deploy": "cds deploy"
     },
     "dependencies": {
-        "@sap/cds": "3.17.4"
+        "@sap/cds": "3.21.2"
     },
     "devDependencies": {
-        "sqlite3": "^4.1.0"
+        "sqlite3": "^4.1.1"
     },
     "cds": {
         "build": {

products-service/pom.xml

@@ -16,9 +16,9 @@
 
 		<!-- DEPENDENCIES VERSION -->
 		<jdk.version>1.8</jdk.version>
-		<cds.services.version>1.0.1</cds.services.version>
+		<cds.services.version>1.2.0</cds.services.version>
-		<cds4j.version>1.2.1</cds4j.version>
+		<cds4j.version>1.6.0</cds4j.version>
-		<spring.boot.version>2.1.7.RELEASE</spring.boot.version>
+		<spring.boot.version>2.2.3.RELEASE</spring.boot.version>
 
 		<node.version>v10.4.1</node.version>
 		<node.url>https://nodejs.org/dist/</node.url>
@@ -128,6 +128,7 @@
 				<version>${spring.boot.version}</version>
 				<configuration>
 					<skip>true</skip>
+					<fork>false</fork>
 				</configuration>
 			</plugin>
 		</plugins>

products-service/srv/pom.xml

@@ -84,6 +84,7 @@
 				<version>${cds4j.version}</version>
 				<configuration>
 					<outputDirectory>${project.basedir}/src/gen</outputDirectory>
+					<basePackage>cds.gen</basePackage>
 				</configuration>
 				<executions>
 					<execution>