From da0c512a2fc26de5a161b13eb91650af23450829 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Fri, 7 Jul 2017 04:53:14 -0400 Subject: [PATCH] Fix incorrect spelling of fileBackedStreamFactory filedBackedStreamFactory should be fileBackedStreamFactory. Change-Id: Ib0b65d68d37c5b0ded4f1739d4ddc578973fe6ec Signed-off-by: Tom Pantelis --- .../cluster/raft/behaviors/Follower.java | 2 +- .../cluster/messaging/MessageAssembler.java | 14 +++++++------- .../cluster/messaging/MessageSlicer.java | 16 ++++++++-------- .../cluster/messaging/MessageAssemblerTest.java | 2 +- .../cluster/messaging/MessageSlicerTest.java | 4 ++-- .../messaging/MessageSlicingIntegrationTest.java | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java index 9f0e0327ce..11fa23748e 100644 --- a/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java +++ b/opendaylight/md-sal/sal-akka-raft/src/main/java/org/opendaylight/controller/cluster/raft/behaviors/Follower.java @@ -78,7 +78,7 @@ public class Follower extends AbstractRaftActorBehavior { .getSyncIndexThreshold()); appendEntriesMessageAssembler = MessageAssembler.builder().logContext(logName()) - .filedBackedStreamFactory(context.getFileBackedOutputStreamFactory()) + .fileBackedStreamFactory(context.getFileBackedOutputStreamFactory()) .assembledMessageCallback((message, sender) -> handleMessage(sender, message)).build(); if (context.getPeerIds().isEmpty() && getLeaderId() == null) { diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java index 71b07f4a7e..328ff0c44a 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageAssembler.java @@ -36,12 +36,12 @@ public class MessageAssembler implements AutoCloseable { private static final Logger LOG = LoggerFactory.getLogger(MessageAssembler.class); private final Cache stateCache; - private final FileBackedOutputStreamFactory filedBackedStreamFactory; + private final FileBackedOutputStreamFactory fileBackedStreamFactory; private final BiConsumer assembledMessageCallback; private final String logContext; private MessageAssembler(Builder builder) { - this.filedBackedStreamFactory = Preconditions.checkNotNull(builder.filedBackedStreamFactory, + this.fileBackedStreamFactory = Preconditions.checkNotNull(builder.fileBackedStreamFactory, "FiledBackedStreamFactory cannot be null"); this.assembledMessageCallback = Preconditions.checkNotNull(builder.assembledMessageCallback, "assembledMessageCallback cannot be null"); @@ -135,7 +135,7 @@ public class MessageAssembler implements AutoCloseable { if (messageSlice.getSliceIndex() == SlicedMessageState.FIRST_SLICE_INDEX) { LOG.debug("{}: Received first slice for {} - creating AssembledMessageState", logContext, identifier); return new AssembledMessageState(identifier, messageSlice.getTotalSlices(), - filedBackedStreamFactory, logContext); + fileBackedStreamFactory, logContext); } LOG.debug("{}: AssembledMessageState not found for {} - returning failed reply", logContext, identifier); @@ -218,7 +218,7 @@ public class MessageAssembler implements AutoCloseable { } public static class Builder { - private FileBackedOutputStreamFactory filedBackedStreamFactory; + private FileBackedOutputStreamFactory fileBackedStreamFactory; private BiConsumer assembledMessageCallback; private long expireStateAfterInactivityDuration = 1; private TimeUnit expireStateAfterInactivityUnit = TimeUnit.MINUTES; @@ -227,11 +227,11 @@ public class MessageAssembler implements AutoCloseable { /** * Sets the factory for creating FileBackedOutputStream instances used for streaming messages. * - * @param newFiledBackedStreamFactory the factory for creating FileBackedOutputStream instances + * @param newFileBackedStreamFactory the factory for creating FileBackedOutputStream instances * @return this Builder */ - public Builder filedBackedStreamFactory(final FileBackedOutputStreamFactory newFiledBackedStreamFactory) { - this.filedBackedStreamFactory = Preconditions.checkNotNull(newFiledBackedStreamFactory); + public Builder fileBackedStreamFactory(final FileBackedOutputStreamFactory newFileBackedStreamFactory) { + this.fileBackedStreamFactory = Preconditions.checkNotNull(newFileBackedStreamFactory); return this; } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlicer.java b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlicer.java index 1647375791..1454e72cc0 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlicer.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/main/java/org/opendaylight/controller/cluster/messaging/MessageSlicer.java @@ -38,14 +38,14 @@ public class MessageSlicer implements AutoCloseable { public static final int DEFAULT_MAX_SLICING_TRIES = 3; private final Cache> stateCache; - private final FileBackedOutputStreamFactory filedBackedStreamFactory; + private final FileBackedOutputStreamFactory fileBackedStreamFactory; private final int messageSliceSize; private final int maxSlicingTries; private final String logContext; private final long id; private MessageSlicer(Builder builder) { - this.filedBackedStreamFactory = builder.filedBackedStreamFactory; + this.fileBackedStreamFactory = builder.fileBackedStreamFactory; this.messageSliceSize = builder.messageSliceSize; this.maxSlicingTries = builder.maxSlicingTries; @@ -100,11 +100,11 @@ public class MessageSlicer implements AutoCloseable { if (message != null) { LOG.debug("{}: slice: identifier: {}, message: {}", logContext, identifier, message); - Preconditions.checkNotNull(filedBackedStreamFactory, + Preconditions.checkNotNull(fileBackedStreamFactory, "The FiledBackedStreamFactory must be set in order to call this slice method"); // Serialize the message to a FileBackedOutputStream. - fileBackedStream = filedBackedStreamFactory.newInstance(); + fileBackedStream = fileBackedStreamFactory.newInstance(); try (ObjectOutputStream out = new ObjectOutputStream(fileBackedStream)) { out.writeObject(message); } catch (IOException e) { @@ -305,7 +305,7 @@ public class MessageSlicer implements AutoCloseable { } public static class Builder { - private FileBackedOutputStreamFactory filedBackedStreamFactory; + private FileBackedOutputStreamFactory fileBackedStreamFactory; private int messageSliceSize = -1; private long expireStateAfterInactivityDuration = -1; private TimeUnit expireStateAfterInactivityUnit = TimeUnit.MINUTES; @@ -317,11 +317,11 @@ public class MessageSlicer implements AutoCloseable { * is used by the {@link MessageSlicer#slice(SliceOptions)} method if a Serializable message is passed. * If Serializable messages aren't passed then the factory need not be set. * - * @param newFiledBackedStreamFactory the factory for creating FileBackedOutputStream instances + * @param newFileBackedStreamFactory the factory for creating FileBackedOutputStream instances * @return this Builder */ - public Builder filedBackedStreamFactory(final FileBackedOutputStreamFactory newFiledBackedStreamFactory) { - this.filedBackedStreamFactory = Preconditions.checkNotNull(newFiledBackedStreamFactory); + public Builder fileBackedStreamFactory(final FileBackedOutputStreamFactory newFileBackedStreamFactory) { + this.fileBackedStreamFactory = Preconditions.checkNotNull(newFileBackedStreamFactory); return this; } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageAssemblerTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageAssemblerTest.java index 73773057cf..209943e83c 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageAssemblerTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageAssemblerTest.java @@ -178,7 +178,7 @@ public class MessageAssemblerTest extends AbstractMessagingTest { } private Builder newMessageAssemblerBuilder(String logContext) { - return MessageAssembler.builder().filedBackedStreamFactory(mockFiledBackedStreamFactory) + return MessageAssembler.builder().fileBackedStreamFactory(mockFiledBackedStreamFactory) .assembledMessageCallback(mockAssembledMessageCallback).logContext(logContext); } } diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicerTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicerTest.java index df12ad2c11..ac6ab2e447 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicerTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicerTest.java @@ -138,7 +138,7 @@ public class MessageSlicerTest extends AbstractMessagingTest { final int expiryDuration = 200; try (MessageSlicer slicer = MessageSlicer.builder().messageSliceSize(1) .logContext("testCheckExpiredSlicedMessageState") - .filedBackedStreamFactory(mockFiledBackedStreamFactory) + .fileBackedStreamFactory(mockFiledBackedStreamFactory) .expireStateAfterInactivity(expiryDuration, TimeUnit.MILLISECONDS).build()) { slice(slicer, IDENTIFIER, new BytesMessage(new byte[]{1, 2}), testProbe.ref(), testProbe.ref(), mockOnFailureCallback); @@ -159,7 +159,7 @@ public class MessageSlicerTest extends AbstractMessagingTest { private MessageSlicer newMessageSlicer(String logContext, final int messageSliceSize) { return MessageSlicer.builder().messageSliceSize(messageSliceSize).logContext(logContext) - .filedBackedStreamFactory(mockFiledBackedStreamFactory).build(); + .fileBackedStreamFactory(mockFiledBackedStreamFactory).build(); } static void slice(MessageSlicer slicer, Identifier identifier, Serializable message, ActorRef sendTo, diff --git a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicingIntegrationTest.java b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicingIntegrationTest.java index a490a24789..23d04b5ed2 100644 --- a/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicingIntegrationTest.java +++ b/opendaylight/md-sal/sal-clustering-commons/src/test/java/org/opendaylight/controller/cluster/messaging/MessageSlicingIntegrationTest.java @@ -63,7 +63,7 @@ public class MessageSlicingIntegrationTest { private final MessageAssembler assembler = MessageAssembler.builder() .assembledMessageCallback(mockAssembledMessageCallback).logContext("test") - .filedBackedStreamFactory(FILE_BACKED_STREAM_FACTORY).build(); + .fileBackedStreamFactory(FILE_BACKED_STREAM_FACTORY).build(); @Before public void setup() { @@ -336,6 +336,6 @@ public class MessageSlicingIntegrationTest { private MessageSlicer newMessageSlicer(String logContext, final int messageSliceSize) { return MessageSlicer.builder().messageSliceSize(messageSliceSize).logContext(logContext) - .filedBackedStreamFactory(FILE_BACKED_STREAM_FACTORY).build(); + .fileBackedStreamFactory(FILE_BACKED_STREAM_FACTORY).build(); } } -- 2.36.6