From 7f70f7afe609c67cf618c47478066aa1d21ef697 Mon Sep 17 00:00:00 2001 From: Kamil Witkowski Date: Thu, 3 Oct 2019 14:50:24 +0200 Subject: [PATCH] chore: change state of following OOP hermetization rules --- src/main/java/io/pillopl/library/catalogue/Book.java | 3 ++- src/main/java/io/pillopl/library/catalogue/BookInstance.java | 3 ++- .../library/catalogue/BookInstanceAddedToCatalogue.java | 3 ++- src/main/java/io/pillopl/library/catalogue/Catalogue.java | 3 ++- .../java/io/pillopl/library/catalogue/CatalogueDatabase.java | 5 +++-- .../lending/book/infrastructure/BookDatabaseRepository.java | 3 ++- .../io/pillopl/library/lending/book/model/BookOnHold.java | 3 ++- .../pillopl/library/lending/book/model/CheckedOutBook.java | 3 ++- .../lending/dailysheet/infrastructure/SheetsReadModel.java | 3 ++- .../lending/patron/infrastructure/HoldDatabaseEntity.java | 3 ++- .../patron/infrastructure/OverdueCheckoutDatabaseEntity.java | 3 ++- .../lending/patron/infrastructure/PatronDatabaseEntity.java | 3 ++- .../patron/infrastructure/PatronsDatabaseRepository.java | 3 ++- .../java/io/pillopl/library/lending/patron/model/Patron.java | 3 ++- .../patronprofile/infrastructure/PatronProfileReadModel.java | 3 ++- 15 files changed, 31 insertions(+), 16 deletions(-) diff --git a/src/main/java/io/pillopl/library/catalogue/Book.java b/src/main/java/io/pillopl/library/catalogue/Book.java index ed371ab..a7b4261 100644 --- a/src/main/java/io/pillopl/library/catalogue/Book.java +++ b/src/main/java/io/pillopl/library/catalogue/Book.java @@ -1,5 +1,6 @@ package io.pillopl.library.catalogue; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -7,7 +8,7 @@ @Value @EqualsAndHashCode(of = "bookIsbn") -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) class Book { @NonNull diff --git a/src/main/java/io/pillopl/library/catalogue/BookInstance.java b/src/main/java/io/pillopl/library/catalogue/BookInstance.java index 6d09bc4..49cefeb 100644 --- a/src/main/java/io/pillopl/library/catalogue/BookInstance.java +++ b/src/main/java/io/pillopl/library/catalogue/BookInstance.java @@ -1,5 +1,6 @@ package io.pillopl.library.catalogue; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.NonNull; import lombok.Value; @@ -7,7 +8,7 @@ import java.util.UUID; @Value -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PRIVATE) class BookInstance { @NonNull diff --git a/src/main/java/io/pillopl/library/catalogue/BookInstanceAddedToCatalogue.java b/src/main/java/io/pillopl/library/catalogue/BookInstanceAddedToCatalogue.java index 59fc4ce..d354903 100644 --- a/src/main/java/io/pillopl/library/catalogue/BookInstanceAddedToCatalogue.java +++ b/src/main/java/io/pillopl/library/catalogue/BookInstanceAddedToCatalogue.java @@ -1,6 +1,7 @@ package io.pillopl.library.catalogue; import io.pillopl.library.commons.events.DomainEvent; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Value; @@ -8,7 +9,7 @@ import java.util.UUID; @Value -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) public class BookInstanceAddedToCatalogue implements DomainEvent { UUID eventId = UUID.randomUUID(); diff --git a/src/main/java/io/pillopl/library/catalogue/Catalogue.java b/src/main/java/io/pillopl/library/catalogue/Catalogue.java index a714c77..7ad61d3 100644 --- a/src/main/java/io/pillopl/library/catalogue/Catalogue.java +++ b/src/main/java/io/pillopl/library/catalogue/Catalogue.java @@ -3,12 +3,13 @@ import io.pillopl.library.commons.commands.Result; import io.pillopl.library.commons.events.DomainEvents; import io.vavr.control.Try; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import static io.pillopl.library.commons.commands.Result.Rejection; import static io.pillopl.library.commons.commands.Result.Success; -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) public class Catalogue { private final CatalogueDatabase database; diff --git a/src/main/java/io/pillopl/library/catalogue/CatalogueDatabase.java b/src/main/java/io/pillopl/library/catalogue/CatalogueDatabase.java index 0ce7b11..691db4b 100644 --- a/src/main/java/io/pillopl/library/catalogue/CatalogueDatabase.java +++ b/src/main/java/io/pillopl/library/catalogue/CatalogueDatabase.java @@ -1,6 +1,7 @@ package io.pillopl.library.catalogue; import io.vavr.control.Option; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -8,7 +9,7 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) class CatalogueDatabase { private final JdbcTemplate jdbcTemplate; @@ -48,7 +49,7 @@ Option findBy(ISBN isbn) { } @Data -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PACKAGE) class BookDatabaseRow { String isbn; String author; diff --git a/src/main/java/io/pillopl/library/lending/book/infrastructure/BookDatabaseRepository.java b/src/main/java/io/pillopl/library/lending/book/infrastructure/BookDatabaseRepository.java index 5afc399..c5b7b61 100644 --- a/src/main/java/io/pillopl/library/lending/book/infrastructure/BookDatabaseRepository.java +++ b/src/main/java/io/pillopl/library/lending/book/infrastructure/BookDatabaseRepository.java @@ -9,6 +9,7 @@ import io.pillopl.library.lending.patron.model.PatronId; import io.vavr.control.Option; import io.vavr.control.Try; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import org.springframework.jdbc.core.BeanPropertyRowMapper; import org.springframework.jdbc.core.JdbcTemplate; @@ -23,7 +24,7 @@ import static io.vavr.control.Option.none; import static io.vavr.control.Option.of; -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) class BookDatabaseRepository implements BookRepository, FindAvailableBook, FindBookOnHold { private final JdbcTemplate jdbcTemplate; diff --git a/src/main/java/io/pillopl/library/lending/book/model/BookOnHold.java b/src/main/java/io/pillopl/library/lending/book/model/BookOnHold.java index c4eea10..bb8f193 100644 --- a/src/main/java/io/pillopl/library/lending/book/model/BookOnHold.java +++ b/src/main/java/io/pillopl/library/lending/book/model/BookOnHold.java @@ -9,6 +9,7 @@ import io.pillopl.library.lending.patron.model.PatronEvent.BookHoldExpired; import io.pillopl.library.lending.patron.model.PatronEvent.BookReturned; import io.pillopl.library.lending.patron.model.PatronId; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -17,7 +18,7 @@ import java.time.Instant; @Value -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) @EqualsAndHashCode(of = "bookInformation") public class BookOnHold implements Book { diff --git a/src/main/java/io/pillopl/library/lending/book/model/CheckedOutBook.java b/src/main/java/io/pillopl/library/lending/book/model/CheckedOutBook.java index 84e8d7c..ee2f206 100644 --- a/src/main/java/io/pillopl/library/lending/book/model/CheckedOutBook.java +++ b/src/main/java/io/pillopl/library/lending/book/model/CheckedOutBook.java @@ -6,13 +6,14 @@ import io.pillopl.library.lending.librarybranch.model.LibraryBranchId; import io.pillopl.library.lending.patron.model.PatronEvent; import io.pillopl.library.lending.patron.model.PatronId; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.NonNull; import lombok.Value; @Value -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) @EqualsAndHashCode(of = "bookInformation") public class CheckedOutBook implements Book { diff --git a/src/main/java/io/pillopl/library/lending/dailysheet/infrastructure/SheetsReadModel.java b/src/main/java/io/pillopl/library/lending/dailysheet/infrastructure/SheetsReadModel.java index 8966017..8121b98 100644 --- a/src/main/java/io/pillopl/library/lending/dailysheet/infrastructure/SheetsReadModel.java +++ b/src/main/java/io/pillopl/library/lending/dailysheet/infrastructure/SheetsReadModel.java @@ -14,6 +14,7 @@ import io.pillopl.library.lending.patron.model.PatronEvent.BookReturned; import io.pillopl.library.lending.patron.model.PatronId; import io.vavr.control.Option; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import org.springframework.context.event.EventListener; import org.springframework.dao.DuplicateKeyException; @@ -32,7 +33,7 @@ import static java.sql.Timestamp.from; import static java.util.stream.Collectors.toList; -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) class SheetsReadModel implements DailySheet { private final JdbcTemplate sheets; diff --git a/src/main/java/io/pillopl/library/lending/patron/infrastructure/HoldDatabaseEntity.java b/src/main/java/io/pillopl/library/lending/patron/infrastructure/HoldDatabaseEntity.java index 537c374..7b221cf 100644 --- a/src/main/java/io/pillopl/library/lending/patron/infrastructure/HoldDatabaseEntity.java +++ b/src/main/java/io/pillopl/library/lending/patron/infrastructure/HoldDatabaseEntity.java @@ -1,5 +1,6 @@ package io.pillopl.library.lending.patron.infrastructure; +import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.data.annotation.Id; @@ -7,7 +8,7 @@ import java.time.Instant; import java.util.UUID; -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PACKAGE) @Getter class HoldDatabaseEntity { diff --git a/src/main/java/io/pillopl/library/lending/patron/infrastructure/OverdueCheckoutDatabaseEntity.java b/src/main/java/io/pillopl/library/lending/patron/infrastructure/OverdueCheckoutDatabaseEntity.java index 1655b63..453aa12 100644 --- a/src/main/java/io/pillopl/library/lending/patron/infrastructure/OverdueCheckoutDatabaseEntity.java +++ b/src/main/java/io/pillopl/library/lending/patron/infrastructure/OverdueCheckoutDatabaseEntity.java @@ -1,5 +1,6 @@ package io.pillopl.library.lending.patron.infrastructure; +import lombok.AccessLevel; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; @@ -7,7 +8,7 @@ import java.util.UUID; -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PACKAGE) @EqualsAndHashCode @Getter class OverdueCheckoutDatabaseEntity { diff --git a/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronDatabaseEntity.java b/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronDatabaseEntity.java index 80396e2..1d11c02 100644 --- a/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronDatabaseEntity.java +++ b/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronDatabaseEntity.java @@ -6,6 +6,7 @@ import io.pillopl.library.lending.patron.model.PatronId; import io.pillopl.library.lending.patron.model.PatronType; import io.vavr.API; +import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.springframework.data.annotation.Id; @@ -17,7 +18,7 @@ import static io.vavr.API.Case; import static io.vavr.Predicates.instanceOf; -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PACKAGE) class PatronDatabaseEntity { @Id diff --git a/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronsDatabaseRepository.java b/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronsDatabaseRepository.java index db81952..ebb94e4 100644 --- a/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronsDatabaseRepository.java +++ b/src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronsDatabaseRepository.java @@ -8,6 +8,7 @@ import io.vavr.Tuple; import io.vavr.Tuple2; import io.vavr.control.Option; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import org.springframework.data.jdbc.repository.query.Query; import org.springframework.data.repository.CrudRepository; @@ -22,7 +23,7 @@ import static io.vavr.Predicates.instanceOf; import static java.util.stream.Collectors.*; -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) class PatronsDatabaseRepository implements Patrons { private final PatronEntityRepository patronEntityRepository; diff --git a/src/main/java/io/pillopl/library/lending/patron/model/Patron.java b/src/main/java/io/pillopl/library/lending/patron/model/Patron.java index dc5d010..befd23d 100644 --- a/src/main/java/io/pillopl/library/lending/patron/model/Patron.java +++ b/src/main/java/io/pillopl/library/lending/patron/model/Patron.java @@ -8,6 +8,7 @@ import io.vavr.collection.List; import io.vavr.control.Either; import io.vavr.control.Option; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.NonNull; @@ -24,7 +25,7 @@ import static io.pillopl.library.lending.patron.model.PatronHolds.MAX_NUMBER_OF_HOLDS; import static io.pillopl.library.lending.patron.model.Rejection.withReason; -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) @EqualsAndHashCode(of = "patron") public class Patron { diff --git a/src/main/java/io/pillopl/library/lending/patronprofile/infrastructure/PatronProfileReadModel.java b/src/main/java/io/pillopl/library/lending/patronprofile/infrastructure/PatronProfileReadModel.java index 03cfa42..8d02628 100644 --- a/src/main/java/io/pillopl/library/lending/patronprofile/infrastructure/PatronProfileReadModel.java +++ b/src/main/java/io/pillopl/library/lending/patronprofile/infrastructure/PatronProfileReadModel.java @@ -8,6 +8,7 @@ import io.pillopl.library.lending.patronprofile.model.HoldsView; import io.pillopl.library.lending.patronprofile.model.PatronProfile; import io.pillopl.library.lending.patronprofile.model.PatronProfiles; +import lombok.AccessLevel; import lombok.AllArgsConstructor; import org.springframework.jdbc.core.ColumnMapRowMapper; import org.springframework.jdbc.core.JdbcTemplate; @@ -20,7 +21,7 @@ import static io.vavr.collection.List.ofAll; import static java.util.stream.Collectors.toList; -@AllArgsConstructor +@AllArgsConstructor(access = AccessLevel.PACKAGE) class PatronProfileReadModel implements PatronProfiles { private final JdbcTemplate sheets;