Rename max to maximum

Author: gjcairo

Sources/NIOHTTP2/GlitchesMonitor.swift

@@ -13,11 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 package struct GlitchesMonitor {
-    package static var defaultMaxGlitches: Int { 200 }
+    package static var defaultMaximumGlitches: Int { 200 }
     private var stateMachine: GlitchesMonitorStateMachine
 
-    package init(maxGlitches: Int = GlitchesMonitor.defaultMaxGlitches) {
-        self.stateMachine = GlitchesMonitorStateMachine(maxGlitches: maxGlitches)
+    package init(maximumGlitches: Int = GlitchesMonitor.defaultMaximumGlitches) {
+        self.stateMachine = GlitchesMonitorStateMachine(maxGlitches: maximumGlitches)
     }
 
     package mutating func processStreamError() throws {

Sources/NIOHTTP2/HTTP2ChannelHandler.swift

@@ -238,7 +238,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
             maximumBufferedControlFrames: 10000,
             maximumSequentialContinuationFrames: NIOHTTP2Handler.defaultMaximumSequentialContinuationFrames,
             maximumRecentlyResetStreams: Self.defaultMaximumRecentlyResetFrames,
-            maxConnectionGlitches: GlitchesMonitor.defaultMaxGlitches,
+            maximumConnectionGlitches: GlitchesMonitor.defaultMaximumGlitches,
             maximumResetFrameCount: 200,
             resetFrameCounterWindow: .seconds(30),
             maximumStreamErrorCount: 200,
@@ -276,7 +276,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
             maximumBufferedControlFrames: maximumBufferedControlFrames,
             maximumSequentialContinuationFrames: NIOHTTP2Handler.defaultMaximumSequentialContinuationFrames,
             maximumRecentlyResetStreams: Self.defaultMaximumRecentlyResetFrames,
-            maxConnectionGlitches: GlitchesMonitor.defaultMaxGlitches,
+            maximumConnectionGlitches: GlitchesMonitor.defaultMaximumGlitches,
             maximumResetFrameCount: 200,
             resetFrameCounterWindow: .seconds(30),
             maximumStreamErrorCount: 200,
@@ -306,7 +306,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
             maximumBufferedControlFrames: connectionConfiguration.maximumBufferedControlFrames,
             maximumSequentialContinuationFrames: connectionConfiguration.maximumSequentialContinuationFrames,
             maximumRecentlyResetStreams: connectionConfiguration.maximumRecentlyResetStreams,
-            maxConnectionGlitches: connectionConfiguration.maxConnectionGlitches,
+            maximumConnectionGlitches: connectionConfiguration.maximumConnectionGlitches,
             maximumResetFrameCount: streamConfiguration.streamResetFrameRateLimit.maximumCount,
             resetFrameCounterWindow: streamConfiguration.streamResetFrameRateLimit.windowLength,
             maximumStreamErrorCount: streamConfiguration.streamErrorRateLimit.maximumCount,
@@ -324,7 +324,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
         maximumBufferedControlFrames: Int,
         maximumSequentialContinuationFrames: Int,
         maximumRecentlyResetStreams: Int,
-        maxConnectionGlitches: Int,
+        maximumConnectionGlitches: Int,
         maximumResetFrameCount: Int,
         resetFrameCounterWindow: TimeAmount,
         maximumStreamErrorCount: Int,
@@ -354,7 +354,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
         self.tolerateImpossibleStateTransitionsInDebugMode = false
         self.inboundStreamMultiplexerState = .uninitializedLegacy
         self.maximumSequentialContinuationFrames = maximumSequentialContinuationFrames
-        self.glitchesMonitor = GlitchesMonitor(maxGlitches: maxConnectionGlitches)
+        self.glitchesMonitor = GlitchesMonitor(maximumGlitches: maximumConnectionGlitches)
     }
 
     /// Constructs a ``NIOHTTP2Handler``.
@@ -376,7 +376,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
     ///         against this DoS vector we put an upper limit on this rate. Defaults to 200.
     ///   - resetFrameCounterWindow:  Controls the sliding window used to enforce the maximum permitted reset frames rate. Too many may exhaust CPU resources. To protect
     ///         against this DoS vector we put an upper limit on this rate. 30 seconds.
-    ///   - maxConnectionGlitches: Controls the maximum number of stream errors that can happen on a connection before the connection is reset. Defaults to 200.
+    ///   - maximumConnectionGlitches: Controls the maximum number of stream errors that can happen on a connection before the connection is reset. Defaults to 200.
     internal init(
         mode: ParserMode,
         initialSettings: HTTP2Settings = nioDefaultSettings,
@@ -391,7 +391,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
         resetFrameCounterWindow: TimeAmount = .seconds(30),
         maximumStreamErrorCount: Int = 200,
         streamErrorCounterWindow: TimeAmount = .seconds(30),
-        maxConnectionGlitches: Int = GlitchesMonitor.defaultMaxGlitches
+        maximumConnectionGlitches: Int = GlitchesMonitor.defaultMaximumGlitches
     ) {
         self.stateMachine = HTTP2ConnectionStateMachine(
             role: .init(mode),
@@ -417,7 +417,7 @@ public final class NIOHTTP2Handler: ChannelDuplexHandler {
         self.tolerateImpossibleStateTransitionsInDebugMode = tolerateImpossibleStateTransitionsInDebugMode
         self.inboundStreamMultiplexerState = .uninitializedLegacy
         self.maximumSequentialContinuationFrames = maximumSequentialContinuationFrames
-        self.glitchesMonitor = GlitchesMonitor(maxGlitches: maxConnectionGlitches)
+        self.glitchesMonitor = GlitchesMonitor(maximumGlitches: maximumConnectionGlitches)
     }
 
     public func handlerAdded(context: ChannelHandlerContext) {
@@ -1387,7 +1387,7 @@ extension NIOHTTP2Handler {
             maximumBufferedControlFrames: connectionConfiguration.maximumBufferedControlFrames,
             maximumSequentialContinuationFrames: connectionConfiguration.maximumSequentialContinuationFrames,
             maximumRecentlyResetStreams: connectionConfiguration.maximumRecentlyResetStreams,
-            maxConnectionGlitches: connectionConfiguration.maxConnectionGlitches,
+            maximumConnectionGlitches: connectionConfiguration.maximumConnectionGlitches,
             maximumResetFrameCount: streamConfiguration.streamResetFrameRateLimit.maximumCount,
             resetFrameCounterWindow: streamConfiguration.streamResetFrameRateLimit.windowLength,
             maximumStreamErrorCount: streamConfiguration.streamErrorRateLimit.maximumCount,
@@ -1420,7 +1420,7 @@ extension NIOHTTP2Handler {
             maximumBufferedControlFrames: connectionConfiguration.maximumBufferedControlFrames,
             maximumSequentialContinuationFrames: connectionConfiguration.maximumSequentialContinuationFrames,
             maximumRecentlyResetStreams: connectionConfiguration.maximumRecentlyResetStreams,
-            maxConnectionGlitches: connectionConfiguration.maxConnectionGlitches,
+            maximumConnectionGlitches: connectionConfiguration.maximumConnectionGlitches,
             maximumResetFrameCount: streamConfiguration.streamResetFrameRateLimit.maximumCount,
             resetFrameCounterWindow: streamConfiguration.streamResetFrameRateLimit.windowLength,
             maximumStreamErrorCount: streamConfiguration.streamErrorRateLimit.maximumCount,
@@ -1445,7 +1445,7 @@ extension NIOHTTP2Handler {
         public var maximumBufferedControlFrames: Int = 10000
         public var maximumSequentialContinuationFrames: Int = NIOHTTP2Handler.defaultMaximumSequentialContinuationFrames
         public var maximumRecentlyResetStreams: Int = NIOHTTP2Handler.defaultMaximumRecentlyResetFrames
-        public var maxConnectionGlitches: Int = GlitchesMonitor.defaultMaxGlitches
+        public var maximumConnectionGlitches: Int = GlitchesMonitor.defaultMaximumGlitches
         public init() {}
     }
 

Tests/NIOHTTP2Tests/GlitchesMonitorTests.swift

@@ -18,7 +18,7 @@ import XCTest
 class GlitchesMonitorTests: XCTestCase {
     func testProcessStreamError() throws {
         let maxGlitches: Int = 10
-        var monitor = GlitchesMonitor(maxGlitches: maxGlitches)
+        var monitor = GlitchesMonitor(maximumGlitches: maxGlitches)
 
         // We accept up to `maxGlitches` glitches without erroring...
         for _ in 1...maxGlitches {

Tests/NIOHTTP2Tests/SimpleClientServerFramePayloadStreamTests.swift

@@ -211,7 +211,7 @@ class SimpleClientServerFramePayloadStreamTests: XCTestCase {
         maximumBufferedControlFrames: Int = 10000,
         maximumSequentialContinuationFrames: Int = 5,
         withMultiplexerCallback multiplexerCallback: NIOChannelInitializer? = nil,
-        maxConnectionGlitches: Int = 10
+        maximumConnectionGlitches: Int = 10
     ) throws {
         XCTAssertNoThrow(
             try self.clientChannel.pipeline.syncOperations.addHandler(
@@ -230,7 +230,7 @@ class SimpleClientServerFramePayloadStreamTests: XCTestCase {
                     initialSettings: serverSettings,
                     maximumBufferedControlFrames: maximumBufferedControlFrames,
                     maximumSequentialContinuationFrames: maximumSequentialContinuationFrames,
-                    maxConnectionGlitches: maxConnectionGlitches
+                    maximumConnectionGlitches: maximumConnectionGlitches
                 )
             )
         )