Refactor Package Layout

prototype/src/main/java/org/hso/ecommerce/ShopController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.shop;
+package org.hso.ecommerce;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class ShopController {
 }

prototype/src/main/java/org/hso/ecommerce/action/somepackage/DemoAction.java

@@ -0,0 +1,7 @@
+package org.hso.ecommerce.action.somepackage;
+
+public class DemoAction {
+    // TODO: remove me.
+    // mksubpackage
+
+}

prototype/src/main/java/org/hso/ecommerce/app/RequestController.java

@@ -1,7 +1,7 @@
 package org.hso.ecommerce.app;
 
-import org.hso.ecommerce.db.repos.UserRepository;
+import org.hso.ecommerce.entities.user.UserRepository;
-import org.hso.ecommerce.entities.User;
+import org.hso.ecommerce.entities.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;

prototype/src/main/java/org/hso/ecommerce/components/LoginIntercepter.java

@@ -1,7 +1,7 @@
 package org.hso.ecommerce.components;
 
-import org.hso.ecommerce.db.repos.UserRepository;
+import org.hso.ecommerce.entities.user.UserRepository;
-import org.hso.ecommerce.entities.User;
+import org.hso.ecommerce.entities.user.User;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;

prototype/src/main/java/org/hso/ecommerce/controller/ArticleController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.user;
+package org.hso.ecommerce.controller;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class ArticleController {
 }

prototype/src/main/java/org/hso/ecommerce/controller/BookingController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class BookingController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.intern;
+package org.hso.ecommerce.controller;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class LoginController {
 }

prototype/src/main/java/org/hso/ecommerce/controller/UserController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.login;
+package org.hso.ecommerce.controller;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class UserController {
 }

prototype/src/main/java/org/hso/ecommerce/controller/intern/IndexController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.intern.article;
+package org.hso.ecommerce.controller.intern;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class IndexController {
 }

prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller.intern;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class WarehouseController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/IndexController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller.intern.customers;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class IndexController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/OrderController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller.intern.customers;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class OrderController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/IndexController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller.intern.suppliers;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class IndexController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OfferController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller.intern.suppliers;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class OfferController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OrderController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller.intern.suppliers;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class OrderController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/shop/ArticleController.java

@@ -0,0 +1,8 @@
+package org.hso.ecommerce.controller.shop;
+
+import org.springframework.stereotype.Controller;
+
+@Controller
+//@RequestMapping("...")
+public class ArticleController {
+}

prototype/src/main/java/org/hso/ecommerce/controller/shop/CheckoutController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.intern.customers;
+package org.hso.ecommerce.controller.shop;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class CheckoutController {
 }

prototype/src/main/java/org/hso/ecommerce/controller/shop/IndexController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.shop.article;
+package org.hso.ecommerce.controller.shop;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class IndexController {
 }

prototype/src/main/java/org/hso/ecommerce/controller/shop/SearchController.java

@@ -1,8 +1,8 @@
-package org.hso.ecommerce.intern.booking;
+package org.hso.ecommerce.controller.shop;
 
 import org.springframework.stereotype.Controller;
 
 @Controller
 //@RequestMapping("...")
-public class RequestController {
+public class SearchController {
 }

prototype/src/main/java/org/hso/ecommerce/entities/booking/Booking.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.booking;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/booking/BookingAccountEntry.java

@@ -1,4 +1,7 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.booking;
+
+import org.hso.ecommerce.entities.supplier.Supplier;
+import org.hso.ecommerce.entities.user.User;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/booking/BookingReason.java

@@ -1,4 +1,7 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.booking;
+
+import org.hso.ecommerce.entities.shop.CustomerOrder;
+import org.hso.ecommerce.entities.supplier.SupplierOrder;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/booking/CustomerPayment.java

@@ -1,4 +1,6 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.booking;
+
+import org.hso.ecommerce.entities.booking.PaymentMethod;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/booking/PaymentMethod.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.booking;
 
 import javax.persistence.Embeddable;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/cron/BackgroundJob.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.cron;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/dashboard/DashboardSummary.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.dashboard;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/shop/Address.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.shop;
 
 import javax.persistence.Embeddable;
 

prototype/src/main/java/org/hso/ecommerce/entities/shop/Article.java

@@ -1,4 +1,6 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.shop;
+
+import org.hso.ecommerce.entities.supplier.ArticleOffer;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/shop/Category.java

@@ -1,4 +1,6 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.shop;
+
+import org.hso.ecommerce.entities.shop.Article;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrder.java

@@ -1,4 +1,6 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.shop;
+
+import org.hso.ecommerce.entities.user.User;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrderPosition.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.shop;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/shop/Image.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.shop;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.supplier;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/supplier/Supplier.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.supplier;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/supplier/SupplierOrder.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.supplier;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/user/User.java

@@ -1,5 +1,7 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.user;
 
+import org.hso.ecommerce.entities.booking.PaymentMethod;
+import org.hso.ecommerce.entities.shop.Address;
 import org.springframework.security.crypto.bcrypt.BCrypt;
 
 import javax.persistence.*;

prototype/src/main/java/org/hso/ecommerce/entities/user/UserRepository.java

@@ -1,6 +1,6 @@
-package org.hso.ecommerce.db.repos;
+package org.hso.ecommerce.entities.user;
 
-import org.hso.ecommerce.entities.User;
+import org.hso.ecommerce.entities.user.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;

prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBooking.java

@@ -1,4 +1,4 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.warehouse;
 
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;

prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingPosition.java

@@ -1,4 +1,6 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.warehouse;
+
+import org.hso.ecommerce.entities.shop.Article;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingPositionSlotEntry.java

@@ -1,4 +1,6 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.warehouse;
+
+import org.hso.ecommerce.entities.shop.Article;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingReason.java

@@ -1,4 +1,7 @@
-package org.hso.ecommerce.entities;
+package org.hso.ecommerce.entities.warehouse;
+
+import org.hso.ecommerce.entities.shop.CustomerOrder;
+import org.hso.ecommerce.entities.supplier.SupplierOrder;
 
 import javax.persistence.*;
 

prototype/src/main/java/org/hso/ecommerce/intern/customers/order/RequestController.java

@@ -1,8 +0,0 @@
-package org.hso.ecommerce.intern.customers.order;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-//@RequestMapping("...")
-public class RequestController {
-}

prototype/src/main/java/org/hso/ecommerce/intern/suppliers/RequestController.java

@@ -1,8 +0,0 @@
-package org.hso.ecommerce.intern.suppliers;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-//@RequestMapping("...")
-public class RequestController {
-}

prototype/src/main/java/org/hso/ecommerce/intern/suppliers/offer/RequestController.java

@@ -1,8 +0,0 @@
-package org.hso.ecommerce.intern.suppliers.offer;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-//@RequestMapping("...")
-public class RequestController {
-}

prototype/src/main/java/org/hso/ecommerce/intern/suppliers/order/RequestController.java

@@ -1,8 +0,0 @@
-package org.hso.ecommerce.intern.suppliers.order;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-//@RequestMapping("...")
-public class RequestController {
-}

prototype/src/main/java/org/hso/ecommerce/intern/warehouse/RequestController.java

@@ -1,8 +0,0 @@
-package org.hso.ecommerce.intern.warehouse;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-//@RequestMapping("...")
-public class RequestController {
-}

prototype/src/main/java/org/hso/ecommerce/shop/checkout/RequestController.java

@@ -1,8 +0,0 @@
-package org.hso.ecommerce.shop.checkout;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-//@RequestMapping("...")
-public class RequestController {
-}

prototype/src/main/java/org/hso/ecommerce/shop/search/RequestController.java

@@ -1,8 +0,0 @@
-package org.hso.ecommerce.shop.search;
-
-import org.springframework.stereotype.Controller;
-
-@Controller
-//@RequestMapping("...")
-public class RequestController {
-}