Skip to content

Commit b01f945

Browse files
authored
remove pool objects and introduce poj_01 dependency (#85)
* remove pool objects and introduce poj_01 dependency * replace anonymous impl. of PoolableSupplier with PoolableSupplierFake * add missing license to PoolableSupplierFake * update poj_01 to 3.0.0 * removed unnecessary PoolTest, as it is poj_01 responsibility now
1 parent 77d88bd commit b01f945

10 files changed

Lines changed: 66 additions & 296 deletions

File tree

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,14 @@
2121
<maven.compiler.target>1.8</maven.compiler.target>
2222
<junit.version>5.10.0</junit.version>
2323
<teragrep.tls_01.version>0.7.1</teragrep.tls_01.version>
24+
<teragrep.poj_01.version>3.0.0</teragrep.poj_01.version>
2425
</properties>
25-
2626
<licenses>
2727
<license>
2828
<name>Apache License v2.0</name>
2929
<url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
3030
</license>
3131
</licenses>
32-
3332
<developers>
3433
<developer>
3534
<name>Mikko Kortelainen</name>
@@ -38,14 +37,17 @@
3837
<organizationUrl>https://teragrep.com</organizationUrl>
3938
</developer>
4039
</developers>
41-
4240
<scm>
4341
<connection>scm:git:https://github.com/teragrep/rlp_01.git</connection>
4442
<developerConnection>scm:git:[email protected]:teragrep/rlp_01.git</developerConnection>
4543
<url>https://github.com/teragrep/rlp_01/tree/master</url>
4644
</scm>
47-
4845
<dependencies>
46+
<dependency>
47+
<groupId>com.teragrep</groupId>
48+
<artifactId>poj_01</artifactId>
49+
<version>${teragrep.poj_01.version}</version>
50+
</dependency>
4951
<!-- tls-channel, without slf4j -->
5052
<dependency>
5153
<groupId>com.teragrep</groupId>
@@ -77,7 +79,6 @@
7779
<scope>test</scope>
7880
</dependency>
7981
</dependencies>
80-
8182
<build>
8283
<directory>${project.basedir}/target</directory>
8384
<finalName>rlp_01</finalName>

src/main/java/com/teragrep/rlp_01/client/IManagedRelpConnection.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
*/
1717
package com.teragrep.rlp_01.client;
1818

19+
1920
import com.teragrep.rlp_01.RelpBatch;
20-
import com.teragrep.rlp_01.pool.Poolable;
21+
import com.teragrep.stb_01.Stubable;
2122

23+
import java.io.Closeable;
2224
import java.io.IOException;
2325

24-
public interface IManagedRelpConnection extends Poolable {
26+
public interface IManagedRelpConnection extends Stubable, Closeable {
2527
void reconnect();
26-
2728
void connect() throws IOException;
2829
void forceReconnect();
2930
void ensureSent(byte[] bytes);

src/main/java/com/teragrep/rlp_01/client/SSLContextSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
*/
1717
package com.teragrep.rlp_01.client;
1818

19-
import com.teragrep.rlp_01.pool.Stubable;
19+
import com.teragrep.stb_01.Stubable;
2020

2121
import javax.net.ssl.SSLContext;
2222
import java.util.function.Supplier;

src/main/java/com/teragrep/rlp_01/pool/Pool.java

Lines changed: 0 additions & 27 deletions
This file was deleted.

src/main/java/com/teragrep/rlp_01/pool/Poolable.java

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/main/java/com/teragrep/rlp_01/pool/Stubable.java

Lines changed: 0 additions & 22 deletions
This file was deleted.

src/main/java/com/teragrep/rlp_01/pool/UnboundPool.java

Lines changed: 0 additions & 100 deletions
This file was deleted.

src/test/java/com/teragrep/rlp_01/client/ManagedConnectionTest.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@
2020
import com.teragrep.net_01.eventloop.EventLoop;
2121
import com.teragrep.net_01.eventloop.EventLoopFactory;
2222
import com.teragrep.net_01.server.ServerFactory;
23+
import com.teragrep.poj_01.pool.Pool;
24+
import com.teragrep.poj_01.pool.PoolableSupplier;
25+
import com.teragrep.poj_01.pool.UnboundPool;
2326
import com.teragrep.rlp_01.RelpBatch;
24-
import com.teragrep.rlp_01.pool.Pool;
25-
import com.teragrep.rlp_01.pool.UnboundPool;
27+
import com.teragrep.rlp_01.pool.PoolableSupplierFake;
2628
import com.teragrep.rlp_03.frame.FrameDelegationClockFactory;
2729
import com.teragrep.rlp_03.frame.delegate.EventDelegate;
2830
import com.teragrep.rlp_03.frame.delegate.FrameDelegate;
@@ -136,7 +138,7 @@ public void testPooledConnections() {
136138

137139
RelpConnectionFactory relpConnectionFactory = new RelpConnectionFactory(relpConfig);
138140

139-
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(relpConnectionFactory, new ManagedRelpConnectionStub());
141+
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(new PoolableSupplierFake<>(c->Assertions.assertDoesNotThrow(c::close), p -> relpConnectionFactory.get()), new ManagedRelpConnectionStub());
140142

141143
int testCycles = 1_000;
142144
CountDownLatch countDownLatch = new CountDownLatch(testCycles);
@@ -184,7 +186,7 @@ public void testPooledRenewedConnections() {
184186

185187
RelpConnectionFactory relpConnectionFactory = new RelpConnectionFactory(relpConfig);
186188

187-
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(relpConnectionFactory, new ManagedRelpConnectionStub());
189+
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(new PoolableSupplierFake<>(c->Assertions.assertDoesNotThrow(c::close), p -> relpConnectionFactory.get()), new ManagedRelpConnectionStub());
188190

189191
int testCycles = 20;
190192
CountDownLatch countDownLatch = new CountDownLatch(testCycles);
@@ -241,7 +243,7 @@ public void testPooledReboundConnections() {
241243

242244
RelpConnectionFactory relpConnectionFactory = new RelpConnectionFactory(relpConfig);
243245

244-
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(relpConnectionFactory, new ManagedRelpConnectionStub());
246+
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(new PoolableSupplierFake<>(c->Assertions.assertDoesNotThrow(c::close), p -> relpConnectionFactory.get()), new ManagedRelpConnectionStub());
245247

246248
int testCycles = 20;
247249
CountDownLatch countDownLatch = new CountDownLatch(testCycles);
@@ -297,7 +299,7 @@ public void testRelpBatchSend() {
297299

298300
RelpConnectionFactory relpConnectionFactory = new RelpConnectionFactory(relpConfig);
299301

300-
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(relpConnectionFactory, new ManagedRelpConnectionStub());
302+
Pool<IManagedRelpConnection> relpConnectionPool = new UnboundPool<>(new PoolableSupplierFake<>(c->Assertions.assertDoesNotThrow(c::close), p -> relpConnectionFactory.get()), new ManagedRelpConnectionStub());
301303

302304
int testCycles = 20;
303305
CountDownLatch countDownLatch = new CountDownLatch(testCycles);

0 commit comments

Comments
 (0)