Poprawki w wersji XML

PC32-RestSerwer/src/main/java/sklep/model/Price.java

+package sklep.model;
+
+import java.math.BigDecimal;
+
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlValue;
+
+@XmlRootElement
+public class Price {
+	@XmlValue
+	private BigDecimal value;
+	
+	public Price() {
+		this.value = BigDecimal.ZERO;
+	}
+	
+	public Price(BigDecimal value) {
+		this.value = value;
+	}
+
+	public BigDecimal getValue() {
+		return value;
+	}
+	
+	public void setValue(BigDecimal value) {
+		this.value = value;
+	}
+	
+	@Override
+	public String toString() {
+		return value.toString();
+	}
+}

PC32-RestSerwer/src/main/java/sklep/model/ProductList.java

+package sklep.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name="products")
+public class ProductList {
+	@XmlElement(name="product")
+	private final List<Product> products = new ArrayList<>();
+	
+	public ProductList() {
+		// zostawia pustą listę
+	}
+	
+	public ProductList(Collection<Product> products) {
+		this.products.addAll(products);
+	}
+	
+	public List<Product> getProducts() {
+		return Collections.unmodifiableList(this.products);
+	}
+	
+	public void setProducts(Collection<Product> products) {
+		this.products.clear();
+		this.products.addAll(products);
+	}
+	
+	@Override
+	public String toString() {
+		return this.products.toString();
+	}
+}

PC32-RestSerwer/src/main/java/sklep/rest/RProductsXML.java

 package sklep.rest;
 
-import java.math.BigDecimal;
-import java.util.List;
-
 import jakarta.ws.rs.Consumes;
 import jakarta.ws.rs.DELETE;
 import jakarta.ws.rs.GET;
@@ -15,7 +12,9 @@ import sklep.db.DBConnection;
 import sklep.db.DBException;
 import sklep.db.ProductDAO;
 import sklep.db.RecordNotFound;
+import sklep.model.Price;
 import sklep.model.Product;
+import sklep.model.ProductList;
 
 @Path("/products.xml")
 @Produces("application/xml")
@@ -23,10 +22,10 @@ import sklep.model.Product;
 public class RProductsXML {
     
     @GET
-    public List<Product> readAll() throws DBException {
+    public ProductList readAll() throws DBException {
         try(DBConnection db = DBConnection.open()) {
             ProductDAO productDAO = db.productDAO();
-            return productDAO.readAll();
+            return new ProductList(productDAO.readAll());
         }
     }
     
@@ -41,24 +40,22 @@ public class RProductsXML {
     
     @GET
     @Path("/{id}/price")
-    @Produces("text/plain")
-    public BigDecimal getPrice(@PathParam("id") int productId) throws DBException, RecordNotFound {
+    public Price getPrice(@PathParam("id") int productId) throws DBException, RecordNotFound {
         try(DBConnection db = DBConnection.open()) {
             ProductDAO productDAO = db.productDAO();
             Product product = productDAO.findById(productId);
-            return product.getPrice();
+            return new Price(product.getPrice());
         }
     }
     
     @PUT
     @Path("/{id}/price")
-    @Consumes("text/plain")
     public void putPrice(@PathParam("id") int productId,
-            BigDecimal newPrice) throws DBException, RecordNotFound {
+            Price newPrice) throws DBException, RecordNotFound {
         try(DBConnection db = DBConnection.open()) {
             ProductDAO productDAO = db.productDAO();
             Product product = productDAO.findById(productId);
-            product.setPrice(newPrice);
+            product.setPrice(newPrice.getValue());
             productDAO.update(product);
             db.commit();
         }