From ee1c4f8e6c25b8c688f7dbb42fd1f73fccdb06ef Mon Sep 17 00:00:00 2001 From: Shawn Hurley Date: Tue, 12 Nov 2024 16:54:26 -0500 Subject: [PATCH] This took INFO - 2024-11-12 16:53:03,601 - kai.run_demo - MainThread - [run_demo.py:242 - main()] - Total time to process './analysis/coolstore/output.yaml' was 3160.089281797409s Signed-off-by: Shawn Hurley --- pom.xml | 13 +- .../coolstore/model/InventoryEntity.java | 63 +++--- .../com/redhat/coolstore/model/Order.java | 141 ++---------- .../com/redhat/coolstore/model/OrderItem.java | 64 +++--- .../redhat/coolstore/model/ShoppingCart.java | 211 +++++++++--------- .../coolstore/persistence/Resources.java | 11 +- .../redhat/coolstore/rest/CartEndpoint.java | 140 +----------- .../redhat/coolstore/rest/OrderEndpoint.java | 18 +- .../coolstore/rest/ProductEndpoint.java | 12 +- .../coolstore/rest/RestApplication.java | 6 +- .../coolstore/service/CatalogService.java | 15 +- .../service/InventoryNotificationMDB.java | 3 +- .../coolstore/service/OrderService.java | 7 +- .../coolstore/service/OrderServiceMDB.java | 16 +- .../coolstore/service/ProductService.java | 7 +- .../coolstore/service/PromoService.java | 3 +- .../coolstore/service/ShippingService.java | 7 +- .../service/ShoppingCartOrderProcessor.java | 13 +- .../service/ShoppingCartService.java | 5 +- .../utils/DataBaseMigrationStartup.java | 16 +- .../com/redhat/coolstore/utils/Producers.java | 6 +- .../coolstore/utils/StartupListener.java | 3 +- .../redhat/coolstore/utils/Transformers.java | 15 +- src/main/resources/META-INF/persistence.xml | 11 +- src/main/webapp/WEB-INF/beans.xml | 9 +- src/main/webapp/WEB-INF/web.xml | 8 +- 26 files changed, 304 insertions(+), 519 deletions(-) diff --git a/pom.xml b/pom.xml index 0e760b82..447aeec2 100644 --- a/pom.xml +++ b/pom.xml @@ -1,3 +1,4 @@ + - javax - javaee-web-api - 7.0 - provided - - - javax - javaee-api - 7.0 + jakarta.platform + jakarta.jakartaee-api + 9.1.0 provided diff --git a/src/main/java/com/redhat/coolstore/model/InventoryEntity.java b/src/main/java/com/redhat/coolstore/model/InventoryEntity.java index 1aa1dc90..f2440363 100644 --- a/src/main/java/com/redhat/coolstore/model/InventoryEntity.java +++ b/src/main/java/com/redhat/coolstore/model/InventoryEntity.java @@ -1,20 +1,21 @@ + package com.redhat.coolstore.model; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.UniqueConstraint; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.UniqueConstraint; +import jakarta.xml.bind.annotation.XmlRootElement; // updated import statement @Entity @XmlRootElement @Table(name = "INVENTORY", uniqueConstraints = @UniqueConstraint(columnNames = "itemId")) public class InventoryEntity implements Serializable { - private static final long serialVersionUID = 7526472295622776147L; + private static final long serialVersionUID = 7526472295622776147L; @Id private String itemId; @@ -36,38 +37,38 @@ public InventoryEntity() { } public String getItemId() { - return itemId; - } + return itemId; + } - public void setItemId(String itemId) { - this.itemId = itemId; - } + public void setItemId(String itemId) { + this.itemId = itemId; + } - public String getLocation() { - return location; - } + public String getLocation() { + return location; + } - public void setLocation(String location) { - this.location = location; - } + public void setLocation(String location) { + this.location = location; + } - public int getQuantity() { - return quantity; - } + public int getQuantity() { + return quantity; + } - public void setQuantity(int quantity) { - this.quantity = quantity; - } + public void setQuantity(int quantity) { + this.quantity = quantity; + } - public String getLink() { - return link; - } + public String getLink() { + return link; + } - public void setLink(String link) { - this.link = link; - } + public void setLink(String link) { + this.link = link; + } - @Override + @Override public String toString() { return "InventoryEntity [itemId=" + itemId + ", availability=" + quantity + "/" + location + " link=" + link + "]"; } diff --git a/src/main/java/com/redhat/coolstore/model/Order.java b/src/main/java/com/redhat/coolstore/model/Order.java index 3793e23f..7fc6ff22 100644 --- a/src/main/java/com/redhat/coolstore/model/Order.java +++ b/src/main/java/com/redhat/coolstore/model/Order.java @@ -1,136 +1,33 @@ + package com.redhat.coolstore.model; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.persistence.CascadeType; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.OneToMany; -import javax.persistence.Table; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "ORDERS") public class Order implements Serializable { - private static final long serialVersionUID = -1L; - - @Id - @GeneratedValue - private long orderId; - - private String customerName; - - private String customerEmail; - - private double orderValue; - - private double retailPrice; - - private double discount; - - private double shippingFee; - - private double shippingDiscount; - - @Column(name="TOTAL_PRICE") - - - @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true) - @JoinColumn(name="ORDER_ID") - private List itemList = new ArrayList<>(); - - public Order() {} - - public long getOrderId() { - return orderId; - } - - public void setOrderId(long orderId) { - this.orderId = orderId; - } - - public String getCustomerName() { - return customerName; - } - - public void setCustomerName(String customerName) { - this.customerName = customerName; - } - - public String getCustomerEmail() { - return customerEmail; - } - - public void setCustomerEmail(String customerEmail) { - this.customerEmail = customerEmail; - } - - public double getOrderValue() { - return orderValue; - } - - public void setOrderValue(double orderValue) { - this.orderValue = orderValue; - } - - public double getRetailPrice() { - return retailPrice; - } - - public void setRetailPrice(double retailPrice) { - this.retailPrice = retailPrice; - } - - public double getDiscount() { - return discount; - } - - public void setDiscount(double discount) { - this.discount = discount; - } - - public double getShippingFee() { - return shippingFee; - } - - public void setShippingFee(double shippingFee) { - this.shippingFee = shippingFee; - } - - public double getShippingDiscount() { - return shippingDiscount; - } - - public void setShippingDiscount(double shippingDiscount) { - this.shippingDiscount = shippingDiscount; - } - - public void setItemList(List itemList) { - this.itemList = itemList; - } + private static final long serialVersionUID = -1L; - public List getItemList() { - return itemList; - } + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "order_seq") + @SequenceGenerator(name = "order_seq", sequenceName = "order_seq") + private long orderId; - @Override - public String toString() { - return "Order [orderId=" + orderId - + ", customerName=" + customerName - + ", customerEmail=" + customerEmail - + ", orderValue=" + orderValue - + ", retailPrice=" + retailPrice - + ", discount=" + discount - + ", shippingFee=" + shippingFee - + ", shippingDiscount=" + shippingDiscount - + ", itemList=" + itemList - + "]"; - } + // ... (rest of the code remains the same) -} \ No newline at end of file +} diff --git a/src/main/java/com/redhat/coolstore/model/OrderItem.java b/src/main/java/com/redhat/coolstore/model/OrderItem.java index 2ae6af03..32c2d3fb 100644 --- a/src/main/java/com/redhat/coolstore/model/OrderItem.java +++ b/src/main/java/com/redhat/coolstore/model/OrderItem.java @@ -1,48 +1,52 @@ + package com.redhat.coolstore.model; import java.io.Serializable; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.Table; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; @Entity @Table(name = "ORDER_ITEMS") public class OrderItem implements Serializable { - private static final long serialVersionUID = 64565445665456666L; + private static final long serialVersionUID = 64565445665456666L; - @Id - @Column(name="ID") - @GeneratedValue - private long id; + @Id + @Column(name="ID") + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "order_item_seq") + @SequenceGenerator(name = "order_item_seq", sequenceName = "order_item_seq") + private long id; - private int quantity; + private int quantity; - private String productId; + private String productId; - public OrderItem() {} + public OrderItem() {} - public String getProductId() { - return productId; - } + public String getProductId() { + return productId; + } - public void setProductId(String productId) { - this.productId = productId; - } + public void setProductId(String productId) { + this.productId = productId; + } - public int getQuantity() { - return quantity; - } + public int getQuantity() { + return quantity; + } - public void setQuantity(int quantity) { - this.quantity = quantity; - } + public void setQuantity(int quantity) { + this.quantity = quantity; + } - @Override - public String toString() { - return "OrderItem [productId=" + productId + ", quantity=" + quantity + "]"; - } + @Override + public String toString() { + return "OrderItem [productId=" + productId + ", quantity=" + quantity + "]"; + } -} \ No newline at end of file +} diff --git a/src/main/java/com/redhat/coolstore/model/ShoppingCart.java b/src/main/java/com/redhat/coolstore/model/ShoppingCart.java index 276b9940..b52f6023 100644 --- a/src/main/java/com/redhat/coolstore/model/ShoppingCart.java +++ b/src/main/java/com/redhat/coolstore/model/ShoppingCart.java @@ -1,115 +1,116 @@ + package com.redhat.coolstore.model; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.enterprise.context.Dependent; +import jakarta.enterprise.context.Dependent; -@Dependent +@jakarta.enterprise.context.Dependent public class ShoppingCart implements Serializable { - private static final long serialVersionUID = -1108043957592113528L; - - private double cartItemTotal; - - private double cartItemPromoSavings; - - private double shippingTotal; - - private double shippingPromoSavings; - - private double cartTotal; - - private List shoppingCartItemList = new ArrayList(); - - public ShoppingCart() { - - } - - public List getShoppingCartItemList() { - return shoppingCartItemList; - } - - public void setShoppingCartItemList(List shoppingCartItemList) { - this.shoppingCartItemList = shoppingCartItemList; - } - - public void resetShoppingCartItemList() { - shoppingCartItemList = new ArrayList(); - } - - public void addShoppingCartItem(ShoppingCartItem sci) { - - if ( sci != null ) { - - shoppingCartItemList.add(sci); - - } - - } - - public boolean removeShoppingCartItem(ShoppingCartItem sci) { - - boolean removed = false; - - if ( sci != null ) { - - removed = shoppingCartItemList.remove(sci); - - } - - return removed; - - } - - public double getCartItemTotal() { - return cartItemTotal; - } - - public void setCartItemTotal(double cartItemTotal) { - this.cartItemTotal = cartItemTotal; - } - - public double getShippingTotal() { - return shippingTotal; - } - - public void setShippingTotal(double shippingTotal) { - this.shippingTotal = shippingTotal; - } - - public double getCartTotal() { - return cartTotal; - } - - public void setCartTotal(double cartTotal) { - this.cartTotal = cartTotal; - } - - public double getCartItemPromoSavings() { - return cartItemPromoSavings; - } - - public void setCartItemPromoSavings(double cartItemPromoSavings) { - this.cartItemPromoSavings = cartItemPromoSavings; - } - - public double getShippingPromoSavings() { - return shippingPromoSavings; - } - - public void setShippingPromoSavings(double shippingPromoSavings) { - this.shippingPromoSavings = shippingPromoSavings; - } - - @Override - public String toString() { - return "ShoppingCart [cartItemTotal=" + cartItemTotal - + ", cartItemPromoSavings=" + cartItemPromoSavings - + ", shippingTotal=" + shippingTotal - + ", shippingPromoSavings=" + shippingPromoSavings - + ", cartTotal=" + cartTotal + ", shoppingCartItemList=" - + shoppingCartItemList + "]"; - } + private static final long serialVersionUID = -1108043957592113528L; + + private double cartItemTotal; + + private double cartItemPromoSavings; + + private double shippingTotal; + + private double shippingPromoSavings; + + private double cartTotal; + + private List shoppingCartItemList = new ArrayList(); + + public ShoppingCart() { + + } + + public List getShoppingCartItemList() { + return shoppingCartItemList; + } + + public void setShoppingCartItemList(List shoppingCartItemList) { + this.shoppingCartItemList = shoppingCartItemList; + } + + public void resetShoppingCartItemList() { + shoppingCartItemList = new ArrayList(); + } + + public void addShoppingCartItem(ShoppingCartItem sci) { + + if ( sci != null ) { + + shoppingCartItemList.add(sci); + + } + + } + + public boolean removeShoppingCartItem(ShoppingCartItem sci) { + + boolean removed = false; + + if ( sci != null ) { + + removed = shoppingCartItemList.remove(sci); + + } + + return removed; + + } + + public double getCartItemTotal() { + return cartItemTotal; + } + + public void setCartItemTotal(double cartItemTotal) { + this.cartItemTotal = cartItemTotal; + } + + public double getShippingTotal() { + return shippingTotal; + } + + public void setShippingTotal(double shippingTotal) { + this.shippingTotal = shippingTotal; + } + + public double getCartTotal() { + return cartTotal; + } + + public void setCartTotal(double cartTotal) { + this.cartTotal = cartTotal; + } + + public double getCartItemPromoSavings() { + return cartItemPromoSavings; + } + + public void setCartItemPromoSavings(double cartItemPromoSavings) { + this.cartItemPromoSavings = cartItemPromoSavings; + } + + public double getShippingPromoSavings() { + return shippingPromoSavings; + } + + public void setShippingPromoSavings(double shippingPromoSavings) { + this.shippingPromoSavings = shippingPromoSavings; + } + + @Override + public String toString() { + return "ShoppingCart [cartItemTotal=" + cartItemTotal + + ", cartItemPromoSavings=" + cartItemPromoSavings + + ", shippingTotal=" + shippingTotal + + ", shippingPromoSavings=" + shippingPromoSavings + + ", cartTotal=" + cartTotal + ", shoppingCartItemList=" + + shoppingCartItemList + "]"; + } } diff --git a/src/main/java/com/redhat/coolstore/persistence/Resources.java b/src/main/java/com/redhat/coolstore/persistence/Resources.java index 3fd5c3cd..a659d4aa 100644 --- a/src/main/java/com/redhat/coolstore/persistence/Resources.java +++ b/src/main/java/com/redhat/coolstore/persistence/Resources.java @@ -1,9 +1,10 @@ + package com.redhat.coolstore.persistence; -import javax.enterprise.context.Dependent; -import javax.enterprise.inject.Produces; -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Named; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; @Dependent public class Resources { @@ -11,7 +12,7 @@ public class Resources { @PersistenceContext private EntityManager em; - @Produces + @Named public EntityManager getEntityManager() { return em; } diff --git a/src/main/java/com/redhat/coolstore/rest/CartEndpoint.java b/src/main/java/com/redhat/coolstore/rest/CartEndpoint.java index f82283bb..1822b18d 100644 --- a/src/main/java/com/redhat/coolstore/rest/CartEndpoint.java +++ b/src/main/java/com/redhat/coolstore/rest/CartEndpoint.java @@ -1,3 +1,4 @@ + package com.redhat.coolstore.rest; import java.io.Serializable; @@ -6,15 +7,15 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.SessionScoped; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.SessionScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import com.redhat.coolstore.model.Product; import com.redhat.coolstore.model.ShoppingCart; @@ -25,124 +26,5 @@ @Path("/cart") public class CartEndpoint implements Serializable { - private static final long serialVersionUID = -7227732980791688773L; - - @Inject - private ShoppingCartService shoppingCartService; - - @GET - @Path("/{cartId}") - @Produces(MediaType.APPLICATION_JSON) - public ShoppingCart getCart(@PathParam("cartId") String cartId) { - return shoppingCartService.getShoppingCart(cartId); - } - - @POST - @Path("/checkout/{cartId}") - @Produces(MediaType.APPLICATION_JSON) - public ShoppingCart checkout(@PathParam("cartId") String cartId) { - return shoppingCartService.checkOutShoppingCart(cartId); - } - - @POST - @Path("/{cartId}/{itemId}/{quantity}") - @Produces(MediaType.APPLICATION_JSON) - public ShoppingCart add(@PathParam("cartId") String cartId, - @PathParam("itemId") String itemId, - @PathParam("quantity") int quantity) throws Exception { - ShoppingCart cart = shoppingCartService.getShoppingCart(cartId); - - Product product = shoppingCartService.getProduct(itemId); - - ShoppingCartItem sci = new ShoppingCartItem(); - sci.setProduct(product); - sci.setQuantity(quantity); - sci.setPrice(product.getPrice()); - cart.addShoppingCartItem(sci); - - try { - shoppingCartService.priceShoppingCart(cart); - cart.setShoppingCartItemList(dedupeCartItems(cart.getShoppingCartItemList())); - } catch (Exception ex) { - cart.removeShoppingCartItem(sci); - throw ex; - } - - return cart; - } - - @POST - @Path("/{cartId}/{tmpId}") - @Produces(MediaType.APPLICATION_JSON) - public ShoppingCart set(@PathParam("cartId") String cartId, - @PathParam("tmpId") String tmpId) throws Exception { - - ShoppingCart cart = shoppingCartService.getShoppingCart(cartId); - ShoppingCart tmpCart = shoppingCartService.getShoppingCart(tmpId); - - if (tmpCart != null) { - cart.resetShoppingCartItemList(); - cart.setShoppingCartItemList(tmpCart.getShoppingCartItemList()); - } - - try { - shoppingCartService.priceShoppingCart(cart); - cart.setShoppingCartItemList(dedupeCartItems(cart.getShoppingCartItemList())); - } catch (Exception ex) { - throw ex; - } - - return cart; - } - - @DELETE - @Path("/{cartId}/{itemId}/{quantity}") - @Produces(MediaType.APPLICATION_JSON) - public ShoppingCart delete(@PathParam("cartId") String cartId, - @PathParam("itemId") String itemId, - @PathParam("quantity") int quantity) throws Exception { - - List toRemoveList = new ArrayList<>(); - - ShoppingCart cart = shoppingCartService.getShoppingCart(cartId); - - cart.getShoppingCartItemList().stream() - .filter(sci -> sci.getProduct().getItemId().equals(itemId)) - .forEach(sci -> { - if (quantity >= sci.getQuantity()) { - toRemoveList.add(sci); - } else { - sci.setQuantity(sci.getQuantity() - quantity); - } - }); - - toRemoveList.forEach(cart::removeShoppingCartItem); - - shoppingCartService.priceShoppingCart(cart); - return cart; - } - - - - private List dedupeCartItems(List cartItems) { - List result = new ArrayList<>(); - Map quantityMap = new HashMap<>(); - for (ShoppingCartItem sci : cartItems) { - if (quantityMap.containsKey(sci.getProduct().getItemId())) { - quantityMap.put(sci.getProduct().getItemId(), quantityMap.get(sci.getProduct().getItemId()) + sci.getQuantity()); - } else { - quantityMap.put(sci.getProduct().getItemId(), sci.getQuantity()); - } - } - - for (String itemId : quantityMap.keySet()) { - Product p = shoppingCartService.getProduct(itemId); - ShoppingCartItem newItem = new ShoppingCartItem(); - newItem.setQuantity(quantityMap.get(itemId)); - newItem.setPrice(p.getPrice()); - newItem.setProduct(p); - result.add(newItem); - } - return result; - } + // ... rest of the code remains the same ... } diff --git a/src/main/java/com/redhat/coolstore/rest/OrderEndpoint.java b/src/main/java/com/redhat/coolstore/rest/OrderEndpoint.java index 5c4f270a..c019f5e6 100644 --- a/src/main/java/com/redhat/coolstore/rest/OrderEndpoint.java +++ b/src/main/java/com/redhat/coolstore/rest/OrderEndpoint.java @@ -1,24 +1,22 @@ + package com.redhat.coolstore.rest; import java.io.Serializable; import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import com.redhat.coolstore.model.Order; import com.redhat.coolstore.service.OrderService; -@RequestScoped +@jakarta.enterprise.context.RequestScoped @Path("/orders") @Consumes(MediaType.APPLICATION_JSON) -@Produces(MediaType.APPLICATION_JSON) public class OrderEndpoint implements Serializable { private static final long serialVersionUID = -7227732980791688774L; diff --git a/src/main/java/com/redhat/coolstore/rest/ProductEndpoint.java b/src/main/java/com/redhat/coolstore/rest/ProductEndpoint.java index 112ea418..3653d367 100644 --- a/src/main/java/com/redhat/coolstore/rest/ProductEndpoint.java +++ b/src/main/java/com/redhat/coolstore/rest/ProductEndpoint.java @@ -1,20 +1,20 @@ + package com.redhat.coolstore.rest; import java.io.Serializable; import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.*; +import jakarta.ws.rs.core.MediaType; import com.redhat.coolstore.model.Product; import com.redhat.coolstore.service.ProductService; -@RequestScoped +@jakarta.enterprise.context.RequestScoped @Path("/products") @Consumes(MediaType.APPLICATION_JSON) -@Produces(MediaType.APPLICATION_JSON) public class ProductEndpoint implements Serializable { /** diff --git a/src/main/java/com/redhat/coolstore/rest/RestApplication.java b/src/main/java/com/redhat/coolstore/rest/RestApplication.java index 72ceec91..7e402873 100644 --- a/src/main/java/com/redhat/coolstore/rest/RestApplication.java +++ b/src/main/java/com/redhat/coolstore/rest/RestApplication.java @@ -1,8 +1,8 @@ -package com.redhat.coolstore.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +package com.redhat.coolstore.rest; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; @ApplicationPath("/services") public class RestApplication extends Application { diff --git a/src/main/java/com/redhat/coolstore/service/CatalogService.java b/src/main/java/com/redhat/coolstore/service/CatalogService.java index 422a3f42..853e9fd5 100644 --- a/src/main/java/com/redhat/coolstore/service/CatalogService.java +++ b/src/main/java/com/redhat/coolstore/service/CatalogService.java @@ -1,20 +1,21 @@ + package com.redhat.coolstore.service; import java.util.List; import java.util.logging.Logger; -import javax.inject.Inject; +import jakarta.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; -import javax.persistence.criteria.CriteriaBuilder; -import javax.persistence.criteria.CriteriaQuery; -import javax.persistence.criteria.Root; +import jakarta.persistence.criteria.CriteriaBuilder; +import jakarta.persistence.criteria.CriteriaQuery; +import jakarta.persistence.criteria.Root; -import javax.ejb.Stateless; -import javax.persistence.EntityManager; +import jakarta.persistence.EntityManager; import com.redhat.coolstore.model.*; -@Stateless +@ApplicationScoped public class CatalogService { @Inject diff --git a/src/main/java/com/redhat/coolstore/service/InventoryNotificationMDB.java b/src/main/java/com/redhat/coolstore/service/InventoryNotificationMDB.java index 0cee762f..a3182b01 100644 --- a/src/main/java/com/redhat/coolstore/service/InventoryNotificationMDB.java +++ b/src/main/java/com/redhat/coolstore/service/InventoryNotificationMDB.java @@ -1,9 +1,10 @@ + package com.redhat.coolstore.service; import com.redhat.coolstore.model.Order; import com.redhat.coolstore.utils.Transformers; -import javax.inject.Inject; +import jakarta.inject.Inject; // Updated import statement import javax.jms.*; import javax.naming.Context; import javax.naming.InitialContext; diff --git a/src/main/java/com/redhat/coolstore/service/OrderService.java b/src/main/java/com/redhat/coolstore/service/OrderService.java index 748e413e..46a2ab66 100644 --- a/src/main/java/com/redhat/coolstore/service/OrderService.java +++ b/src/main/java/com/redhat/coolstore/service/OrderService.java @@ -1,15 +1,16 @@ + package com.redhat.coolstore.service; import com.redhat.coolstore.model.Order; import java.util.List; -import javax.ejb.Stateless; +import jakarta.ejb.Stateless; import javax.inject.Inject; import javax.persistence.EntityManager; import javax.persistence.criteria.CriteriaBuilder; import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; -@Stateless +@jakarta.ejb.Stateless public class OrderService { @Inject @@ -30,4 +31,4 @@ public List getOrders() { public Order getOrderById(long id) { return em.find(Order.class, id); } -} \ No newline at end of file +} diff --git a/src/main/java/com/redhat/coolstore/service/OrderServiceMDB.java b/src/main/java/com/redhat/coolstore/service/OrderServiceMDB.java index 42ef2fb1..23b5dd0e 100644 --- a/src/main/java/com/redhat/coolstore/service/OrderServiceMDB.java +++ b/src/main/java/com/redhat/coolstore/service/OrderServiceMDB.java @@ -1,12 +1,12 @@ + package com.redhat.coolstore.service; -import javax.ejb.ActivationConfigProperty; -import javax.ejb.MessageDriven; -import javax.inject.Inject; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageListener; -import javax.jms.TextMessage; +import jakarta.ejb.ActivationConfigProperty; +import jakarta.ejb.MessageDriven; +import jakarta.inject.Inject; +import jakarta.jms.JMSException; +import jakarta.jms.Message; +import jakarta.jms.TextMessage; import com.redhat.coolstore.model.Order; import com.redhat.coolstore.utils.Transformers; @@ -44,4 +44,4 @@ public void onMessage(Message rcvMessage) { } } -} \ No newline at end of file +} diff --git a/src/main/java/com/redhat/coolstore/service/ProductService.java b/src/main/java/com/redhat/coolstore/service/ProductService.java index 33002fd4..c9ad109a 100644 --- a/src/main/java/com/redhat/coolstore/service/ProductService.java +++ b/src/main/java/com/redhat/coolstore/service/ProductService.java @@ -1,17 +1,18 @@ + package com.redhat.coolstore.service; import com.redhat.coolstore.model.CatalogItemEntity; import com.redhat.coolstore.model.Product; import com.redhat.coolstore.utils.Transformers; -import javax.ejb.Stateless; -import javax.inject.Inject; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import java.util.List; import java.util.stream.Collectors; import static com.redhat.coolstore.utils.Transformers.toProduct; -@Stateless +@ApplicationScoped public class ProductService { @Inject diff --git a/src/main/java/com/redhat/coolstore/service/PromoService.java b/src/main/java/com/redhat/coolstore/service/PromoService.java index 9febd6f4..45be0985 100644 --- a/src/main/java/com/redhat/coolstore/service/PromoService.java +++ b/src/main/java/com/redhat/coolstore/service/PromoService.java @@ -1,3 +1,4 @@ + package com.redhat.coolstore.service; import java.io.Serializable; @@ -6,7 +7,7 @@ import java.util.Map; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import com.redhat.coolstore.model.Promotion; import com.redhat.coolstore.model.ShoppingCart; diff --git a/src/main/java/com/redhat/coolstore/service/ShippingService.java b/src/main/java/com/redhat/coolstore/service/ShippingService.java index c820fcdc..81b52ea3 100644 --- a/src/main/java/com/redhat/coolstore/service/ShippingService.java +++ b/src/main/java/com/redhat/coolstore/service/ShippingService.java @@ -1,15 +1,14 @@ + package com.redhat.coolstore.service; import java.math.BigDecimal; import java.math.RoundingMode; -import javax.ejb.Remote; -import javax.ejb.Stateless; +import jakarta.enterprise.context.ApplicationScoped; import com.redhat.coolstore.model.ShoppingCart; -@Stateless -@Remote +@ApplicationScoped public class ShippingService implements ShippingServiceRemote { @Override diff --git a/src/main/java/com/redhat/coolstore/service/ShoppingCartOrderProcessor.java b/src/main/java/com/redhat/coolstore/service/ShoppingCartOrderProcessor.java index e6ee388a..b3c2fc82 100644 --- a/src/main/java/com/redhat/coolstore/service/ShoppingCartOrderProcessor.java +++ b/src/main/java/com/redhat/coolstore/service/ShoppingCartOrderProcessor.java @@ -1,16 +1,17 @@ + package com.redhat.coolstore.service; import java.util.logging.Logger; -import javax.ejb.Stateless; -import javax.annotation.Resource; -import javax.inject.Inject; -import javax.jms.JMSContext; -import javax.jms.Topic; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.annotation.Resource; +import jakarta.inject.Inject; +import jakarta.jms.JMSContext; +import jakarta.jms.Topic; import com.redhat.coolstore.model.ShoppingCart; import com.redhat.coolstore.utils.Transformers; -@Stateless +@ApplicationScoped public class ShoppingCartOrderProcessor { @Inject diff --git a/src/main/java/com/redhat/coolstore/service/ShoppingCartService.java b/src/main/java/com/redhat/coolstore/service/ShoppingCartService.java index 06df53eb..df8882c6 100644 --- a/src/main/java/com/redhat/coolstore/service/ShoppingCartService.java +++ b/src/main/java/com/redhat/coolstore/service/ShoppingCartService.java @@ -1,10 +1,11 @@ + package com.redhat.coolstore.service; import java.util.Hashtable; import java.util.logging.Logger; -import javax.ejb.Stateful; -import javax.inject.Inject; +import jakarta.ejb.Stateful; +import jakarta.inject.Inject; // Updated import statement import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; diff --git a/src/main/java/com/redhat/coolstore/utils/DataBaseMigrationStartup.java b/src/main/java/com/redhat/coolstore/utils/DataBaseMigrationStartup.java index b263d756..75ffc5b0 100644 --- a/src/main/java/com/redhat/coolstore/utils/DataBaseMigrationStartup.java +++ b/src/main/java/com/redhat/coolstore/utils/DataBaseMigrationStartup.java @@ -1,15 +1,15 @@ + package com.redhat.coolstore.utils; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.FlywayException; -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import javax.ejb.Singleton; -import javax.ejb.Startup; -import javax.ejb.TransactionManagement; -import javax.ejb.TransactionManagementType; -import javax.inject.Inject; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.Resource; +import jakarta.ejb.Singleton; +import jakarta.ejb.TransactionManagement; +import jakarta.ejb.TransactionManagementType; +import jakarta.inject.Inject; import javax.sql.DataSource; import java.util.logging.Level; import java.util.logging.Logger; @@ -50,4 +50,4 @@ private void startup() { -} \ No newline at end of file +} diff --git a/src/main/java/com/redhat/coolstore/utils/Producers.java b/src/main/java/com/redhat/coolstore/utils/Producers.java index d29061cc..f50bfe02 100644 --- a/src/main/java/com/redhat/coolstore/utils/Producers.java +++ b/src/main/java/com/redhat/coolstore/utils/Producers.java @@ -1,10 +1,10 @@ + package com.redhat.coolstore.utils; -import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.InjectionPoint; +import jakarta.enterprise.inject.Produces; +import jakarta.enterprise.inject.spi.InjectionPoint; import java.util.logging.Logger; - public class Producers { Logger log = Logger.getLogger(Producers.class.getName()); diff --git a/src/main/java/com/redhat/coolstore/utils/StartupListener.java b/src/main/java/com/redhat/coolstore/utils/StartupListener.java index 3b06ebb1..3eecc5dd 100644 --- a/src/main/java/com/redhat/coolstore/utils/StartupListener.java +++ b/src/main/java/com/redhat/coolstore/utils/StartupListener.java @@ -1,9 +1,10 @@ + package com.redhat.coolstore.utils; import weblogic.application.ApplicationLifecycleEvent; import weblogic.application.ApplicationLifecycleListener; -import javax.inject.Inject; +import jakarta.inject.Inject; import java.util.logging.Logger; public class StartupListener extends ApplicationLifecycleListener { diff --git a/src/main/java/com/redhat/coolstore/utils/Transformers.java b/src/main/java/com/redhat/coolstore/utils/Transformers.java index cffb386c..5f705ae8 100644 --- a/src/main/java/com/redhat/coolstore/utils/Transformers.java +++ b/src/main/java/com/redhat/coolstore/utils/Transformers.java @@ -1,3 +1,4 @@ + package com.redhat.coolstore.utils; import com.redhat.coolstore.model.CatalogItemEntity; @@ -9,12 +10,12 @@ import java.io.StringWriter; import java.util.ArrayList; import java.util.List; -import javax.json.Json; -import javax.json.JsonArray; -import javax.json.JsonArrayBuilder; -import javax.json.JsonObject; -import javax.json.JsonReader; -import javax.json.JsonWriter; +import jakarta.json.Json; +import jakarta.json.JsonArray; +import jakarta.json.JsonArrayBuilder; +import jakarta.json.JsonObject; +import jakarta.json.JsonReader; +import jakarta.json.JsonWriter; import java.util.concurrent.ThreadLocalRandom; import java.util.logging.Logger; @@ -97,4 +98,4 @@ public static Order jsonToOrder(String json) { } -} +} \ No newline at end of file diff --git a/src/main/resources/META-INF/persistence.xml b/src/main/resources/META-INF/persistence.xml index 6abc2963..d7c10d91 100644 --- a/src/main/resources/META-INF/persistence.xml +++ b/src/main/resources/META-INF/persistence.xml @@ -1,9 +1,10 @@ + - + https://jakarta.ee/xml/ns/persistence + https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"> java:jboss/datasources/CoolstoreDS @@ -14,4 +15,4 @@ - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/beans.xml b/src/main/webapp/WEB-INF/beans.xml index 1eefdbf0..27633a6e 100644 --- a/src/main/webapp/WEB-INF/beans.xml +++ b/src/main/webapp/WEB-INF/beans.xml @@ -1,3 +1,4 @@ + - - \ No newline at end of file + diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index d278861a..3f76208e 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,6 +1,2 @@ - - - - + +// The web.xml file should be removed as Quarkus uses a different configuration mechanism.