Skip to content

Commit 40d229f

Browse files
committed
refactoring
1 parent e4579f8 commit 40d229f

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

src/main/java/com/github/jlangch/venice/util/ipc/TcpClient.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ public void open() {
189189
ex);
190190
}
191191

192-
// request config from server
192+
// request the config from server
193193
try {
194194
final IMessage response = send(createConfigRequestMessage());
195195
if (response.getResponseStatus() != ResponseStatus.OK) {
@@ -204,20 +204,20 @@ public void open() {
204204
Coerce.toVncLong(
205205
config.get(
206206
new VncKeyword("max-msg-size"),
207-
new VncLong(MESSAGE_LIMIT_MAX))).toJavaLong());
207+
new VncLong(Message.MESSAGE_LIMIT_MAX))).toJavaLong());
208208
compressor.set(
209209
new Compressor(
210210
Coerce.toVncLong(
211211
config.get(
212212
new VncKeyword("compress-cutoff-size"),
213-
new VncLong(MESSAGE_LIMIT_MAX))).toJavaLong()));
213+
new VncLong(-1))).toJavaLong()));
214214
encrypt.set(
215215
encrypt.get() // client side encrypt request
216216
|| VncBoolean.isTrue( // server side encrypt request
217217
config.get(
218218
new VncKeyword(":encrypt"),
219-
VncBoolean.False)));
220-
}
219+
VncBoolean.False)));
220+
}
221221
catch(Exception ex) {
222222
IO.safeClose(ch);
223223
opened.set(false);
@@ -1197,9 +1197,6 @@ private static byte[] toBytes(final String s, final String charset) {
11971197
}
11981198

11991199

1200-
public static final long MESSAGE_LIMIT_MIN = 2 * 1024;
1201-
public static final long MESSAGE_LIMIT_MAX = 200 * 1024 * 1024;
1202-
12031200
private final Semaphore sendSemaphore = new Semaphore(1);
12041201

12051202
private final String host;
@@ -1208,7 +1205,7 @@ private static byte[] toBytes(final String s, final String charset) {
12081205
private final AtomicBoolean opened = new AtomicBoolean(false);
12091206
private final AtomicReference<SocketChannel> channel = new AtomicReference<>();
12101207
private final AtomicBoolean subscription = new AtomicBoolean(false);
1211-
private final AtomicLong maxMessageSize = new AtomicLong(MESSAGE_LIMIT_MAX);
1208+
private final AtomicLong maxMessageSize = new AtomicLong(Message.MESSAGE_LIMIT_MAX);
12121209
private final AtomicLong messageSentCount = new AtomicLong(0L);
12131210
private final AtomicLong messageReceiveCount = new AtomicLong(0L);
12141211

src/main/java/com/github/jlangch/venice/util/ipc/TcpServer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,9 @@ public long getCompressCutoffSize() {
158158
* @return this server
159159
*/
160160
public TcpServer setMaxMessageSize(final long maxSize) {
161-
maxMessageSize.set(Math.max(MESSAGE_LIMIT_MIN, Math.min(MESSAGE_LIMIT_MAX, maxSize)));
161+
maxMessageSize.set(Math.max(
162+
Message.MESSAGE_LIMIT_MIN,
163+
Math.min(Message.MESSAGE_LIMIT_MAX, maxSize)));
162164
return this;
163165
}
164166

@@ -560,8 +562,6 @@ private static byte[] toBytes(final String s, final String charset) {
560562

561563

562564

563-
public static final long MESSAGE_LIMIT_MIN = 2 * 1024;
564-
public static final long MESSAGE_LIMIT_MAX = 200 * 1024 * 1024;
565565
public static final long QUEUES_MIN = 201;
566566
public static final long QUEUES_MAX = 20;
567567

@@ -570,7 +570,7 @@ private static byte[] toBytes(final String s, final String charset) {
570570
private final String endpointId;
571571
private final AtomicBoolean started = new AtomicBoolean(false);
572572
private final AtomicReference<ServerSocketChannel> server = new AtomicReference<>();
573-
private final AtomicLong maxMessageSize = new AtomicLong(MESSAGE_LIMIT_MAX);
573+
private final AtomicLong maxMessageSize = new AtomicLong(Message.MESSAGE_LIMIT_MAX);
574574
private final AtomicLong maxQueues = new AtomicLong(QUEUES_MAX);
575575
private final AtomicBoolean encrypt = new AtomicBoolean(false);
576576
private final AtomicLong connectionId = new AtomicLong(0);

src/main/java/com/github/jlangch/venice/util/ipc/impl/Message.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -542,6 +542,10 @@ public static void validateQueueName(final String name) {
542542
}
543543

544544

545+
546+
public static final long MESSAGE_LIMIT_MIN = 2 * 1024;
547+
public static final long MESSAGE_LIMIT_MAX = 200 * 1024 * 1024;
548+
545549
public static final long EXPIRES_NEVER = -1L;
546550
public static final long NO_TIMEOUT = -1L;
547551
public static final long DEFAULT_TIMEOUT = 300L; // 300ms

src/test/java/com/github/jlangch/venice/util/ipc/TcpClientRuntimeConfigTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525

2626
import org.junit.jupiter.api.Test;
2727

28+
import com.github.jlangch.venice.util.ipc.impl.Message;
29+
2830

2931
public class TcpClientRuntimeConfigTest {
3032

@@ -43,7 +45,7 @@ public void test_client_defaults() throws Exception {
4345
try {
4446
assertEquals(false, client.isEncrypted());
4547
assertEquals(-1, client.getCompressCutoffSize());
46-
assertEquals(TcpServer.MESSAGE_LIMIT_MAX, client.getMaxMessageSize());
48+
assertEquals(Message.MESSAGE_LIMIT_MAX, client.getMaxMessageSize());
4749
}
4850
catch(Exception ex) {
4951
// OK

0 commit comments

Comments
 (0)