Identity Field Pattern

Author: Rehab-M-Esmail

Identity_Field/pom.xml

@@ -78,6 +78,14 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

Identity_Field/src/main/java/com/iluwater/fieild/Controller/BookController.java renamed to Identity_Field/src/main/java/com/iluwater/fieild/controller/BookController.java

@@ -1,7 +1,7 @@
-package com.iluwater.fieild.Controller;
+package com.iluwater.fieild.controller;
 
-import com.iluwater.fieild.Model.Book;
-import com.iluwater.fieild.Services.BookService;
+import com.iluwater.fieild.model.Book;
+import com.iluwater.fieild.services.BookService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,8 +17,8 @@ public BookController(BookService bookService) {
 
   // Create a new book
   @PostMapping
-  public Book createBook(@RequestBody String title, String Author) {
-    return bookService.createBook(title,Author);
+  public Book createBook(@RequestBody String title, String author) {
+    return bookService.createBook(title,author);
   }
 
   // Get a book by ID

Identity_Field/src/main/java/com/iluwater/fieild/Model/Book.java renamed to Identity_Field/src/main/java/com/iluwater/fieild/model/Book.java

@@ -23,19 +23,18 @@
   * THE SOFTWARE.
 */
 
-package com.iluwater.fieild.Model;
+package com.iluwater.fieild.model;
+import javax.persistence.Entity;
 import lombok.Getter;
 import lombok.Setter;
-import javax.persistence.Entity;
-
 @Setter
 @Getter
 @Entity
 public class Book extends DomainObject {
   private String title;
   private String author;
 
-
+/** Book constructor*/
   public Book(String title, String author) {
     this.title = title;
     this.author = author;

Identity_Field/src/main/java/com/iluwater/fieild/Model/Client.java renamed to Identity_Field/src/main/java/com/iluwater/fieild/model/Client.java

@@ -22,7 +22,7 @@
   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   * THE SOFTWARE.
 */
-package com.iluwater.fieild.Model;
+package com.iluwater.fieild.model;
 import java.util.regex.Pattern;
 
 import lombok.Getter;
@@ -35,13 +35,13 @@
 public class Client extends DomainObject {
   private static final String EMAIL_REGEX = "^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z]{2,}$";
   private String name;
-  private String Email;
+  private String email;
 
-  public Client(String name, String Email) {
+  public Client(String name, String email) {
     Pattern pattern = Pattern.compile(EMAIL_REGEX);
     this.name = name;
-    if (pattern.matcher(Email).matches()) {
-      this.Email = Email;
+    if (pattern.matcher(email).matches()) {
+      this.email = email;
     }
   }
 

Identity_Field/src/main/java/com/iluwater/fieild/Model/DomainObject.java renamed to Identity_Field/src/main/java/com/iluwater/fieild/model/DomainObject.java

@@ -22,7 +22,7 @@
   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   * THE SOFTWARE.
 */
-package com.iluwater.fieild.Model;
+package com.iluwater.fieild.model;
 /*
  * The DomainObject class provides a base for domain entities
  * that require unique identification within the application.

Identity_Field/src/main/java/com/iluwater/fieild/Services/BookRepository.java renamed to Identity_Field/src/main/java/com/iluwater/fieild/services/BookRepository.java

@@ -1,15 +1,17 @@
-package com.iluwater.fieild.Services;
-import com.iluwater.fieild.Model.Book;
-import org.springframework.beans.factory.annotation.Autowired;
+package com.iluwater.fieild.services;
+import com.iluwater.fieild.model.Book;
 import org.springframework.stereotype.Repository;
 import javax.persistence.EntityManager;
 
 @Repository
 public class BookRepository {
-  @Autowired
-  private EntityManager entityManager;
+  private final EntityManager entityManager;
 
-  public Book createBook(String title,String author) {
+  public BookRepository(EntityManager entityManager) {
+    this.entityManager = entityManager;
+  }
+
+  public Book createBook(String title, String author) {
     Book book = new Book(title, author);
     entityManager.persist(book);
     return book;

Identity_Field/src/main/java/com/iluwater/fieild/Services/BookService.java renamed to Identity_Field/src/main/java/com/iluwater/fieild/services/BookService.java

@@ -1,5 +1,5 @@
-package com.iluwater.fieild.Services;
-import com.iluwater.fieild.Model.*;
+package com.iluwater.fieild.services;
+import com.iluwater.fieild.model.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

Identity_Field/src/test/java/com/iluwater/fieild/BookTest.java

@@ -25,9 +25,9 @@
 
 package com.iluwater.fieild;
 
-import com.iluwater.fieild.Controller.BookController;
-import com.iluwater.fieild.Model.Book;
-import com.iluwater.fieild.Services.BookService;
+import com.iluwater.fieild.controller.BookController;
+import com.iluwater.fieild.model.Book;
+import com.iluwater.fieild.services.BookService;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 
@@ -36,30 +36,39 @@
 class BookTest {
   @Mock
   private BookService bookService;
-  BookController bookController = new BookController(bookService);
+  BookController bookController;
+
+  {
+    bookController = new BookController(bookService);
+  }
+
   @Test
   void checkIdNotNull()
   {
-    Book book = bookController.createBook("Design patterns","someone");
+    Book book;
+    book = bookController.createBook("Design patterns","someone");
     assertNotNull(book.getId());
   }
   @Test
   void checkTwoIdsNotEqual()
   {
-    Book book = bookController.createBook("Design patterns","someone");
+    Book book;
+    book = bookController.createBook("Design patterns","someone");
     Book book2 = bookController.createBook("Head first","someone");
     assertNotEquals(book.getId(),book2.getId());
   }
   @Test
   void checkTitleNotNull()
   {
-    Book book = bookController.createBook("Design patterns","someone");
+    Book book;
+    book = bookController.createBook("Design patterns","someone");
     assertNotNull(book.getTitle());
   }
   @Test
   void checkAuthorNotNull()
   {
-    Book book = bookController.createBook("Design patterns","someone");
+    Book book;
+    book = bookController.createBook("Design patterns", "someone");
     assertNotNull(book.getAuthor());
   }
   void checkSearch()

Identity_Field/src/test/java/com/iluwater/fieild/ClientTest.java

@@ -24,7 +24,7 @@
  */
 package com.iluwater.fieild;
 
-import com.iluwater.fieild.Model.Client;
+import com.iluwater.fieild.model.Client;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.*;