Skip to content

Commit f31b21f

Browse files
authored
Merge pull request #43 from KamilWitkowski7/master
chore: change state of following OOP hermetization rules
2 parents bb00638 + 7f70f7a commit f31b21f

15 files changed

+31
-16
lines changed

src/main/java/io/pillopl/library/catalogue/Book.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package io.pillopl.library.catalogue;
22

3+
import lombok.AccessLevel;
34
import lombok.AllArgsConstructor;
45
import lombok.EqualsAndHashCode;
56
import lombok.NonNull;
67
import lombok.Value;
78

89
@Value
910
@EqualsAndHashCode(of = "bookIsbn")
10-
@AllArgsConstructor
11+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
1112
class Book {
1213

1314
@NonNull

src/main/java/io/pillopl/library/catalogue/BookInstance.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package io.pillopl.library.catalogue;
22

3+
import lombok.AccessLevel;
34
import lombok.AllArgsConstructor;
45
import lombok.NonNull;
56
import lombok.Value;
67

78
import java.util.UUID;
89

910
@Value
10-
@AllArgsConstructor
11+
@AllArgsConstructor(access = AccessLevel.PRIVATE)
1112
class BookInstance {
1213

1314
@NonNull

src/main/java/io/pillopl/library/catalogue/BookInstanceAddedToCatalogue.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package io.pillopl.library.catalogue;
22

33
import io.pillopl.library.commons.events.DomainEvent;
4+
import lombok.AccessLevel;
45
import lombok.AllArgsConstructor;
56
import lombok.Value;
67

78
import java.time.Instant;
89
import java.util.UUID;
910

1011
@Value
11-
@AllArgsConstructor
12+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
1213
public class BookInstanceAddedToCatalogue implements DomainEvent {
1314

1415
UUID eventId = UUID.randomUUID();

src/main/java/io/pillopl/library/catalogue/Catalogue.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
import io.pillopl.library.commons.commands.Result;
44
import io.pillopl.library.commons.events.DomainEvents;
55
import io.vavr.control.Try;
6+
import lombok.AccessLevel;
67
import lombok.AllArgsConstructor;
78

89
import static io.pillopl.library.commons.commands.Result.Rejection;
910
import static io.pillopl.library.commons.commands.Result.Success;
1011

11-
@AllArgsConstructor
12+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
1213
public class Catalogue {
1314

1415
private final CatalogueDatabase database;

src/main/java/io/pillopl/library/catalogue/CatalogueDatabase.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package io.pillopl.library.catalogue;
22

33
import io.vavr.control.Option;
4+
import lombok.AccessLevel;
45
import lombok.AllArgsConstructor;
56
import lombok.Data;
67
import lombok.NoArgsConstructor;
78
import org.springframework.dao.EmptyResultDataAccessException;
89
import org.springframework.jdbc.core.BeanPropertyRowMapper;
910
import org.springframework.jdbc.core.JdbcTemplate;
1011

11-
@AllArgsConstructor
12+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
1213
class CatalogueDatabase {
1314

1415
private final JdbcTemplate jdbcTemplate;
@@ -48,7 +49,7 @@ Option<Book> findBy(ISBN isbn) {
4849
}
4950

5051
@Data
51-
@NoArgsConstructor
52+
@NoArgsConstructor(access = AccessLevel.PACKAGE)
5253
class BookDatabaseRow {
5354
String isbn;
5455
String author;

src/main/java/io/pillopl/library/lending/book/infrastructure/BookDatabaseRepository.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.pillopl.library.lending.patron.model.PatronId;
1010
import io.vavr.control.Option;
1111
import io.vavr.control.Try;
12+
import lombok.AccessLevel;
1213
import lombok.AllArgsConstructor;
1314
import org.springframework.jdbc.core.BeanPropertyRowMapper;
1415
import org.springframework.jdbc.core.JdbcTemplate;
@@ -23,7 +24,7 @@
2324
import static io.vavr.control.Option.none;
2425
import static io.vavr.control.Option.of;
2526

26-
@AllArgsConstructor
27+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
2728
class BookDatabaseRepository implements BookRepository, FindAvailableBook, FindBookOnHold {
2829

2930
private final JdbcTemplate jdbcTemplate;

src/main/java/io/pillopl/library/lending/book/model/BookOnHold.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import io.pillopl.library.lending.patron.model.PatronEvent.BookHoldExpired;
1010
import io.pillopl.library.lending.patron.model.PatronEvent.BookReturned;
1111
import io.pillopl.library.lending.patron.model.PatronId;
12+
import lombok.AccessLevel;
1213
import lombok.AllArgsConstructor;
1314
import lombok.EqualsAndHashCode;
1415
import lombok.NonNull;
@@ -17,7 +18,7 @@
1718
import java.time.Instant;
1819

1920
@Value
20-
@AllArgsConstructor
21+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
2122
@EqualsAndHashCode(of = "bookInformation")
2223
public class BookOnHold implements Book {
2324

src/main/java/io/pillopl/library/lending/book/model/CheckedOutBook.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
import io.pillopl.library.lending.librarybranch.model.LibraryBranchId;
77
import io.pillopl.library.lending.patron.model.PatronEvent;
88
import io.pillopl.library.lending.patron.model.PatronId;
9+
import lombok.AccessLevel;
910
import lombok.AllArgsConstructor;
1011
import lombok.EqualsAndHashCode;
1112
import lombok.NonNull;
1213
import lombok.Value;
1314

1415
@Value
15-
@AllArgsConstructor
16+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
1617
@EqualsAndHashCode(of = "bookInformation")
1718
public class CheckedOutBook implements Book {
1819

src/main/java/io/pillopl/library/lending/dailysheet/infrastructure/SheetsReadModel.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.pillopl.library.lending.patron.model.PatronEvent.BookReturned;
1515
import io.pillopl.library.lending.patron.model.PatronId;
1616
import io.vavr.control.Option;
17+
import lombok.AccessLevel;
1718
import lombok.AllArgsConstructor;
1819
import org.springframework.context.event.EventListener;
1920
import org.springframework.dao.DuplicateKeyException;
@@ -32,7 +33,7 @@
3233
import static java.sql.Timestamp.from;
3334
import static java.util.stream.Collectors.toList;
3435

35-
@AllArgsConstructor
36+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
3637
class SheetsReadModel implements DailySheet {
3738

3839
private final JdbcTemplate sheets;

src/main/java/io/pillopl/library/lending/patron/infrastructure/HoldDatabaseEntity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package io.pillopl.library.lending.patron.infrastructure;
22

3+
import lombok.AccessLevel;
34
import lombok.Getter;
45
import lombok.NoArgsConstructor;
56
import org.springframework.data.annotation.Id;
67

78
import java.time.Instant;
89
import java.util.UUID;
910

10-
@NoArgsConstructor
11+
@NoArgsConstructor(access = AccessLevel.PACKAGE)
1112
@Getter
1213
class HoldDatabaseEntity {
1314

src/main/java/io/pillopl/library/lending/patron/infrastructure/OverdueCheckoutDatabaseEntity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package io.pillopl.library.lending.patron.infrastructure;
22

3+
import lombok.AccessLevel;
34
import lombok.EqualsAndHashCode;
45
import lombok.Getter;
56
import lombok.NoArgsConstructor;
67
import org.springframework.data.annotation.Id;
78

89
import java.util.UUID;
910

10-
@NoArgsConstructor
11+
@NoArgsConstructor(access = AccessLevel.PACKAGE)
1112
@EqualsAndHashCode
1213
@Getter
1314
class OverdueCheckoutDatabaseEntity {

src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronDatabaseEntity.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import io.pillopl.library.lending.patron.model.PatronId;
77
import io.pillopl.library.lending.patron.model.PatronType;
88
import io.vavr.API;
9+
import lombok.AccessLevel;
910
import lombok.NoArgsConstructor;
1011
import org.springframework.data.annotation.Id;
1112

@@ -17,7 +18,7 @@
1718
import static io.vavr.API.Case;
1819
import static io.vavr.Predicates.instanceOf;
1920

20-
@NoArgsConstructor
21+
@NoArgsConstructor(access = AccessLevel.PACKAGE)
2122
class PatronDatabaseEntity {
2223

2324
@Id

src/main/java/io/pillopl/library/lending/patron/infrastructure/PatronsDatabaseRepository.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.vavr.Tuple;
99
import io.vavr.Tuple2;
1010
import io.vavr.control.Option;
11+
import lombok.AccessLevel;
1112
import lombok.AllArgsConstructor;
1213
import org.springframework.data.jdbc.repository.query.Query;
1314
import org.springframework.data.repository.CrudRepository;
@@ -22,7 +23,7 @@
2223
import static io.vavr.Predicates.instanceOf;
2324
import static java.util.stream.Collectors.*;
2425

25-
@AllArgsConstructor
26+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
2627
class PatronsDatabaseRepository implements Patrons {
2728

2829
private final PatronEntityRepository patronEntityRepository;

src/main/java/io/pillopl/library/lending/patron/model/Patron.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.vavr.collection.List;
99
import io.vavr.control.Either;
1010
import io.vavr.control.Option;
11+
import lombok.AccessLevel;
1112
import lombok.AllArgsConstructor;
1213
import lombok.EqualsAndHashCode;
1314
import lombok.NonNull;
@@ -24,7 +25,7 @@
2425
import static io.pillopl.library.lending.patron.model.PatronHolds.MAX_NUMBER_OF_HOLDS;
2526
import static io.pillopl.library.lending.patron.model.Rejection.withReason;
2627

27-
@AllArgsConstructor
28+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
2829
@EqualsAndHashCode(of = "patron")
2930
public class Patron {
3031

src/main/java/io/pillopl/library/lending/patronprofile/infrastructure/PatronProfileReadModel.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.pillopl.library.lending.patronprofile.model.HoldsView;
99
import io.pillopl.library.lending.patronprofile.model.PatronProfile;
1010
import io.pillopl.library.lending.patronprofile.model.PatronProfiles;
11+
import lombok.AccessLevel;
1112
import lombok.AllArgsConstructor;
1213
import org.springframework.jdbc.core.ColumnMapRowMapper;
1314
import org.springframework.jdbc.core.JdbcTemplate;
@@ -20,7 +21,7 @@
2021
import static io.vavr.collection.List.ofAll;
2122
import static java.util.stream.Collectors.toList;
2223

23-
@AllArgsConstructor
24+
@AllArgsConstructor(access = AccessLevel.PACKAGE)
2425
class PatronProfileReadModel implements PatronProfiles {
2526

2627
private final JdbcTemplate sheets;

0 commit comments

Comments
 (0)