wyświeltanie produktów za pomocą szablonów JSP

PC30-SklepSpring/pom.xml

@@ -65,7 +65,6 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>jstl</artifactId>
-			<version>1.2</version>
 		</dependency>
 	</dependencies>
 

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

+package sklep.alternatywne_wersje_bazy_danych;
+
+import java.util.List;
+
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
+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(path="/alt4", produces="text/plain")
+public class ProductController_v4 {
+	@Autowired
+	private EntityManager em;
+	
+	@GetMapping
+	public String wszystkieProdukty(Model model) {
+		TypedQuery<Product> query = em.createNamedQuery("Product.findAll", Product.class);
+		List<Product> products = query.getResultList();
+		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);
+			return "product";
+		} else {
+			model.addAttribute("product_id", id);
+			return "missing_product";
+		}
+	}
+	
+	@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();
+		model.addAttribute("products", products);
+		return "products";
+	}
+}

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

@@ -2,6 +2,9 @@ package sklep.controller;
 
 import java.util.List;
 
+import javax.persistence.EntityManager;
+import javax.persistence.TypedQuery;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -9,10 +12,7 @@ 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 org.springframework.web.bind.annotation.ResponseBody;
 
-import javax.persistence.EntityManager;
-import javax.persistence.TypedQuery;
 import sklep.model.Product;
 
 @Controller
@@ -30,38 +30,24 @@ public class ProductController {
 	}
 
 	@GetMapping("/{id}")
-	@ResponseBody
-	public String jedenProdukt(@PathVariable int id) {
-		StringBuilder sb = new StringBuilder();
+	public String jedenProdukt(@PathVariable int id, Model model) {
 		Product product = em.find(Product.class, id);
 		if(product != null) {
-			sb.append("Znaleziony produkt:\n")
-				.append(product.getProductName())
-				.append(" za cenę ")
-				.append(product.getPrice())
-				.append('\n');
+			model.addAttribute("product", product);
+			return "product";
 		} else {
-			sb.append("Nie ma produktu o numerze ").append(id);
+			model.addAttribute("product_id", id);
+			return "missing_product";
 		}
-		return sb.toString();
 	}
 	
 	@GetMapping("/szukaj")
-	@ResponseBody
-	public String wyszukajProdukty(@RequestParam String name) {
-		StringBuilder sb = new StringBuilder();
-		
+	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();
-		for(Product product : products) {
-			sb.append("* produkt ")
-				.append(product.getProductName())
-				.append(" za cenę ")
-				.append(product.getPrice())
-				.append('\n');
-		}
-		return sb.toString();
+		model.addAttribute("products", products);
+		return "products";
 	}
 }