Utworzenie *klasy* ProductRepository

PC30-SklepSpring/src/main/java/sklep/alternatywne_wersje_bazy_danych/ProductController_v4.java

@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import sklep.model.Product;
 
 @Controller
-@RequestMapping(path="/alt4", produces="text/plain")
+@RequestMapping("/alt4")
 public class ProductController_v4 {
 	@Autowired
 	private EntityManager em;

PC30-SklepSpring/src/main/java/sklep/alternatywne_wersje_bazy_danych/ProductController_v5.java

+package sklep.alternatywne_wersje_bazy_danych;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import sklep.model.Product;
+
+@Controller
+@RequestMapping("/alt5")
+public class ProductController_v5 {
+	@Autowired
+	private ProductRepository_v5 productRepository;
+	
+	@GetMapping
+	public String wszystkieProdukty(Model model) {
+		List<Product> products = productRepository.findAll();
+		model.addAttribute("products", products);
+		return "products";
+	}
+
+	@GetMapping("/{id}")
+	public String jedenProdukt(@PathVariable int id, Model model) {
+		Optional<Product> product = productRepository.findById(id);
+		if(product.isPresent()) {
+			model.addAttribute("product", product.get());
+			return "product";
+		} else {
+			model.addAttribute("product_id", id);
+			return "missing_product";
+		}
+	}
+	
+	@GetMapping("/szukaj")
+	public String wyszukajProdukty(@RequestParam String name, Model model) {
+		List<Product> products = productRepository.findByProductName(name);
+		model.addAttribute("products", products);
+		return "products";
+	}
+}

PC30-SklepSpring/src/main/java/sklep/alternatywne_wersje_bazy_danych/ProductRepository_v5.java

+package sklep.alternatywne_wersje_bazy_danych;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import sklep.model.Product;
+
+@Repository
+public class ProductRepository_v5 {
+	@Autowired
+	private EntityManager em;
+	
+	public List<Product> findAll() {
+		TypedQuery<Product> query = em.createNamedQuery("Product.findAll", Product.class);
+		return query.getResultList();
+	}
+	
+	public Optional<Product> findById(int productId) {
+		return Optional.ofNullable(em.find(Product.class, productId));
+	}
+	
+	public List<Product> findByProductName(String name) {
+		final String sql = "SELECT p FROM Product p WHERE p.productName = :name";
+		TypedQuery<Product> query = em.createQuery(sql, Product.class);
+		query.setParameter("name", name);
+		return query.getResultList();
+	}
+}

PC30-SklepSpring/src/main/java/sklep/controller/ProductController.java

 package sklep.controller;
 
 import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
+import java.util.Optional;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -14,26 +12,26 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import sklep.model.Product;
+import sklep.repository.ProductRepository;
 
 @Controller
-@RequestMapping(path="/products", produces="text/plain")
+@RequestMapping("/products")
 public class ProductController {
 	@Autowired
-	private EntityManager em;
+	private ProductRepository productRepository;
 	
 	@GetMapping
 	public String wszystkieProdukty(Model model) {
-		TypedQuery<Product> query = em.createNamedQuery("Product.findAll", Product.class);
-		List<Product> products = query.getResultList();
+		List<Product> products = productRepository.findAll();
 		model.addAttribute("products", products);
 		return "products";
 	}
 
 	@GetMapping("/{id}")
 	public String jedenProdukt(@PathVariable int id, Model model) {
-		Product product = em.find(Product.class, id);
-		if(product != null) {
-			model.addAttribute("product", product);
+		Optional<Product> product = productRepository.findById(id);
+		if(product.isPresent()) {
+			model.addAttribute("product", product.get());
 			return "product";
 		} else {
 			model.addAttribute("product_id", id);
@@ -43,10 +41,7 @@ public class ProductController {
 	
 	@GetMapping("/szukaj")
 	public String wyszukajProdukty(@RequestParam String name, Model model) {
-		final String sql = "SELECT p FROM Product p WHERE p.productName = :name";
-		TypedQuery<Product> query = em.createQuery(sql, Product.class);
-		query.setParameter("name", name);
-		List<Product> products = query.getResultList();
+		List<Product> products = productRepository.findByProductName(name);
 		model.addAttribute("products", products);
 		return "products";
 	}

PC30-SklepSpring/src/main/java/sklep/repository/ProductRepository.java

+package sklep.repository;
+
+import java.util.List;
+import java.util.Optional;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Repository;
+
+import sklep.model.Product;
+
+@Repository
+public class ProductRepository {
+	@Autowired
+	private EntityManager em;
+	
+	public List<Product> findAll() {
+		TypedQuery<Product> query = em.createNamedQuery("Product.findAll", Product.class);
+		return query.getResultList();
+	}
+	
+	public Optional<Product> findById(int productId) {
+		return Optional.ofNullable(em.find(Product.class, productId));
+	}
+	
+	public List<Product> findByProductName(String name) {
+		final String sql = "SELECT p FROM Product p WHERE p.productName = :name";
+		TypedQuery<Product> query = em.createQuery(sql, Product.class);
+		query.setParameter("name", name);
+		return query.getResultList();
+	}
+}

PC30-SklepSpring/src/main/webapp/WEB-INF/templates/index.jsp

@@ -29,6 +29,7 @@
 <li><a href="/products/1">products/1</a> - jeden produkt</li>
 <li><a href="/products/9">products/9</a> - nieistniejący produkt</li>
 <li><a href="/products/szukaj">wyszukiwarka</a></li>
+<li><a href="/products/szukaj?name=pralka">wyszukiwarka/pralka</a></li>
 <li><a href="/products/new">nowy produkt</a></li>
 <li><a href="/products/1/edit">edycja produktu</a></li>
 </ul>

PC30-SklepSpring/src/main/webapp/WEB-INF/templates/products.jsp

@@ -26,7 +26,7 @@
 <c:forEach var="product" items="${products}">
 	<div class="product">
 		<img class="photo" src="/products/${product.productId}/photo" alt=""/>
-		<p>Towar <a href="products/${product.productId}" class="product-name">${product.productName}</a></p>
+		<p>Towar <a href="/products/${product.productId}" class="product-name">${product.productName}</a></p>
 		<p>Cena: <span class="product-price">${product.price}</span></p>
 		<p class="product-description">${product.description}</p>
 	    <div class="action"><a href="/products/${product.productId}/edit">Edytuj</a></div>