diff --git a/src/main/java/com/booleanuk/core/Article.java b/src/main/java/com/booleanuk/core/Article.java index 1e359b0..78f7744 100644 --- a/src/main/java/com/booleanuk/core/Article.java +++ b/src/main/java/com/booleanuk/core/Article.java @@ -1,35 +1,10 @@ package com.booleanuk.core; -public class Article { - String title; +public class Article extends Item { + Author author; - boolean onLoan = false; - - public Article(String title) { - this.title = title; - } - - public boolean isOnLoan() { - return onLoan; - } - - public String checkIn() { - if (!this.isOnLoan()) { - return "item is not currently on loan"; - } - - this.onLoan = false; - - return "item has been checked in"; - } - - public String checkOut() { - if (this.isOnLoan()) { - return "item is currently on loan"; - } - - this.onLoan = true; - - return "item has been checked out"; + public Article(String title, Author author) { + super(title); + this.author = author; } } diff --git a/src/main/java/com/booleanuk/core/Author.java b/src/main/java/com/booleanuk/core/Author.java new file mode 100644 index 0000000..a943155 --- /dev/null +++ b/src/main/java/com/booleanuk/core/Author.java @@ -0,0 +1,26 @@ +package com.booleanuk.core; + +public class Author { + private String name; + private String contactInfo; + private String webPage; + + + public Author(String name, String contactInfo, String webPage) { + this.name = name; + this.contactInfo = contactInfo; + this.webPage = webPage; + } + + public String getName() { + return name; + } + + public String getContactInfo() { + return contactInfo; + } + + public String getWebPage() { + return webPage; + } +} diff --git a/src/main/java/com/booleanuk/core/Book.java b/src/main/java/com/booleanuk/core/Book.java index 9261f65..2e0d43f 100644 --- a/src/main/java/com/booleanuk/core/Book.java +++ b/src/main/java/com/booleanuk/core/Book.java @@ -1,35 +1,10 @@ package com.booleanuk.core; -public class Book { - String title; +public class Book extends Item{ + Author author; - boolean onLoan = false; - - public Book(String title) { - this.title = title; - } - - public boolean isOnLoan() { - return onLoan; - } - - public String checkIn() { - if (!this.isOnLoan()) { - return "item is not currently on loan"; - } - - this.onLoan = false; - - return "item has been checked in"; - } - - public String checkOut() { - if (this.isOnLoan()) { - return "item is currently on loan"; - } - - this.onLoan = true; - - return "item has been checked out"; + public Book(String title, Author author) { + super(title); + this.author = author; } } diff --git a/src/main/java/com/booleanuk/core/Item.java b/src/main/java/com/booleanuk/core/Item.java new file mode 100644 index 0000000..b2a2636 --- /dev/null +++ b/src/main/java/com/booleanuk/core/Item.java @@ -0,0 +1,35 @@ +package com.booleanuk.core; + +public class Item { + String title; + + boolean onLoan = false; + + public Item(String title) { + this.title = title; + } + + public boolean isOnLoan() { + return onLoan; + } + + public String checkIn() { + if (!this.isOnLoan()) { + return "item is not currently on loan"; + } + + this.onLoan = false; + + return "item has been checked in"; + } + + public String checkOut() { + if (this.isOnLoan()) { + return "item is currently on loan"; + } + + this.onLoan = true; + + return "item has been checked out"; + } +} diff --git a/src/main/java/com/booleanuk/core/Library.java b/src/main/java/com/booleanuk/core/Library.java index f03ecf0..05f0a14 100644 --- a/src/main/java/com/booleanuk/core/Library.java +++ b/src/main/java/com/booleanuk/core/Library.java @@ -1,28 +1,19 @@ package com.booleanuk.core; +import java.util.ArrayList; import java.util.List; public class Library { - List
articles; - List books; - List newspapers; + List items = new ArrayList<>(); - public void addToStock(Article item) { - this.articles.add(item); - } - - public void addToStock(Book item) { - this.books.add(item); - } - - public void addToStock(Newspaper item) { - this.newspapers.add(item); + public void addToStock(Item item) { + this.items.add(item); } // The following methods may contain code that you are unfamiliar with. The strange syntax of article -> something // is called a lambda expression (https://www.w3schools.com/java/java_lambda.asp) - public String checkInArticle(String title) { - List
filtered = this.articles.stream() + public String checkInItem(String title) { + List filtered = this.items.stream() .filter(article -> article.title.equals(title)) .toList(); @@ -33,8 +24,8 @@ public String checkInArticle(String title) { return filtered.get(0).checkIn(); } - public String checkOutArticle(String title) { - List
filtered = this.articles.stream() + public String checkOutItem(String title) { + List filtered = this.items.stream() .filter(article -> article.title.equals(title)) .toList(); @@ -45,51 +36,4 @@ public String checkOutArticle(String title) { return filtered.get(0).checkOut(); } - public String checkInBook(String title) { - List filtered = this.books.stream() - .filter(book -> book.title.equals(title)) - .toList(); - - if (filtered.size() < 1) { - return "item is not part of the library's collection"; - } - - return filtered.get(0).checkIn(); - } - - public String checkOutBook(String title) { - List filtered = this.books.stream() - .filter(book -> book.title.equals(title)) - .toList(); - - if (filtered.size() < 1) { - return "item is not part of the library's collection"; - } - - return filtered.get(0).checkOut(); - } - - public String checkInNewspaper(String title) { - List filtered = this.newspapers.stream() - .filter(newspaper -> newspaper.title.equals(title)) - .toList(); - - if (filtered.size() < 1) { - return "item is not part of the library's collection"; - } - - return filtered.get(0).checkIn(); - } - - public String checkOutNewspaper(String title) { - List filtered = this.newspapers.stream() - .filter(newspaper -> newspaper.title.equals(title)) - .toList(); - - if (filtered.size() < 1) { - return "item is not part of the library's collection"; - } - - return filtered.get(0).checkOut(); - } } diff --git a/src/main/java/com/booleanuk/core/Newspaper.java b/src/main/java/com/booleanuk/core/Newspaper.java index 8411d9c..a828549 100644 --- a/src/main/java/com/booleanuk/core/Newspaper.java +++ b/src/main/java/com/booleanuk/core/Newspaper.java @@ -1,23 +1,17 @@ package com.booleanuk.core; -public class Newspaper { - String title; - - boolean onLoan = false; - +public class Newspaper extends Item{ public Newspaper(String title) { - this.title = title; - } - - public boolean isOnLoan() { - return onLoan; + super(title); } + @Override public String checkIn() { return "newspapers are not available for loan"; } - + @Override public String checkOut() { return "newspapers are not available for loan"; } + } diff --git a/src/test/java/com/booleanuk/core/ArticleTest.java b/src/test/java/com/booleanuk/core/ArticleTest.java index 00bbaeb..6985db5 100644 --- a/src/test/java/com/booleanuk/core/ArticleTest.java +++ b/src/test/java/com/booleanuk/core/ArticleTest.java @@ -6,13 +6,15 @@ class ArticleTest { @Test public void shouldCheckOutIfAvailable() { - Article article = new Article("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Article article = new Article("JUnit Rocks", author); Assertions.assertEquals("item has been checked out", article.checkOut()); } @Test public void shouldDeclineIfNotAvailableToCheckout() { - Article article = new Article("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Article article = new Article("JUnit Rocks", author); article.checkOut(); Assertions.assertEquals("item is currently on loan", article.checkOut()); @@ -20,7 +22,8 @@ public void shouldDeclineIfNotAvailableToCheckout() { @Test public void shouldCheckInIfOnLoan() { - Article article = new Article("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Article article = new Article("JUnit Rocks", author); article.checkOut(); Assertions.assertEquals("item has been checked in", article.checkIn()); @@ -28,7 +31,8 @@ public void shouldCheckInIfOnLoan() { @Test public void shouldDeclineCheckInIfNotOnLoan() { - Article article = new Article("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Article article = new Article("JUnit Rocks", author); Assertions.assertEquals("item is not currently on loan", article.checkIn()); } diff --git a/src/test/java/com/booleanuk/core/BookTest.java b/src/test/java/com/booleanuk/core/BookTest.java index 180a165..1671524 100644 --- a/src/test/java/com/booleanuk/core/BookTest.java +++ b/src/test/java/com/booleanuk/core/BookTest.java @@ -6,13 +6,15 @@ public class BookTest { @Test public void shouldCheckOutIfAvailable() { - Book book = new Book("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Book book = new Book("JUnit Rocks", author); Assertions.assertEquals("item has been checked out", book.checkOut()); } @Test public void shouldDeclineIfNotAvailableToCheckout() { - Book book = new Book("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Book book = new Book("JUnit Rocks", author); book.checkOut(); Assertions.assertEquals("item is currently on loan", book.checkOut()); @@ -20,7 +22,8 @@ public void shouldDeclineIfNotAvailableToCheckout() { @Test public void shouldCheckInIfOnLoan() { - Book book = new Book("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Book book = new Book("JUnit Rocks", author); book.checkOut(); Assertions.assertEquals("item has been checked in", book.checkIn()); @@ -28,7 +31,8 @@ public void shouldCheckInIfOnLoan() { @Test public void shouldDeclineCheckInIfNotOnLoan() { - Book book = new Book("JUnit Rocks"); + Author author = new Author("Jon", "546789", "jon.com"); + Book book = new Book("JUnit Rocks", author); Assertions.assertEquals("item is not currently on loan", book.checkIn()); } diff --git a/src/test/java/com/booleanuk/core/LibraryTest.java b/src/test/java/com/booleanuk/core/LibraryTest.java new file mode 100644 index 0000000..be1bbdb --- /dev/null +++ b/src/test/java/com/booleanuk/core/LibraryTest.java @@ -0,0 +1,18 @@ +package com.booleanuk.core; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class LibraryTest { + @Test + public void checkLibrary() { + Author author = new Author("Jon", "546789", "jon.com"); + Library library = new Library(); + library.addToStock(new Article("Today's Fashin", author)); + library.addToStock(new Newspaper("Yesterdays paper")); + + Assertions.assertEquals("item is not currently on loan", library.checkInItem("Today's Fashin")); + Assertions.assertEquals("item has been checked out", library.checkOutItem("Today's Fashin")); + Assertions.assertEquals("newspapers are not available for loan", library.checkOutItem("Yesterdays paper")); + } +}