refactor: Make import list for a couple module more readable

sociomantic-tsunami · Jan 27, 2025 · cb2d2eb · cb2d2eb
1 parent efafc6a
commit cb2d2eb
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 116 deletions.
diff --git a/src/swarm/client/connection/FiberSocketConnection.d b/src/swarm/client/connection/FiberSocketConnection.d
@@ -4,7 +4,8 @@
     adding an extra socket initialisation step to set various parameters for
     TCP keepalive and SYN retransmits.
 
-    copyright:      Copyright (c) 2012-2017 dunnhumby Germany GmbH. All rights reserved
+    Copyright:
+        Copyright (c) 2012-2017 dunnhumby Germany GmbH. All rights reserved
 
     License:
         Boost Software License Version 1.0. See LICENSE.txt for details.
@@ -14,13 +15,6 @@
 module swarm.client.connection.FiberSocketConnection;
 
 
-
-/*******************************************************************************
-
-    Imports
-
-*******************************************************************************/
-
 import Ocean = ocean.io.select.protocol.fiber.FiberSocketConnection;
 
 import core.sys.posix.netinet.in_: SOL_SOCKET, IPPROTO_TCP, SO_KEEPALIVE;

diff --git a/src/swarm/client/connection/NodeConnectionPool.d b/src/swarm/client/connection/NodeConnectionPool.d
@@ -11,58 +11,32 @@
 
 module swarm.client.connection.NodeConnectionPool;
 
-
-
-/*******************************************************************************
-
-    Imports
-
-*******************************************************************************/
-
 import ocean.core.Verify;
-
 import ocean.meta.types.Qualifiers;
 
-import swarm.Const;
-
+import swarm.client.ClientExceptions;
 import swarm.client.connection.RequestConnection;
-
-import swarm.client.model.ClientSettings;
-
 import swarm.client.connection.model.INodeConnectionPool;
 import swarm.client.connection.model.INodeConnectionPoolErrorReporter;
-
 import swarm.client.connection.RequestOverflow;
-
+import swarm.client.model.ClientSettings;
 import swarm.client.request.model.IRequest;
-
 import swarm.client.request.params.IRequestParams;
-
 import swarm.client.request.notifier.IRequestNotification;
-
-import swarm.client.ClientExceptions;
+import swarm.Const;
 
 import ocean.core.TypeConvert : castFrom;
-
-import ocean.util.container.pool.ObjectPool;
-
 import ocean.io.select.client.model.ISelectClient;
-
 import ocean.io.select.EpollSelectDispatcher;
+import ocean.util.container.pool.ObjectPool;
 
 //version = FixedQueue;
-
-version ( FixedQueued )
-{
+version (FixedQueued)
     import ocean.util.container.queue.FixedRingQueue;
-}
 else
-{
     import ocean.util.container.queue.FlexibleRingQueue;
-}
-
-debug ( SwarmClient ) import ocean.io.Stdout;
 
+debug (SwarmClient) import ocean.io.Stdout;
 
 
 /*******************************************************************************

diff --git a/src/swarm/client/connection/RequestConnection.d b/src/swarm/client/connection/RequestConnection.d
@@ -2,7 +2,8 @@
 
     Fiber-based client socket connection holding request handler instances
 
-    copyright:      Copyright (c) 2011-2017 dunnhumby Germany GmbH. All rights reserved
+    Copyright:
+        Copyright (c) 2011-2017 dunnhumby Germany GmbH. All rights reserved
 
     License:
         Boost Software License Version 1.0. See LICENSE.txt for details.
@@ -11,63 +12,34 @@
 
 module swarm.client.connection.RequestConnection;
 
-
-
-/*******************************************************************************
-
-    Imports
-
-*******************************************************************************/
-
-import swarm.Const;
-
+import swarm.client.ClientExceptions;
 import swarm.common.connection.CommandMixins;
-
+import swarm.client.connection.FiberSocketConnection;
+import swarm.client.connection.model.INodeConnectionPool;
+import swarm.client.connection.model.INodeConnectionPoolInfo;
 import swarm.client.request.model.IRequest;
-
 import swarm.client.request.params.IRequestParams;
-
 import swarm.client.request.notifier.IRequestNotification;
-
-import swarm.client.connection.model.INodeConnectionPool;
-import swarm.client.connection.model.INodeConnectionPoolInfo;
-
-import swarm.client.ClientExceptions;
-
+import swarm.Const;
+import ocean.core.Enum;
 import swarm.protocol.FiberSelectReader;
 import swarm.protocol.FiberSelectWriter;
 
-import ocean.core.Enum;
-
 import ocean.core.Verify;
-
+import ocean.io.compress.lzo.LzoChunkCompressor;
 import ocean.io.select.client.FiberSelectEvent;
-
-import ocean.io.select.fiber.SelectFiber;
-
 import ocean.io.select.client.model.ISelectClient;
-
 import ocean.io.select.EpollSelectDispatcher;
-
-import ocean.io.compress.lzo.LzoChunkCompressor;
-
-debug ( SwarmClient ) import ocean.io.Stdout;
-
-import swarm.client.connection.FiberSocketConnection;
+import ocean.io.select.fiber.SelectFiber;
+debug (SwarmClient) import ocean.io.Stdout;
 
 import ocean.meta.types.Qualifiers;
 import ocean.util.log.Logger;
 
 
-
-/*******************************************************************************
-
-    Static module logger
-
-*******************************************************************************/
-
-static private Logger log;
-static this ( )
+/// Module logger
+private Logger log;
+static this ()
 {
     log = Log.lookup("swarm.client.connection.RequestConnection");
 }

diff --git a/src/swarm/protocol/FiberSelectReader.d b/src/swarm/protocol/FiberSelectReader.d
@@ -20,25 +20,12 @@
 module swarm.protocol.FiberSelectReader;
 
 
-
-/*******************************************************************************
-
-    Imports
-
-*******************************************************************************/
-
-import ocean.meta.types.Qualifiers;
-
 import ocean.core.Array;
-
 import ocean.core.Exception;
-
+import ocean.meta.types.Qualifiers;
+import ocean.io.select.EpollSelectDispatcher;
 import Ocean = ocean.io.select.protocol.fiber.FiberSelectReader;
-
 import ocean.io.select.protocol.fiber.model.IFiberSelectProtocol;
-
-import ocean.io.select.EpollSelectDispatcher;
-
 import ocean.math.Math : min, max;
 
 
@@ -48,7 +35,7 @@ import ocean.math.Math : min, max;
 
 ***************************************************************************/
 
-public static class InputTooLargeException : Exception
+public class InputTooLargeException : Exception
 {
     mixin ReusableExceptionImplementation!();
 }
@@ -522,4 +509,3 @@ unittest
     static assert(is(typeof(
         { FiberSelectReader reader; reader.skipArray!(int)(); })));
 }
-
diff --git a/src/swarm/protocol/FiberSelectWriter.d b/src/swarm/protocol/FiberSelectWriter.d
@@ -19,26 +19,15 @@
 
 module swarm.protocol.FiberSelectWriter;
 
-
-
-/*******************************************************************************
-
-    Imports
-
-*******************************************************************************/
-
+import ocean.core.Array : copy;
+import ocean.core.Verify;
+import ocean.io.select.EpollSelectDispatcher;
 import Ocean = ocean.io.select.protocol.fiber.BufferedFiberSelectWriter;
 import ocean.io.select.protocol.fiber.model.IFiberSelectProtocol;
-
-import ocean.io.select.EpollSelectDispatcher;
-
-import ocean.core.Verify;
-
 import ocean.math.Math : min;
 
-import ocean.core.Array : copy;
-
 
+/// Ditto
 public class FiberSelectWriter : Ocean.BufferedFiberSelectWriter
 {
     import swarm.protocol.IAddrPort;
@@ -160,5 +149,3 @@ public class FiberSelectWriter : Ocean.BufferedFiberSelectWriter
         }
     }
 }
-
-