toad/toad-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: rework Runtime.Config.Builder to be Runtime.Builder, add explicit bind to address

Browse Source
This commit is contained in:
Orion Kindel
2023-04-11 13:39:43 -05:00
parent a8aa0f8bf7
commit ea59f92cb5
10 changed files with 201 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
src/main/java/dev.toad/Runtime.java → src/main/java/dev.toad/ToadRuntime.java
View File

@@ -2,53 +2,99 @@ package dev.toad;
import dev.toad.ffi.*;
import dev.toad.msg.MessageRef;
import java.net.InetSocketAddress;
import java.time.Duration;
import java.util.Optional;
import java.util.function.Function;
interface BuilderPort {
Runtime.Config.Builder port(short port);
}
public class ToadRuntime {
public class Runtime {
static native Config defaultConfigImpl();
protected static native Config defaultConfigImpl();
static Config defaultConfig = null;
protected static Config defaultConfig = null;
protected static Config defaultConfig() {
if (Runtime.defaultConfig == null) {
Runtime.defaultConfig = Runtime.defaultConfigImpl();
static Config defaultConfig() {
if (ToadRuntime.defaultConfig == null) {
ToadRuntime.defaultConfig = ToadRuntime.defaultConfigImpl();
}
return Runtime.defaultConfig;
return ToadRuntime.defaultConfig;
}
static {
System.loadLibrary("toad_java_glue");
}
private final long addr;
private final Ptr ptr;
private final Config config;
private static native long init(Config o);
private native Optional<MessageRef> pollReq();
private static native Optional<MessageRef> pollReq(long addr);
public static Runtime getOrInit(Config o) {
return new Runtime(o);
Optional<MessageRef> pollReq() {
return ToadRuntime.pollReq(this.ptr.addr());
}
public Runtime(Config o) {
this.addr = Runtime.init(o);
public static BuilderRequiresBindToAddress builder() {
return new Builder();
}
ToadRuntime(Config o) {
this.config = o;
this.ptr = Ptr.register(this.getClass(), this.init(o));
}
public Config config() {
return this.config;
}
public interface BuilderRequiresBindToAddress {
ToadRuntime.Builder port(short port);
ToadRuntime.Builder address(InetSocketAddress addr);
}
public static final class Builder implements BuilderRequiresBindToAddress {
Config.Msg.Builder msg = Config.Msg.builder();
Optional<InetSocketAddress> addr = Optional.empty();
u8 concurrency = ToadRuntime.defaultConfig().concurrency;
Builder() {}
public ToadRuntime build() {
var cfg = new Config(this.addr.get(), this.concurrency, this.msg.build());
return new ToadRuntime(cfg);
}
public Builder msg(Function<Config.Msg.Builder, Config.Msg.Builder> f) {
this.msg = f.apply(this.msg);
return this;
}
public Builder port(short port) {
return this.address(new InetSocketAddress(port));
}
public Builder address(InetSocketAddress addr) {
this.addr = Optional.of(addr);
return this;
}
public Builder concurrency(byte concurrency) {
this.concurrency = new u8(concurrency);
return this;
}
}
public static final class Config {
protected u16 port;
protected u8 concurrency;
protected Msg msg;
final InetSocketAddress addr;
final u8 concurrency;
final Msg msg;
protected Config(u16 port, u8 concurrency, Msg msg) {
this.port = port;
Config(InetSocketAddress addr, u8 concurrency, Msg msg) {
this.addr = addr;
this.concurrency = concurrency;
this.msg = msg;
}
@@ -56,15 +102,15 @@ public class Runtime {
@Override
public boolean equals(Object other) {
return switch (other) {
case Config o -> o.port == this.port &&
case Config o -> o.addr == this.addr &&
o.concurrency == this.concurrency &&
o.msg == this.msg;
default -> false;
};
}
public int port() {
return this.port.intValue();
public InetSocketAddress addr() {
return this.addr();
}
public short concurrency() {
@@ -75,43 +121,19 @@ public class Runtime {
return this.msg;
}
public static final class Builder implements BuilderPort {
public final Msg.Builder msg = Msg.builder();
protected Optional<u16> port = Optional.empty();
protected u8 concurrency = Runtime.defaultConfig().concurrency;
protected Builder() {}
public Config build() {
return new Config(this.port.get(), this.concurrency, this.msg.build());
}
public Builder port(short port) {
this.port = Optional.of(new u16(port));
return this;
}
public Builder concurrency(byte concurrency) {
this.concurrency = new u8(concurrency);
return this;
}
}
public static final class Msg {
protected u16 tokenSeed;
protected u16 probingRateBytesPerSecond;
protected Duration multicastResponseLeisure;
protected Con con;
protected Non non;
u16 tokenSeed;
u16 probingRateBytesPerSecond;
Duration multicastResponseLeisure;
Con con;
Non non;
public static Builder builder() {
return new Builder();
}
protected Msg(
Msg(
u16 tokenSeed,
u16 probingRateBytesPerSecond,
Duration multicastResponseLeisure,
@@ -159,13 +181,12 @@ public class Runtime {
public static final class Builder {
public final Con.Builder con = Con.builder();
public final Non.Builder non = Non.builder();
protected u16 tokenSeed = Runtime.defaultConfig().msg.tokenSeed;
protected u16 probingRateBytesPerSecond = Runtime.defaultConfig()
Con.Builder con = Con.builder();
Non.Builder non = Non.builder();
u16 tokenSeed = ToadRuntime.defaultConfig().msg.tokenSeed;
u16 probingRateBytesPerSecond = ToadRuntime.defaultConfig()
.msg.probingRateBytesPerSecond;
protected Duration multicastResponseLeisure = Runtime.defaultConfig()
Duration multicastResponseLeisure = ToadRuntime.defaultConfig()
.msg.multicastResponseLeisure;
public Msg build() {
@@ -178,6 +199,16 @@ public class Runtime {
);
}
public Builder con(Function<Con.Builder, Con.Builder> f) {
this.con = f.apply(this.con);
return this;
}
public Builder non(Function<Non.Builder, Non.Builder> f) {
this.non = f.apply(this.non);
return this;
}
public Builder tokenSeed(u16 tokenSeed) {
this.tokenSeed = tokenSeed;
return this;
@@ -197,20 +228,20 @@ public class Runtime {
return this;
}
protected Builder() {}
Builder() {}
}
public static final class Con {
protected RetryStrategy ackedRetryStrategy;
protected RetryStrategy unackedRetryStrategy;
protected u16 maxAttempts;
final RetryStrategy ackedRetryStrategy;
final RetryStrategy unackedRetryStrategy;
final u16 maxAttempts;
public static Builder builder() {
return new Builder();
}
protected Con(
Con(
RetryStrategy unackedRetryStrategy,
RetryStrategy ackedRetryStrategy,
u16 maxAttempts
@@ -244,12 +275,11 @@ public class Runtime {
public static final class Builder {
protected RetryStrategy ackedRetryStrategy = Runtime.defaultConfig()
RetryStrategy ackedRetryStrategy = ToadRuntime.defaultConfig()
.msg.con.ackedRetryStrategy;
protected RetryStrategy unackedRetryStrategy = Runtime.defaultConfig()
RetryStrategy unackedRetryStrategy = ToadRuntime.defaultConfig()
.msg.con.unackedRetryStrategy;
protected u16 maxAttempts = Runtime.defaultConfig()
.msg.con.maxAttempts;
u16 maxAttempts = ToadRuntime.defaultConfig().msg.con.maxAttempts;
public Con build() {
return new Con(
@@ -276,20 +306,20 @@ public class Runtime {
return this;
}
protected Builder() {}
Builder() {}
}
}
public static final class Non {
protected RetryStrategy retryStrategy;
protected u16 maxAttempts;
final RetryStrategy retryStrategy;
final u16 maxAttempts;
public static Builder builder() {
return new Builder();
}
protected Non(RetryStrategy retryStrategy, u16 maxAttempts) {
Non(RetryStrategy retryStrategy, u16 maxAttempts) {
this.retryStrategy = retryStrategy;
this.maxAttempts = maxAttempts;
}
@@ -313,10 +343,9 @@ public class Runtime {
public static final class Builder {
protected RetryStrategy retryStrategy = Runtime.defaultConfig()
RetryStrategy retryStrategy = ToadRuntime.defaultConfig()
.msg.non.retryStrategy;
protected u16 maxAttempts = Runtime.defaultConfig()
.msg.non.maxAttempts;
u16 maxAttempts = ToadRuntime.defaultConfig().msg.non.maxAttempts;
public Non build() {
return new Non(this.retryStrategy, this.maxAttempts);
@@ -332,7 +361,7 @@ public class Runtime {
return this;
}
protected Builder() {}
Builder() {}
}
}
}

3
src/main/java/dev.toad/msg/Message.java
View File

@@ -1,8 +1,11 @@
package dev.toad.msg;
import java.net.InetSocketAddress;
import java.util.List;
public interface Message {
public InetSocketAddress source();
public int id();
public byte[] token();

19
src/main/java/dev.toad/msg/MessageOwned.java
View File

@@ -1,5 +1,6 @@
package dev.toad.msg;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -7,12 +8,13 @@ import java.util.stream.Collectors;
public class MessageOwned implements Message {
private static int id;
private static byte[] token;
private static byte[] payload;
private static MessageCode code;
private static MessageType type;
private static List<MessageOption> opts;
private final InetSocketAddress source;
private final int id;
private final byte[] token;
private final byte[] payload;
private final MessageCode code;
private final MessageType type;
private final List<MessageOption> opts;
public MessageOwned(MessageRef ref) {
this.id = ref.id();
@@ -20,6 +22,7 @@ public class MessageOwned implements Message {
this.code = ref.code();
this.type = ref.type();
this.payload = ref.payloadBytes().clone();
this.source = ref.source();
this.opts =
Arrays
@@ -29,6 +32,10 @@ public class MessageOwned implements Message {
.collect(Collectors.toList());
}
public InetSocketAddress source() {
return this.source;
}
public int id() {
return this.id;
}

14
src/main/java/dev.toad/msg/MessageRef.java
View File

@@ -1,8 +1,10 @@
package dev.toad.msg;
import dev.toad.ffi.Ptr;
import java.net.InetSocketAddress;
import java.util.Arrays;
import java.util.List;
import java.util.Optional;
/**
* A pointer to a [`toad_msg::Message`](https://docs.rs/toad-msg/latest/toad_msg/struct.Message.html)
@@ -15,6 +17,10 @@ public class MessageRef implements Message, AutoCloseable {
private Ptr ptr;
private Optional<InetSocketAddress> source = Optional.empty();
private static native InetSocketAddress source(long addr);
private static native int id(long addr);
private static native byte[] token(long addr);
@@ -35,6 +41,14 @@ public class MessageRef implements Message, AutoCloseable {
return new MessageOwned(this);
}
public InetSocketAddress source() {
if (this.source.isEmpty()) {
this.source = Optional.of(this.source(this.ptr.addr()));
}
return this.source.get();
}
public int id() {
return this.id(this.ptr.addr());
}