From 23cfcfc81ebb7082f8a2823bbe79706fcdae0d80 Mon Sep 17 00:00:00 2001 From: Hiram Chirino Date: Sun, 16 Mar 2025 17:49:01 -0400 Subject: [PATCH] refactor: simplify by putting everything in the io.roastedroot.proxywasm package. --- .../io/roastedroot/proxywasm/{impl => }/ABI.java | 16 +++------------- .../proxywasm/{v1 => }/ABIVersion.java | 2 +- .../roastedroot/proxywasm/{v1 => }/Action.java | 2 +- .../proxywasm/{v1 => }/BufferType.java | 2 +- .../proxywasm/{v1 => }/ChainedHandler.java | 2 +- .../roastedroot/proxywasm/{v1 => }/Context.java | 2 +- .../proxywasm/{v1 => }/ForeignFunction.java | 2 +- .../roastedroot/proxywasm/{v1 => }/Handler.java | 2 +- .../roastedroot/proxywasm/{v1 => }/Helpers.java | 2 +- .../proxywasm/{v1 => }/HttpContext.java | 4 ++-- .../roastedroot/proxywasm/{v1 => }/LogLevel.java | 2 +- .../roastedroot/proxywasm/{v1 => }/MapType.java | 2 +- .../proxywasm/{v1 => }/MetricType.java | 2 +- .../proxywasm/{v1 => }/NetworkContext.java | 4 ++-- .../roastedroot/proxywasm/{v1 => }/PeerType.java | 2 +- .../proxywasm/{v1 => }/PluginContext.java | 2 +- .../proxywasm/{v1 => }/ProxyWasm.java | 6 ++---- .../proxywasm/{v1 => }/QueueName.java | 2 +- .../proxywasm/{v1 => }/StartException.java | 2 +- .../proxywasm/{v1 => }/StreamType.java | 2 +- .../proxywasm/{v1 => }/WasmException.java | 2 +- .../proxywasm/{v1 => }/WasmResult.java | 2 +- .../proxywasm/DispatchCallOnTickTest.java | 2 -- .../roastedroot/proxywasm/EchoHttpBodyTest.java | 8 ++------ .../proxywasm/ForeignCallOnTickTest.java | 2 -- .../proxywasm/HttpAuthRandomTest.java | 7 ++----- .../roastedroot/proxywasm/HttpBodyChunkTest.java | 6 +----- .../io/roastedroot/proxywasm/HttpBodyTest.java | 8 ++------ .../roastedroot/proxywasm/HttpHeadersTest.java | 3 --- .../roastedroot/proxywasm/HttpRoutingTest.java | 3 --- .../proxywasm/JsonValidationTest.java | 6 +----- .../io/roastedroot/proxywasm/MetricsTest.java | 4 ---- .../io/roastedroot/proxywasm/MockHandler.java | 9 --------- .../roastedroot/proxywasm/MockSharedHandler.java | 4 ---- .../proxywasm/MultipleDispatchesTest.java | 3 --- .../io/roastedroot/proxywasm/NetworkTest.java | 7 +------ .../proxywasm/OnRequestHeadersTest.java | 2 -- .../proxywasm/PostponeRequestsTest.java | 3 --- .../io/roastedroot/proxywasm/PropertiesTest.java | 5 +---- .../io/roastedroot/proxywasm/SharedDataTest.java | 3 --- .../roastedroot/proxywasm/SharedQueueTest.java | 5 ----- .../proxywasm/TimersClocksRandomTest.java | 3 --- .../proxywasm/VmPluginConfigurationTest.java | 2 -- 43 files changed, 37 insertions(+), 124 deletions(-) rename src/main/java/io/roastedroot/proxywasm/{impl => }/ABI.java (98%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/ABIVersion.java (93%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/Action.java (96%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/BufferType.java (96%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/ChainedHandler.java (99%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/Context.java (97%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/ForeignFunction.java (65%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/Handler.java (99%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/Helpers.java (99%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/HttpContext.java (95%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/LogLevel.java (96%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/MapType.java (96%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/MetricType.java (96%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/NetworkContext.java (94%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/PeerType.java (96%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/PluginContext.java (87%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/ProxyWasm.java (98%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/QueueName.java (94%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/StartException.java (77%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/StreamType.java (96%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/WasmException.java (90%) rename src/main/java/io/roastedroot/proxywasm/{v1 => }/WasmResult.java (98%) diff --git a/src/main/java/io/roastedroot/proxywasm/impl/ABI.java b/src/main/java/io/roastedroot/proxywasm/ABI.java similarity index 98% rename from src/main/java/io/roastedroot/proxywasm/impl/ABI.java rename to src/main/java/io/roastedroot/proxywasm/ABI.java index 7bd69da..fbe6e57 100644 --- a/src/main/java/io/roastedroot/proxywasm/impl/ABI.java +++ b/src/main/java/io/roastedroot/proxywasm/ABI.java @@ -1,7 +1,7 @@ -package io.roastedroot.proxywasm.impl; +package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.replaceBytes; -import static io.roastedroot.proxywasm.v1.Helpers.string; +import static io.roastedroot.proxywasm.Helpers.replaceBytes; +import static io.roastedroot.proxywasm.Helpers.string; import com.dylibso.chicory.experimental.hostmodule.annotations.HostModule; import com.dylibso.chicory.experimental.hostmodule.annotations.WasmExport; @@ -9,16 +9,6 @@ import com.dylibso.chicory.runtime.Memory; import com.dylibso.chicory.runtime.WasmRuntimeException; import com.dylibso.chicory.wasm.InvalidException; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.BufferType; -import io.roastedroot.proxywasm.v1.Handler; -import io.roastedroot.proxywasm.v1.LogLevel; -import io.roastedroot.proxywasm.v1.MapType; -import io.roastedroot.proxywasm.v1.MetricType; -import io.roastedroot.proxywasm.v1.QueueName; -import io.roastedroot.proxywasm.v1.StreamType; -import io.roastedroot.proxywasm.v1.WasmException; -import io.roastedroot.proxywasm.v1.WasmResult; import java.nio.ByteBuffer; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/src/main/java/io/roastedroot/proxywasm/v1/ABIVersion.java b/src/main/java/io/roastedroot/proxywasm/ABIVersion.java similarity index 93% rename from src/main/java/io/roastedroot/proxywasm/v1/ABIVersion.java rename to src/main/java/io/roastedroot/proxywasm/ABIVersion.java index 9088fed..2308fae 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/ABIVersion.java +++ b/src/main/java/io/roastedroot/proxywasm/ABIVersion.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; public enum ABIVersion { // The values follow the same order as in the Go code using iota (0-based incrementing) diff --git a/src/main/java/io/roastedroot/proxywasm/v1/Action.java b/src/main/java/io/roastedroot/proxywasm/Action.java similarity index 96% rename from src/main/java/io/roastedroot/proxywasm/v1/Action.java rename to src/main/java/io/roastedroot/proxywasm/Action.java index 8d89aa8..278add4 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/Action.java +++ b/src/main/java/io/roastedroot/proxywasm/Action.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Action represents the action which Wasm contexts expects hosts to take. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/BufferType.java b/src/main/java/io/roastedroot/proxywasm/BufferType.java similarity index 96% rename from src/main/java/io/roastedroot/proxywasm/v1/BufferType.java rename to src/main/java/io/roastedroot/proxywasm/BufferType.java index ab66b3a..61a2835 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/BufferType.java +++ b/src/main/java/io/roastedroot/proxywasm/BufferType.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents the type of buffer in proxy WASM. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/ChainedHandler.java b/src/main/java/io/roastedroot/proxywasm/ChainedHandler.java similarity index 99% rename from src/main/java/io/roastedroot/proxywasm/v1/ChainedHandler.java rename to src/main/java/io/roastedroot/proxywasm/ChainedHandler.java index 44c6c67..55ec17b 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/ChainedHandler.java +++ b/src/main/java/io/roastedroot/proxywasm/ChainedHandler.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/roastedroot/proxywasm/v1/Context.java b/src/main/java/io/roastedroot/proxywasm/Context.java similarity index 97% rename from src/main/java/io/roastedroot/proxywasm/v1/Context.java rename to src/main/java/io/roastedroot/proxywasm/Context.java index 19ea76a..d6559dc 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/Context.java +++ b/src/main/java/io/roastedroot/proxywasm/Context.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; import java.io.Closeable; diff --git a/src/main/java/io/roastedroot/proxywasm/v1/ForeignFunction.java b/src/main/java/io/roastedroot/proxywasm/ForeignFunction.java similarity index 65% rename from src/main/java/io/roastedroot/proxywasm/v1/ForeignFunction.java rename to src/main/java/io/roastedroot/proxywasm/ForeignFunction.java index fd75763..b6f811c 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/ForeignFunction.java +++ b/src/main/java/io/roastedroot/proxywasm/ForeignFunction.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; public interface ForeignFunction { byte[] apply(byte[] data); diff --git a/src/main/java/io/roastedroot/proxywasm/v1/Handler.java b/src/main/java/io/roastedroot/proxywasm/Handler.java similarity index 99% rename from src/main/java/io/roastedroot/proxywasm/v1/Handler.java rename to src/main/java/io/roastedroot/proxywasm/Handler.java index 2d61bf0..568024d 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/Handler.java +++ b/src/main/java/io/roastedroot/proxywasm/Handler.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/io/roastedroot/proxywasm/v1/Helpers.java b/src/main/java/io/roastedroot/proxywasm/Helpers.java similarity index 99% rename from src/main/java/io/roastedroot/proxywasm/v1/Helpers.java rename to src/main/java/io/roastedroot/proxywasm/Helpers.java index adfcb18..7182b46 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/Helpers.java +++ b/src/main/java/io/roastedroot/proxywasm/Helpers.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; import com.dylibso.chicory.runtime.HostFunction; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/io/roastedroot/proxywasm/v1/HttpContext.java b/src/main/java/io/roastedroot/proxywasm/HttpContext.java similarity index 95% rename from src/main/java/io/roastedroot/proxywasm/v1/HttpContext.java rename to src/main/java/io/roastedroot/proxywasm/HttpContext.java index ce65613..54ab2d0 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/HttpContext.java +++ b/src/main/java/io/roastedroot/proxywasm/HttpContext.java @@ -1,6 +1,6 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.len; +import static io.roastedroot.proxywasm.Helpers.len; public class HttpContext extends Context { diff --git a/src/main/java/io/roastedroot/proxywasm/v1/LogLevel.java b/src/main/java/io/roastedroot/proxywasm/LogLevel.java similarity index 96% rename from src/main/java/io/roastedroot/proxywasm/v1/LogLevel.java rename to src/main/java/io/roastedroot/proxywasm/LogLevel.java index 6fcd2c8..18d9874 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/LogLevel.java +++ b/src/main/java/io/roastedroot/proxywasm/LogLevel.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents log levels for proxy WASM. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/MapType.java b/src/main/java/io/roastedroot/proxywasm/MapType.java similarity index 96% rename from src/main/java/io/roastedroot/proxywasm/v1/MapType.java rename to src/main/java/io/roastedroot/proxywasm/MapType.java index ec6f0f3..ba57ea4 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/MapType.java +++ b/src/main/java/io/roastedroot/proxywasm/MapType.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents the type of map in proxy WASM. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/MetricType.java b/src/main/java/io/roastedroot/proxywasm/MetricType.java similarity index 96% rename from src/main/java/io/roastedroot/proxywasm/v1/MetricType.java rename to src/main/java/io/roastedroot/proxywasm/MetricType.java index 5e354d6..441a7df 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/MetricType.java +++ b/src/main/java/io/roastedroot/proxywasm/MetricType.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents the type of metric in proxy WASM. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/NetworkContext.java b/src/main/java/io/roastedroot/proxywasm/NetworkContext.java similarity index 94% rename from src/main/java/io/roastedroot/proxywasm/v1/NetworkContext.java rename to src/main/java/io/roastedroot/proxywasm/NetworkContext.java index c5b5889..ac9ee93 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/NetworkContext.java +++ b/src/main/java/io/roastedroot/proxywasm/NetworkContext.java @@ -1,6 +1,6 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.len; +import static io.roastedroot.proxywasm.Helpers.len; public class NetworkContext extends Context { diff --git a/src/main/java/io/roastedroot/proxywasm/v1/PeerType.java b/src/main/java/io/roastedroot/proxywasm/PeerType.java similarity index 96% rename from src/main/java/io/roastedroot/proxywasm/v1/PeerType.java rename to src/main/java/io/roastedroot/proxywasm/PeerType.java index c059516..4cee2ff 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/PeerType.java +++ b/src/main/java/io/roastedroot/proxywasm/PeerType.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents the type of peer in proxy WASM. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/PluginContext.java b/src/main/java/io/roastedroot/proxywasm/PluginContext.java similarity index 87% rename from src/main/java/io/roastedroot/proxywasm/v1/PluginContext.java rename to src/main/java/io/roastedroot/proxywasm/PluginContext.java index 26690f8..3f196de 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/PluginContext.java +++ b/src/main/java/io/roastedroot/proxywasm/PluginContext.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; public class PluginContext extends Context { diff --git a/src/main/java/io/roastedroot/proxywasm/v1/ProxyWasm.java b/src/main/java/io/roastedroot/proxywasm/ProxyWasm.java similarity index 98% rename from src/main/java/io/roastedroot/proxywasm/v1/ProxyWasm.java rename to src/main/java/io/roastedroot/proxywasm/ProxyWasm.java index 32daff8..61478e5 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/ProxyWasm.java +++ b/src/main/java/io/roastedroot/proxywasm/ProxyWasm.java @@ -1,6 +1,6 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.len; +import static io.roastedroot.proxywasm.Helpers.len; import com.dylibso.chicory.runtime.ByteBufferMemory; import com.dylibso.chicory.runtime.HostFunction; @@ -12,8 +12,6 @@ import com.dylibso.chicory.wasm.WasmModule; import com.dylibso.chicory.wasm.types.MemoryLimits; import com.dylibso.chicory.wasm.types.ValueType; -import io.roastedroot.proxywasm.impl.ABI; -import io.roastedroot.proxywasm.impl.ABI_ModuleFactory; import java.io.Closeable; import java.nio.charset.StandardCharsets; import java.util.HashMap; diff --git a/src/main/java/io/roastedroot/proxywasm/v1/QueueName.java b/src/main/java/io/roastedroot/proxywasm/QueueName.java similarity index 94% rename from src/main/java/io/roastedroot/proxywasm/v1/QueueName.java rename to src/main/java/io/roastedroot/proxywasm/QueueName.java index 8a7e398..03c0508 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/QueueName.java +++ b/src/main/java/io/roastedroot/proxywasm/QueueName.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; import java.util.Objects; diff --git a/src/main/java/io/roastedroot/proxywasm/v1/StartException.java b/src/main/java/io/roastedroot/proxywasm/StartException.java similarity index 77% rename from src/main/java/io/roastedroot/proxywasm/v1/StartException.java rename to src/main/java/io/roastedroot/proxywasm/StartException.java index 24bd499..fb344ff 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/StartException.java +++ b/src/main/java/io/roastedroot/proxywasm/StartException.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; public class StartException extends Exception { public StartException(String message) { diff --git a/src/main/java/io/roastedroot/proxywasm/v1/StreamType.java b/src/main/java/io/roastedroot/proxywasm/StreamType.java similarity index 96% rename from src/main/java/io/roastedroot/proxywasm/v1/StreamType.java rename to src/main/java/io/roastedroot/proxywasm/StreamType.java index b11d9b2..19e8e80 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/StreamType.java +++ b/src/main/java/io/roastedroot/proxywasm/StreamType.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents the type of map in proxy WASM. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/WasmException.java b/src/main/java/io/roastedroot/proxywasm/WasmException.java similarity index 90% rename from src/main/java/io/roastedroot/proxywasm/v1/WasmException.java rename to src/main/java/io/roastedroot/proxywasm/WasmException.java index 7e404ca..215f430 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/WasmException.java +++ b/src/main/java/io/roastedroot/proxywasm/WasmException.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents WebAssembly result codes. diff --git a/src/main/java/io/roastedroot/proxywasm/v1/WasmResult.java b/src/main/java/io/roastedroot/proxywasm/WasmResult.java similarity index 98% rename from src/main/java/io/roastedroot/proxywasm/v1/WasmResult.java rename to src/main/java/io/roastedroot/proxywasm/WasmResult.java index cf3fd49..f4b151e 100644 --- a/src/main/java/io/roastedroot/proxywasm/v1/WasmResult.java +++ b/src/main/java/io/roastedroot/proxywasm/WasmResult.java @@ -1,4 +1,4 @@ -package io.roastedroot.proxywasm.v1; +package io.roastedroot.proxywasm; /** * Represents WebAssembly result codes. diff --git a/src/test/java/io/roastedroot/proxywasm/DispatchCallOnTickTest.java b/src/test/java/io/roastedroot/proxywasm/DispatchCallOnTickTest.java index 3391c43..b971ac0 100644 --- a/src/test/java/io/roastedroot/proxywasm/DispatchCallOnTickTest.java +++ b/src/test/java/io/roastedroot/proxywasm/DispatchCallOnTickTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/roastedroot/proxywasm/EchoHttpBodyTest.java b/src/test/java/io/roastedroot/proxywasm/EchoHttpBodyTest.java index 8b01a7e..98355ae 100644 --- a/src/test/java/io/roastedroot/proxywasm/EchoHttpBodyTest.java +++ b/src/test/java/io/roastedroot/proxywasm/EchoHttpBodyTest.java @@ -1,15 +1,11 @@ package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.bytes; -import static io.roastedroot.proxywasm.v1.Helpers.string; +import static io.roastedroot.proxywasm.Helpers.bytes; +import static io.roastedroot.proxywasm.Helpers.string; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.HttpContext; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/io/roastedroot/proxywasm/ForeignCallOnTickTest.java b/src/test/java/io/roastedroot/proxywasm/ForeignCallOnTickTest.java index 74bd9eb..43c4664 100644 --- a/src/test/java/io/roastedroot/proxywasm/ForeignCallOnTickTest.java +++ b/src/test/java/io/roastedroot/proxywasm/ForeignCallOnTickTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/roastedroot/proxywasm/HttpAuthRandomTest.java b/src/test/java/io/roastedroot/proxywasm/HttpAuthRandomTest.java index 400ba1f..1e52530 100644 --- a/src/test/java/io/roastedroot/proxywasm/HttpAuthRandomTest.java +++ b/src/test/java/io/roastedroot/proxywasm/HttpAuthRandomTest.java @@ -1,15 +1,12 @@ package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.bytes; -import static io.roastedroot.proxywasm.v1.Helpers.string; +import static io.roastedroot.proxywasm.Helpers.bytes; +import static io.roastedroot.proxywasm.Helpers.string; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/io/roastedroot/proxywasm/HttpBodyChunkTest.java b/src/test/java/io/roastedroot/proxywasm/HttpBodyChunkTest.java index 2633e59..9624da1 100644 --- a/src/test/java/io/roastedroot/proxywasm/HttpBodyChunkTest.java +++ b/src/test/java/io/roastedroot/proxywasm/HttpBodyChunkTest.java @@ -1,14 +1,10 @@ package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.bytes; +import static io.roastedroot.proxywasm.Helpers.bytes; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.HttpContext; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/io/roastedroot/proxywasm/HttpBodyTest.java b/src/test/java/io/roastedroot/proxywasm/HttpBodyTest.java index 3090988..fafffca 100644 --- a/src/test/java/io/roastedroot/proxywasm/HttpBodyTest.java +++ b/src/test/java/io/roastedroot/proxywasm/HttpBodyTest.java @@ -1,15 +1,11 @@ package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.bytes; -import static io.roastedroot.proxywasm.v1.Helpers.string; +import static io.roastedroot.proxywasm.Helpers.bytes; +import static io.roastedroot.proxywasm.Helpers.string; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.HttpContext; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.charset.StandardCharsets; import java.nio.file.Path; import java.util.Map; diff --git a/src/test/java/io/roastedroot/proxywasm/HttpHeadersTest.java b/src/test/java/io/roastedroot/proxywasm/HttpHeadersTest.java index 0f8553e..8657159 100644 --- a/src/test/java/io/roastedroot/proxywasm/HttpHeadersTest.java +++ b/src/test/java/io/roastedroot/proxywasm/HttpHeadersTest.java @@ -4,9 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/roastedroot/proxywasm/HttpRoutingTest.java b/src/test/java/io/roastedroot/proxywasm/HttpRoutingTest.java index dddcadb..a6a3add 100644 --- a/src/test/java/io/roastedroot/proxywasm/HttpRoutingTest.java +++ b/src/test/java/io/roastedroot/proxywasm/HttpRoutingTest.java @@ -3,9 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/roastedroot/proxywasm/JsonValidationTest.java b/src/test/java/io/roastedroot/proxywasm/JsonValidationTest.java index 69c30d6..cdd23da 100644 --- a/src/test/java/io/roastedroot/proxywasm/JsonValidationTest.java +++ b/src/test/java/io/roastedroot/proxywasm/JsonValidationTest.java @@ -1,13 +1,9 @@ package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.bytes; +import static io.roastedroot.proxywasm.Helpers.bytes; import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.HttpContext; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/io/roastedroot/proxywasm/MetricsTest.java b/src/test/java/io/roastedroot/proxywasm/MetricsTest.java index 99a1d02..f9aaf45 100644 --- a/src/test/java/io/roastedroot/proxywasm/MetricsTest.java +++ b/src/test/java/io/roastedroot/proxywasm/MetricsTest.java @@ -4,10 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.MetricType; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/roastedroot/proxywasm/MockHandler.java b/src/test/java/io/roastedroot/proxywasm/MockHandler.java index 7fa58df..33484de 100644 --- a/src/test/java/io/roastedroot/proxywasm/MockHandler.java +++ b/src/test/java/io/roastedroot/proxywasm/MockHandler.java @@ -4,15 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ChainedHandler; -import io.roastedroot.proxywasm.v1.Handler; -import io.roastedroot.proxywasm.v1.Helpers; -import io.roastedroot.proxywasm.v1.LogLevel; -import io.roastedroot.proxywasm.v1.MetricType; -import io.roastedroot.proxywasm.v1.StreamType; -import io.roastedroot.proxywasm.v1.WasmException; -import io.roastedroot.proxywasm.v1.WasmResult; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/src/test/java/io/roastedroot/proxywasm/MockSharedHandler.java b/src/test/java/io/roastedroot/proxywasm/MockSharedHandler.java index 0ea2206..622d593 100644 --- a/src/test/java/io/roastedroot/proxywasm/MockSharedHandler.java +++ b/src/test/java/io/roastedroot/proxywasm/MockSharedHandler.java @@ -1,9 +1,5 @@ package io.roastedroot.proxywasm; -import io.roastedroot.proxywasm.v1.Handler; -import io.roastedroot.proxywasm.v1.QueueName; -import io.roastedroot.proxywasm.v1.WasmException; -import io.roastedroot.proxywasm.v1.WasmResult; import java.util.HashMap; import java.util.LinkedList; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/test/java/io/roastedroot/proxywasm/MultipleDispatchesTest.java b/src/test/java/io/roastedroot/proxywasm/MultipleDispatchesTest.java index 37ee2fc..ac14b2e 100644 --- a/src/test/java/io/roastedroot/proxywasm/MultipleDispatchesTest.java +++ b/src/test/java/io/roastedroot/proxywasm/MultipleDispatchesTest.java @@ -3,9 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; diff --git a/src/test/java/io/roastedroot/proxywasm/NetworkTest.java b/src/test/java/io/roastedroot/proxywasm/NetworkTest.java index 6c34e4e..02ea896 100644 --- a/src/test/java/io/roastedroot/proxywasm/NetworkTest.java +++ b/src/test/java/io/roastedroot/proxywasm/NetworkTest.java @@ -1,14 +1,9 @@ package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.bytes; +import static io.roastedroot.proxywasm.Helpers.bytes; import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.MetricType; -import io.roastedroot.proxywasm.v1.NetworkContext; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/src/test/java/io/roastedroot/proxywasm/OnRequestHeadersTest.java b/src/test/java/io/roastedroot/proxywasm/OnRequestHeadersTest.java index 739ca14..76048e3 100644 --- a/src/test/java/io/roastedroot/proxywasm/OnRequestHeadersTest.java +++ b/src/test/java/io/roastedroot/proxywasm/OnRequestHeadersTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.List; import java.util.Map; diff --git a/src/test/java/io/roastedroot/proxywasm/PostponeRequestsTest.java b/src/test/java/io/roastedroot/proxywasm/PostponeRequestsTest.java index fa761eb..1a22ff9 100644 --- a/src/test/java/io/roastedroot/proxywasm/PostponeRequestsTest.java +++ b/src/test/java/io/roastedroot/proxywasm/PostponeRequestsTest.java @@ -3,9 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/roastedroot/proxywasm/PropertiesTest.java b/src/test/java/io/roastedroot/proxywasm/PropertiesTest.java index fe0d8d5..3b247df 100644 --- a/src/test/java/io/roastedroot/proxywasm/PropertiesTest.java +++ b/src/test/java/io/roastedroot/proxywasm/PropertiesTest.java @@ -1,14 +1,11 @@ package io.roastedroot.proxywasm; -import static io.roastedroot.proxywasm.v1.Helpers.append; +import static io.roastedroot.proxywasm.Helpers.append; import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.Map; import org.junit.jupiter.api.AfterEach; diff --git a/src/test/java/io/roastedroot/proxywasm/SharedDataTest.java b/src/test/java/io/roastedroot/proxywasm/SharedDataTest.java index 91a231b..cb813fa 100644 --- a/src/test/java/io/roastedroot/proxywasm/SharedDataTest.java +++ b/src/test/java/io/roastedroot/proxywasm/SharedDataTest.java @@ -3,9 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import org.junit.jupiter.api.Test; diff --git a/src/test/java/io/roastedroot/proxywasm/SharedQueueTest.java b/src/test/java/io/roastedroot/proxywasm/SharedQueueTest.java index c096237..8487cb9 100644 --- a/src/test/java/io/roastedroot/proxywasm/SharedQueueTest.java +++ b/src/test/java/io/roastedroot/proxywasm/SharedQueueTest.java @@ -4,11 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.Action; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.QueueName; -import io.roastedroot.proxywasm.v1.StartException; -import io.roastedroot.proxywasm.v1.WasmException; import java.io.Closeable; import java.io.IOException; import java.nio.file.Path; diff --git a/src/test/java/io/roastedroot/proxywasm/TimersClocksRandomTest.java b/src/test/java/io/roastedroot/proxywasm/TimersClocksRandomTest.java index f2ceebb..8b772a5 100644 --- a/src/test/java/io/roastedroot/proxywasm/TimersClocksRandomTest.java +++ b/src/test/java/io/roastedroot/proxywasm/TimersClocksRandomTest.java @@ -4,9 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; -import io.roastedroot.proxywasm.v1.WasmResult; import java.nio.file.Path; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/test/java/io/roastedroot/proxywasm/VmPluginConfigurationTest.java b/src/test/java/io/roastedroot/proxywasm/VmPluginConfigurationTest.java index 4044a57..e0095e2 100644 --- a/src/test/java/io/roastedroot/proxywasm/VmPluginConfigurationTest.java +++ b/src/test/java/io/roastedroot/proxywasm/VmPluginConfigurationTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.dylibso.chicory.wasm.Parser; -import io.roastedroot.proxywasm.v1.ProxyWasm; -import io.roastedroot.proxywasm.v1.StartException; import java.nio.file.Path; import java.util.List; import java.util.Map;