diff --git a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java index 5b3bfdfdf..249f01f64 100644 --- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java +++ b/abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java @@ -25,7 +25,6 @@ package com.iluwatar.abstractdocument; import org.junit.jupiter.api.Test; - import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java b/abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java index c19c57b6f..4b52fa7a6 100644 --- a/abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java +++ b/abstract-document/src/test/java/com/iluwatar/abstractdocument/DomainTest.java @@ -28,7 +28,6 @@ import com.iluwatar.abstractdocument.domain.Car; import com.iluwatar.abstractdocument.domain.Part; import com.iluwatar.abstractdocument.domain.enums.Property; import org.junit.jupiter.api.Test; - import java.util.List; import java.util.Map; diff --git a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Kingdom.java b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Kingdom.java index 12ff5635c..05ef14d3f 100644 --- a/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Kingdom.java +++ b/abstract-factory/src/main/java/com/iluwatar/abstractfactory/Kingdom.java @@ -27,6 +27,9 @@ package com.iluwatar.abstractfactory; import lombok.Getter; import lombok.Setter; +/** + * Helper class to manufacture {@link KingdomFactory} beans. + */ @Getter @Setter public class Kingdom { diff --git a/active-object/src/main/java/com/iluwatar/activeobject/ActiveCreature.java b/active-object/src/main/java/com/iluwatar/activeobject/ActiveCreature.java index 1212e7272..d1c5fa692 100644 --- a/active-object/src/main/java/com/iluwatar/activeobject/ActiveCreature.java +++ b/active-object/src/main/java/com/iluwatar/activeobject/ActiveCreature.java @@ -26,7 +26,6 @@ package com.iluwatar.activeobject; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -77,8 +76,8 @@ public abstract class ActiveCreature { */ public void eat() throws InterruptedException { requests.put(() -> { - logger.info("{} is eating!",name()); - logger.info("{} has finished eating!",name()); + logger.info("{} is eating!", name()); + logger.info("{} has finished eating!", name()); }); } @@ -88,7 +87,7 @@ public abstract class ActiveCreature { */ public void roam() throws InterruptedException { requests.put(() -> - logger.info("{} has started to roam in the wastelands.",name()) + logger.info("{} has started to roam in the wastelands.", name()) ); } diff --git a/active-object/src/main/java/com/iluwatar/activeobject/App.java b/active-object/src/main/java/com/iluwatar/activeobject/App.java index e589c4a87..b88b4c559 100644 --- a/active-object/src/main/java/com/iluwatar/activeobject/App.java +++ b/active-object/src/main/java/com/iluwatar/activeobject/App.java @@ -26,7 +26,6 @@ package com.iluwatar.activeobject; import java.util.ArrayList; import java.util.List; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -58,7 +57,7 @@ public class App implements Runnable { public void run() { List creatures = new ArrayList<>(); try { - for (int i = 0;i < NUM_CREATURES;i++) { + for (int i = 0; i < NUM_CREATURES; i++) { creatures.add(new Orc(Orc.class.getSimpleName() + i)); creatures.get(i).eat(); creatures.get(i).roam(); @@ -68,7 +67,7 @@ public class App implements Runnable { logger.error(e.getMessage()); Thread.currentThread().interrupt(); } finally { - for (int i = 0;i < NUM_CREATURES;i++) { + for (int i = 0; i < NUM_CREATURES; i++) { creatures.get(i).kill(0); } } diff --git a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java index 5d5c2a081..10024ff0d 100644 --- a/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java +++ b/adapter/src/test/java/com/iluwatar/adapter/AdapterPatternTest.java @@ -26,7 +26,6 @@ package com.iluwatar.adapter; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import java.util.HashMap; import java.util.Map; diff --git a/business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java b/business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java index 79ee0b0f4..d3ab8a853 100644 --- a/business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java +++ b/business-delegate/src/test/java/com/iluwatar/business/delegate/AppTest.java @@ -25,7 +25,6 @@ package com.iluwatar.business.delegate; import org.junit.jupiter.api.Test; - import java.io.IOException; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/caching/src/main/java/com/iluwatar/caching/AppManager.java b/caching/src/main/java/com/iluwatar/caching/AppManager.java index 01e9a4a64..3d2985375 100644 --- a/caching/src/main/java/com/iluwatar/caching/AppManager.java +++ b/caching/src/main/java/com/iluwatar/caching/AppManager.java @@ -25,9 +25,7 @@ package com.iluwatar.caching; import com.iluwatar.caching.database.DbManager; - import java.util.Optional; - import lombok.extern.slf4j.Slf4j; /** diff --git a/caching/src/main/java/com/iluwatar/caching/CacheStore.java b/caching/src/main/java/com/iluwatar/caching/CacheStore.java index bf956def1..2c7184f57 100644 --- a/caching/src/main/java/com/iluwatar/caching/CacheStore.java +++ b/caching/src/main/java/com/iluwatar/caching/CacheStore.java @@ -28,7 +28,6 @@ import com.iluwatar.caching.database.DbManager; import java.util.List; import java.util.Optional; import java.util.stream.Collectors; - import lombok.extern.slf4j.Slf4j; /** diff --git a/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java b/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java index 31f5fdc96..f2fa696cc 100644 --- a/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java +++ b/caching/src/main/java/com/iluwatar/caching/database/MongoDb.java @@ -52,7 +52,7 @@ public class MongoDb implements DbManager { private MongoClient client; private MongoDatabase db; - void setDB(MongoDatabase db) { + void setDb(MongoDatabase db) { this.db = db; } diff --git a/caching/src/main/java/com/iluwatar/caching/database/VirtualDb.java b/caching/src/main/java/com/iluwatar/caching/database/VirtualDb.java index 604cb83e3..6155e1d69 100644 --- a/caching/src/main/java/com/iluwatar/caching/database/VirtualDb.java +++ b/caching/src/main/java/com/iluwatar/caching/database/VirtualDb.java @@ -25,7 +25,6 @@ package com.iluwatar.caching.database; import com.iluwatar.caching.UserAccount; - import java.util.HashMap; import java.util.Map; diff --git a/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java b/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java index 16d38f175..5cb130a34 100644 --- a/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java +++ b/caching/src/test/java/com/iluwatar/caching/database/MongoDbTest.java @@ -55,7 +55,7 @@ class MongoDbTest { @BeforeEach void init() { db = mock(MongoDatabase.class); - mongoDb.setDB(db); + mongoDb.setDb(db); userAccount = new UserAccount(ID, NAME, ADDITIONAL_INFO); } diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml index f741eb3a0..5df5050f0 100644 --- a/checkstyle-suppressions.xml +++ b/checkstyle-suppressions.xml @@ -7,4 +7,5 @@ + diff --git a/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/CollectingParameterTest.java b/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/CollectingParameterTest.java index 76f74d3a0..9818dbb18 100644 --- a/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/CollectingParameterTest.java +++ b/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/CollectingParameterTest.java @@ -27,7 +27,6 @@ package com.iluwatar.collectingparameter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; - import java.util.LinkedList; import java.util.Queue; diff --git a/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/PrinterQueueTest.java b/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/PrinterQueueTest.java index 20cdb49f3..8cbe071a5 100644 --- a/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/PrinterQueueTest.java +++ b/collecting-parameter/src/test/java/com/iluwatar/collectingparameter/PrinterQueueTest.java @@ -27,7 +27,6 @@ package com.iluwatar.collectingparameter; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Timeout; - import java.util.LinkedList; import java.util.Queue; diff --git a/commander/src/main/java/com/iluwatar/commander/Service.java b/commander/src/main/java/com/iluwatar/commander/Service.java index 50c237d5e..e3177fc30 100644 --- a/commander/src/main/java/com/iluwatar/commander/Service.java +++ b/commander/src/main/java/com/iluwatar/commander/Service.java @@ -25,7 +25,6 @@ package com.iluwatar.commander; import com.iluwatar.commander.exceptions.DatabaseUnavailableException; - import java.security.SecureRandom; import java.util.ArrayList; import java.util.Hashtable; diff --git a/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java b/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java index e5eb489a4..c584d2ebd 100644 --- a/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java +++ b/commander/src/main/java/com/iluwatar/commander/employeehandle/EmployeeDatabase.java @@ -27,7 +27,6 @@ package com.iluwatar.commander.employeehandle; import com.iluwatar.commander.Database; import com.iluwatar.commander.Order; import com.iluwatar.commander.exceptions.DatabaseUnavailableException; - import java.util.HashMap; import java.util.Map; diff --git a/commander/src/test/java/com/iluwatar/commander/CommanderTest.java b/commander/src/test/java/com/iluwatar/commander/CommanderTest.java index a3b2c641a..42405417c 100644 --- a/commander/src/test/java/com/iluwatar/commander/CommanderTest.java +++ b/commander/src/test/java/com/iluwatar/commander/CommanderTest.java @@ -37,10 +37,8 @@ import com.iluwatar.commander.paymentservice.PaymentService; import com.iluwatar.commander.queue.QueueDatabase; import com.iluwatar.commander.shippingservice.ShippingDatabase; import com.iluwatar.commander.shippingservice.ShippingService; - import org.junit.jupiter.api.Test; import org.junit.platform.commons.util.StringUtils; - import java.util.ArrayList; import java.util.List; diff --git a/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java b/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java index 27c829a75..547c6ed46 100644 --- a/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java +++ b/composite-view/src/test/java/com/iluwatar/compositeview/AppServletTest.java @@ -29,7 +29,6 @@ import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import org.junit.jupiter.api.Test; import org.mockito.Mockito; - import java.io.PrintWriter; import java.io.StringWriter; diff --git a/context-object/src/main/java/com/iluwatar/context/object/LayerA.java b/context-object/src/main/java/com/iluwatar/context/object/LayerA.java index 5d1ae4513..87faec2a8 100644 --- a/context-object/src/main/java/com/iluwatar/context/object/LayerA.java +++ b/context-object/src/main/java/com/iluwatar/context/object/LayerA.java @@ -26,6 +26,9 @@ package com.iluwatar.context.object; import lombok.Getter; +/** + * Layer A in the context object pattern. + */ @Getter public class LayerA { diff --git a/context-object/src/main/java/com/iluwatar/context/object/LayerB.java b/context-object/src/main/java/com/iluwatar/context/object/LayerB.java index 73229d4fe..d4991f17f 100644 --- a/context-object/src/main/java/com/iluwatar/context/object/LayerB.java +++ b/context-object/src/main/java/com/iluwatar/context/object/LayerB.java @@ -26,6 +26,9 @@ package com.iluwatar.context.object; import lombok.Getter; +/** + * Layer B in the context object pattern. + */ @Getter public class LayerB { diff --git a/context-object/src/main/java/com/iluwatar/context/object/LayerC.java b/context-object/src/main/java/com/iluwatar/context/object/LayerC.java index 1d1604beb..78c6dcec5 100644 --- a/context-object/src/main/java/com/iluwatar/context/object/LayerC.java +++ b/context-object/src/main/java/com/iluwatar/context/object/LayerC.java @@ -26,6 +26,9 @@ package com.iluwatar.context.object; import lombok.Getter; +/** + * Layer C in the context object pattern. + */ @Getter public class LayerC { diff --git a/cqrs/src/main/java/com/iluwatar/cqrs/commandes/ICommandService.java b/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandService.java similarity index 98% rename from cqrs/src/main/java/com/iluwatar/cqrs/commandes/ICommandService.java rename to cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandService.java index 5cba383cf..114280afb 100644 --- a/cqrs/src/main/java/com/iluwatar/cqrs/commandes/ICommandService.java +++ b/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandService.java @@ -27,7 +27,7 @@ package com.iluwatar.cqrs.commandes; /** * This interface represents the commands of the CQRS pattern. */ -public interface ICommandService { +public interface CommandService { void authorCreated(String username, String name, String email); diff --git a/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java b/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java index 3572b3c20..52b32dc45 100644 --- a/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java +++ b/cqrs/src/main/java/com/iluwatar/cqrs/commandes/CommandServiceImpl.java @@ -30,10 +30,10 @@ import com.iluwatar.cqrs.util.HibernateUtil; import org.hibernate.SessionFactory; /** - * This class is an implementation of {@link ICommandService} interface. It uses Hibernate as an api + * This class is an implementation of {@link CommandService} interface. It uses Hibernate as an api * for persistence. */ -public class CommandServiceImpl implements ICommandService { +public class CommandServiceImpl implements CommandService { private final SessionFactory sessionFactory = HibernateUtil.getSessionFactory(); diff --git a/cqrs/src/main/java/com/iluwatar/cqrs/queries/IQueryService.java b/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryService.java similarity index 98% rename from cqrs/src/main/java/com/iluwatar/cqrs/queries/IQueryService.java rename to cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryService.java index 590a61c15..c226c6f21 100644 --- a/cqrs/src/main/java/com/iluwatar/cqrs/queries/IQueryService.java +++ b/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryService.java @@ -32,7 +32,7 @@ import java.util.List; /** * This interface represents the query methods of the CQRS pattern. */ -public interface IQueryService { +public interface QueryService { Author getAuthorByUsername(String username); diff --git a/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java b/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java index 38a4b6ce9..ed6db0b50 100644 --- a/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java +++ b/cqrs/src/main/java/com/iluwatar/cqrs/queries/QueryServiceImpl.java @@ -34,51 +34,51 @@ import org.hibernate.SessionFactory; import org.hibernate.query.Query; /** - * This class is an implementation of {@link IQueryService}. It uses Hibernate native queries to + * This class is an implementation of {@link QueryService}. It uses Hibernate native queries to * return DTOs from the database. */ -public class QueryServiceImpl implements IQueryService { +public class QueryServiceImpl implements QueryService { private final SessionFactory sessionFactory = HibernateUtil.getSessionFactory(); @Override public Author getAuthorByUsername(String username) { - Author authorDTo; + Author authorDto; try (var session = sessionFactory.openSession()) { Query sqlQuery = session.createQuery( "select new com.iluwatar.cqrs.dto.Author(a.name, a.email, a.username)" + " from com.iluwatar.cqrs.domain.model.Author a where a.username=:username"); sqlQuery.setParameter(AppConstants.USER_NAME, username); - authorDTo = sqlQuery.uniqueResult(); + authorDto = sqlQuery.uniqueResult(); } - return authorDTo; + return authorDto; } @Override public Book getBook(String title) { - Book bookDTo; + Book bookDto; try (var session = sessionFactory.openSession()) { Query sqlQuery = session.createQuery( "select new com.iluwatar.cqrs.dto.Book(b.title, b.price)" + " from com.iluwatar.cqrs.domain.model.Book b where b.title=:title"); sqlQuery.setParameter("title", title); - bookDTo = sqlQuery.uniqueResult(); + bookDto = sqlQuery.uniqueResult(); } - return bookDTo; + return bookDto; } @Override public List getAuthorBooks(String username) { - List bookDTos; + List bookDtos; try (var session = sessionFactory.openSession()) { Query sqlQuery = session.createQuery( "select new com.iluwatar.cqrs.dto.Book(b.title, b.price)" + " from com.iluwatar.cqrs.domain.model.Author a, com.iluwatar.cqrs.domain.model.Book b " + "where b.author.id = a.id and a.username=:username"); sqlQuery.setParameter(AppConstants.USER_NAME, username); - bookDTos = sqlQuery.list(); + bookDtos = sqlQuery.list(); } - return bookDTos; + return bookDtos; } @Override diff --git a/cqrs/src/test/java/com/iluwatar/cqrs/IntegrationTest.java b/cqrs/src/test/java/com/iluwatar/cqrs/IntegrationTest.java index 0b64602b5..d7df072aa 100644 --- a/cqrs/src/test/java/com/iluwatar/cqrs/IntegrationTest.java +++ b/cqrs/src/test/java/com/iluwatar/cqrs/IntegrationTest.java @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.iluwatar.cqrs.commandes.CommandServiceImpl; import com.iluwatar.cqrs.dto.Author; import com.iluwatar.cqrs.dto.Book; -import com.iluwatar.cqrs.queries.IQueryService; +import com.iluwatar.cqrs.queries.QueryService; import com.iluwatar.cqrs.queries.QueryServiceImpl; import java.math.BigInteger; import org.junit.jupiter.api.BeforeAll; @@ -41,7 +41,7 @@ import org.junit.jupiter.api.Test; */ class IntegrationTest { - private static IQueryService queryService; + private static QueryService queryService; @BeforeAll static void initializeAndPopulateDatabase() { diff --git a/currying/src/test/java/com/iluwatar/currying/BookCurryingTest.java b/currying/src/test/java/com/iluwatar/currying/BookCurryingTest.java index 437941583..74ac4ead3 100644 --- a/currying/src/test/java/com/iluwatar/currying/BookCurryingTest.java +++ b/currying/src/test/java/com/iluwatar/currying/BookCurryingTest.java @@ -28,7 +28,6 @@ import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; - import java.time.LocalDate; /** diff --git a/data-transfer-object/src/test/java/com/iluwatar/datatransfer/customer/CustomerResourceTest.java b/data-transfer-object/src/test/java/com/iluwatar/datatransfer/customer/CustomerResourceTest.java index 59d379d1e..cc14c059a 100644 --- a/data-transfer-object/src/test/java/com/iluwatar/datatransfer/customer/CustomerResourceTest.java +++ b/data-transfer-object/src/test/java/com/iluwatar/datatransfer/customer/CustomerResourceTest.java @@ -29,7 +29,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; - import com.iluwatar.datatransfer.customer.CustomerDto; import com.iluwatar.datatransfer.customer.CustomerResource; import org.junit.jupiter.api.Test; diff --git a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/utils/InMemoryAppender.java b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/utils/InMemoryAppender.java index c1f774b1b..f39877810 100644 --- a/dependency-injection/src/test/java/com/iluwatar/dependency/injection/utils/InMemoryAppender.java +++ b/dependency-injection/src/test/java/com/iluwatar/dependency/injection/utils/InMemoryAppender.java @@ -28,7 +28,6 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; import org.slf4j.LoggerFactory; - import java.util.LinkedList; import java.util.List; diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/App.java b/domain-model/src/main/java/com/iluwatar/domainmodel/App.java index 681e7c4fc..89c848f66 100644 --- a/domain-model/src/main/java/com/iluwatar/domainmodel/App.java +++ b/domain-model/src/main/java/com/iluwatar/domainmodel/App.java @@ -29,7 +29,6 @@ import static org.joda.money.CurrencyUnit.USD; import java.sql.SQLException; import java.time.LocalDate; import javax.sql.DataSource; - import org.h2.jdbcx.JdbcDataSource; import org.joda.money.Money; diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/Customer.java b/domain-model/src/main/java/com/iluwatar/domainmodel/Customer.java index 333ae2f98..e0f646a77 100644 --- a/domain-model/src/main/java/com/iluwatar/domainmodel/Customer.java +++ b/domain-model/src/main/java/com/iluwatar/domainmodel/Customer.java @@ -28,7 +28,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Optional; - import lombok.Builder; import lombok.Getter; import lombok.NonNull; diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDao.java b/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDao.java index cae939b00..1375a0323 100644 --- a/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDao.java +++ b/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDao.java @@ -27,6 +27,9 @@ package com.iluwatar.domainmodel; import java.sql.SQLException; import java.util.Optional; +/** + * DAO interface for customer transactions. + */ public interface CustomerDao { Optional findByName(String name) throws SQLException; diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDaoImpl.java b/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDaoImpl.java index f34afa3b8..b24da7a49 100644 --- a/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDaoImpl.java +++ b/domain-model/src/main/java/com/iluwatar/domainmodel/CustomerDaoImpl.java @@ -30,9 +30,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Optional; import javax.sql.DataSource; - import org.joda.money.Money; +/** + * Implementations for database operations of Customer. + */ public class CustomerDaoImpl implements CustomerDao { private final DataSource dataSource; diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/Product.java b/domain-model/src/main/java/com/iluwatar/domainmodel/Product.java index 4fda5f341..6d2f37a02 100644 --- a/domain-model/src/main/java/com/iluwatar/domainmodel/Product.java +++ b/domain-model/src/main/java/com/iluwatar/domainmodel/Product.java @@ -31,7 +31,6 @@ import java.sql.SQLException; import java.time.LocalDate; import java.time.temporal.ChronoUnit; import java.util.Optional; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDao.java b/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDao.java index 5c156e220..bfedc5098 100644 --- a/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDao.java +++ b/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDao.java @@ -27,6 +27,9 @@ package com.iluwatar.domainmodel; import java.sql.SQLException; import java.util.Optional; +/** + * DAO interface for product transactions. + */ public interface ProductDao { Optional findByName(String name) throws SQLException; diff --git a/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDaoImpl.java b/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDaoImpl.java index ab011cec7..781bc3a80 100644 --- a/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDaoImpl.java +++ b/domain-model/src/main/java/com/iluwatar/domainmodel/ProductDaoImpl.java @@ -31,10 +31,11 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.Optional; import javax.sql.DataSource; - import org.joda.money.Money; - +/** + * Implementations for database transactions of Product. + */ public class ProductDaoImpl implements ProductDao { private final DataSource dataSource; diff --git a/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerDaoImplTest.java b/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerDaoImplTest.java index e704c61fd..9251420ba 100644 --- a/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerDaoImplTest.java +++ b/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerDaoImplTest.java @@ -29,7 +29,6 @@ import org.joda.money.Money; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import javax.sql.DataSource; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerTest.java b/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerTest.java index 47f201b73..cb55f3303 100644 --- a/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerTest.java +++ b/domain-model/src/test/java/com/iluwatar/domainmodel/CustomerTest.java @@ -28,7 +28,6 @@ import org.joda.money.CurrencyUnit; import org.joda.money.Money; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import java.sql.SQLException; import java.time.LocalDate; import java.util.ArrayList; diff --git a/domain-model/src/test/java/com/iluwatar/domainmodel/ProductDaoImplTest.java b/domain-model/src/test/java/com/iluwatar/domainmodel/ProductDaoImplTest.java index cf460b9ef..ae2985afa 100644 --- a/domain-model/src/test/java/com/iluwatar/domainmodel/ProductDaoImplTest.java +++ b/domain-model/src/test/java/com/iluwatar/domainmodel/ProductDaoImplTest.java @@ -28,7 +28,6 @@ import org.joda.money.Money; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import javax.sql.DataSource; import java.sql.ResultSet; import java.sql.SQLException; diff --git a/domain-model/src/test/java/com/iluwatar/domainmodel/ProductTest.java b/domain-model/src/test/java/com/iluwatar/domainmodel/ProductTest.java index bb55ef44d..f3326fe3b 100644 --- a/domain-model/src/test/java/com/iluwatar/domainmodel/ProductTest.java +++ b/domain-model/src/test/java/com/iluwatar/domainmodel/ProductTest.java @@ -27,7 +27,6 @@ package com.iluwatar.domainmodel; import org.joda.money.Money; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import java.sql.SQLException; import java.time.LocalDate; import java.util.Optional; diff --git a/domain-model/src/test/java/com/iluwatar/domainmodel/TestUtils.java b/domain-model/src/test/java/com/iluwatar/domainmodel/TestUtils.java index b6d789252..5c788fa8e 100644 --- a/domain-model/src/test/java/com/iluwatar/domainmodel/TestUtils.java +++ b/domain-model/src/test/java/com/iluwatar/domainmodel/TestUtils.java @@ -25,7 +25,6 @@ package com.iluwatar.domainmodel; import org.h2.jdbcx.JdbcDataSource; - import javax.sql.DataSource; import java.sql.SQLException; diff --git a/embedded-value/src/main/java/com/iluwatar/embedded/value/App.java b/embedded-value/src/main/java/com/iluwatar/embedded/value/App.java index 9e5011c59..3a5162960 100644 --- a/embedded-value/src/main/java/com/iluwatar/embedded/value/App.java +++ b/embedded-value/src/main/java/com/iluwatar/embedded/value/App.java @@ -25,22 +25,20 @@ package com.iluwatar.embedded.value; import java.util.stream.Collectors; - import lombok.extern.slf4j.Slf4j; -/* - * Many small objects make sense in an OO system that don’t make sense as +/** + *

Many small objects make sense in an OO system that don’t make sense as * tables in a database. Examples include currency-aware money objects (amount, currency) and date * ranges. Although the default thinking is to save an object as a table, no sane - * person would want a table of money values. + * person would want a table of money values.

* - * An Embedded Value maps the values of an object to fields in the record of + *

An Embedded Value maps the values of an object to fields in the record of * the object’s owner. In this implementation we have an Order object with links to an * ShippingAddress object. In the resulting table the fields in the ShippingAddress * object map to fields in the Order table rather than make new records - * themselves. + * themselves.

*/ - @Slf4j public class App { @@ -62,11 +60,9 @@ public class App { final var order3 = new Order("Carrie Soto is Back", "Shiva", new ShippingAddress("Bangalore", "Karnataka", "560004")); - /** - * Create table for orders - Orders(id, name, orderedBy, city, state, pincode). - * We can see that table is different from the Order object we have. - * We're mapping ShippingAddress into city, state, pincode colummns of the database and not creating a separate table. - */ + // Create table for orders - Orders(id, name, orderedBy, city, state, pincode). + // We can see that table is different from the Order object we have. + // We're mapping ShippingAddress into city, state, pincode colummns of the database and not creating a separate table. if (dataSource.createSchema()) { LOGGER.info("TABLE CREATED"); LOGGER.info("Table \"Orders\" schema:\n" + dataSource.getSchema()); @@ -84,21 +80,17 @@ public class App { dataSource.insertOrder(order2); dataSource.insertOrder(order3); - /** - * Query orders - * We'll create ShippingAddress object from city, state, pincode values from the table - * and add it to Order object - */ + + // Query orders. + // We'll create ShippingAddress object from city, state, pincode values from the table and add it to Order object LOGGER.info("Orders Query: {}", dataSource.queryOrders().collect(Collectors.toList()) + "\n"); //Query order by given id LOGGER.info("Query Order with id=2: {}", dataSource.queryOrder(2)); - /** - * Remove order by given id. - * Since we'd mapped address in the same table, deleting order will also take - * out the shipping address details - */ + + //Remove order by given id. + //Since we'd mapped address in the same table, deleting order will also take out the shipping address details. LOGGER.info("Remove Order with id=1"); dataSource.removeOrder(1); LOGGER.info("\nOrders Query: {}", dataSource.queryOrders().collect(Collectors.toList()) + "\n"); diff --git a/embedded-value/src/main/java/com/iluwatar/embedded/value/DataSource.java b/embedded-value/src/main/java/com/iluwatar/embedded/value/DataSource.java index e2ec2ed7c..520331b50 100644 --- a/embedded-value/src/main/java/com/iluwatar/embedded/value/DataSource.java +++ b/embedded-value/src/main/java/com/iluwatar/embedded/value/DataSource.java @@ -31,36 +31,29 @@ import java.sql.SQLException; import java.sql.Statement; import java.util.ArrayList; import java.util.stream.Stream; - import lombok.extern.slf4j.Slf4j; -/* - * Communicates with H2 database with the help of JDBC API - * - * Inherits the SQL queries and methods from @link AbstractDataSource class - */ +/** + * Communicates with H2 database with the help of JDBC API. + * Inherits the SQL queries and methods from @link AbstractDataSource class. + */ @Slf4j public class DataSource implements DataSourceInterface { private Connection conn; - /** - * Statements are objects which are used to execute queries which will not be - * repeated. - */ + // Statements are objects which are used to execute queries which will not be repeated. private Statement getschema; private Statement deleteschema; private Statement queryOrders; - /* - * PreparedStatements are used to execute queries which will be repeated. - */ + // PreparedStatements are used to execute queries which will be repeated. private PreparedStatement insertIntoOrders; private PreparedStatement removeorder; - private PreparedStatement queyOrderByID; + private PreparedStatement queyOrderById; /** - * {@summary} - * Establish connection to database. + * {@summary Establish connection to database. + * Constructor to create DataSource object.} */ public DataSource() { try { @@ -79,7 +72,7 @@ public class DataSource implements DataSourceInterface { getschema = conn.createStatement(); queryOrders = conn.createStatement(); removeorder = conn.prepareStatement(REMOVE_ORDER); - queyOrderByID = conn.prepareStatement(QUERY_ORDER); + queyOrderById = conn.prepareStatement(QUERY_ORDER); deleteschema = conn.createStatement(); } catch (SQLException e) { LOGGER.error(e.getLocalizedMessage(), e.getCause()); @@ -156,7 +149,6 @@ public class DataSource implements DataSourceInterface { } /** - * {@summary} * Query order by given id. * @param id as the parameter * @return Order objct @@ -166,9 +158,9 @@ public class DataSource implements DataSourceInterface { @Override public Order queryOrder(int id) throws SQLException { Order order = null; - queyOrderByID.setInt(1, id); - try (var rSet = queyOrderByID.executeQuery()) { - queyOrderByID.setInt(1, id); + queyOrderById.setInt(1, id); + try (var rSet = queyOrderById.executeQuery()) { + queyOrderById.setInt(1, id); if (rSet.next()) { var address = new ShippingAddress(rSet.getString(4), rSet.getString(5), rSet.getString(6)); @@ -204,7 +196,7 @@ public class DataSource implements DataSourceInterface { try { deleteschema.execute(DELETE_SCHEMA); queryOrders.close(); - queyOrderByID.close(); + queyOrderById.close(); deleteschema.close(); insertIntoOrders.close(); conn.close(); diff --git a/embedded-value/src/main/java/com/iluwatar/embedded/value/Order.java b/embedded-value/src/main/java/com/iluwatar/embedded/value/Order.java index 9c87a83f6..c4984dd4c 100644 --- a/embedded-value/src/main/java/com/iluwatar/embedded/value/Order.java +++ b/embedded-value/src/main/java/com/iluwatar/embedded/value/Order.java @@ -27,7 +27,8 @@ package com.iluwatar.embedded.value; import lombok.Getter; import lombok.Setter; import lombok.ToString; -/* + +/** * A POJO which represents the Order object. */ @ToString diff --git a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java index 5fb7aeaf9..60bc05639 100644 --- a/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java +++ b/event-aggregator/src/main/java/com/iluwatar/event/aggregator/EventEmitter.java @@ -63,8 +63,8 @@ public abstract class EventEmitter { protected void notifyObservers(Event e) { if (observerLists.containsKey(e)) { observerLists - .get(e) - .forEach(observer -> observer.onEvent(e)); + .get(e) + .forEach(observer -> observer.onEvent(e)); } } diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java index e92163e6e..b65c4e94f 100644 --- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java +++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/App.java @@ -53,7 +53,7 @@ import lombok.extern.slf4j.Slf4j; * Communicate with pending asynchronous operations using the familiar events-and-delegates model. * * @see EventManager - * @see Event + * @see AsyncEvent */ @Slf4j public class App { diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/AsyncEvent.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/AsyncEvent.java new file mode 100644 index 000000000..63239a476 --- /dev/null +++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/AsyncEvent.java @@ -0,0 +1,99 @@ +/* + * This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt). + * + * The MIT License + * Copyright © 2014-2022 Ilkka Seppälä + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.iluwatar.event.asynchronous; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +/** + * Each Event runs as a separate/individual thread. + */ +@Slf4j +@RequiredArgsConstructor +public class AsyncEvent implements Event, Runnable { + + private final int eventId; + private final int eventTime; + @Getter + private final boolean synchronous; + private Thread thread; + private boolean isComplete = false; + private ThreadCompleteListener eventListener; + + @Override + public void start() { + thread = new Thread(this); + thread.start(); + } + + @Override + public void stop() { + if (null == thread) { + return; + } + thread.interrupt(); + } + + @Override + public void status() { + if (!isComplete) { + LOGGER.info("[{}] is not done.", eventId); + } else { + LOGGER.info("[{}] is done.", eventId); + } + } + + @Override + public void run() { + var currentTime = System.currentTimeMillis(); + var endTime = currentTime + (eventTime * 1000); + while (System.currentTimeMillis() < endTime) { + try { + Thread.sleep(1000); // Sleep for 1 second. + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + return; + } + } + isComplete = true; + completed(); + } + + public final void addListener(final ThreadCompleteListener listener) { + this.eventListener = listener; + } + + public final void removeListener() { + this.eventListener = null; + } + + private void completed() { + if (eventListener != null) { + eventListener.completedEventHandler(eventId); + } + } + +} diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java index ed4feb1fe..663ba5a7e 100644 --- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java +++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/Event.java @@ -24,76 +24,15 @@ */ package com.iluwatar.event.asynchronous; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - /** - * Each Event runs as a separate/individual thread. + * Events that fulfill the start stop and list out current status behaviour follow this interface. */ -@Slf4j -@RequiredArgsConstructor -public class Event implements IEvent, Runnable { +public interface Event { - private final int eventId; - private final int eventTime; - @Getter - private final boolean synchronous; - private Thread thread; - private boolean isComplete = false; - private ThreadCompleteListener eventListener; + void start(); - @Override - public void start() { - thread = new Thread(this); - thread.start(); - } + void stop(); - @Override - public void stop() { - if (null == thread) { - return; - } - thread.interrupt(); - } - - @Override - public void status() { - if (!isComplete) { - LOGGER.info("[{}] is not done.", eventId); - } else { - LOGGER.info("[{}] is done.", eventId); - } - } - - @Override - public void run() { - var currentTime = System.currentTimeMillis(); - var endTime = currentTime + (eventTime * 1000); - while (System.currentTimeMillis() < endTime) { - try { - Thread.sleep(1000); // Sleep for 1 second. - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - return; - } - } - isComplete = true; - completed(); - } - - public final void addListener(final ThreadCompleteListener listener) { - this.eventListener = listener; - } - - public final void removeListener(final ThreadCompleteListener listener) { - this.eventListener = null; - } - - private void completed() { - if (eventListener != null) { - eventListener.completedEventHandler(eventId); - } - } + void status(); } diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java index 9b0a55c8c..8414d145e 100644 --- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java +++ b/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/EventManager.java @@ -29,7 +29,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; /** - * EventManager handles and maintains a pool of event threads. {@link Event} threads are created + * EventManager handles and maintains a pool of event threads. {@link AsyncEvent} threads are created * upon user request. Thre are two types of events; Asynchronous and Synchronous. There can be * multiple Asynchronous events running at once but only one Synchronous event running at a time. * Currently supported event operations are: start, stop, and getStatus. Once an event is complete, @@ -45,7 +45,7 @@ public class EventManager implements ThreadCompleteListener { public static final int MAX_EVENT_TIME = 1800; // in seconds / 30 minutes. private int currentlyRunningSyncEvent = -1; private final SecureRandom rand; - private final Map eventPool; + private final Map eventPool; private static final String DOES_NOT_EXIST = " does not exist."; @@ -108,7 +108,7 @@ public class EventManager implements ThreadCompleteListener { var newEventId = generateId(); - var newEvent = new Event(newEventId, eventTime, isSynchronous); + var newEvent = new AsyncEvent(newEventId, eventTime, isSynchronous); newEvent.addListener(this); eventPool.put(newEventId, newEvent); @@ -167,7 +167,7 @@ public class EventManager implements ThreadCompleteListener { */ @SuppressWarnings("rawtypes") public void statusOfAllEvents() { - eventPool.entrySet().forEach(entry -> ((Event) ((Map.Entry) entry).getValue()).status()); + eventPool.entrySet().forEach(entry -> ((AsyncEvent) ((Map.Entry) entry).getValue()).status()); } /** @@ -175,7 +175,7 @@ public class EventManager implements ThreadCompleteListener { */ @SuppressWarnings("rawtypes") public void shutdown() { - eventPool.entrySet().forEach(entry -> ((Event) ((Map.Entry) entry).getValue()).stop()); + eventPool.entrySet().forEach(entry -> ((AsyncEvent) ((Map.Entry) entry).getValue()).stop()); } /** @@ -195,7 +195,7 @@ public class EventManager implements ThreadCompleteListener { } /** - * Callback from an {@link Event} (once it is complete). The Event is then removed from the pool. + * Callback from an {@link AsyncEvent} (once it is complete). The Event is then removed from the pool. */ @Override public void completedEventHandler(int eventId) { @@ -209,7 +209,7 @@ public class EventManager implements ThreadCompleteListener { /** * Getter method for event pool. */ - public Map getEventPool() { + public Map getEventPool() { return eventPool; } diff --git a/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java b/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java index 677fdb869..e54a0874f 100644 --- a/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java +++ b/event-asynchronous/src/test/java/com/iluwatar/event/asynchronous/EventAsynchronousTest.java @@ -136,4 +136,26 @@ class EventAsynchronousTest { LOGGER.error(e.getMessage()); } } -} + + @Test + void testLongRunningEventException(){ + assertThrows(LongRunningEventException.class, () -> { + var eventManager = new EventManager(); + eventManager.createAsync(2000); + }); + } + + + @Test + void testMaxNumOfEventsAllowedException(){ + assertThrows(MaxNumOfEventsAllowedException.class, () -> { + final var eventManager = new EventManager(); + for(int i=0;i<1100;i++){ + eventManager.createAsync(i); + } + }); + } + + + +} \ No newline at end of file diff --git a/execute-around/src/main/java/com/iluwatar/execute/around/App.java b/execute-around/src/main/java/com/iluwatar/execute/around/App.java index d44dfd42d..a956dd57a 100644 --- a/execute-around/src/main/java/com/iluwatar/execute/around/App.java +++ b/execute-around/src/main/java/com/iluwatar/execute/around/App.java @@ -27,7 +27,6 @@ package com.iluwatar.execute.around; import java.io.File; import java.io.IOException; import java.util.Scanner; - import lombok.extern.slf4j.Slf4j; /** diff --git a/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java b/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java index c0d3ad6e2..66c844aa4 100644 --- a/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java +++ b/execute-around/src/main/java/com/iluwatar/execute/around/SimpleFileWriter.java @@ -26,7 +26,6 @@ package com.iluwatar.execute.around; import java.io.FileWriter; import java.io.IOException; - import lombok.extern.slf4j.Slf4j; /** diff --git a/extension-objects/src/test/java/concreteextensions/CommanderTest.java b/extension-objects/src/test/java/concreteextensions/CommanderTest.java index 0aa8281ac..56343ba4b 100644 --- a/extension-objects/src/test/java/concreteextensions/CommanderTest.java +++ b/extension-objects/src/test/java/concreteextensions/CommanderTest.java @@ -31,7 +31,6 @@ import ch.qos.logback.core.read.ListAppender; import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import units.CommanderUnit; - import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/extension-objects/src/test/java/concreteextensions/SergeantTest.java b/extension-objects/src/test/java/concreteextensions/SergeantTest.java index ae2bcb57d..2c75e3ef5 100644 --- a/extension-objects/src/test/java/concreteextensions/SergeantTest.java +++ b/extension-objects/src/test/java/concreteextensions/SergeantTest.java @@ -31,7 +31,6 @@ import ch.qos.logback.core.read.ListAppender; import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; import units.SergeantUnit; - import java.util.List; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/factory-kit/src/main/java/com/iluwatar/factorykit/App.java b/factory-kit/src/main/java/com/iluwatar/factorykit/App.java index 8b5bdb0a1..9ec59e7ca 100644 --- a/factory-kit/src/main/java/com/iluwatar/factorykit/App.java +++ b/factory-kit/src/main/java/com/iluwatar/factorykit/App.java @@ -25,7 +25,6 @@ package com.iluwatar.factorykit; import java.util.ArrayList; - import lombok.extern.slf4j.Slf4j; /** diff --git a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/App.java b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/App.java index e4d8c93f9..83f51f647 100644 --- a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/App.java +++ b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/App.java @@ -26,7 +26,6 @@ package com.iluwatar.fanout.fanin; import java.util.Arrays; import java.util.List; - import lombok.extern.slf4j.Slf4j; diff --git a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/Consumer.java b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/Consumer.java index 3f8619d47..acb1f2a05 100644 --- a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/Consumer.java +++ b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/Consumer.java @@ -25,7 +25,6 @@ package com.iluwatar.fanout.fanin; import java.util.concurrent.atomic.AtomicLong; - import lombok.Getter; diff --git a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/SquareNumberRequest.java b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/SquareNumberRequest.java index a4c2ce1c9..4ae062a62 100644 --- a/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/SquareNumberRequest.java +++ b/fanout-fanin/src/main/java/com/iluwatar/fanout/fanin/SquareNumberRequest.java @@ -25,7 +25,6 @@ package com.iluwatar.fanout.fanin; import java.security.SecureRandom; - import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/FanOutFanInTest.java b/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/FanOutFanInTest.java index 33315adfd..bd31108b7 100644 --- a/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/FanOutFanInTest.java +++ b/fanout-fanin/src/test/java/com/iluwatar/fanout/fanin/FanOutFanInTest.java @@ -26,7 +26,6 @@ package com.iluwatar.fanout.fanin; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; - import java.util.Arrays; import java.util.List; diff --git a/filterer/src/main/java/com/iluwatar/filterer/threat/ProbabilisticThreatAwareSystem.java b/filterer/src/main/java/com/iluwatar/filterer/threat/ProbabilisticThreatAwareSystem.java index e2554bbcc..79446d4fe 100644 --- a/filterer/src/main/java/com/iluwatar/filterer/threat/ProbabilisticThreatAwareSystem.java +++ b/filterer/src/main/java/com/iluwatar/filterer/threat/ProbabilisticThreatAwareSystem.java @@ -25,7 +25,6 @@ package com.iluwatar.filterer.threat; import com.iluwatar.filterer.domain.Filterer; - import java.util.List; /** @@ -35,14 +34,14 @@ public interface ProbabilisticThreatAwareSystem extends ThreatAwareSystem { /** * {@inheritDoc} - * @return + * @return {@link ProbableThreat} */ @Override List threats(); /** * {@inheritDoc} - * @return + * @return {@link Filterer} */ @Override Filterer filtered(); diff --git a/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatAwareSystem.java b/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatAwareSystem.java index 53e6286f2..6e9bf7af6 100644 --- a/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatAwareSystem.java +++ b/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatAwareSystem.java @@ -25,7 +25,6 @@ package com.iluwatar.filterer.threat; import com.iluwatar.filterer.domain.Filterer; - import java.util.List; /** diff --git a/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatType.java b/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatType.java index 827e4cabf..72293ce13 100644 --- a/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatType.java +++ b/filterer/src/main/java/com/iluwatar/filterer/threat/ThreatType.java @@ -24,6 +24,9 @@ */ package com.iluwatar.filterer.threat; +/** + * Enum class representing Threat types. + */ public enum ThreatType { TROJAN, WORM, diff --git a/filterer/src/test/java/com/iluwatar/filterer/threat/SimpleThreatAwareSystemTest.java b/filterer/src/test/java/com/iluwatar/filterer/threat/SimpleThreatAwareSystemTest.java index a4053d45b..5865b558d 100644 --- a/filterer/src/test/java/com/iluwatar/filterer/threat/SimpleThreatAwareSystemTest.java +++ b/filterer/src/test/java/com/iluwatar/filterer/threat/SimpleThreatAwareSystemTest.java @@ -25,7 +25,6 @@ package com.iluwatar.filterer.threat; import org.junit.jupiter.api.Test; - import java.util.List; import static org.junit.jupiter.api.Assertions.*; diff --git a/front-controller/src/test/java/com/iluwatar/front/controller/utils/InMemoryAppender.java b/front-controller/src/test/java/com/iluwatar/front/controller/utils/InMemoryAppender.java index ed741b475..ca0a5ccbf 100644 --- a/front-controller/src/test/java/com/iluwatar/front/controller/utils/InMemoryAppender.java +++ b/front-controller/src/test/java/com/iluwatar/front/controller/utils/InMemoryAppender.java @@ -28,7 +28,6 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; import org.slf4j.LoggerFactory; - import java.util.LinkedList; import java.util.List; diff --git a/identity-map/src/main/java/com/iluwatar/identitymap/IdNotFoundException.java b/identity-map/src/main/java/com/iluwatar/identitymap/IdNotFoundException.java index 8aa71376f..a3246189b 100644 --- a/identity-map/src/main/java/com/iluwatar/identitymap/IdNotFoundException.java +++ b/identity-map/src/main/java/com/iluwatar/identitymap/IdNotFoundException.java @@ -24,6 +24,9 @@ */ package com.iluwatar.identitymap; +/** + * Using Runtime Exception to control the flow in case Person Id doesn not exist. + */ public class IdNotFoundException extends RuntimeException { public IdNotFoundException(final String message) { super(message); diff --git a/identity-map/src/main/java/com/iluwatar/identitymap/IdentityMap.java b/identity-map/src/main/java/com/iluwatar/identitymap/IdentityMap.java index e00542f64..633dff35d 100644 --- a/identity-map/src/main/java/com/iluwatar/identitymap/IdentityMap.java +++ b/identity-map/src/main/java/com/iluwatar/identitymap/IdentityMap.java @@ -26,7 +26,6 @@ package com.iluwatar.identitymap; import java.util.HashMap; import java.util.Map; - import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/identity-map/src/main/java/com/iluwatar/identitymap/Person.java b/identity-map/src/main/java/com/iluwatar/identitymap/Person.java index 0402682f3..d15e7faf6 100644 --- a/identity-map/src/main/java/com/iluwatar/identitymap/Person.java +++ b/identity-map/src/main/java/com/iluwatar/identitymap/Person.java @@ -25,7 +25,6 @@ package com.iluwatar.identitymap; import java.io.Serializable; - import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulator.java b/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulator.java index 9966f11b5..7cee5e06a 100644 --- a/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulator.java +++ b/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulator.java @@ -24,13 +24,16 @@ */ package com.iluwatar.identitymap; +/** + * Simulator interface for Person DB. + */ public interface PersonDbSimulator { - Person find(int personNationalID); + Person find(int personNationalId); void insert(Person person); void update(Person person); - void delete(int personNationalID); + void delete(int personNationalId); } diff --git a/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulatorImplementation.java b/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulatorImplementation.java index 15b59313d..22abb44f2 100644 --- a/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulatorImplementation.java +++ b/identity-map/src/main/java/com/iluwatar/identitymap/PersonDbSimulatorImplementation.java @@ -27,7 +27,6 @@ package com.iluwatar.identitymap; import java.util.ArrayList; import java.util.List; import java.util.Optional; - import lombok.extern.slf4j.Slf4j; /** @@ -49,10 +48,10 @@ public class PersonDbSimulatorImplementation implements PersonDbSimulator { static final String ID_STR = "ID : "; @Override - public Person find(int personNationalID) throws IdNotFoundException { - Optional elem = personList.stream().filter(p -> p.getPersonNationalId() == personNationalID).findFirst(); + public Person find(int personNationalId) throws IdNotFoundException { + Optional elem = personList.stream().filter(p -> p.getPersonNationalId() == personNationalId).findFirst(); if (elem.isEmpty()) { - throw new IdNotFoundException(ID_STR + personNationalID + NOT_IN_DATA_BASE); + throw new IdNotFoundException(ID_STR + personNationalId + NOT_IN_DATA_BASE); } LOGGER.info(elem.get().toString()); return elem.get(); diff --git a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java index 8f82ac54a..12772ab45 100644 --- a/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java +++ b/intercepting-filter/src/main/java/com/iluwatar/intercepting/filter/Target.java @@ -76,7 +76,7 @@ public class Target extends JFrame { //NOSONAR jsp.setPreferredSize(new Dimension(500, 250)); add(jsp, BorderLayout.CENTER); - del.addActionListener(new DListener()); + del.addActionListener(new TargetListener()); var rootPane = SwingUtilities.getRootPane(del); rootPane.setDefaultButton(del); @@ -87,7 +87,7 @@ public class Target extends JFrame { //NOSONAR dtm.addRow(new Object[]{request[0], request[1], request[2], request[3], request[4]}); } - class DListener implements ActionListener { + class TargetListener implements ActionListener { @Override public void actionPerformed(ActionEvent e) { var temp = jt.getSelectedRow(); diff --git a/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/TargetTest.java b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/TargetTest.java new file mode 100644 index 000000000..dcecb2730 --- /dev/null +++ b/intercepting-filter/src/test/java/com/iluwatar/intercepting/filter/TargetTest.java @@ -0,0 +1,46 @@ +/* + * This project is licensed under the MIT license. Module intercepting-filter is using ZK framework licensed under LGPL (see lgpl-3.0.txt). + * + * The MIT License + * Copyright © 2014-2022 Ilkka Seppälä + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.iluwatar.intercepting.filter; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; + +/** + * Date: 01/29/23 - 1:33 PM + * + * @author Rahul Raj + */ +class TargetTest { + + @Test + void testSetup(){ + final var target = new Target(); + assertEquals(target.getSize().getWidth(), Double.valueOf(640)); + assertEquals(target.getSize().getHeight(), Double.valueOf(480)); + assertEquals(true,target.isVisible()); + } +} diff --git a/layers/src/main/java/com/iluwatar/layers/entity/Cake.java b/layers/src/main/java/com/iluwatar/layers/entity/Cake.java index ef425135f..69f0781b9 100644 --- a/layers/src/main/java/com/iluwatar/layers/entity/Cake.java +++ b/layers/src/main/java/com/iluwatar/layers/entity/Cake.java @@ -26,7 +26,6 @@ package com.iluwatar.layers.entity; import java.util.HashSet; import java.util.Set; - import javax.persistence.CascadeType; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/leader-followers/src/main/java/com/iluwatar/leaderfollowers/Worker.java b/leader-followers/src/main/java/com/iluwatar/leaderfollowers/Worker.java index 0c7c7b584..5ad463a4a 100644 --- a/leader-followers/src/main/java/com/iluwatar/leaderfollowers/Worker.java +++ b/leader-followers/src/main/java/com/iluwatar/leaderfollowers/Worker.java @@ -27,6 +27,9 @@ package com.iluwatar.leaderfollowers; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +/** + * Worker class that takes work from work center. + */ @EqualsAndHashCode(onlyExplicitlyIncluded = true) @Slf4j public class Worker implements Runnable { diff --git a/metadata-mapping/src/main/java/com/iluwatar/metamapping/App.java b/metadata-mapping/src/main/java/com/iluwatar/metamapping/App.java index a78da7a5d..0bc79f96f 100644 --- a/metadata-mapping/src/main/java/com/iluwatar/metamapping/App.java +++ b/metadata-mapping/src/main/java/com/iluwatar/metamapping/App.java @@ -62,7 +62,7 @@ public class App { // get service var userService = new UserService(); // use create service to add users - for (var user: generateSampleUsers()) { + for (var user : generateSampleUsers()) { var id = userService.createUser(user); LOGGER.info("Add user" + user + "at" + id + "."); } diff --git a/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java b/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java index 048f470ae..2a47c29ce 100644 --- a/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java +++ b/metadata-mapping/src/main/java/com/iluwatar/metamapping/utils/DatabaseUtil.java @@ -47,9 +47,6 @@ public class DatabaseUtil { */ private DatabaseUtil() {} - /** - * Create database. - */ static { LOGGER.info("create h2 database"); var source = new JdbcDataSource(); diff --git a/model-view-intent/src/test/java/com/iluwatar/model/view/intent/CalculatorViewModelTest.java b/model-view-intent/src/test/java/com/iluwatar/model/view/intent/CalculatorViewModelTest.java index 91a45e83b..57cb556d6 100644 --- a/model-view-intent/src/test/java/com/iluwatar/model/view/intent/CalculatorViewModelTest.java +++ b/model-view-intent/src/test/java/com/iluwatar/model/view/intent/CalculatorViewModelTest.java @@ -2,7 +2,6 @@ package com.iluwatar.model.view.intent; import com.iluwatar.model.view.intent.actions.*; import org.junit.jupiter.api.Test; - import java.util.ArrayList; import java.util.List; diff --git a/model-view-presenter/etc/model-view-presenter.ucls b/model-view-presenter/etc/model-view-presenter.ucls index 70e905d3f..0228d3762 100644 --- a/model-view-presenter/etc/model-view-presenter.ucls +++ b/model-view-presenter/etc/model-view-presenter.ucls @@ -1,9 +1,9 @@ - "-presenter" FileSelectorPresenter +FileSelectorJframe --> "-presenter" FileSelectorPresenter FileSelectorStub --> "-presenter" FileSelectorPresenter FileSelectorPresenter --> "-view" FileSelectorView FileSelectorPresenter --> "-loader" FileLoader -FileSelectorJFrame ..|> FileSelectorView +FileSelectorJframe ..|> FileSelectorView FileSelectorStub ..|> FileSelectorView @enduml \ No newline at end of file diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/App.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/App.java index 68ce8c85e..7bee50111 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/App.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/App.java @@ -31,7 +31,7 @@ package com.iluwatar.model.view.presenter; * (Presenter). * *

In the following example, The {@link FileLoader} class represents the app's logic, the {@link - * FileSelectorJFrame} is the GUI and the {@link FileSelectorPresenter} is responsible to respond to + * FileSelectorJframe} is the GUI and the {@link FileSelectorPresenter} is responsible to respond to * users' actions. * *

Finally, please notice the wiring between the Presenter and the View and between the @@ -46,7 +46,7 @@ public class App { */ public static void main(String[] args) { var loader = new FileLoader(); - var frame = new FileSelectorJFrame(); + var frame = new FileSelectorJframe(); var presenter = new FileSelectorPresenter(frame); presenter.setLoader(loader); presenter.start(); diff --git a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJframe.java similarity index 98% rename from model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java rename to model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJframe.java index 3e623b2d3..fa3fe2a3e 100644 --- a/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJFrame.java +++ b/model-view-presenter/src/main/java/com/iluwatar/model/view/presenter/FileSelectorJframe.java @@ -30,7 +30,6 @@ import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED; import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; - import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JLabel; @@ -43,7 +42,7 @@ import javax.swing.JTextField; /** * This class is the GUI implementation of the View component in the Model-View-Presenter pattern. */ -public class FileSelectorJFrame extends JFrame implements FileSelectorView, ActionListener { +public class FileSelectorJframe extends JFrame implements FileSelectorView, ActionListener { /** * Default serial version ID. @@ -83,7 +82,7 @@ public class FileSelectorJFrame extends JFrame implements FileSelectorView, Acti /** * Constructor. */ - public FileSelectorJFrame() { + public FileSelectorJframe() { super("File Loader"); this.setDefaultCloseOperation(EXIT_ON_CLOSE); this.setLayout(null); diff --git a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/IEvent.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorJframeTest.java similarity index 64% rename from event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/IEvent.java rename to model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorJframeTest.java index a1144343c..bad021dc1 100644 --- a/event-asynchronous/src/main/java/com/iluwatar/event/asynchronous/IEvent.java +++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorJframeTest.java @@ -1,5 +1,5 @@ /* - * This project is licensed under the MIT license. Module model-view-viewmodel is using ZK framework licensed under LGPL (see lgpl-3.0.txt). + * This project is licensed under the MIT license. Module model-view-presenter is using ZK framework licensed under LGPL (see lgpl-3.0.txt). * * The MIT License * Copyright © 2014-2022 Ilkka Seppälä @@ -22,17 +22,31 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.iluwatar.event.asynchronous; +package com.iluwatar.model.view.presenter; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; + +import java.awt.event.ActionEvent; + +import org.junit.jupiter.api.Test; /** - * Events that fulfill the start stop and list out current status behaviour follow this interface. + * Date: 01/29/23 - 6:00 PM + * + * @author Rahul Raj */ -public interface IEvent { - - void start(); - - void stop(); - - void status(); +class FileSelectorJframeTest { + + /** + * Tests if the jframe action event is triggered without any exception. + */ + @Test + void testActionEvent() { + assertDoesNotThrow(() ->{ + FileSelectorJframe jFrame = new FileSelectorJframe(); + ActionEvent action = new ActionEvent("dummy", 1, "dummy"); + jFrame.actionPerformed(action); + }); + } } diff --git a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java index b77b0bd83..b9a31253b 100644 --- a/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java +++ b/model-view-presenter/src/test/java/com/iluwatar/model/view/presenter/FileSelectorPresenterTest.java @@ -144,4 +144,16 @@ class FileSelectorPresenterTest { assertFalse(stub.isOpened()); } + + @Test + void testNullFile() { + stub.setFileName(null); + presenter.start(); + presenter.fileNameChanged(); + presenter.confirmed(); + + assertFalse(loader.isLoaded()); + assertFalse(stub.dataDisplayed()); + } + } diff --git a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/Book.java b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/Book.java index b43637b21..27f679402 100644 --- a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/Book.java +++ b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/Book.java @@ -27,6 +27,9 @@ package com.iluwatar.model.view.viewmodel; import lombok.AllArgsConstructor; import lombok.Data; +/** + * Book class. + */ @AllArgsConstructor @Data public class Book { diff --git a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookService.java b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookService.java index e227d1c1b..11ff6971e 100644 --- a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookService.java +++ b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookService.java @@ -27,6 +27,9 @@ package com.iluwatar.model.view.viewmodel; import java.util.List; +/** + * Class representing a service to load books. + */ public interface BookService { /* List all books * @return all books diff --git a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookServiceImpl.java b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookServiceImpl.java index 713bc584d..a407b1e8f 100644 --- a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookServiceImpl.java +++ b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookServiceImpl.java @@ -27,6 +27,9 @@ package com.iluwatar.model.view.viewmodel; import java.util.ArrayList; import java.util.List; +/** + * Class that actually implement the books to load. + */ public class BookServiceImpl implements BookService { private List designPatternBooks = new ArrayList<>(); diff --git a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookViewModel.java b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookViewModel.java index b4673e31c..1fb477638 100644 --- a/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookViewModel.java +++ b/model-view-viewmodel/src/main/java/com/iluwatar/model/view/viewmodel/BookViewModel.java @@ -25,11 +25,13 @@ package com.iluwatar.model.view.viewmodel; import java.util.List; - import org.zkoss.bind.annotation.Command; import org.zkoss.bind.annotation.NotifyChange; import org.zkoss.zk.ui.select.annotation.WireVariable; +/** + * BookViewModel class. + */ public class BookViewModel { @WireVariable @@ -56,7 +58,7 @@ public class BookViewModel { * and used to delete the selected book from the list of books. */ @Command - @NotifyChange({"selectedBook","bookList"}) + @NotifyChange({"selectedBook", "bookList"}) public void deleteBook() { if (selectedBook != null) { getBookList().remove(selectedBook); diff --git a/observer/src/main/java/com/iluwatar/observer/App.java b/observer/src/main/java/com/iluwatar/observer/App.java index 0b3239a86..049828f39 100644 --- a/observer/src/main/java/com/iluwatar/observer/App.java +++ b/observer/src/main/java/com/iluwatar/observer/App.java @@ -24,9 +24,9 @@ */ package com.iluwatar.observer; -import com.iluwatar.observer.generic.GHobbits; -import com.iluwatar.observer.generic.GOrcs; -import com.iluwatar.observer.generic.GWeather; +import com.iluwatar.observer.generic.GenHobbits; +import com.iluwatar.observer.generic.GenOrcs; +import com.iluwatar.observer.generic.GenWeather; import lombok.extern.slf4j.Slf4j; /** @@ -61,9 +61,9 @@ public class App { // Generic observer inspired by Java Generics and Collections by Naftalin & Wadler LOGGER.info("--Running generic version--"); - var genericWeather = new GWeather(); - genericWeather.addObserver(new GOrcs()); - genericWeather.addObserver(new GHobbits()); + var genericWeather = new GenWeather(); + genericWeather.addObserver(new GenOrcs()); + genericWeather.addObserver(new GenHobbits()); genericWeather.timePasses(); genericWeather.timePasses(); diff --git a/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java b/observer/src/main/java/com/iluwatar/observer/generic/GenHobbits.java similarity index 93% rename from observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java rename to observer/src/main/java/com/iluwatar/observer/generic/GenHobbits.java index ae8ec3d36..1d4e9baa6 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/GHobbits.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GenHobbits.java @@ -31,10 +31,10 @@ import lombok.extern.slf4j.Slf4j; * GHobbits. */ @Slf4j -public class GHobbits implements Race { +public class GenHobbits implements Race { @Override - public void update(GWeather weather, WeatherType weatherType) { + public void update(GenWeather weather, WeatherType weatherType) { LOGGER.info("The hobbits are facing " + weatherType.getDescription() + " weather now"); } } diff --git a/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java b/observer/src/main/java/com/iluwatar/observer/generic/GenOrcs.java similarity index 93% rename from observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java rename to observer/src/main/java/com/iluwatar/observer/generic/GenOrcs.java index 7890cc2e2..bbf1c197f 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/GOrcs.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GenOrcs.java @@ -31,10 +31,10 @@ import lombok.extern.slf4j.Slf4j; * GOrcs. */ @Slf4j -public class GOrcs implements Race { +public class GenOrcs implements Race { @Override - public void update(GWeather weather, WeatherType weatherType) { + public void update(GenWeather weather, WeatherType weatherType) { LOGGER.info("The orcs are facing " + weatherType.getDescription() + " weather now"); } } diff --git a/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java b/observer/src/main/java/com/iluwatar/observer/generic/GenWeather.java similarity index 94% rename from observer/src/main/java/com/iluwatar/observer/generic/GWeather.java rename to observer/src/main/java/com/iluwatar/observer/generic/GenWeather.java index e0511c34e..485f2ab36 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/GWeather.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/GenWeather.java @@ -31,11 +31,11 @@ import lombok.extern.slf4j.Slf4j; * GWeather. */ @Slf4j -public class GWeather extends Observable { +public class GenWeather extends Observable { private WeatherType currentWeather; - public GWeather() { + public GenWeather() { currentWeather = WeatherType.SUNNY; } diff --git a/observer/src/main/java/com/iluwatar/observer/generic/Race.java b/observer/src/main/java/com/iluwatar/observer/generic/Race.java index 69cfd8aba..6b602e2f7 100644 --- a/observer/src/main/java/com/iluwatar/observer/generic/Race.java +++ b/observer/src/main/java/com/iluwatar/observer/generic/Race.java @@ -29,5 +29,5 @@ import com.iluwatar.observer.WeatherType; /** * Race. */ -public interface Race extends Observer { +public interface Race extends Observer { } diff --git a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java index 256a8b7d9..491c6f611 100644 --- a/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java +++ b/observer/src/test/java/com/iluwatar/observer/WeatherObserverTest.java @@ -28,7 +28,6 @@ import com.iluwatar.observer.utils.InMemoryAppender; import java.util.Collection; import java.util.function.Supplier; - import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java index 61bf1214c..2c260bebb 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/GHobbitsTest.java @@ -25,7 +25,6 @@ package com.iluwatar.observer.generic; import com.iluwatar.observer.WeatherType; - import java.util.Collection; import java.util.List; @@ -34,7 +33,7 @@ import java.util.List; * * @author Jeroen Meulemeester */ -class GHobbitsTest extends ObserverTest { +class GHobbitsTest extends ObserverTest { @Override public Collection dataProvider() { @@ -50,7 +49,7 @@ class GHobbitsTest extends ObserverTest { * Create a new test with the given weather and expected response */ public GHobbitsTest() { - super(GHobbits::new); + super(GenHobbits::new); } } diff --git a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java index 5ff500480..4b8be12e2 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/GWeatherTest.java @@ -48,7 +48,7 @@ class GWeatherTest { @BeforeEach void setUp() { - appender = new InMemoryAppender(GWeather.class); + appender = new InMemoryAppender(GenWeather.class); } @AfterEach @@ -64,7 +64,7 @@ class GWeatherTest { void testAddRemoveObserver() { final var observer = mock(Race.class); - final var weather = new GWeather(); + final var weather = new GenWeather(); weather.addObserver(observer); verifyNoMoreInteractions(observer); @@ -86,7 +86,7 @@ class GWeatherTest { @Test void testTimePasses() { final var observer = mock(Race.class); - final var weather = new GWeather(); + final var weather = new GenWeather(); weather.addObserver(observer); final var inOrder = inOrder(observer); diff --git a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java index a4d743404..2a558447e 100644 --- a/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java +++ b/observer/src/test/java/com/iluwatar/observer/generic/OrcsTest.java @@ -25,7 +25,6 @@ package com.iluwatar.observer.generic; import com.iluwatar.observer.WeatherType; - import java.util.Collection; import java.util.List; @@ -34,7 +33,7 @@ import java.util.List; * * @author Jeroen Meulemeester */ -class OrcsTest extends ObserverTest { +class OrcsTest extends ObserverTest { @Override public Collection dataProvider() { @@ -50,7 +49,7 @@ class OrcsTest extends ObserverTest { * Create a new test with the given weather and expected response */ public OrcsTest() { - super(GOrcs::new); + super(GenOrcs::new); } } diff --git a/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java b/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java index 92794a515..59d699c18 100644 --- a/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java +++ b/observer/src/test/java/com/iluwatar/observer/utils/InMemoryAppender.java @@ -28,7 +28,6 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; import org.slf4j.LoggerFactory; - import java.util.LinkedList; import java.util.List; diff --git a/parameter-object/src/main/java/com/iluwatar/parameter/object/ParameterObject.java b/parameter-object/src/main/java/com/iluwatar/parameter/object/ParameterObject.java index b440d0d3b..3ad217f1e 100644 --- a/parameter-object/src/main/java/com/iluwatar/parameter/object/ParameterObject.java +++ b/parameter-object/src/main/java/com/iluwatar/parameter/object/ParameterObject.java @@ -24,6 +24,9 @@ */ package com.iluwatar.parameter.object; +/** + * ParameterObject. + */ public class ParameterObject { /** @@ -83,6 +86,9 @@ public class ParameterObject { type, sortBy, sortOrder); } + /** + * Builder for ParameterObject. + */ public static final class Builder { private String type; diff --git a/parameter-object/src/main/java/com/iluwatar/parameter/object/SearchService.java b/parameter-object/src/main/java/com/iluwatar/parameter/object/SearchService.java index bf31d9b98..5179f886b 100644 --- a/parameter-object/src/main/java/com/iluwatar/parameter/object/SearchService.java +++ b/parameter-object/src/main/java/com/iluwatar/parameter/object/SearchService.java @@ -24,6 +24,9 @@ */ package com.iluwatar.parameter.object; +/** + * SearchService to demonstrate parameter object pattern. + */ public class SearchService { /** diff --git a/parameter-object/src/main/java/com/iluwatar/parameter/object/SortOrder.java b/parameter-object/src/main/java/com/iluwatar/parameter/object/SortOrder.java index a254e92b8..546e4111b 100644 --- a/parameter-object/src/main/java/com/iluwatar/parameter/object/SortOrder.java +++ b/parameter-object/src/main/java/com/iluwatar/parameter/object/SortOrder.java @@ -24,6 +24,9 @@ */ package com.iluwatar.parameter.object; +/** + * enum for sort order types. + */ public enum SortOrder { ASC("asc"), DESC("desc"); diff --git a/pom.xml b/pom.xml index f629bbfc6..8405ac144 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ 5.1.0 1.1.0 3.0.0-M8 - 3.1.0 + 3.2.0 4.1 2.1.1 diff --git a/presentation-model/src/main/java/com/iluwatar/presentationmodel/DisplayedAlbums.java b/presentation-model/src/main/java/com/iluwatar/presentationmodel/DisplayedAlbums.java index f5d60df03..11dae6df6 100644 --- a/presentation-model/src/main/java/com/iluwatar/presentationmodel/DisplayedAlbums.java +++ b/presentation-model/src/main/java/com/iluwatar/presentationmodel/DisplayedAlbums.java @@ -26,7 +26,6 @@ package com.iluwatar.presentationmodel; import java.util.ArrayList; import java.util.List; - import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/presentation-model/src/main/java/com/iluwatar/presentationmodel/View.java b/presentation-model/src/main/java/com/iluwatar/presentationmodel/View.java index 332701a64..2d694644f 100644 --- a/presentation-model/src/main/java/com/iluwatar/presentationmodel/View.java +++ b/presentation-model/src/main/java/com/iluwatar/presentationmodel/View.java @@ -32,7 +32,6 @@ import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JFrame; import javax.swing.JList; - import lombok.Getter; import lombok.extern.slf4j.Slf4j; @@ -100,7 +99,7 @@ public class View { /** * save the data to PresentationModel. */ - public void saveToPMod() { + public void saveToMod() { LOGGER.info("Save data to PresentationModel"); model.setArtist(txtArtist.getText()); model.setTitle(txtTitle.getText()); @@ -111,7 +110,7 @@ public class View { /** * load the data from PresentationModel. */ - public void loadFromPMod() { + public void loadFromMod() { LOGGER.info("Load data from PresentationModel"); txtArtist.setText(model.getArtist()); txtTitle.setText(model.getTitle()); @@ -133,7 +132,7 @@ public class View { @Override public void mouseClicked(final MouseEvent e) { model.setSelectedAlbumNumber(albumList.getSelectedIndex() + 1); - loadFromPMod(); + loadFromMod(); } }); b1.add(albumList); @@ -162,15 +161,15 @@ public class View { apply.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(final MouseEvent e) { - saveToPMod(); - loadFromPMod(); + saveToMod(); + loadFromMod(); } }); cancel = new JButton("Cancel"); cancel.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(final MouseEvent e) { - loadFromPMod(); + loadFromMod(); } }); diff --git a/presentation-model/src/test/java/com/iluwatar/presentationmodel/ViewTest.java b/presentation-model/src/test/java/com/iluwatar/presentationmodel/ViewTest.java index a715a25ca..7a0e6edd0 100644 --- a/presentation-model/src/test/java/com/iluwatar/presentationmodel/ViewTest.java +++ b/presentation-model/src/test/java/com/iluwatar/presentationmodel/ViewTest.java @@ -39,8 +39,8 @@ class ViewTest { String testArtist = "testArtist"; view.getTxtArtist().setText(testArtist); view.getTxtTitle().setText(testTitle); - view.saveToPMod(); - view.loadFromPMod(); + view.saveToMod(); + view.loadFromMod(); assertEquals(testTitle, view.getModel().getTitle()); assertEquals(testArtist, view.getModel().getArtist()); } @@ -53,8 +53,8 @@ class ViewTest { String testComposer = "testComposer"; view.getChkClassical().setSelected(isClassical); view.getTxtComposer().setText(testComposer); - view.saveToPMod(); - view.loadFromPMod(); + view.saveToMod(); + view.loadFromMod(); assertTrue(view.getModel().getIsClassical()); assertEquals(testComposer, view.getModel().getComposer()); } @@ -64,7 +64,7 @@ class ViewTest { View view = new View(); view.createView(); view.getModel().setSelectedAlbumNumber(2); - view.loadFromPMod(); + view.loadFromMod(); assertEquals(albumList[1], view.getModel().getTitle()); } @@ -73,7 +73,7 @@ class ViewTest { View view = new View(); view.createView(); view.getModel().setSelectedAlbumNumber(4); - view.loadFromPMod(); + view.loadFromMod(); assertEquals(albumList[3], view.getModel().getTitle()); } } diff --git a/registry/src/main/java/com/iluwatar/registry/App.java b/registry/src/main/java/com/iluwatar/registry/App.java index e2290c667..1a9c5234b 100644 --- a/registry/src/main/java/com/iluwatar/registry/App.java +++ b/registry/src/main/java/com/iluwatar/registry/App.java @@ -27,6 +27,13 @@ package com.iluwatar.registry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * In Registry pattern, objects of a single class are stored and provide a global point of access to them. + * Note that there is no restriction on the number of objects. + * + *

The given example {@link CustomerRegistry} represents the registry used to store and + * access {@link Customer} objects.

+ */ public class App { private static final Logger LOGGER = LoggerFactory.getLogger(App.class); diff --git a/registry/src/main/java/com/iluwatar/registry/Customer.java b/registry/src/main/java/com/iluwatar/registry/Customer.java index 6d7e6aeaa..b544ed63b 100644 --- a/registry/src/main/java/com/iluwatar/registry/Customer.java +++ b/registry/src/main/java/com/iluwatar/registry/Customer.java @@ -24,6 +24,9 @@ */ package com.iluwatar.registry; +/** + * Customer entity used in registry pattern example. + */ public class Customer { private final String id; diff --git a/registry/src/main/java/com/iluwatar/registry/CustomerRegistry.java b/registry/src/main/java/com/iluwatar/registry/CustomerRegistry.java index 0e296c90f..f1e8bbf21 100644 --- a/registry/src/main/java/com/iluwatar/registry/CustomerRegistry.java +++ b/registry/src/main/java/com/iluwatar/registry/CustomerRegistry.java @@ -27,6 +27,9 @@ package com.iluwatar.registry; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +/** + * CustomerRegistry class used to store/access {@link Customer} objects. + */ public final class CustomerRegistry { private static final CustomerRegistry instance = new CustomerRegistry(); diff --git a/role-object/src/main/java/com/iluwatar/roleobject/BorrowerRole.java b/role-object/src/main/java/com/iluwatar/roleobject/BorrowerRole.java index f64b0303b..e082438a1 100644 --- a/role-object/src/main/java/com/iluwatar/roleobject/BorrowerRole.java +++ b/role-object/src/main/java/com/iluwatar/roleobject/BorrowerRole.java @@ -24,6 +24,9 @@ */ package com.iluwatar.roleobject; +/** + * Borrower role. + */ public class BorrowerRole extends CustomerRole { private String name; diff --git a/role-object/src/main/java/com/iluwatar/roleobject/InvestorRole.java b/role-object/src/main/java/com/iluwatar/roleobject/InvestorRole.java index 86378a588..0606c9b54 100644 --- a/role-object/src/main/java/com/iluwatar/roleobject/InvestorRole.java +++ b/role-object/src/main/java/com/iluwatar/roleobject/InvestorRole.java @@ -24,6 +24,9 @@ */ package com.iluwatar.roleobject; +/** + * Investor role. + */ public class InvestorRole extends CustomerRole { private String name; diff --git a/saga/src/test/java/com/iluwatar/saga/choreography/SagaApplicationTest.java b/saga/src/test/java/com/iluwatar/saga/choreography/SagaApplicationTest.java index 5c8a9473c..29f835684 100644 --- a/saga/src/test/java/com/iluwatar/saga/choreography/SagaApplicationTest.java +++ b/saga/src/test/java/com/iluwatar/saga/choreography/SagaApplicationTest.java @@ -27,7 +27,6 @@ package com.iluwatar.saga.choreography; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import com.iluwatar.saga.orchestration.SagaApplication; - import org.junit.jupiter.api.Test; /*** diff --git a/separated-interface/src/main/java/com/iluwatar/separatedinterface/invoice/TaxCalculator.java b/separated-interface/src/main/java/com/iluwatar/separatedinterface/invoice/TaxCalculator.java index 04d7c4775..85b6e6786 100644 --- a/separated-interface/src/main/java/com/iluwatar/separatedinterface/invoice/TaxCalculator.java +++ b/separated-interface/src/main/java/com/iluwatar/separatedinterface/invoice/TaxCalculator.java @@ -24,6 +24,9 @@ */ package com.iluwatar.separatedinterface.invoice; +/** + * TaxCalculator interface to demonstrate The Separated Interface pattern. + */ public interface TaxCalculator { double calculate(double amount); diff --git a/separated-interface/src/test/java/com/iluwatar/separatedinterface/AppTest.java b/separated-interface/src/test/java/com/iluwatar/separatedinterface/AppTest.java index 03683953c..995aabf19 100644 --- a/separated-interface/src/test/java/com/iluwatar/separatedinterface/AppTest.java +++ b/separated-interface/src/test/java/com/iluwatar/separatedinterface/AppTest.java @@ -25,7 +25,6 @@ package com.iluwatar.separatedinterface; import org.junit.jupiter.api.Test; - import com.iluwatar.separatedinterface.App; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; diff --git a/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountryDao.java b/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountryDao.java index c2bb91c6d..2bd3a7305 100644 --- a/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountryDao.java +++ b/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountryDao.java @@ -41,6 +41,9 @@ package com.iluwatar.serializedentity; import java.io.IOException; +/** + * DAO interface for Country transactions. + */ public interface CountryDao { int insertCountry() throws IOException; int selectCountry() throws IOException, ClassNotFoundException; diff --git a/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountrySchemaSql.java b/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountrySchemaSql.java index 0de83e7e5..971f875c6 100644 --- a/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountrySchemaSql.java +++ b/serialized-entity/src/main/java/com/iluwatar/serializedentity/CountrySchemaSql.java @@ -33,7 +33,6 @@ import java.sql.Blob; import java.sql.ResultSet; import java.sql.SQLException; import javax.sql.DataSource; - import lombok.extern.slf4j.Slf4j; /** diff --git a/spatial-partition/src/main/java/com/iluwatar/spatialpartition/Bubble.java b/spatial-partition/src/main/java/com/iluwatar/spatialpartition/Bubble.java index b8bac9ad9..f1f9fb61d 100644 --- a/spatial-partition/src/main/java/com/iluwatar/spatialpartition/Bubble.java +++ b/spatial-partition/src/main/java/com/iluwatar/spatialpartition/Bubble.java @@ -68,9 +68,9 @@ public class Bubble extends Point { var toBePopped = false; //if any other bubble collides with it, made true for (var point : toCheck) { var otherId = point.id; - if (allBubbles.get(otherId) != null && //the bubble hasn't been popped yet - this.id != otherId && //the two bubbles are not the same - this.touches(allBubbles.get(otherId))) { //the bubbles touch + if (allBubbles.get(otherId) != null //the bubble hasn't been popped yet + && this.id != otherId //the two bubbles are not the same + && this.touches(allBubbles.get(otherId))) { //the bubbles touch allBubbles.get(otherId).pop(allBubbles); toBePopped = true; } diff --git a/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServices.java b/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServices.java index e6bd3c2d0..9dafdba44 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServices.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServices.java @@ -24,6 +24,9 @@ */ package com.iluwatar.specialcase; +/** + * ApplicationServices interface to demonstrate special case pattern. + */ public interface ApplicationServices { ReceiptViewModel loggedInUserPurchase(String userName, String itemName); diff --git a/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServicesImpl.java b/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServicesImpl.java index a35b97593..cb21e57f6 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServicesImpl.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/ApplicationServicesImpl.java @@ -24,6 +24,9 @@ */ package com.iluwatar.specialcase; +/** + * Implementation of special case pattern. + */ public class ApplicationServicesImpl implements ApplicationServices { private DomainServicesImpl domain = new DomainServicesImpl(); diff --git a/special-case/src/main/java/com/iluwatar/specialcase/Db.java b/special-case/src/main/java/com/iluwatar/specialcase/Db.java index fe13ae3fd..c58294319 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/Db.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/Db.java @@ -27,6 +27,9 @@ package com.iluwatar.specialcase; import java.util.HashMap; import java.util.Map; +/** + * DB class for seeding user info. + */ public class Db { private static Db instance; @@ -113,6 +116,9 @@ public class Db { return itemName2Product.get(itemName); } + /** + * User class to store user info. + */ public class User { private String userName; @@ -130,6 +136,9 @@ public class Db { } } + /** + * Account info. + */ public class Account { private Double amount; @@ -156,6 +165,9 @@ public class Db { } } + /** + * Product info. + */ public class Product { private Double price; diff --git a/special-case/src/main/java/com/iluwatar/specialcase/DomainServices.java b/special-case/src/main/java/com/iluwatar/specialcase/DomainServices.java index e943398b4..84502e64d 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/DomainServices.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/DomainServices.java @@ -24,5 +24,8 @@ */ package com.iluwatar.specialcase; +/** + * DomainServices interface. + */ public interface DomainServices { } diff --git a/special-case/src/main/java/com/iluwatar/specialcase/DomainServicesImpl.java b/special-case/src/main/java/com/iluwatar/specialcase/DomainServicesImpl.java index 7188a116f..ac31a9083 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/DomainServicesImpl.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/DomainServicesImpl.java @@ -24,6 +24,9 @@ */ package com.iluwatar.specialcase; +/** + * Implementation of DomainServices for special case. + */ public class DomainServicesImpl implements DomainServices { /** diff --git a/special-case/src/main/java/com/iluwatar/specialcase/DownForMaintenance.java b/special-case/src/main/java/com/iluwatar/specialcase/DownForMaintenance.java index 1aab5f258..713dcaef7 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/DownForMaintenance.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/DownForMaintenance.java @@ -27,6 +27,9 @@ package com.iluwatar.specialcase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Down for Maintenance view for the ReceiptViewModel. + */ public class DownForMaintenance implements ReceiptViewModel { private static final Logger LOGGER = LoggerFactory.getLogger(DownForMaintenance.class); diff --git a/special-case/src/main/java/com/iluwatar/specialcase/InsufficientFunds.java b/special-case/src/main/java/com/iluwatar/specialcase/InsufficientFunds.java index fdf241acf..03dff2c41 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/InsufficientFunds.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/InsufficientFunds.java @@ -26,6 +26,9 @@ package com.iluwatar.specialcase; import lombok.extern.slf4j.Slf4j; +/** + * View representing insufficient funds. + */ @Slf4j public class InsufficientFunds implements ReceiptViewModel { diff --git a/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java b/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java index 2db30c168..681b9077c 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/InvalidUser.java @@ -27,6 +27,9 @@ package com.iluwatar.specialcase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Receipt View representing invalid user. + */ public class InvalidUser implements ReceiptViewModel { private static final Logger LOGGER = LoggerFactory.getLogger(InvalidUser.class); diff --git a/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java b/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java index dbb4f1a52..3abef8b13 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/MaintenanceLock.java @@ -27,6 +27,9 @@ package com.iluwatar.specialcase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Acquire lock on the DB for maintenance. + */ public class MaintenanceLock { private static final Logger LOGGER = LoggerFactory.getLogger(MaintenanceLock.class); diff --git a/special-case/src/main/java/com/iluwatar/specialcase/MoneyTransaction.java b/special-case/src/main/java/com/iluwatar/specialcase/MoneyTransaction.java index b86d90383..8ff191501 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/MoneyTransaction.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/MoneyTransaction.java @@ -24,6 +24,9 @@ */ package com.iluwatar.specialcase; +/** + * Represents the money transaction taking place at a given moment. + */ public class MoneyTransaction { private Double amount; diff --git a/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java b/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java index c44844e54..9a04a63f5 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/OutOfStock.java @@ -27,6 +27,9 @@ package com.iluwatar.specialcase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Receipt view for showing out of stock message. + */ public class OutOfStock implements ReceiptViewModel { private static final Logger LOGGER = LoggerFactory.getLogger(OutOfStock.class); diff --git a/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java b/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java index 4ecd35789..b3e9db303 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/ReceiptDto.java @@ -27,6 +27,9 @@ package com.iluwatar.specialcase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * Receipt view representing the transaction recceipt. + */ public class ReceiptDto implements ReceiptViewModel { private static final Logger LOGGER = LoggerFactory.getLogger(ReceiptDto.class); diff --git a/special-case/src/main/java/com/iluwatar/specialcase/ReceiptViewModel.java b/special-case/src/main/java/com/iluwatar/specialcase/ReceiptViewModel.java index ab0ea40a2..633005b07 100644 --- a/special-case/src/main/java/com/iluwatar/specialcase/ReceiptViewModel.java +++ b/special-case/src/main/java/com/iluwatar/specialcase/ReceiptViewModel.java @@ -24,6 +24,9 @@ */ package com.iluwatar.specialcase; +/** + * ReceiptViewModel interface. + */ public interface ReceiptViewModel { void show(); diff --git a/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java b/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java index 83048bb05..8411398b2 100644 --- a/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java +++ b/special-case/src/test/java/com/iluwatar/specialcase/SpecialCasesTest.java @@ -33,7 +33,6 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; import java.util.List; - import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; diff --git a/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.java b/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.java index 05ba3e733..3ecd70de4 100644 --- a/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.java +++ b/step-builder/src/main/java/com/iluwatar/stepbuilder/Character.java @@ -25,7 +25,6 @@ package com.iluwatar.stepbuilder; import java.util.List; - import lombok.Getter; import lombok.Setter; diff --git a/strategy/src/main/java/com/iluwatar/strategy/LambdaStrategy.java b/strategy/src/main/java/com/iluwatar/strategy/LambdaStrategy.java index 82503aa90..698e1bb14 100644 --- a/strategy/src/main/java/com/iluwatar/strategy/LambdaStrategy.java +++ b/strategy/src/main/java/com/iluwatar/strategy/LambdaStrategy.java @@ -26,9 +26,15 @@ package com.iluwatar.strategy; import lombok.extern.slf4j.Slf4j; +/** + * Lambda implementation for enum strategy pattern. + */ @Slf4j public class LambdaStrategy { + /** + * Enum to demonstrate strategy pattern. + */ public enum Strategy implements DragonSlayingStrategy { MeleeStrategy(() -> LOGGER.info( "With your Excalibur you severe the dragon's head!")), diff --git a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java index 633a0f13d..05104fa29 100644 --- a/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java +++ b/subclass-sandbox/src/test/java/com/iluwatar/subclasssandbox/GroundDiveTest.java @@ -28,7 +28,6 @@ import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOutNor import static org.junit.jupiter.api.Assertions.assertEquals; import com.github.stefanbirkner.systemlambda.Statement; - import org.junit.jupiter.api.Test; /** diff --git a/table-module/src/main/java/com/iluwatar/tablemodule/App.java b/table-module/src/main/java/com/iluwatar/tablemodule/App.java index 59f57df37..632b4019d 100644 --- a/table-module/src/main/java/com/iluwatar/tablemodule/App.java +++ b/table-module/src/main/java/com/iluwatar/tablemodule/App.java @@ -26,7 +26,6 @@ package com.iluwatar.tablemodule; import java.sql.SQLException; import javax.sql.DataSource; - import lombok.extern.slf4j.Slf4j; import org.h2.jdbcx.JdbcDataSource; diff --git a/table-module/src/main/java/com/iluwatar/tablemodule/UserTableModule.java b/table-module/src/main/java/com/iluwatar/tablemodule/UserTableModule.java index aea1f02c5..92ffb6db6 100644 --- a/table-module/src/main/java/com/iluwatar/tablemodule/UserTableModule.java +++ b/table-module/src/main/java/com/iluwatar/tablemodule/UserTableModule.java @@ -27,7 +27,6 @@ package com.iluwatar.tablemodule; import java.sql.ResultSet; import java.sql.SQLException; import javax.sql.DataSource; - import lombok.extern.slf4j.Slf4j; diff --git a/table-module/src/test/java/com/iluwatar/tablemodule/UserTableModuleTest.java b/table-module/src/test/java/com/iluwatar/tablemodule/UserTableModuleTest.java index 6588fc398..a9dc41b3e 100644 --- a/table-module/src/test/java/com/iluwatar/tablemodule/UserTableModuleTest.java +++ b/table-module/src/test/java/com/iluwatar/tablemodule/UserTableModuleTest.java @@ -28,7 +28,6 @@ import org.h2.jdbcx.JdbcDataSource; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import javax.sql.DataSource; import java.sql.DriverManager; import java.sql.SQLException; diff --git a/thread-local-storage/src/test/java/ThreadLocalTest.java b/thread-local-storage/src/test/java/ThreadLocalTest.java index 7c069b227..974b7ec8b 100644 --- a/thread-local-storage/src/test/java/ThreadLocalTest.java +++ b/thread-local-storage/src/test/java/ThreadLocalTest.java @@ -4,7 +4,6 @@ import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; - import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.List; diff --git a/throttling/src/main/java/com/iluwatar/throttling/BarCustomer.java b/throttling/src/main/java/com/iluwatar/throttling/BarCustomer.java index 7bf9cca36..81615f1b9 100644 --- a/throttling/src/main/java/com/iluwatar/throttling/BarCustomer.java +++ b/throttling/src/main/java/com/iluwatar/throttling/BarCustomer.java @@ -25,7 +25,6 @@ package com.iluwatar.throttling; import java.security.InvalidParameterException; - import lombok.Getter; /** diff --git a/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java b/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java index 6ad90e05e..e21b1c930 100644 --- a/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java +++ b/throttling/src/test/java/com/iluwatar/throttling/BarCustomerTest.java @@ -25,7 +25,6 @@ package com.iluwatar.throttling; import org.junit.jupiter.api.Test; - import java.security.InvalidParameterException; import static org.junit.jupiter.api.Assertions.assertThrows; diff --git a/transaction-script/src/main/java/com/iluwatar/transactionscript/Hotel.java b/transaction-script/src/main/java/com/iluwatar/transactionscript/Hotel.java index 17af82bc6..f0d077952 100644 --- a/transaction-script/src/main/java/com/iluwatar/transactionscript/Hotel.java +++ b/transaction-script/src/main/java/com/iluwatar/transactionscript/Hotel.java @@ -26,6 +26,9 @@ package com.iluwatar.transactionscript; import lombok.extern.slf4j.Slf4j; +/** + * Hotel class to implement TS pattern. + */ @Slf4j public class Hotel { diff --git a/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDao.java b/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDao.java index 96c9fd76c..b698ab114 100644 --- a/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDao.java +++ b/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDao.java @@ -27,6 +27,9 @@ package com.iluwatar.transactionscript; import java.util.Optional; import java.util.stream.Stream; +/** + * DAO interface for hotel transactions. + */ public interface HotelDao { Stream getAll() throws Exception; diff --git a/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDaoImpl.java b/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDaoImpl.java index 98aa066a0..e64ad1548 100644 --- a/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDaoImpl.java +++ b/transaction-script/src/main/java/com/iluwatar/transactionscript/HotelDaoImpl.java @@ -36,6 +36,9 @@ import java.util.stream.StreamSupport; import javax.sql.DataSource; import lombok.extern.slf4j.Slf4j; +/** + * Implementation of database operations for Hotel class. + */ @Slf4j public class HotelDaoImpl implements HotelDao { diff --git a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java index 94f8ec663..eb2e74897 100644 --- a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java +++ b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/CellPool.java @@ -26,7 +26,6 @@ package com.iluwatar.typeobject; import com.google.gson.JsonParseException; import com.iluwatar.typeobject.Candy.Type; - import java.security.SecureRandom; import java.util.ArrayList; import java.util.List; diff --git a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/JsonParser.java b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/JsonParser.java index da0588aa2..80d079f29 100644 --- a/typeobjectpattern/src/main/java/com/iluwatar/typeobject/JsonParser.java +++ b/typeobjectpattern/src/main/java/com/iluwatar/typeobject/JsonParser.java @@ -28,7 +28,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonObject; import com.google.gson.JsonParseException; import com.iluwatar.typeobject.Candy.Type; - import java.io.InputStreamReader; import java.util.Hashtable; diff --git a/unit-of-work/src/main/java/com/iluwatar/unitofwork/ArmsDealer.java b/unit-of-work/src/main/java/com/iluwatar/unitofwork/ArmsDealer.java index fd4feb339..9c77c13a1 100644 --- a/unit-of-work/src/main/java/com/iluwatar/unitofwork/ArmsDealer.java +++ b/unit-of-work/src/main/java/com/iluwatar/unitofwork/ArmsDealer.java @@ -35,7 +35,7 @@ import lombok.extern.slf4j.Slf4j; */ @Slf4j @RequiredArgsConstructor -public class ArmsDealer implements IUnitOfWork { +public class ArmsDealer implements UnitOfWork { private final Map> context; private final WeaponDatabase weaponDatabase; diff --git a/unit-of-work/src/main/java/com/iluwatar/unitofwork/UnitActions.java b/unit-of-work/src/main/java/com/iluwatar/unitofwork/UnitActions.java index 9e7625253..ce69e9693 100644 --- a/unit-of-work/src/main/java/com/iluwatar/unitofwork/UnitActions.java +++ b/unit-of-work/src/main/java/com/iluwatar/unitofwork/UnitActions.java @@ -27,6 +27,9 @@ package com.iluwatar.unitofwork; import lombok.Getter; import lombok.RequiredArgsConstructor; +/** + * Enum representing unit actions. + */ @Getter @RequiredArgsConstructor public enum UnitActions { diff --git a/unit-of-work/src/main/java/com/iluwatar/unitofwork/IUnitOfWork.java b/unit-of-work/src/main/java/com/iluwatar/unitofwork/UnitOfWork.java similarity index 98% rename from unit-of-work/src/main/java/com/iluwatar/unitofwork/IUnitOfWork.java rename to unit-of-work/src/main/java/com/iluwatar/unitofwork/UnitOfWork.java index 306ee6cb9..5b7a9413a 100644 --- a/unit-of-work/src/main/java/com/iluwatar/unitofwork/IUnitOfWork.java +++ b/unit-of-work/src/main/java/com/iluwatar/unitofwork/UnitOfWork.java @@ -29,7 +29,7 @@ package com.iluwatar.unitofwork; * * @param Any generic entity */ -public interface IUnitOfWork { +public interface UnitOfWork { /** * Any register new operation occurring on UnitOfWork is only going to be performed on commit. diff --git a/version-number/src/main/java/com/iluwatar/versionnumber/Book.java b/version-number/src/main/java/com/iluwatar/versionnumber/Book.java index f008591a9..f01d4be36 100644 --- a/version-number/src/main/java/com/iluwatar/versionnumber/Book.java +++ b/version-number/src/main/java/com/iluwatar/versionnumber/Book.java @@ -24,6 +24,9 @@ */ package com.iluwatar.versionnumber; +/** + * Model class for Book entity. + */ public class Book { private long id; private String title = "";