summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
3d8f5da)
This migrates from Guava, using Java 8 equivalent.
Change-Id: I71d01dae05e4f426406989d240c12745149d6964
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
package org.opendaylight.controller.cluster.common.actor;
package org.opendaylight.controller.cluster.common.actor;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkState;
+import static java.util.Objects.requireNonNull;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import com.google.common.annotations.Beta;
import com.google.common.annotations.VisibleForTesting;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
import com.google.common.annotations.Beta;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
import com.google.common.base.Stopwatch;
import com.google.common.base.Ticker;
import com.google.common.collect.ImmutableList;
import java.util.LinkedList;
import java.util.List;
import com.google.common.base.Stopwatch;
import com.google.common.base.Ticker;
import com.google.common.collect.ImmutableList;
import java.util.LinkedList;
import java.util.List;
+import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private final long elapsedTimeInNanos;
MessageProcessingTime(final Class<?> messageClass, final long elapsedTimeInNanos) {
private final long elapsedTimeInNanos;
MessageProcessingTime(final Class<?> messageClass, final long elapsedTimeInNanos) {
- this.messageClass = Preconditions.checkNotNull(messageClass);
+ this.messageClass = requireNonNull(messageClass);
this.elapsedTimeInNanos = elapsedTimeInNanos;
}
this.elapsedTimeInNanos = elapsedTimeInNanos;
}
@Override
public Optional<Error> error() {
@Override
public Optional<Error> error() {
- return Optional.absent();
+ return Optional.empty();
@VisibleForTesting
MessageTracker(final Class<?> expectedMessageClass, final long expectedArrivalIntervalInMillis,
final Ticker ticker) {
@VisibleForTesting
MessageTracker(final Class<?> expectedMessageClass, final long expectedArrivalIntervalInMillis,
final Ticker ticker) {
- Preconditions.checkArgument(expectedArrivalIntervalInMillis >= 0);
- this.expectedMessageClass = Preconditions.checkNotNull(expectedMessageClass);
+ checkArgument(expectedArrivalIntervalInMillis >= 0);
+ this.expectedMessageClass = requireNonNull(expectedMessageClass);
this.expectedArrivalInterval = MILLISECONDS.toNanos(expectedArrivalIntervalInMillis);
this.expectedArrivalInterval = MILLISECONDS.toNanos(expectedArrivalIntervalInMillis);
- this.ticker = Preconditions.checkNotNull(ticker);
+ this.ticker = requireNonNull(ticker);
this.expectedMessageWatch = Stopwatch.createUnstarted(ticker);
this.currentMessageContext = new CurrentMessageContext();
}
this.expectedMessageWatch = Stopwatch.createUnstarted(ticker);
this.currentMessageContext = new CurrentMessageContext();
}
@Override
public String toString() {
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("\n> Last Expected Message = ").append(lastExpectedMessage);
- builder.append("\n> Current Expected Message = ").append(currentExpectedMessage);
- builder.append("\n> Expected time in between messages = ").append(expectedTimeInMillis);
- builder.append("\n> Actual time in between messages = ").append(actualTimeInMillis);
+ StringBuilder builder = new StringBuilder()
+ .append("\n> Last Expected Message = ").append(lastExpectedMessage)
+ .append("\n> Current Expected Message = ").append(currentExpectedMessage)
+ .append("\n> Expected time in between messages = ").append(expectedTimeInMillis)
+ .append("\n> Actual time in between messages = ").append(actualTimeInMillis);
for (MessageProcessingTime time : messagesSinceLastExpectedMessage) {
builder.append("\n\t> ").append(time);
}
for (MessageProcessingTime time : messagesSinceLastExpectedMessage) {
builder.append("\n\t> ").append(time);
}
private Object message;
void reset(final Object newMessage) {
private Object message;
void reset(final Object newMessage) {
- this.message = Preconditions.checkNotNull(newMessage);
- Preconditions.checkState(!stopwatch.isRunning(),
- "Trying to reset a context that is not done (%s). currentMessage = %s", this, newMessage);
+ this.message = requireNonNull(newMessage);
+ checkState(!stopwatch.isRunning(), "Trying to reset a context that is not done (%s). currentMessage = %s",
+ this, newMessage);
@Override
public Optional<Error> error() {
@Override
public Optional<Error> error() {
- return Optional.absent();
+ return Optional.empty();
private final Error error;
ErrorContext(final Object message, final Error error) {
private final Error error;
ErrorContext(final Object message, final Error error) {
- this.message = Preconditions.checkNotNull(message);
- this.error = Preconditions.checkNotNull(error);
+ this.message = requireNonNull(message);
+ this.error = requireNonNull(error);
@Override
protected void handleNonRaftCommand(final Object message) {
try (MessageTracker.Context context = appendEntriesReplyTracker.received(message)) {
@Override
protected void handleNonRaftCommand(final Object message) {
try (MessageTracker.Context context = appendEntriesReplyTracker.received(message)) {
- final Optional<Error> maybeError = context.error();
+ final java.util.Optional<Error> maybeError = context.error();
if (maybeError.isPresent()) {
LOG.trace("{} : AppendEntriesReply failed to arrive at the expected interval {}", persistenceId(),
maybeError.get());
if (maybeError.isPresent()) {
LOG.trace("{} : AppendEntriesReply failed to arrive at the expected interval {}", persistenceId(),
maybeError.get());