Some cascade/fetch cleanups:

- CascadeType.MERGE is basicly an UPDATE statement, it needs to be REFRESH (from database to local entity object)
- Fetch strategy EAGER is default, no need to specify it
- updated jar(s)

diff --git a/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java b/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java
index fb5fd00d2167ea226314998afd63d9fd86f34c26..78fb2084fc5376f768345a6dbd20a013f65ed76f 100644 (file)
--- a/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java
+++ b/src/org/mxchange/jshopcore/model/basket/items/BasketItem.java
@@ -56,7 +56,7 @@ public class BasketItem extends BaseItem implements AddableBasketItem, Comparabl
         * Product instance
         */
        @JoinColumn (name = "product_id", updatable = false)
-       @OneToOne (targetEntity = GenericProduct.class, cascade = CascadeType.MERGE)
+       @OneToOne (targetEntity = GenericProduct.class, cascade = CascadeType.REFRESH)
        private Product itemProduct;
 
        /**

diff --git a/src/org/mxchange/jshopcore/model/category/ProductCategory.java b/src/org/mxchange/jshopcore/model/category/ProductCategory.java
index 721e638fef6e124c198b8e8a7bf4e723a71f451f..0e9442760b86d061a7bbf82fff269de0c2fab17d 100644 (file)
--- a/src/org/mxchange/jshopcore/model/category/ProductCategory.java
+++ b/src/org/mxchange/jshopcore/model/category/ProductCategory.java
@@ -61,7 +61,7 @@ public class ProductCategory implements Category, Comparable<Category> {
         * Parent category
         */
        @JoinColumn (name = "parent_id")
-       @OneToOne (targetEntity = ProductCategory.class, cascade = CascadeType.MERGE)
+       @OneToOne (targetEntity = ProductCategory.class, cascade = CascadeType.REFRESH)
        private Category parentCategory;
 
        /**

diff --git a/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java b/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java
index 1637f8ab49a6e389831e3a10278b347d07c58bbb..1606ac5b97e8723b5930fc2e439d1bb5e9dce834 100644 (file)
--- a/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java
+++ b/src/org/mxchange/jshopcore/model/customer/status/CustomerAccountStatus.java
@@ -19,7 +19,7 @@ package org.mxchange.jshopcore.model.customer.status;
 import java.io.Serializable;
 
 /**
- * An enum for customer's account status like confirmed, locked, etc.
+ * An enumeration for customer's account status like confirmed, locked, etc.
  * <p>
  * @author Roland Haeder<roland@mxchange.org>
  */
@@ -36,7 +36,7 @@ public enum CustomerAccountStatus implements Serializable {
        CONFIRMED("CUSTOMER_ACCOUNT_STATUS_CONFIRMED"), //NOI18N
 
        /**
-        * Locked (maybe violeted T&C)
+        * Locked (maybe violated T&C)
         */
        LOCKED("CUSTOMER_ACCOUNT_STATUS_LOCKED"); //NOI18N
 

diff --git a/src/org/mxchange/jshopcore/model/order/ShopOrder.java b/src/org/mxchange/jshopcore/model/order/ShopOrder.java
index 2fe383fb1cf55653c74af5486fb7f6614fd12072..51acec5ba3664d93389f0e0f3d6fad6c42fefdd6 100644 (file)
--- a/src/org/mxchange/jshopcore/model/order/ShopOrder.java
+++ b/src/org/mxchange/jshopcore/model/order/ShopOrder.java
@@ -60,7 +60,7 @@ public class ShopOrder implements Orderable, Comparable<Orderable> {
         * Customer instance
         */
        @JoinColumn (name = "customer_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = ShopCustomer.class, cascade = CascadeType.MERGE, optional = false)
+       @OneToOne (targetEntity = ShopCustomer.class, cascade = CascadeType.REFRESH, optional = false)
        private Customer customer;
 
        /**

diff --git a/src/org/mxchange/jshopcore/model/order/items/OrderItem.java b/src/org/mxchange/jshopcore/model/order/items/OrderItem.java
index f16c66051842bde2f60e3fbde2eb2ce1456659a2..23f2ab18876021ff634593e44ce062c9ca1e84ac 100644 (file)
--- a/src/org/mxchange/jshopcore/model/order/items/OrderItem.java
+++ b/src/org/mxchange/jshopcore/model/order/items/OrderItem.java
@@ -71,7 +71,7 @@ public class OrderItem extends BaseItem implements AddableBasketItem, Comparable
         * Product instance
         */
        @JoinColumn (name = "order_product_id", updatable = false)
-       @OneToOne (targetEntity = GenericProduct.class, cascade = CascadeType.MERGE)
+       @OneToOne (targetEntity = GenericProduct.class, cascade = CascadeType.REFRESH)
        private Product product;
 
        /**

diff --git a/src/org/mxchange/jshopcore/model/product/GenericProduct.java b/src/org/mxchange/jshopcore/model/product/GenericProduct.java
index 8a3fedb549f4239834711d130be84c2486ed91e0..05fba515ce397f5135973c3c3bb1ad8ced3d0f36 100644 (file)
--- a/src/org/mxchange/jshopcore/model/product/GenericProduct.java
+++ b/src/org/mxchange/jshopcore/model/product/GenericProduct.java
@@ -55,7 +55,7 @@ public class GenericProduct implements Product, Comparable<Product> {
         * Product productCategory
         */
        @JoinColumn (name = "category_id", nullable = false, updatable = false)
-       @OneToOne (targetEntity = ProductCategory.class, cascade = CascadeType.MERGE, optional = false)
+       @OneToOne (targetEntity = ProductCategory.class, cascade = CascadeType.REFRESH, optional = false)
        private Category productCategory;
 
        /**