Skip to content

Commit

Permalink
[Java] Reduce scope of methods in ClientConductor.
Browse files Browse the repository at this point in the history
  • Loading branch information
mjpt777 committed Oct 14, 2020
1 parent 47c679b commit 6a47820
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions aeron-client/src/main/java/io/aeron/ClientConductor.java
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ boolean isTerminating()
return isTerminating;
}

public void onError(final long correlationId, final int codeValue, final ErrorCode errorCode, final String message)
void onError(final long correlationId, final int codeValue, final ErrorCode errorCode, final String message)
{
driverException = new RegistrationException(correlationId, codeValue, errorCode, message);

Expand All @@ -228,13 +228,12 @@ public void onError(final long correlationId, final int codeValue, final ErrorCo
}
}

public void onAsyncError(
final long correlationId, final int codeValue, final ErrorCode errorCode, final String message)
void onAsyncError(final long correlationId, final int codeValue, final ErrorCode errorCode, final String message)
{
handleError(new RegistrationException(correlationId, codeValue, errorCode, message));
}

public void onChannelEndpointError(final int statusIndicatorId, final String message)
void onChannelEndpointError(final int statusIndicatorId, final String message)
{
for (final Object resource : resourceByRegIdMap.values())
{
Expand All @@ -259,7 +258,7 @@ else if (resource instanceof Publication)
}
}

public void onNewPublication(
void onNewPublication(
final long correlationId,
final long registrationId,
final int streamId,
Expand All @@ -282,7 +281,7 @@ public void onNewPublication(
resourceByRegIdMap.put(correlationId, publication);
}

public void onNewExclusivePublication(
void onNewExclusivePublication(
final long correlationId,
final long registrationId,
final int streamId,
Expand Down Expand Up @@ -311,13 +310,13 @@ public void onNewExclusivePublication(
resourceByRegIdMap.put(correlationId, publication);
}

public void onNewSubscription(final long correlationId, final int statusIndicatorId)
void onNewSubscription(final long correlationId, final int statusIndicatorId)
{
final Subscription subscription = (Subscription)resourceByRegIdMap.get(correlationId);
subscription.channelStatusId(statusIndicatorId);
}

public void onAvailableImage(
void onAvailableImage(
final long correlationId,
final int sessionId,
final long subscriptionRegistrationId,
Expand Down Expand Up @@ -359,7 +358,7 @@ public void onAvailableImage(
}
}

public void onUnavailableImage(final long correlationId, final long subscriptionRegistrationId)
void onUnavailableImage(final long correlationId, final long subscriptionRegistrationId)
{
final Subscription subscription = (Subscription)resourceByRegIdMap.get(subscriptionRegistrationId);
if (null != subscription)
Expand All @@ -376,26 +375,26 @@ public void onUnavailableImage(final long correlationId, final long subscription
}
}

public void onNewCounter(final long correlationId, final int counterId)
void onNewCounter(final long correlationId, final int counterId)
{
resourceByRegIdMap.put(correlationId, new Counter(correlationId, this, counterValuesBuffer, counterId));
onAvailableCounter(correlationId, counterId);
}

public void onAvailableCounter(final long registrationId, final int counterId)
void onAvailableCounter(final long registrationId, final int counterId)
{
for (final AvailableCounterHandler handler : availableCounterHandlerById.values())
{
notifyCounterAvailable(registrationId, counterId, handler);
}
}

public void onUnavailableCounter(final long registrationId, final int counterId)
void onUnavailableCounter(final long registrationId, final int counterId)
{
notifyUnavailableCounterHandlers(registrationId, counterId);
}

public void onClientTimeout()
void onClientTimeout()
{
if (!isClosed)
{
Expand Down

0 comments on commit 6a47820

Please sign in to comment.