Removed cascade-all type annotation from Order reference to Business

class
Qorder · Dec 30, 2013 · ffda46d · ffda46d
1 parent 25c9173
commit ffda46d
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/QorderWS/src/main/java/com/qorder/qorderws/controller/CategoryController.java b/QorderWS/src/main/java/com/qorder/qorderws/controller/CategoryController.java
@@ -26,7 +26,7 @@
 public class CategoryController {
 
 	private static final Logger LOGGER = LoggerFactory
-			.getLogger(BusinessController.class);
+			.getLogger(CategoryController.class);
 
 	@Autowired
 	private ICategoryService categoryService;

diff --git a/QorderWS/src/main/java/com/qorder/qorderws/controller/MenuController.java b/QorderWS/src/main/java/com/qorder/qorderws/controller/MenuController.java
@@ -22,7 +22,7 @@
 public class MenuController {
 
 	private static final Logger LOGGER = LoggerFactory
-			.getLogger(BusinessController.class);
+			.getLogger(MenuController.class);
 
 	@Autowired
 	private IMenuService menuService;

diff --git a/QorderWS/src/main/java/com/qorder/qorderws/controller/OrderController.java b/QorderWS/src/main/java/com/qorder/qorderws/controller/OrderController.java
@@ -22,7 +22,7 @@
 @RequestMapping(value = "/orders")
 public class OrderController {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(BusinessController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(OrderController.class);
 
 	@Autowired
 	private IOrderService orderService;
@@ -37,7 +37,7 @@ ResponseEntity<Void> createOrder(@RequestParam Long id, @RequestBody OrderDTO or
 	@RequestMapping(value = "/business", params = "id", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	ResponseEntity<PendingOrdersDTO> getOrdersByBusinessId(@RequestParam Long id) throws BusinessDoesNotExistException {
 		PendingOrdersDTO pendingOrders = orderService.fetchOrdersFromBusinessID(id);
-		LOGGER.info("Request for business orders.\nFetchedList size is ");
+		LOGGER.info("Request for business orders.\nFetchedList size is " + pendingOrders.getOrders().size());
 		return new ResponseEntity<PendingOrdersDTO>(pendingOrders, HttpStatus.OK);
 	}
 

diff --git a/QorderWS/src/main/java/com/qorder/qorderws/controller/ProductController.java b/QorderWS/src/main/java/com/qorder/qorderws/controller/ProductController.java
@@ -26,7 +26,7 @@
 @RequestMapping(value = "/products")
 public class ProductController {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(BusinessController.class);
+	private static final Logger LOGGER = LoggerFactory.getLogger(ProductController.class);
 
 	@Autowired
 	private IProductService productService;

diff --git a/QorderWS/src/main/java/com/qorder/qorderws/dao/OrderDAO.java b/QorderWS/src/main/java/com/qorder/qorderws/dao/OrderDAO.java
@@ -59,8 +59,8 @@ public boolean delete(Order order) {
 			return true;
 		} catch (final HibernateException ex) {
 			LOGGER.warn(
-					"Hibernate exception was raised while trying to delete order, info: ",
-					ex.getLocalizedMessage());
+					"Hibernate exception was raised while trying to delete order, info: " +
+					ex.getLocalizedMessage(),ex);
 		}
 
 		return false;

diff --git a/QorderWS/src/main/java/com/qorder/qorderws/model/order/Order.java b/QorderWS/src/main/java/com/qorder/qorderws/model/order/Order.java
@@ -41,7 +41,7 @@ public class Order {
 	@LazyCollection(LazyCollectionOption.FALSE)
 	private List<ProductHolder> orderList = new ArrayList<ProductHolder>();
 
-	@ManyToOne(targetEntity = Business.class, cascade = CascadeType.ALL)
+	@ManyToOne(targetEntity = Business.class)
 	@JoinColumn(name = "BUSINESS_ID")
 	private Business business;
 

diff --git a/QorderWS/src/main/java/com/qorder/qorderws/service/IOrderService.java b/QorderWS/src/main/java/com/qorder/qorderws/service/IOrderService.java
@@ -1,7 +1,7 @@
 package com.qorder.qorderws.service;
 
-import com.qorder.qorderws.dto.order.PendingOrdersDTO;
 import com.qorder.qorderws.dto.order.OrderDTO;
+import com.qorder.qorderws.dto.order.PendingOrdersDTO;
 import com.qorder.qorderws.exception.BusinessDoesNotExistException;
 
 public interface IOrderService {

diff --git a/QorderWS/src/main/java/com/qorder/qorderws/service/OrderService.java b/QorderWS/src/main/java/com/qorder/qorderws/service/OrderService.java
@@ -7,9 +7,9 @@
 
 import com.qorder.qorderws.dao.IBusinessDAO;
 import com.qorder.qorderws.dao.IOrderDAO;
-import com.qorder.qorderws.dto.order.PendingOrdersDTO;
 import com.qorder.qorderws.dto.order.OrderDTO;
 import com.qorder.qorderws.dto.order.OrderViewDTO;
+import com.qorder.qorderws.dto.order.PendingOrdersDTO;
 import com.qorder.qorderws.exception.BusinessDoesNotExistException;
 import com.qorder.qorderws.mapper.OrderDTOtoOrderMapper;
 import com.qorder.qorderws.mapper.OrderToOrderViewDTOMapper;
@@ -57,8 +57,8 @@ public PendingOrdersDTO fetchOrdersFromBusinessID(long businessId) throws Busine
 		{
 			OrderViewDTO orderView = new OrderToOrderViewDTOMapper().map(order, new OrderViewDTO());
 			businessOrders.addOrderViewDTO(orderView);
+			orderDAO.delete(order);
 		}
 		return businessOrders;
 	}
-
 }
diff --git a/QorderWS/src/main/resources/hibernate/hibernate.cfg.xml b/QorderWS/src/main/resources/hibernate/hibernate.cfg.xml
@@ -17,7 +17,7 @@
 		<!-- Echo all executed SQL to stdout -->
 		<property name="show_sql">true</property>
 
-		<property name="hbm2ddl.auto">validate</property>
+		<property name="hbm2ddl.auto">create</property>
 
 		<mapping class="com.qorder.qorderws.model.order.Order" />
 		<mapping class="com.qorder.qorderws.model.order.ProductHolder" />