spring-action: tried to fix chapter3 broken examples

missing controller


duplicated info?


wrong object reference on thymeleaf


improved logging


missing things from original example

Author: MarioCodes

spring/spring-in-action-book/README.md

@@ -4,5 +4,6 @@ Following book and implementing code examples.
 * **Chapter 2.** Developing web applications  
 MVC; Thymeleaf; Controllers;
 
-* **Chapter 3.** Working with data  
-Databases; JDBC vs Spring Data JPA;
+* **Chapter 3.** Working with data   
+Databases; JDBC vs Spring Data JPA;  
+The examples at this chapter **do not** work! The examples from the author are a mess, don't work and following the book *step by step*, there's code that magically appears / disappears at it's repository. I'm not gonna spend more hours fixing something the author should've done.

spring/spring-in-action-book/chapter-3/.gitignore

@@ -49,30 +49,6 @@ public Taco taco() {
         return new Taco();
     }
 
-    /**
-     * This is going to be loaded every time we load for "design" view.
-     *
-     * @param model -
-     */
-    @ModelAttribute
-    public void addIngredientsToModel(final Model model) {
-        final List<Ingredient> ingredients = Arrays.asList(
-                new Ingredient("FLTO", "Flour tortilla", Type.WRAP),
-                new Ingredient("COTO", "Corn tortilla", Type.WRAP),
-                new Ingredient("GRBF", "Ground Beef", Type.PROTEIN),
-                new Ingredient("CARN", "Carnitas", Type.PROTEIN),
-                new Ingredient("TMTO", "Diced tomatoes", Type.VEGGIES),
-                new Ingredient("LETC", "Lettuce", Type.VEGGIES),
-                new Ingredient("CHED", "Ceddar", Type.CHEESE),
-                new Ingredient("JACK", "Monterrey Jack", Type.CHEESE),
-                new Ingredient("SLSA", "Salsa", Type.SAUCE),
-                new Ingredient("SRCR", "Sour cream", Type.SAUCE));
-
-        for (final Type type : Type.values()) {
-            model.addAttribute(type.toString().toLowerCase(), filterByType(ingredients, type));
-        }
-    }
-
     @GetMapping
     public String showDesignForm(final Model model) {
         final List<Ingredient> ingredients = new ArrayList<>();
@@ -88,16 +64,17 @@ public String showDesignForm(final Model model) {
     }
 
     @PostMapping
-    public String processDesign(@Valid @ModelAttribute("design") final Taco design,
+    public String processDesign(@Valid final Taco design,
                                 final Errors errors,
                                 @ModelAttribute final Order order) {
         if (errors.hasErrors()) {
             log.error("Errors found on processDesign()");
+            errors.getAllErrors().forEach(x -> log.error("{}", x));
             return "design";
         }
 
         final Taco saved = this.tacoRepository.save(design);
-        order.getTacos().add(saved);
+        order.addDesign(saved);
 
         log.info("processing design '{}'", design);
         return "redirect:/orders/current";

spring/spring-in-action-book/chapter-3/jdbc/.gitignore

@@ -0,0 +1,24 @@
+package es.msanchez.spring.springinaction.controllers;
+
+import es.msanchez.spring.springinaction.dao.IngredientRepository;
+import es.msanchez.spring.springinaction.entities.Ingredient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+@Component
+public class IngredientByIdConverter implements Converter<String, Ingredient> {
+
+    private IngredientRepository ingredientRepo;
+
+    @Autowired
+    public IngredientByIdConverter(final IngredientRepository ingredientRepo) {
+        this.ingredientRepo = ingredientRepo;
+    }
+
+    @Override
+    public Ingredient convert(final String id) {
+        return ingredientRepo.findOne(id);
+    }
+
+}

spring/spring-in-action-book/chapter-3/jdbc/src/main/java/es/msanchez/spring/springinaction/controllers/DesignTacoController.java

@@ -1,36 +1,52 @@
 package es.msanchez.spring.springinaction.controllers;
 
+import es.msanchez.spring.springinaction.dao.OrderRepository;
 import es.msanchez.spring.springinaction.entities.Order;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.SessionAttributes;
+import org.springframework.web.bind.support.SessionStatus;
 
 import javax.validation.Valid;
 
 @Slf4j
 @Controller
 @RequestMapping("/orders")
+@SessionAttributes("order")
 public class OrderController {
 
-  @GetMapping("/current")
-  public String orderForm(final Model model) {
-    model.addAttribute("order", new Order());
-    return "orderForm";
-  }
-
-  @PostMapping
-  public String handleOrder(@Valid final Order order,
-                                   final Errors errors) {
-    if(errors.hasErrors()) {
-      return "orderForm";
+    private OrderRepository orderRepo;
+
+    @Autowired
+    public OrderController(final OrderRepository orderRepo) {
+        this.orderRepo = orderRepo;
+    }
+
+    @GetMapping("/current")
+    public String orderForm(final Model model) {
+        model.addAttribute("order", new Order());
+        return "orderForm";
     }
 
-    log.info("order submitted '{}'", order);
-    return "redirect:/";
-  }
+    @PostMapping
+    public String handleOrder(@Valid final Order order,
+                              final Errors errors,
+                              final SessionStatus sessionStatus) {
+        if (errors.hasErrors()) {
+            return "orderForm";
+        }
+
+        orderRepo.save(order);
+        sessionStatus.setComplete();
+
+        log.info("order submitted '{}'", order);
+        return "redirect:/";
+    }
 
 }

spring/spring-in-action-book/chapter-3/jdbc/src/main/java/es/msanchez/spring/springinaction/controllers/IngredientByIdConverter.java

@@ -1,9 +1,7 @@
 package es.msanchez.spring.springinaction.dao;
 
 import es.msanchez.spring.springinaction.entities.Ingredient;
-import org.springframework.stereotype.Repository;
 
-@Repository
 public interface IngredientRepository {
 
     Iterable<Ingredient> findAll();

spring/spring-in-action-book/chapter-3/jdbc/src/main/java/es/msanchez/spring/springinaction/controllers/OrderController.java

@@ -0,0 +1,84 @@
+// tag::core[]
+package es.msanchez.spring.springinaction.dao;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import es.msanchez.spring.springinaction.entities.Order;
+import es.msanchez.spring.springinaction.entities.Taco;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+
+import java.sql.Date;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class JdbcOrderRepository implements OrderRepository {
+
+    private SimpleJdbcInsert orderInserter;
+    private SimpleJdbcInsert orderTacoInserter;
+    private ObjectMapper objectMapper;
+
+    @Autowired
+    public JdbcOrderRepository(JdbcTemplate jdbc) {
+        this.orderInserter = new SimpleJdbcInsert(jdbc)
+                .withTableName("Taco_Order")
+                .usingGeneratedKeyColumns("id");
+
+        this.orderTacoInserter = new SimpleJdbcInsert(jdbc)
+                .withTableName("Taco_Order_Tacos");
+
+        this.objectMapper = new ObjectMapper();
+    }
+// end::core[]
+
+    // tag::save[]
+    @Override
+    public Order save(Order order) {
+        order.setCreatedAt(Date.valueOf(LocalDateTime.now().toString()));
+        long orderId = saveOrderDetails(order);
+        order.setId(orderId);
+        List<Taco> tacos = order.getTacos();
+        for (Taco taco : tacos) {
+            saveTacoToOrder(taco, orderId);
+        }
+
+        return order;
+    }
+
+    private long saveOrderDetails(Order order) {
+        @SuppressWarnings("unchecked")
+        Map<String, Object> values =
+                objectMapper.convertValue(order, Map.class);
+        values.put("createdAt", order.getCreatedAt());
+
+        long orderId =
+                orderInserter
+                        .executeAndReturnKey(values)
+                        .longValue();
+        return orderId;
+    }
+
+    private void saveTacoToOrder(Taco taco, long orderId) {
+        Map<String, Object> values = new HashMap<>();
+        values.put("tacoOrder", orderId);
+        values.put("taco", taco.getId());
+        orderTacoInserter.execute(values);
+    }
+
+// end::save[]
+
+/*
+// tag::core[]
+
+...
+
+// end::core[]
+ */
+
+// tag::core[]
+}
+// end::core[]

spring/spring-in-action-book/chapter-3/jdbc/src/main/java/es/msanchez/spring/springinaction/dao/IngredientRepository.java

@@ -2,12 +2,11 @@
 
 import es.msanchez.spring.springinaction.entities.Ingredient;
 import es.msanchez.spring.springinaction.entities.Taco;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.PreparedStatementCreator;
 import org.springframework.jdbc.core.PreparedStatementCreatorFactory;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
 
 import java.sql.Date;
@@ -16,6 +15,7 @@
 import java.time.LocalDate;
 import java.util.Arrays;
 
+@Slf4j
 @Repository
 public class JdbcTacoRepository implements TacoRepository {
 
@@ -41,15 +41,22 @@ private void saveIngredientToTaco(final Ingredient ingredient,
     }
 
     private long saveTacoInfo(final Taco taco) {
-        taco.setCreatedAt(Date.valueOf(LocalDate.now()));
+        final Date now = Date.valueOf(LocalDate.now());
+        log.info("Date timestamp: {}", now);
+        taco.setCreatedAt(now);
         final PreparedStatementCreator psc = new PreparedStatementCreatorFactory(
                 "insert into Taco (name, createdAt) values (?,?)",
                 Types.VARCHAR, Types.TIMESTAMP
         ).newPreparedStatementCreator(Arrays.asList(taco.getName(),
                 new Timestamp(taco.getCreatedAt().getTime())));
-
-        final KeyHolder keyHolder = new GeneratedKeyHolder();
-        this.jdbc.update(psc, keyHolder);
-        return keyHolder.getKey().longValue();
+        log.info("PreparedStatement: {}", psc.toString());
+
+        final int result = this.jdbc.update(psc);
+        log.info("result from update: {}", result);
+        /*
+         * The original example uses -> return number.longValue(); this comes from a KeyHolder
+         * but the implementation doesnt work as it returns a null.
+         */
+        return result;
     }
 }

spring/spring-in-action-book/chapter-3/jdbc/src/main/java/es/msanchez/spring/springinaction/dao/JdbcOrderRepository.java

@@ -44,4 +44,8 @@ public class Order {
 
   private List<Taco> tacos = new ArrayList<>();
 
+  public void addDesign(final Taco design) {
+    this.tacos.add(design);
+  }
+
 }