From de6c750e7f1a4f84d4c4e20a1386d40dbeff6e51 Mon Sep 17 00:00:00 2001 From: CodeSteak Date: Wed, 29 Apr 2020 22:44:16 +0200 Subject: [PATCH] Refactor Package Layout --- .../{shop/RequestController.java => ShopController.java} | 4 ++-- .../org/hso/ecommerce/action/somepackage/DemoAction.java | 7 +++++++ .../java/org/hso/ecommerce/app/RequestController.java | 4 ++-- .../org/hso/ecommerce/components/LoginIntercepter.java | 4 ++-- .../ArticleController.java} | 4 ++-- .../org/hso/ecommerce/controller/BookingController.java | 8 ++++++++ .../LoginController.java} | 4 ++-- .../UserController.java} | 4 ++-- .../intern/IndexController.java} | 4 ++-- .../ecommerce/controller/intern/WarehouseController.java | 8 ++++++++ .../controller/intern/customers/IndexController.java | 8 ++++++++ .../controller/intern/customers/OrderController.java | 8 ++++++++ .../controller/intern/suppliers/IndexController.java | 8 ++++++++ .../controller/intern/suppliers/OfferController.java | 8 ++++++++ .../controller/intern/suppliers/OrderController.java | 8 ++++++++ .../hso/ecommerce/controller/shop/ArticleController.java | 8 ++++++++ .../shop/CheckoutController.java} | 4 ++-- .../shop/IndexController.java} | 4 ++-- .../shop/SearchController.java} | 4 ++-- .../org/hso/ecommerce/entities/{ => booking}/Booking.java | 2 +- .../entities/{ => booking}/BookingAccountEntry.java | 5 ++++- .../ecommerce/entities/{ => booking}/BookingReason.java | 5 ++++- .../ecommerce/entities/{ => booking}/CustomerPayment.java | 4 +++- .../ecommerce/entities/{ => booking}/PaymentMethod.java | 2 +- .../hso/ecommerce/entities/{ => cron}/BackgroundJob.java | 2 +- .../entities/{ => dashboard}/DashboardSummary.java | 2 +- .../org/hso/ecommerce/entities/{ => shop}/Address.java | 2 +- .../org/hso/ecommerce/entities/{ => shop}/Article.java | 4 +++- .../org/hso/ecommerce/entities/{ => shop}/Category.java | 4 +++- .../hso/ecommerce/entities/{ => shop}/CustomerOrder.java | 4 +++- .../entities/{ => shop}/CustomerOrderPosition.java | 2 +- .../java/org/hso/ecommerce/entities/{ => shop}/Image.java | 2 +- .../ecommerce/entities/{ => supplier}/ArticleOffer.java | 2 +- .../hso/ecommerce/entities/{ => supplier}/Supplier.java | 2 +- .../ecommerce/entities/{ => supplier}/SupplierOrder.java | 2 +- .../java/org/hso/ecommerce/entities/{ => user}/User.java | 4 +++- .../{db/repos => entities/user}/UserRepository.java | 4 ++-- .../entities/{ => warehouse}/WarehouseBooking.java | 2 +- .../{ => warehouse}/WarehouseBookingPosition.java | 4 +++- .../WarehouseBookingPositionSlotEntry.java | 4 +++- .../entities/{ => warehouse}/WarehouseBookingReason.java | 5 ++++- .../intern/customers/order/RequestController.java | 8 -------- .../hso/ecommerce/intern/suppliers/RequestController.java | 8 -------- .../intern/suppliers/offer/RequestController.java | 8 -------- .../intern/suppliers/order/RequestController.java | 8 -------- .../hso/ecommerce/intern/warehouse/RequestController.java | 8 -------- .../hso/ecommerce/shop/checkout/RequestController.java | 8 -------- .../org/hso/ecommerce/shop/search/RequestController.java | 8 -------- 48 files changed, 137 insertions(+), 99 deletions(-) rename prototype/src/main/java/org/hso/ecommerce/{shop/RequestController.java => ShopController.java} (58%) create mode 100644 prototype/src/main/java/org/hso/ecommerce/action/somepackage/DemoAction.java rename prototype/src/main/java/org/hso/ecommerce/{user/RequestController.java => controller/ArticleController.java} (56%) create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/BookingController.java rename prototype/src/main/java/org/hso/ecommerce/{intern/RequestController.java => controller/LoginController.java} (56%) rename prototype/src/main/java/org/hso/ecommerce/{login/RequestController.java => controller/UserController.java} (57%) rename prototype/src/main/java/org/hso/ecommerce/{intern/article/RequestController.java => controller/intern/IndexController.java} (54%) create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/IndexController.java create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/OrderController.java create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/IndexController.java create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OfferController.java create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OrderController.java create mode 100644 prototype/src/main/java/org/hso/ecommerce/controller/shop/ArticleController.java rename prototype/src/main/java/org/hso/ecommerce/{intern/customers/RequestController.java => controller/shop/CheckoutController.java} (54%) rename prototype/src/main/java/org/hso/ecommerce/{shop/article/RequestController.java => controller/shop/IndexController.java} (55%) rename prototype/src/main/java/org/hso/ecommerce/{intern/booking/RequestController.java => controller/shop/SearchController.java} (54%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => booking}/Booking.java (91%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => booking}/BookingAccountEntry.java (75%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => booking}/BookingReason.java (76%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => booking}/CustomerPayment.java (73%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => booking}/PaymentMethod.java (80%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => cron}/BackgroundJob.java (91%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => dashboard}/DashboardSummary.java (92%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => shop}/Address.java (80%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => shop}/Article.java (88%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => shop}/Category.java (83%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => shop}/CustomerOrder.java (91%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => shop}/CustomerOrderPosition.java (90%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => shop}/Image.java (87%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => supplier}/ArticleOffer.java (88%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => supplier}/Supplier.java (88%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => supplier}/SupplierOrder.java (94%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => user}/User.java (86%) rename prototype/src/main/java/org/hso/ecommerce/{db/repos => entities/user}/UserRepository.java (81%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => warehouse}/WarehouseBooking.java (92%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => warehouse}/WarehouseBookingPosition.java (87%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => warehouse}/WarehouseBookingPositionSlotEntry.java (79%) rename prototype/src/main/java/org/hso/ecommerce/entities/{ => warehouse}/WarehouseBookingReason.java (72%) delete mode 100644 prototype/src/main/java/org/hso/ecommerce/intern/customers/order/RequestController.java delete mode 100644 prototype/src/main/java/org/hso/ecommerce/intern/suppliers/RequestController.java delete mode 100644 prototype/src/main/java/org/hso/ecommerce/intern/suppliers/offer/RequestController.java delete mode 100644 prototype/src/main/java/org/hso/ecommerce/intern/suppliers/order/RequestController.java delete mode 100644 prototype/src/main/java/org/hso/ecommerce/intern/warehouse/RequestController.java delete mode 100644 prototype/src/main/java/org/hso/ecommerce/shop/checkout/RequestController.java delete mode 100644 prototype/src/main/java/org/hso/ecommerce/shop/search/RequestController.java diff --git a/prototype/src/main/java/org/hso/ecommerce/shop/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/ShopController.java similarity index 58% rename from prototype/src/main/java/org/hso/ecommerce/shop/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/ShopController.java index fd5a45a..d09bd0e 100644 --- a/prototype/src/main/java/org/hso/ecommerce/shop/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/action/somepackage/DemoAction.java b/prototype/src/main/java/org/hso/ecommerce/action/somepackage/DemoAction.java new file mode 100644 index 0000000..22f8946 --- /dev/null +++ b/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 + +} diff --git a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java index 9866d5e..f90906a 100644 --- a/prototype/src/main/java/org/hso/ecommerce/app/RequestController.java +++ b/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; +import org.hso.ecommerce.entities.user.UserRepository; +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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/components/LoginIntercepter.java b/prototype/src/main/java/org/hso/ecommerce/components/LoginIntercepter.java index 8763618..c4a2419 100644 --- a/prototype/src/main/java/org/hso/ecommerce/components/LoginIntercepter.java +++ b/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; +import org.hso.ecommerce.entities.user.UserRepository; +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; diff --git a/prototype/src/main/java/org/hso/ecommerce/user/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/controller/ArticleController.java similarity index 56% rename from prototype/src/main/java/org/hso/ecommerce/user/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/controller/ArticleController.java index 79dff55..5433d25 100644 --- a/prototype/src/main/java/org/hso/ecommerce/user/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/BookingController.java b/prototype/src/main/java/org/hso/ecommerce/controller/BookingController.java new file mode 100644 index 0000000..d35093e --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java similarity index 56% rename from prototype/src/main/java/org/hso/ecommerce/intern/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/controller/LoginController.java index 12b0629..5f4ebad 100644 --- a/prototype/src/main/java/org/hso/ecommerce/intern/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/login/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/controller/UserController.java similarity index 57% rename from prototype/src/main/java/org/hso/ecommerce/login/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/controller/UserController.java index 99c9c48..523bf2e 100644 --- a/prototype/src/main/java/org/hso/ecommerce/login/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/article/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/IndexController.java similarity index 54% rename from prototype/src/main/java/org/hso/ecommerce/intern/article/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/controller/intern/IndexController.java index e9cb1d7..32ee4a7 100644 --- a/prototype/src/main/java/org/hso/ecommerce/intern/article/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/WarehouseController.java new file mode 100644 index 0000000..9b618f7 --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/IndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/IndexController.java new file mode 100644 index 0000000..ee07280 --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/OrderController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/customers/OrderController.java new file mode 100644 index 0000000..19db2a9 --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/IndexController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/IndexController.java new file mode 100644 index 0000000..c9ad42b --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OfferController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OfferController.java new file mode 100644 index 0000000..a7932b5 --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OrderController.java b/prototype/src/main/java/org/hso/ecommerce/controller/intern/suppliers/OrderController.java new file mode 100644 index 0000000..aa63fcd --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ArticleController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ArticleController.java new file mode 100644 index 0000000..5e17f90 --- /dev/null +++ b/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 { +} diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/customers/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/CheckoutController.java similarity index 54% rename from prototype/src/main/java/org/hso/ecommerce/intern/customers/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/controller/shop/CheckoutController.java index 9c2a1ee..13f3dda 100644 --- a/prototype/src/main/java/org/hso/ecommerce/intern/customers/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/shop/article/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/IndexController.java similarity index 55% rename from prototype/src/main/java/org/hso/ecommerce/shop/article/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/controller/shop/IndexController.java index d77cdfd..378efa1 100644 --- a/prototype/src/main/java/org/hso/ecommerce/shop/article/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/booking/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/SearchController.java similarity index 54% rename from prototype/src/main/java/org/hso/ecommerce/intern/booking/RequestController.java rename to prototype/src/main/java/org/hso/ecommerce/controller/shop/SearchController.java index 6010e3a..29d47d7 100644 --- a/prototype/src/main/java/org/hso/ecommerce/intern/booking/RequestController.java +++ b/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 { } diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/Booking.java b/prototype/src/main/java/org/hso/ecommerce/entities/booking/Booking.java similarity index 91% rename from prototype/src/main/java/org/hso/ecommerce/entities/Booking.java rename to prototype/src/main/java/org/hso/ecommerce/entities/booking/Booking.java index ac53277..997f578 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/Booking.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/BookingAccountEntry.java b/prototype/src/main/java/org/hso/ecommerce/entities/booking/BookingAccountEntry.java similarity index 75% rename from prototype/src/main/java/org/hso/ecommerce/entities/BookingAccountEntry.java rename to prototype/src/main/java/org/hso/ecommerce/entities/booking/BookingAccountEntry.java index da98894..92e282f 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/BookingAccountEntry.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/BookingReason.java b/prototype/src/main/java/org/hso/ecommerce/entities/booking/BookingReason.java similarity index 76% rename from prototype/src/main/java/org/hso/ecommerce/entities/BookingReason.java rename to prototype/src/main/java/org/hso/ecommerce/entities/booking/BookingReason.java index 561bf05..b2bc6cc 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/BookingReason.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/CustomerPayment.java b/prototype/src/main/java/org/hso/ecommerce/entities/booking/CustomerPayment.java similarity index 73% rename from prototype/src/main/java/org/hso/ecommerce/entities/CustomerPayment.java rename to prototype/src/main/java/org/hso/ecommerce/entities/booking/CustomerPayment.java index b52a2d9..037e856 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/CustomerPayment.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/PaymentMethod.java b/prototype/src/main/java/org/hso/ecommerce/entities/booking/PaymentMethod.java similarity index 80% rename from prototype/src/main/java/org/hso/ecommerce/entities/PaymentMethod.java rename to prototype/src/main/java/org/hso/ecommerce/entities/booking/PaymentMethod.java index 0723219..6cb5307 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/PaymentMethod.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/BackgroundJob.java b/prototype/src/main/java/org/hso/ecommerce/entities/cron/BackgroundJob.java similarity index 91% rename from prototype/src/main/java/org/hso/ecommerce/entities/BackgroundJob.java rename to prototype/src/main/java/org/hso/ecommerce/entities/cron/BackgroundJob.java index 6fe33d8..14a4ae3 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/BackgroundJob.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/DashboardSummary.java b/prototype/src/main/java/org/hso/ecommerce/entities/dashboard/DashboardSummary.java similarity index 92% rename from prototype/src/main/java/org/hso/ecommerce/entities/DashboardSummary.java rename to prototype/src/main/java/org/hso/ecommerce/entities/dashboard/DashboardSummary.java index 13f7965..9f68988 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/DashboardSummary.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/Address.java b/prototype/src/main/java/org/hso/ecommerce/entities/shop/Address.java similarity index 80% rename from prototype/src/main/java/org/hso/ecommerce/entities/Address.java rename to prototype/src/main/java/org/hso/ecommerce/entities/shop/Address.java index ecd4b35..32d057b 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/Address.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/Article.java b/prototype/src/main/java/org/hso/ecommerce/entities/shop/Article.java similarity index 88% rename from prototype/src/main/java/org/hso/ecommerce/entities/Article.java rename to prototype/src/main/java/org/hso/ecommerce/entities/shop/Article.java index 23c0209..6cd198e 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/Article.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/Category.java b/prototype/src/main/java/org/hso/ecommerce/entities/shop/Category.java similarity index 83% rename from prototype/src/main/java/org/hso/ecommerce/entities/Category.java rename to prototype/src/main/java/org/hso/ecommerce/entities/shop/Category.java index 9703b0a..13b0b54 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/Category.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/CustomerOrder.java b/prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrder.java similarity index 91% rename from prototype/src/main/java/org/hso/ecommerce/entities/CustomerOrder.java rename to prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrder.java index 455aede..dd7d4f8 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/CustomerOrder.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/CustomerOrderPosition.java b/prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrderPosition.java similarity index 90% rename from prototype/src/main/java/org/hso/ecommerce/entities/CustomerOrderPosition.java rename to prototype/src/main/java/org/hso/ecommerce/entities/shop/CustomerOrderPosition.java index db1d486..dbe53f7 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/CustomerOrderPosition.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/Image.java b/prototype/src/main/java/org/hso/ecommerce/entities/shop/Image.java similarity index 87% rename from prototype/src/main/java/org/hso/ecommerce/entities/Image.java rename to prototype/src/main/java/org/hso/ecommerce/entities/shop/Image.java index 62eac9e..33eebdb 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/Image.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/ArticleOffer.java b/prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java similarity index 88% rename from prototype/src/main/java/org/hso/ecommerce/entities/ArticleOffer.java rename to prototype/src/main/java/org/hso/ecommerce/entities/supplier/ArticleOffer.java index f880fe2..005b0b9 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/ArticleOffer.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/Supplier.java b/prototype/src/main/java/org/hso/ecommerce/entities/supplier/Supplier.java similarity index 88% rename from prototype/src/main/java/org/hso/ecommerce/entities/Supplier.java rename to prototype/src/main/java/org/hso/ecommerce/entities/supplier/Supplier.java index 5ae9794..7649ea2 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/Supplier.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/SupplierOrder.java b/prototype/src/main/java/org/hso/ecommerce/entities/supplier/SupplierOrder.java similarity index 94% rename from prototype/src/main/java/org/hso/ecommerce/entities/SupplierOrder.java rename to prototype/src/main/java/org/hso/ecommerce/entities/supplier/SupplierOrder.java index 80bb818..e92339c 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/SupplierOrder.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/User.java b/prototype/src/main/java/org/hso/ecommerce/entities/user/User.java similarity index 86% rename from prototype/src/main/java/org/hso/ecommerce/entities/User.java rename to prototype/src/main/java/org/hso/ecommerce/entities/user/User.java index 5d023cf..9b07996 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/User.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/db/repos/UserRepository.java b/prototype/src/main/java/org/hso/ecommerce/entities/user/UserRepository.java similarity index 81% rename from prototype/src/main/java/org/hso/ecommerce/db/repos/UserRepository.java rename to prototype/src/main/java/org/hso/ecommerce/entities/user/UserRepository.java index 5940480..fcbc891 100644 --- a/prototype/src/main/java/org/hso/ecommerce/db/repos/UserRepository.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBooking.java b/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBooking.java similarity index 92% rename from prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBooking.java rename to prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBooking.java index b6501ef..97a2805 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBooking.java +++ b/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; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingPosition.java b/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingPosition.java similarity index 87% rename from prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingPosition.java rename to prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingPosition.java index 9cf35f0..88ceee3 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingPosition.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingPositionSlotEntry.java b/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingPositionSlotEntry.java similarity index 79% rename from prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingPositionSlotEntry.java rename to prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingPositionSlotEntry.java index 3ea0d57..7529e4f 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingPositionSlotEntry.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingReason.java b/prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingReason.java similarity index 72% rename from prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingReason.java rename to prototype/src/main/java/org/hso/ecommerce/entities/warehouse/WarehouseBookingReason.java index 0fd4834..ec60c4d 100644 --- a/prototype/src/main/java/org/hso/ecommerce/entities/WarehouseBookingReason.java +++ b/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.*; diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/customers/order/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/intern/customers/order/RequestController.java deleted file mode 100644 index 4bd43b6..0000000 --- a/prototype/src/main/java/org/hso/ecommerce/intern/customers/order/RequestController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hso.ecommerce.intern.customers.order; - -import org.springframework.stereotype.Controller; - -@Controller -//@RequestMapping("...") -public class RequestController { -} diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/RequestController.java deleted file mode 100644 index 375b0eb..0000000 --- a/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/RequestController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hso.ecommerce.intern.suppliers; - -import org.springframework.stereotype.Controller; - -@Controller -//@RequestMapping("...") -public class RequestController { -} diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/offer/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/offer/RequestController.java deleted file mode 100644 index f295ae6..0000000 --- a/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/offer/RequestController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hso.ecommerce.intern.suppliers.offer; - -import org.springframework.stereotype.Controller; - -@Controller -//@RequestMapping("...") -public class RequestController { -} diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/order/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/order/RequestController.java deleted file mode 100644 index cd9fe09..0000000 --- a/prototype/src/main/java/org/hso/ecommerce/intern/suppliers/order/RequestController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hso.ecommerce.intern.suppliers.order; - -import org.springframework.stereotype.Controller; - -@Controller -//@RequestMapping("...") -public class RequestController { -} diff --git a/prototype/src/main/java/org/hso/ecommerce/intern/warehouse/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/intern/warehouse/RequestController.java deleted file mode 100644 index 0baac54..0000000 --- a/prototype/src/main/java/org/hso/ecommerce/intern/warehouse/RequestController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hso.ecommerce.intern.warehouse; - -import org.springframework.stereotype.Controller; - -@Controller -//@RequestMapping("...") -public class RequestController { -} diff --git a/prototype/src/main/java/org/hso/ecommerce/shop/checkout/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/shop/checkout/RequestController.java deleted file mode 100644 index 964f258..0000000 --- a/prototype/src/main/java/org/hso/ecommerce/shop/checkout/RequestController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hso.ecommerce.shop.checkout; - -import org.springframework.stereotype.Controller; - -@Controller -//@RequestMapping("...") -public class RequestController { -} diff --git a/prototype/src/main/java/org/hso/ecommerce/shop/search/RequestController.java b/prototype/src/main/java/org/hso/ecommerce/shop/search/RequestController.java deleted file mode 100644 index 40c349b..0000000 --- a/prototype/src/main/java/org/hso/ecommerce/shop/search/RequestController.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.hso.ecommerce.shop.search; - -import org.springframework.stereotype.Controller; - -@Controller -//@RequestMapping("...") -public class RequestController { -}