From 64db7a082fee02f800f1cf27d6b57b0db276b55f Mon Sep 17 00:00:00 2001
From: Pekka Helenius <fincer89@hotmail.com>
Date: Thu, 1 Oct 2020 02:04:01 +0300
Subject: [PATCH] Partial rebase of controller logic

---
 .../bookstore/{web => service}/BigDecimalPropertyEditor.java   | 2 +-
 .../fjordtek/bookstore/{web => service}/BookAuthorHelper.java  | 2 +-
 .../fjordtek/bookstore/{web => service}/HttpServerLogger.java  | 2 +-
 .../fjordtek/bookstore/web/BookBasePathAwareController.java    | 2 ++
 .../main/java/com/fjordtek/bookstore/web/BookController.java   | 3 +++
 .../java/com/fjordtek/bookstore/web/BookRestController.java    | 1 +
 6 files changed, 9 insertions(+), 3 deletions(-)
 rename bookstore/src/main/java/com/fjordtek/bookstore/{web => service}/BigDecimalPropertyEditor.java (95%)
 rename bookstore/src/main/java/com/fjordtek/bookstore/{web => service}/BookAuthorHelper.java (98%)
 rename bookstore/src/main/java/com/fjordtek/bookstore/{web => service}/HttpServerLogger.java (98%)

diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BigDecimalPropertyEditor.java b/bookstore/src/main/java/com/fjordtek/bookstore/service/BigDecimalPropertyEditor.java
similarity index 95%
rename from bookstore/src/main/java/com/fjordtek/bookstore/web/BigDecimalPropertyEditor.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/service/BigDecimalPropertyEditor.java
index 0f2b47d..9b567f1 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BigDecimalPropertyEditor.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/service/BigDecimalPropertyEditor.java
@@ -1,6 +1,6 @@
 // Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.web;
+package com.fjordtek.bookstore.service;
 
 import java.beans.PropertyEditorSupport;
 import java.math.BigDecimal;
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookAuthorHelper.java b/bookstore/src/main/java/com/fjordtek/bookstore/service/BookAuthorHelper.java
similarity index 98%
rename from bookstore/src/main/java/com/fjordtek/bookstore/web/BookAuthorHelper.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/service/BookAuthorHelper.java
index 1e70486..5ea5190 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookAuthorHelper.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/service/BookAuthorHelper.java
@@ -1,6 +1,6 @@
 //Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.web;
+package com.fjordtek.bookstore.service;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpServerLogger.java b/bookstore/src/main/java/com/fjordtek/bookstore/service/HttpServerLogger.java
similarity index 98%
rename from bookstore/src/main/java/com/fjordtek/bookstore/web/HttpServerLogger.java
rename to bookstore/src/main/java/com/fjordtek/bookstore/service/HttpServerLogger.java
index 07b4e1b..f3e5d0c 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/HttpServerLogger.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/service/HttpServerLogger.java
@@ -1,6 +1,6 @@
 // Pekka Helenius <fincer89@hotmail.com>, Fjordtek 2020
 
-package com.fjordtek.bookstore.web;
+package com.fjordtek.bookstore.service;
 
 import java.util.ArrayList;
 import java.util.Enumeration;
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java
index 3703091..8d9c2b9 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookBasePathAwareController.java
@@ -22,6 +22,8 @@ import com.fjordtek.bookstore.model.Book;
 import com.fjordtek.bookstore.model.BookEventHandler;
 import com.fjordtek.bookstore.model.BookRepository;
 import com.fjordtek.bookstore.model.CategoryRepository;
+import com.fjordtek.bookstore.service.BookAuthorHelper;
+import com.fjordtek.bookstore.service.HttpServerLogger;
 
 /**
  *
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
index d3ed06a..6e7e6f8 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookController.java
@@ -33,6 +33,9 @@ import com.fjordtek.bookstore.model.BookHash;
 import com.fjordtek.bookstore.model.BookHashRepository;
 import com.fjordtek.bookstore.model.BookRepository;
 import com.fjordtek.bookstore.model.CategoryRepository;
+import com.fjordtek.bookstore.service.BigDecimalPropertyEditor;
+import com.fjordtek.bookstore.service.BookAuthorHelper;
+import com.fjordtek.bookstore.service.HttpServerLogger;
 
 /**
 *
diff --git a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java
index 10a932a..b2cff02 100644
--- a/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java
+++ b/bookstore/src/main/java/com/fjordtek/bookstore/web/BookRestController.java
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.fjordtek.bookstore.model.Book;
 import com.fjordtek.bookstore.model.BookHashRepository;
 import com.fjordtek.bookstore.model.BookRepository;
+import com.fjordtek.bookstore.service.HttpServerLogger;
 
 /**
 *