Fix incorrect spelling of fileBackedStreamFactory

filedBackedStreamFactory should be fileBackedStreamFactory.

Change-Id: Ib0b65d68d37c5b0ded4f1739d4ddc578973fe6ec
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

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 9f0e0327ce16e109c33c28e0b7c0147aabe69194..11fa23748e776c11372b74e8e885117db0f06fd1 100644 (file)
--- 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 71b07f4a7e4128f123db1e9808fdbd8df1d46711..328ff0c44a507c9301cbe89f16a18b3ae68668fb 100644 (file)
--- 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<Identifier, AssembledMessageState> stateCache;
-    private final FileBackedOutputStreamFactory filedBackedStreamFactory;
+    private final FileBackedOutputStreamFactory fileBackedStreamFactory;
     private final BiConsumer<Object, ActorRef> 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<Object, ActorRef> 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 164737579162a5dfcdec0be0abebfd3a8ee1244e..1454e72cc063d2323ca4844cb9e8dcb5ae7e3d9f 100644 (file)
--- 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<Identifier, SlicedMessageState<ActorRef>> 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 73773057cf74311147ad5caafaa4dafd3ca0a8c3..209943e83c7012f1256aec5fa4c8189cfe17112b 100644 (file)
--- 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 df12ad2c1158c5e5b63b95c758261dbe8321b954..ac6ab2e447b52e61b49e00c348f4af245886795e 100644 (file)
--- 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 a490a247899f05c27d8e184123d7a6a2d916c0b8..23d04b5ed2d7b8226a957b8243bc9a88b852390b 100644 (file)
--- 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();
     }
 }