Merge branch 'spring-mvc-command-obj-code-assignment-review' into spring-sec-maven-dep

Author: springframeworkguru

src/main/java/guru/springframework/controllers/CustomerController.java

@@ -2,6 +2,7 @@
 
 import guru.springframework.commands.CustomerForm;
 import guru.springframework.commands.validators.CustomerFormValidator;
+import guru.springframework.converters.CustomerToCustomerForm;
 import guru.springframework.domain.Customer;
 import guru.springframework.services.CustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,6 +27,7 @@ public class CustomerController {
 
     private CustomerService customerService;
     private Validator customerFormValidator;
+    private CustomerToCustomerForm customerToCustomerForm;
 
     @Autowired
     public void setCustomerService(CustomerService customerService) {
@@ -38,6 +40,11 @@ public void setCustomerFormValidator(CustomerFormValidator customerFormValidator
         this.customerFormValidator = customerFormValidator;
     }
 
+    @Autowired
+    public void setCustomerToCustomerForm(CustomerToCustomerForm customerToCustomerForm) {
+        this.customerToCustomerForm = customerToCustomerForm;
+    }
+
     @RequestMapping({"/list", "/"})
     public String listCustomers(Model model){
         model.addAttribute("customers", customerService.listAll());
@@ -52,7 +59,10 @@ public String showCustomer(@PathVariable Integer id, Model model){
 
     @RequestMapping("/edit/{id}")
     public String edit(@PathVariable Integer id, Model model){
-        model.addAttribute("customerForm", customerService.getById(id));
+
+        Customer customer = customerService.getById(id);
+
+        model.addAttribute("customerForm", customerToCustomerForm.convert(customer));
         return "customer/customerform";
     }
 

src/main/java/guru/springframework/controllers/ProductController.java

@@ -1,6 +1,7 @@
 package guru.springframework.controllers;
 
 import guru.springframework.commands.ProductForm;
+import guru.springframework.converters.ProductToProductForm;
 import guru.springframework.domain.Product;
 import guru.springframework.services.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,13 @@ public class ProductController {
 
     private ProductService productService;
 
+    private ProductToProductForm productToProductForm;
+
+    @Autowired
+    public void setProductToProductForm(ProductToProductForm productToProductForm) {
+        this.productToProductForm = productToProductForm;
+    }
+
     @Autowired
     public void setProductService(ProductService productService) {
         this.productService = productService;
@@ -40,25 +48,28 @@ public String getProduct(@PathVariable Integer id, Model model){
 
     @RequestMapping("product/edit/{id}")
     public String edit(@PathVariable Integer id, Model model){
-        model.addAttribute("productForm", productService.getById(id));
+        Product product = productService.getById(id);
+        ProductForm productForm = productToProductForm.convert(product);
+
+        model.addAttribute("productForm", productForm);
         return "product/productform";
     }
 
     @RequestMapping("/product/new")
     public String newProduct(Model model){
-        model.addAttribute("productForm", new Product());
+        model.addAttribute("productForm", new ProductForm());
         return "product/productform";
     }
 
     @RequestMapping(value = "/product", method = RequestMethod.POST)
     public String saveOrUpdateProduct(@Valid ProductForm productForm, BindingResult bindingResult){
 
-
         if(bindingResult.hasErrors()){
             return "product/productform";
         }
 
-        ProductForm savedProduct = productService.saveOrUpdate(productForm);
+        Product savedProduct = productService.saveOrUpdateProductForm(productForm);
+
         return "redirect:/product/show/" + savedProduct.getId();
     }
 

src/main/java/guru/springframework/converters/CustomerToCustomerForm.java

@@ -0,0 +1,30 @@
+package guru.springframework.converters;
+
+import guru.springframework.commands.CustomerForm;
+import guru.springframework.domain.Customer;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.stereotype.Component;
+
+/**
+ * Created by jt on 9/26/16.
+ */
+@Component
+public class CustomerToCustomerForm implements Converter<Customer, CustomerForm> {
+
+    @Override
+    public CustomerForm convert(Customer customer) {
+        CustomerForm customerForm = new CustomerForm();
+
+        customerForm.setCustomerId(customer.getId());
+        customerForm.setCustomerVersion(customer.getVersion());
+        customerForm.setEmail(customer.getEmail());
+        customerForm.setFirstName(customer.getFirstName());
+        customerForm.setLastName(customer.getLastName());
+        customerForm.setPhoneNumber(customer.getPhoneNumber());
+        customerForm.setUserId(customer.getUser().getId());
+        customerForm.setUserName(customer.getUser().getUsername());
+        customerForm.setUserVersion(customer.getUser().getVersion());
+
+        return customerForm;
+    }
+}

src/main/java/guru/springframework/services/ProductService.java

@@ -8,6 +8,6 @@
  */
 public interface ProductService extends CRUDService<Product> {
 
-    ProductForm saveOrUpdate(ProductForm productForm);
+    Product saveOrUpdateProductForm(ProductForm productForm);
 
 }

src/main/java/guru/springframework/services/jpaservices/ProductServiceJpaDaoImpl.java

@@ -2,7 +2,6 @@
 
 import guru.springframework.commands.ProductForm;
 import guru.springframework.converters.ProductFormToProduct;
-import guru.springframework.converters.ProductToProductForm;
 import guru.springframework.domain.Product;
 import guru.springframework.services.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,14 +18,8 @@
 @Profile("jpadao")
 public class ProductServiceJpaDaoImpl extends AbstractJpaDaoService implements ProductService {
 
-    private ProductToProductForm productToProductForm;
     private ProductFormToProduct productFormToProduct;
 
-    @Autowired
-    public void setProductToProductForm(ProductToProductForm productToProductForm) {
-        this.productToProductForm = productToProductForm;
-    }
-
     @Autowired
     public void setProductFormToProduct(ProductFormToProduct productFormToProduct) {
         this.productFormToProduct = productFormToProduct;
@@ -58,20 +51,8 @@ public Product saveOrUpdate(Product domainObject) {
     }
 
     @Override
-    public ProductForm saveOrUpdate(ProductForm productForm) {
-
-        if (productForm.getId() != null) { //existing product
-            Product productToUpdate = this.getById(productForm.getId());
-
-            productToUpdate.setVersion(productForm.getVersion());
-            productToUpdate.setDescription(productForm.getDescription());
-            productToUpdate.setPrice(productForm.getPrice());
-            productToUpdate.setImageUrl(productForm.getImageUrl());
-
-            return productToProductForm.convert(this.saveOrUpdate(productToUpdate));
-        } else { // new product
-            return productToProductForm.convert(this.saveOrUpdate(productFormToProduct.convert(productForm)));
-        }
+    public Product saveOrUpdateProductForm(ProductForm productForm) {
+        return saveOrUpdate(productFormToProduct.convert(productForm));
     }
 
     @Override

src/main/java/guru/springframework/services/mapservices/ProductServiceImpl.java

@@ -2,7 +2,6 @@
 
 import guru.springframework.commands.ProductForm;
 import guru.springframework.converters.ProductFormToProduct;
-import guru.springframework.converters.ProductToProductForm;
 import guru.springframework.domain.DomainObject;
 import guru.springframework.domain.Product;
 import guru.springframework.services.ProductService;
@@ -19,19 +18,14 @@
 @Profile("map")
 public class ProductServiceImpl extends AbstractMapService implements ProductService {
 
-    private ProductToProductForm productToProductForm;
     private ProductFormToProduct productFormToProduct;
 
-    @Autowired
-    public void setProductToProductForm(ProductToProductForm productToProductForm) {
-        this.productToProductForm = productToProductForm;
-    }
-
     @Autowired
     public void setProductFormToProduct(ProductFormToProduct productFormToProduct) {
         this.productFormToProduct = productFormToProduct;
     }
 
+
     @Override
     public List<DomainObject> listAll() {
         return super.listAll();
@@ -48,19 +42,8 @@ public Product saveOrUpdate(Product domainObject) {
     }
 
     @Override
-    public ProductForm saveOrUpdate(ProductForm productForm) {
-        if(productForm.getId() != null){ //existing product
-            Product productToUpdate = this.getById(productForm.getId());
-
-            productToUpdate.setVersion(productForm.getVersion());
-            productToUpdate.setDescription(productForm.getDescription());
-            productToUpdate.setPrice(productForm.getPrice());
-            productToUpdate.setImageUrl(productForm.getImageUrl());
-
-            return productToProductForm.convert(this.saveOrUpdate(productToUpdate));
-        } else { // new product
-            return productToProductForm.convert(this.saveOrUpdate(productFormToProduct.convert(productForm)));
-        }
+    public Product saveOrUpdateProductForm(ProductForm productForm) {
+        return saveOrUpdate(productFormToProduct.convert(productForm));
     }
 
     @Override

src/main/java/guru/springframework/services/reposervices/CustomerServiceRepoImpl.java

@@ -4,10 +4,12 @@
 import guru.springframework.converters.CustomerFormToCustomer;
 import guru.springframework.domain.Customer;
 import guru.springframework.repositories.CustomerRepository;
+import guru.springframework.repositories.UserRepository;
 import guru.springframework.services.CustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -20,13 +22,19 @@
 public class CustomerServiceRepoImpl implements CustomerService {
 
     private CustomerRepository customerRepository;
+    private UserRepository userRepository;
     private CustomerFormToCustomer customerFormToCustomer;
 
     @Autowired
     public void setCustomerRepository(CustomerRepository customerRepository) {
         this.customerRepository = customerRepository;
     }
 
+    @Autowired
+    public void setUserRepository(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
     @Autowired
     public void setCustomerFormToCustomer(CustomerFormToCustomer customerFormToCustomer) {
         this.customerFormToCustomer = customerFormToCustomer;
@@ -63,7 +71,12 @@ public Customer saveOrUpdateCustomerForm(CustomerForm customerForm) {
     }
 
     @Override
+    @Transactional
     public void delete(Integer id) {
-        customerRepository.delete(id);
+
+        Customer customer = customerRepository.findOne(id);
+
+        userRepository.delete(customer.getUser());
+        customerRepository.delete(customer);
     }
 }

src/main/java/guru/springframework/services/reposervices/ProductServiceRepoImpl.java

@@ -2,7 +2,6 @@
 
 import guru.springframework.commands.ProductForm;
 import guru.springframework.converters.ProductFormToProduct;
-import guru.springframework.converters.ProductToProductForm;
 import guru.springframework.domain.Product;
 import guru.springframework.repositories.ProductRepository;
 import guru.springframework.services.ProductService;
@@ -20,26 +19,18 @@
 @Profile({"springdatajpa"})
 public class ProductServiceRepoImpl implements ProductService {
 
-    private ProductToProductForm productToProductForm;
+    private ProductRepository productRepository;
     private ProductFormToProduct productFormToProduct;
 
     @Autowired
-    public void setProductToProductForm(ProductToProductForm productToProductForm) {
-        this.productToProductForm = productToProductForm;
+    public void setProductRepository(ProductRepository productRepository) {
+        this.productRepository = productRepository;
     }
 
     @Autowired
     public void setProductFormToProduct(ProductFormToProduct productFormToProduct) {
         this.productFormToProduct = productFormToProduct;
     }
-
-    private ProductRepository productRepository;
-
-    @Autowired
-    public void setProductRepository(ProductRepository productRepository) {
-        this.productRepository = productRepository;
-    }
-
     @Override
     public List<?> listAll() {
         List<Product> products = new ArrayList<>();
@@ -48,25 +39,13 @@ public List<?> listAll() {
     }
 
     @Override
-    public ProductForm saveOrUpdate(ProductForm productForm) {
-
-        if (productForm.getId() != null) { //existing product
-            Product productToUpdate = this.getById(productForm.getId());
-
-            productToUpdate.setVersion(productForm.getVersion());
-            productToUpdate.setDescription(productForm.getDescription());
-            productToUpdate.setPrice(productForm.getPrice());
-            productToUpdate.setImageUrl(productForm.getImageUrl());
-
-            return productToProductForm.convert(this.saveOrUpdate(productToUpdate));
-        } else { // new product
-            return productToProductForm.convert(this.saveOrUpdate(productFormToProduct.convert(productForm)));
-        }
+    public Product getById(Integer id) {
+        return productRepository.findOne(id);
     }
 
     @Override
-    public Product getById(Integer id) {
-        return productRepository.findOne(id);
+    public Product saveOrUpdateProductForm(ProductForm productForm) {
+        return saveOrUpdate(productFormToProduct.convert(productForm));
     }
 
     @Override

src/main/java/guru/springframework/services/reposervices/UserServiceRepoImpl.java

@@ -1,11 +1,13 @@
 package guru.springframework.services.reposervices;
 
 import guru.springframework.domain.User;
+import guru.springframework.repositories.CustomerRepository;
 import guru.springframework.repositories.UserRepository;
 import guru.springframework.services.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -18,12 +20,18 @@
 public class UserServiceRepoImpl implements UserService {
 
     private UserRepository userRepository;
+    private CustomerRepository customerRepository;
 
     @Autowired
     public void setUserRepository(UserRepository userRepository) {
         this.userRepository = userRepository;
     }
 
+    @Autowired
+    public void setCustomerRepository(CustomerRepository customerRepository) {
+        this.customerRepository = customerRepository;
+    }
+
     @Override
     public List<?> listAll() {
         List<User> users = new ArrayList<>();
@@ -42,7 +50,10 @@ public User saveOrUpdate(User domainObject) {
     }
 
     @Override
+    @Transactional
     public void delete(Integer id) {
-        userRepository.delete(id);
+        User user = userRepository.findOne(id);
+        customerRepository.delete(user.getCustomer());
+        userRepository.delete(user);
     }
 }