Skopiowanie klas modelu do klienta REST

PC34-RestKlient/src/main/java/sklep/model/Customer.java

+package sklep.model;
+
+import java.util.Objects;
+
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Customer {
+	@XmlAttribute
+	private String email;
+	private String name;
+	@XmlElement(name="phone")
+	private String phoneNumber;
+	private String address;
+	@XmlElement(name="postal-code")
+	private String postalCode;
+	private String city;
+	
+	public Customer() {
+	}
+	
+	public Customer(String email, String name, String phone, String address, String postalCode, String city) {
+		this.email = email;
+		this.name = name;
+		this.phoneNumber = phone;
+		this.address = address;
+		this.postalCode = postalCode;
+		this.city = city;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+
+	public void setPhoneNumber(String phone) {
+		this.phoneNumber = phone;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+
+	public String getCity() {
+		return city;
+	}
+
+	public void setCity(String city) {
+		this.city = city;
+	}
+
+	@Override
+	public String toString() {
+		return "Customer [email=" + email + ", name=" + name + ", phone=" + phoneNumber + ", address=" + address
+				+ ", postalCode=" + postalCode + ", city=" + city + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(email, name, address, city, phoneNumber, postalCode);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Customer other = (Customer) obj;
+		return Objects.equals(email, other.email) && Objects.equals(name, other.name)
+				&& Objects.equals(address, other.address) && Objects.equals(city, other.city)
+				&& Objects.equals(phoneNumber, other.phoneNumber) && Objects.equals(postalCode, other.postalCode);
+	}
+
+}

PC34-RestKlient/src/main/java/sklep/model/LocalDateTimeAdapter.java

+package sklep.model;
+
+import java.time.LocalDateTime;
+
+import jakarta.xml.bind.annotation.adapters.XmlAdapter;
+
+public class LocalDateTimeAdapter extends XmlAdapter<String, LocalDateTime> {
+
+	@Override
+	public LocalDateTime unmarshal(String s) throws Exception {
+		return LocalDateTime.parse(s);
+	}
+
+	@Override
+	public String marshal(LocalDateTime dt) throws Exception {
+		return dt.toString();
+	}
+
+}

PC34-RestKlient/src/main/java/sklep/model/Order.java

+package sklep.model;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+
+@XmlRootElement
+public class Order {
+	@XmlAttribute(name="id")
+	private Integer orderId;
+	
+	@XmlAttribute(name="customer-email")
+	private String customerEmail;
+	
+	@XmlElement(name="order-date")
+	@XmlJavaTypeAdapter(LocalDateTimeAdapter.class)
+	private LocalDateTime orderDate;
+	
+	@XmlAttribute(name="status")
+	private Status orderStatus;
+	
+	@XmlElementWrapper(name="products")
+	@XmlElement(name="product")
+	public final List<OrderProduct> products = new ArrayList<>();
+	
+	public Order() {
+	}
+
+	public Order(Integer orderId, String customerEmail, LocalDateTime orderDate, Status orderStatus) {
+		this.orderId = orderId;
+		this.customerEmail = customerEmail;
+		this.orderDate = orderDate;
+		this.orderStatus = orderStatus;
+	}
+
+	public static Order ofDbFields(int orderId, String customerEmail, java.sql.Timestamp orderDate, String orderStatus) {
+		return new Order(orderId, customerEmail,
+				orderDate.toLocalDateTime(),
+				Status.valueOf(orderStatus.toUpperCase()));
+	}
+
+	public Integer getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Integer orderId) {
+		this.orderId = orderId;
+	}
+
+	public String getCustomerEmail() {
+		return customerEmail;
+	}
+
+	public void setCustomerEmail(String customerEmail) {
+		this.customerEmail = customerEmail;
+	}
+
+	public LocalDateTime getOrderDate() {
+		return orderDate;
+	}
+
+	public void setOrderDate(LocalDateTime orderDate) {
+		this.orderDate = orderDate;
+	}
+
+	public Status getOrderStatus() {
+		return orderStatus;
+	}
+
+	public void setOrderStatus(Status orderStatus) {
+		this.orderStatus = orderStatus;
+	}
+	
+	public List<OrderProduct> getProducts() {
+		return Collections.unmodifiableList(products);
+	}
+
+	public void addProduct(OrderProduct product) {
+		this.products.add(product);
+	}
+
+	public void addProducts(Collection<OrderProduct> products) {
+		this.products.addAll(products);
+	}
+
+	public void setProducts(Collection<OrderProduct> products) {
+		this.products.clear();
+		this.products.addAll(products);
+	}
+
+	
+	@Override
+	public String toString() {
+		return "Order [orderId=" + orderId + ", customerEmail=" + customerEmail + ", orderDate=" + orderDate
+				+ ", orderStatus=" + orderStatus + "]";
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(customerEmail, orderDate, orderId, orderStatus);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Order other = (Order) obj;
+		return Objects.equals(customerEmail, other.customerEmail) && Objects.equals(orderDate, other.orderDate)
+				&& Objects.equals(orderId, other.orderId) && orderStatus == other.orderStatus;
+	}
+
+
+	public enum Status {
+	    NEW,
+		CONFIRMED,
+		PAID,
+		SHIPPED,
+		CLOSED,
+		RETURNED,
+		;
+	}
+}

PC34-RestKlient/src/main/java/sklep/model/OrderProduct.java

+package sklep.model;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlTransient;
+
+public class OrderProduct {
+	@XmlTransient
+	private Integer orderId;
+	
+	@XmlAttribute(name="id")
+	private Integer productId;
+	
+	private int quantity;
+
+	@XmlElement(name="actual-price")
+	private BigDecimal actualPrice;
+
+	public OrderProduct() {
+	}
+
+	public OrderProduct(Integer orderId, Integer productId, int quantity, BigDecimal actualPrice) {
+		this.orderId = orderId;
+		this.productId = productId;
+		this.quantity = quantity;
+		this.actualPrice = actualPrice;
+	}
+	
+	public static OrderProduct of(Integer orderId, Product product, int quantity) {
+		return new OrderProduct(orderId, product.getProductId(), quantity, product.getPrice());
+	}
+
+	public Integer getOrderId() {
+		return orderId;
+	}
+
+	public void setOrderId(Integer orderId) {
+		this.orderId = orderId;
+	}
+
+	public Integer getProductId() {
+		return productId;
+	}
+
+	public void setProductId(Integer productId) {
+		this.productId = productId;
+	}
+
+	public int getQuantity() {
+		return quantity;
+	}
+
+	public void setQuantity(int quantity) {
+		this.quantity = quantity;
+	}
+
+	public BigDecimal getActualPrice() {
+		return actualPrice;
+	}
+
+	public void setActualPrice(BigDecimal actualPrice) {
+		this.actualPrice = actualPrice;
+	}
+
+	@Override
+	public String toString() {
+		return "OrderProduct [orderId=" + orderId + ", productId=" + productId + ", quantity=" + quantity
+				+ ", actualPrice=" + actualPrice+ "]";
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(orderId, productId, quantity, actualPrice);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		OrderProduct other = (OrderProduct) obj;
+		return Objects.equals(orderId, other.orderId) && Objects.equals(productId, other.productId)
+				&& quantity == other.quantity
+				&& Objects.equals(actualPrice, other.actualPrice);
+	}
+	
+}

PC34-RestKlient/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();
+	}
+}

PC34-RestKlient/src/main/java/sklep/model/Product.java

+package sklep.model;
+
+import java.math.BigDecimal;
+import java.util.Objects;
+
+import jakarta.xml.bind.annotation.XmlAttribute;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+public class Product {
+	@XmlAttribute(name="id")
+	private Integer productId;
+	
+	@XmlElement(name="product-name")
+	private String productName;
+	private BigDecimal price;
+	private BigDecimal vat;
+	private String description;
+	
+	public Product() {
+	}
+	
+	public Product(Integer productId, String productName, BigDecimal price, BigDecimal vat, String description) {
+		this.productId = productId;
+		this.productName = productName;
+		this.price = price;
+		this.vat = vat;
+		this.description = description;
+	}
+
+	public Integer getProductId() {
+		return productId;
+	}
+
+	public void setProductId(Integer productId) {
+		this.productId = productId;
+	}
+
+	public String getProductName() {
+		return productName;
+	}
+
+	public void setProductName(String productName) {
+		this.productName = productName;
+	}
+
+	public BigDecimal getPrice() {
+		return price;
+	}
+
+	public void setPrice(BigDecimal price) {
+		this.price = price;
+	}
+	
+	public BigDecimal getVat() {
+		return vat;
+	}
+	
+	public void setVat(BigDecimal vat) {
+		this.vat = vat;
+	}
+
+	public String getDescription() {
+		return description;
+	}
+
+	public void setDescription(String description) {
+		this.description = description;
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(description, price, vat, productId, productName);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj)
+			return true;
+		if (obj == null)
+			return false;
+		if (getClass() != obj.getClass())
+			return false;
+		Product other = (Product) obj;
+		return Objects.equals(productId, other.productId) && Objects.equals(productName, other.productName)
+				&& Objects.equals(price, other.price)
+				&& Objects.equals(vat, other.vat)
+				&& Objects.equals(description, other.description);
+	}
+
+	@Override
+	public String toString() {
+		return "Product [productId=" + productId + ", productName=" + productName + ", price=" + price + ", vat=" + vat
+				+ ", description=" + description + "]";
+	}
+
+	public String toHtml() {
+        return String.format("<div class='product'>"
+                + "<h2>%s</h2>"
+                + "<p>(nr %d)</p>"
+                + "<p>Cena: <strong>%,.2f PLN</strong></p>"
+                + "<p>%s</p>"
+                + "</div>",
+                getProductName(),
+                getProductId(),
+                getPrice(),
+                getDescription());
+	}
+
+}

PC34-RestKlient/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();
+	}
+}

PC34-RestKlient/src/main/java/sklep/model/package-info.java

+@XmlAccessorType(XmlAccessType.FIELD)
+package sklep.model;
+
+import jakarta.xml.bind.annotation.XmlAccessType;
+import jakarta.xml.bind.annotation.XmlAccessorType;