Skip to content

Commit

Permalink
rename following code review
Browse files Browse the repository at this point in the history
  • Loading branch information
@msillence
msillence committed Oct 26, 2023
1 parent def9cef commit d42ecbc
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions ...b2/journal/retrieve/JournalReceivers.java → .../journal/retrieve/ReceiverPagination.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
import com.fnz.db2.journal.retrieve.rnrn0200.DetailedJournalReceiver;
import com.ibm.as400.access.AS400;

public class JournalReceivers {
static final Logger log = LoggerFactory.getLogger(JournalReceivers.class);
public class ReceiverPagination {
static final Logger log = LoggerFactory.getLogger(ReceiverPagination.class);

private final JournalInfoRetrieval journalInfoRetrieval;
private final JournalInfo journalInfo;
private final BigInteger maxServerSideEntriesBI;
private DetailedJournalReceiver cachedEndPosition;
private List<DetailedJournalReceiver> cachedReceivers = null;

JournalReceivers(JournalInfoRetrieval journalInfoRetrieval, int maxServerSideEntries, JournalInfo journalInfo) {
ReceiverPagination(JournalInfoRetrieval journalInfoRetrieval, int maxServerSideEntries, JournalInfo journalInfo) {
this.journalInfoRetrieval = journalInfoRetrieval;
maxServerSideEntriesBI = BigInteger.valueOf(maxServerSideEntries);
this.journalInfo= journalInfo;
Expand Down
4 changes: 2 additions & 2 deletions journal-parsing/src/main/java/com/fnz/db2/journal/retrieve/RetrieveJournal.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class RetrieveJournal {
private static final FirstHeaderDecoder firstHeaderDecoder = new FirstHeaderDecoder();
private static final EntryHeaderDecoder entryHeaderDecoder = new EntryHeaderDecoder();
private final SimpleDateFormat dateFormatter = new SimpleDateFormat("yyMMdd-hhmm");
private final JournalReceivers journalReceivers;
private final ReceiverPagination journalReceivers;
private final ParameterListBuilder builder = new ParameterListBuilder();

RetrieveConfig config;
Expand All @@ -56,7 +56,7 @@ public class RetrieveJournal {

public RetrieveJournal(RetrieveConfig config, JournalInfoRetrieval journalRetrieval) {
this.config = config;
journalReceivers = new JournalReceivers(journalRetrieval, config.maxServerSideEntries(), config.journalInfo());
journalReceivers = new ReceiverPagination(journalRetrieval, config.maxServerSideEntries(), config.journalInfo());

builder.withJournal(config.journalInfo().journalName(), config.journalInfo().journalLibrary());
}
Expand Down
48 changes: 24 additions & 24 deletions ...ournal/retrieve/JournalReceiversTest.java → ...rnal/retrieve/ReceiverPaginationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import com.ibm.as400.access.AS400;

@ExtendWith(MockitoExtension.class)
class JournalReceiversTest {
JournalReceivers receivers;
class ReceiverPaginationTest {
ReceiverPagination receivers;
@Mock
JournalInfoRetrieval journalInfoRetrieval;
JournalInfo journalInfo = new JournalInfo("journal", "journallib");
Expand All @@ -50,7 +50,7 @@ public void setUp() throws Exception {

@Test
void findRangeWithinCurrentPosistion() throws Exception {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);

final List<DetailedJournalReceiver> list = Arrays.asList(dr1);

Expand All @@ -68,7 +68,7 @@ void findRangeWithinCurrentPosistion() throws Exception {

@Test
void findRangeInList() throws Exception {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);

final List<DetailedJournalReceiver> list = Arrays.asList(dr1, dr2);

Expand All @@ -86,7 +86,7 @@ void findRangeInList() throws Exception {

@Test
void findRangeReFetchList() throws Exception {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 15, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 15, journalInfo);

final DetailedJournalReceiver detailedEnd = dr2;
final List<DetailedJournalReceiver> list = Arrays.asList(dr1, detailedEnd);
Expand Down Expand Up @@ -115,7 +115,7 @@ void findRangeReFetchList() throws Exception {

@Test
void testFindRangeMidFirstEntry() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -139,7 +139,7 @@ void testFindRangeMidFirstEntry() {

@Test
void testFindRangeMidSecondEntryReset() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -163,7 +163,7 @@ void testFindRangeMidSecondEntryReset() {

@Test
void testFindRangeMidSecondContiguous() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -187,7 +187,7 @@ void testFindRangeMidSecondContiguous() {

@Test
void testFindRangeMidEndEntry() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -211,7 +211,7 @@ void testFindRangeMidEndEntry() {

@Test
void testFindRangePastEnd() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -235,7 +235,7 @@ void testFindRangePastEnd() {

@Test
void testFindRangeEqualsEnd() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 10, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 10, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -251,7 +251,7 @@ void testFindRangeEqualsEnd() {

@Test
void testFindMidStartingMid() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand Down Expand Up @@ -280,7 +280,7 @@ void testFindMidStartingMid() {

@Test
void testFindStartingPastEnd() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -300,7 +300,7 @@ void testFindStartingPastEnd() {
void testPaginateInSameReceiverEnd() throws Exception {
final int maxOffset = 1000;
final BigInteger maxServerSideEntriesBI = BigInteger.valueOf(maxOffset);
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, maxOffset, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, maxOffset, journalInfo);

final JournalProcessedPosition startPosition = new JournalProcessedPosition(BigInteger.ONE,
new JournalReceiver("j1", "jlib"), Instant.ofEpochSecond(0), true);
Expand All @@ -318,7 +318,7 @@ void testPaginateInSameReceiverEnd() throws Exception {
void testPaginateInSameReceiverLimited() throws Exception {
final int maxOffset = 10;
final BigInteger maxServerSideEntriesBI = BigInteger.valueOf(maxOffset);
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, maxOffset, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, maxOffset, journalInfo);

final JournalProcessedPosition startPosition = new JournalProcessedPosition(BigInteger.ONE,
new JournalReceiver("j1", "jlib"), Instant.ofEpochSecond(0), true);
Expand Down Expand Up @@ -348,14 +348,14 @@ void testUpdateEndPosition() {
new JournalReceiverInfo(j2.info().receiver(), new Date(2), JournalStatus.OnlineSavedDetached,
Optional.of(1)),
BigInteger.valueOf(11), BigInteger.valueOf(200), Optional.empty(), 1, 1);
JournalReceivers.updateEndPosition(list, endPosition);
ReceiverPagination.updateEndPosition(list, endPosition);

assertEquals(endPosition, list.get(1));
}

@Test
void testFindMissingCurrentReceiver() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -377,23 +377,23 @@ void testFindMissingCurrentReceiver() {

@Test
void testContainsEndPosition() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final List<DetailedJournalReceiver> list = List.of(dr2, dr3);
assertTrue(jreceivers.containsEndPosition(list, dr3), "last entry found");
assertTrue(jreceivers.containsEndPosition(list, dr2), "first entry found");
}

@Test
void testNotContainsEndPosition() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final List<DetailedJournalReceiver> list = List.of(dr2, dr3);
final boolean found = jreceivers.containsEndPosition(list, dr1);
assertFalse(found, "receiver does not exist in list");
}

@Test
void testStartEqualsEndNotProcessed() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -411,7 +411,7 @@ void testStartEqualsEndNotProcessed() {

@Test
void testStartEqualsEndProcessed() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -430,7 +430,7 @@ void testStartEqualsEndProcessed() {

@Test
void testStartEqualsEndProcessedResetReceiver() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -454,7 +454,7 @@ void testStartEqualsEndProcessedResetReceiver() {

@Test
void testStartEqualsEndNotProcessedResetReceivers() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand All @@ -476,7 +476,7 @@ void testStartEqualsEndNotProcessedResetReceivers() {

@Test
void testStartEqualsEndProcessedResetReceiversPaginate() {
final JournalReceivers jreceivers = new JournalReceivers(journalInfoRetrieval, 100, journalInfo);
final ReceiverPagination jreceivers = new ReceiverPagination(journalInfoRetrieval, 100, journalInfo);
final DetailedJournalReceiver j1 = new DetailedJournalReceiver(
new JournalReceiverInfo(new JournalReceiver("j1", "jlib"), new Date(1),
JournalStatus.OnlineSavedDetached, Optional.of(1)),
Expand Down

0 comments on commit d42ecbc

Please sign in to comment.