refactor: simplify by putting everything in the io.roastedroot.proxywasm package.

src/main/java/io/roastedroot/proxywasm/impl/ABI.java → src/main/java/io/roastedroot/proxywasm/ABI.java

@@ -1,24 +1,14 @@
-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;
 import com.dylibso.chicory.runtime.Instance;
 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;

src/main/java/io/roastedroot/proxywasm/v1/ABIVersion.java → 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)

src/main/java/io/roastedroot/proxywasm/v1/Action.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/BufferType.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/ChainedHandler.java → 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;

src/main/java/io/roastedroot/proxywasm/v1/Context.java → 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;
 

src/main/java/io/roastedroot/proxywasm/v1/ForeignFunction.java → 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);

src/main/java/io/roastedroot/proxywasm/v1/Handler.java → 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;

src/main/java/io/roastedroot/proxywasm/v1/Helpers.java → 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;

src/main/java/io/roastedroot/proxywasm/v1/HttpContext.java → 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 {
 

src/main/java/io/roastedroot/proxywasm/v1/LogLevel.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/MapType.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/MetricType.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/NetworkContext.java → 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 {
 

src/main/java/io/roastedroot/proxywasm/v1/PeerType.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/PluginContext.java → 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 {
 

src/main/java/io/roastedroot/proxywasm/v1/ProxyWasm.java → 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;

src/main/java/io/roastedroot/proxywasm/v1/QueueName.java → 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;
 

src/main/java/io/roastedroot/proxywasm/v1/StartException.java → 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) {

src/main/java/io/roastedroot/proxywasm/v1/StreamType.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/WasmException.java → 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.

src/main/java/io/roastedroot/proxywasm/v1/WasmResult.java → 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.

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;

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;

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;
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;
 

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;