Skip to content

Commit

Permalink
[Java]: naming
Browse files Browse the repository at this point in the history
  • Loading branch information
tmontgomery committed Aug 14, 2017
1 parent ba4a6fe commit f04eddc
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion aeron-client/src/main/java/io/aeron/Subscription.java
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ public void forEachImage(final Consumer<Image> imageConsumer)
* @param index in the array
* @return image at given index
*/
public Image getImage(final int index)
public Image imageAtIndex(final int index)
{
return images[index];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void run()
Thread.yield();
}

final Image image = subscription.getImage(0);
final Image image = subscription.imageAtIndex(0);

long failedPolls = 0;
long successfulPolls = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void run()
Thread.yield();
}

final Image image = subscription.getImage(0);
final Image image = subscription.imageAtIndex(0);

long failedPolls = 0;
long successfulPolls = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ private static void roundTripMessages(
Thread.yield();
}

final Image image = pongSubscription.getImage(0);
final Image image = pongSubscription.imageAtIndex(0);

for (int i = 0; i < numMessages; i++)
{
Expand Down
2 changes: 1 addition & 1 deletion aeron-samples/src/main/java/io/aeron/samples/Ping.java
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ private static void roundTripMessages(
Thread.yield();
}

final Image image = subscription.getImage(0);
final Image image = subscription.imageAtIndex(0);

for (int i = 0; i < count; i++)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ private long makeRecording()
Thread.yield();
}

final Image image = subscription.getImage(0);
final Image image = subscription.imageAtIndex(0);

int i = 0;
while (i < NUMBER_OF_MESSAGES)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public void run()
idleStrategy.idle();
}

final Image image = subscription.getImage(0);
final Image image = subscription.imageAtIndex(0);

while (image.position() < FINAL_POSITION.get())
{
Expand Down
6 changes: 3 additions & 3 deletions aeron-system-tests/src/test/java/io/aeron/PubAndSubTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ public void shouldReceivePublishedMessageOneForOneWithReSubscription(final Strin
TimeUnit.MILLISECONDS.toNanos(900));
}

assertEquals(publication.position(), subscription.getImage(0).position());
assertEquals(publication.position(), subscription.imageAtIndex(0).position());

subscription.close();
stage.set(2);
Expand All @@ -698,7 +698,7 @@ public void shouldReceivePublishedMessageOneForOneWithReSubscription(final Strin
Thread.yield();
}

assertEquals(publication.position(), subscription.getImage(0).position());
assertEquals(publication.position(), subscription.imageAtIndex(0).position());

for (int i = 0; i < numMessagesToSendStageTwo; i++)
{
Expand All @@ -720,7 +720,7 @@ public void shouldReceivePublishedMessageOneForOneWithReSubscription(final Strin
TimeUnit.MILLISECONDS.toNanos(900));
}

assertEquals(publication.position(), subscription.getImage(0).position());
assertEquals(publication.position(), subscription.imageAtIndex(0).position());

verify(fragmentHandler, times(numMessagesToSendStageOne + numMessagesToSendStageTwo)).onFragment(
any(DirectBuffer.class),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public void shouldRecordAndReplay()
recordingId, fromPosition, length, REPLAY_CHANNEL, REPLAY_STREAM_ID))
{
consume(subscription, messageCount, messagePrefix);
assertEquals(length, subscription.getImage(0).position());
assertEquals(length, subscription.imageAtIndex(0).position());
}
}

Expand Down

0 comments on commit f04eddc

Please sign in to comment.