Skip to content

Commit cb2d2eb

Browse files
Geod24Geod24
committed
refactor: Make import list for a couple module more readable
1 parent efafc6a commit cb2d2eb

File tree

5 files changed

+29
-116
lines changed

5 files changed

+29
-116
lines changed

‎src/swarm/client/connection/FiberSocketConnection.d‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
adding an extra socket initialisation step to set various parameters for
55
TCP keepalive and SYN retransmits.
66
7-
copyright: Copyright (c) 2012-2017 dunnhumby Germany GmbH. All rights reserved
7+
Copyright:
8+
Copyright (c) 2012-2017 dunnhumby Germany GmbH. All rights reserved
89
910
License:
1011
Boost Software License Version 1.0. See LICENSE.txt for details.
@@ -14,13 +15,6 @@
1415
module swarm.client.connection.FiberSocketConnection;
1516

1617

17-
18-
/*******************************************************************************
19-
20-
Imports
21-
22-
*******************************************************************************/
23-
2418
import Ocean = ocean.io.select.protocol.fiber.FiberSocketConnection;
2519

2620
import core.sys.posix.netinet.in_: SOL_SOCKET, IPPROTO_TCP, SO_KEEPALIVE;

‎src/swarm/client/connection/NodeConnectionPool.d‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,58 +11,32 @@
1111

1212
module swarm.client.connection.NodeConnectionPool;
1313

14-
15-
16-
/*******************************************************************************
17-
18-
Imports
19-
20-
*******************************************************************************/
21-
2214
import ocean.core.Verify;
23-
2415
import ocean.meta.types.Qualifiers;
2516

26-
import swarm.Const;
27-
17+
import swarm.client.ClientExceptions;
2818
import swarm.client.connection.RequestConnection;
29-
30-
import swarm.client.model.ClientSettings;
31-
3219
import swarm.client.connection.model.INodeConnectionPool;
3320
import swarm.client.connection.model.INodeConnectionPoolErrorReporter;
34-
3521
import swarm.client.connection.RequestOverflow;
36-
22+
import swarm.client.model.ClientSettings;
3723
import swarm.client.request.model.IRequest;
38-
3924
import swarm.client.request.params.IRequestParams;
40-
4125
import swarm.client.request.notifier.IRequestNotification;
42-
43-
import swarm.client.ClientExceptions;
26+
import swarm.Const;
4427

4528
import ocean.core.TypeConvert : castFrom;
46-
47-
import ocean.util.container.pool.ObjectPool;
48-
4929
import ocean.io.select.client.model.ISelectClient;
50-
5130
import ocean.io.select.EpollSelectDispatcher;
31+
import ocean.util.container.pool.ObjectPool;
5232

5333
//version = FixedQueue;
54-
55-
version ( FixedQueued )
56-
{
34+
version (FixedQueued)
5735
import ocean.util.container.queue.FixedRingQueue;
58-
}
5936
else
60-
{
6137
import ocean.util.container.queue.FlexibleRingQueue;
62-
}
63-
64-
debug ( SwarmClient ) import ocean.io.Stdout;
6538

39+
debug (SwarmClient) import ocean.io.Stdout;
6640

6741

6842
/*******************************************************************************

‎src/swarm/client/connection/RequestConnection.d‎

Lines changed: 14 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
33
Fiber-based client socket connection holding request handler instances
44
5-
copyright: Copyright (c) 2011-2017 dunnhumby Germany GmbH. All rights reserved
5+
Copyright:
6+
Copyright (c) 2011-2017 dunnhumby Germany GmbH. All rights reserved
67
78
License:
89
Boost Software License Version 1.0. See LICENSE.txt for details.
@@ -11,63 +12,34 @@
1112

1213
module swarm.client.connection.RequestConnection;
1314

14-
15-
16-
/*******************************************************************************
17-
18-
Imports
19-
20-
*******************************************************************************/
21-
22-
import swarm.Const;
23-
15+
import swarm.client.ClientExceptions;
2416
import swarm.common.connection.CommandMixins;
25-
17+
import swarm.client.connection.FiberSocketConnection;
18+
import swarm.client.connection.model.INodeConnectionPool;
19+
import swarm.client.connection.model.INodeConnectionPoolInfo;
2620
import swarm.client.request.model.IRequest;
27-
2821
import swarm.client.request.params.IRequestParams;
29-
3022
import swarm.client.request.notifier.IRequestNotification;
31-
32-
import swarm.client.connection.model.INodeConnectionPool;
33-
import swarm.client.connection.model.INodeConnectionPoolInfo;
34-
35-
import swarm.client.ClientExceptions;
36-
23+
import swarm.Const;
24+
import ocean.core.Enum;
3725
import swarm.protocol.FiberSelectReader;
3826
import swarm.protocol.FiberSelectWriter;
3927

40-
import ocean.core.Enum;
41-
4228
import ocean.core.Verify;
43-
29+
import ocean.io.compress.lzo.LzoChunkCompressor;
4430
import ocean.io.select.client.FiberSelectEvent;
45-
46-
import ocean.io.select.fiber.SelectFiber;
47-
4831
import ocean.io.select.client.model.ISelectClient;
49-
5032
import ocean.io.select.EpollSelectDispatcher;
51-
52-
import ocean.io.compress.lzo.LzoChunkCompressor;
53-
54-
debug ( SwarmClient ) import ocean.io.Stdout;
55-
56-
import swarm.client.connection.FiberSocketConnection;
33+
import ocean.io.select.fiber.SelectFiber;
34+
debug (SwarmClient) import ocean.io.Stdout;
5735

5836
import ocean.meta.types.Qualifiers;
5937
import ocean.util.log.Logger;
6038

6139

62-
63-
/*******************************************************************************
64-
65-
Static module logger
66-
67-
*******************************************************************************/
68-
69-
static private Logger log;
70-
static this ( )
40+
/// Module logger
41+
private Logger log;
42+
static this ()
7143
{
7244
log = Log.lookup("swarm.client.connection.RequestConnection");
7345
}

‎src/swarm/protocol/FiberSelectReader.d‎

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,25 +20,12 @@
2020
module swarm.protocol.FiberSelectReader;
2121

2222

23-
24-
/*******************************************************************************
25-
26-
Imports
27-
28-
*******************************************************************************/
29-
30-
import ocean.meta.types.Qualifiers;
31-
3223
import ocean.core.Array;
33-
3424
import ocean.core.Exception;
35-
25+
import ocean.meta.types.Qualifiers;
26+
import ocean.io.select.EpollSelectDispatcher;
3627
import Ocean = ocean.io.select.protocol.fiber.FiberSelectReader;
37-
3828
import ocean.io.select.protocol.fiber.model.IFiberSelectProtocol;
39-
40-
import ocean.io.select.EpollSelectDispatcher;
41-
4229
import ocean.math.Math : min, max;
4330

4431

@@ -48,7 +35,7 @@ import ocean.math.Math : min, max;
4835
4936
***************************************************************************/
5037

51-
public static class InputTooLargeException : Exception
38+
public class InputTooLargeException : Exception
5239
{
5340
mixin ReusableExceptionImplementation!();
5441
}
@@ -522,4 +509,3 @@ unittest
522509
static assert(is(typeof(
523510
{ FiberSelectReader reader; reader.skipArray!(int)(); })));
524511
}
525-

‎src/swarm/protocol/FiberSelectWriter.d‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,15 @@
1919

2020
module swarm.protocol.FiberSelectWriter;
2121

22-
23-
24-
/*******************************************************************************
25-
26-
Imports
27-
28-
*******************************************************************************/
29-
22+
import ocean.core.Array : copy;
23+
import ocean.core.Verify;
24+
import ocean.io.select.EpollSelectDispatcher;
3025
import Ocean = ocean.io.select.protocol.fiber.BufferedFiberSelectWriter;
3126
import ocean.io.select.protocol.fiber.model.IFiberSelectProtocol;
32-
33-
import ocean.io.select.EpollSelectDispatcher;
34-
35-
import ocean.core.Verify;
36-
3727
import ocean.math.Math : min;
3828

39-
import ocean.core.Array : copy;
40-
4129

30+
/// Ditto
4231
public class FiberSelectWriter : Ocean.BufferedFiberSelectWriter
4332
{
4433
import swarm.protocol.IAddrPort;
@@ -160,5 +149,3 @@ public class FiberSelectWriter : Ocean.BufferedFiberSelectWriter
160149
}
161150
}
162151
}
163-
164-

0 commit comments

Comments
 (0)