diff --git a/src/main/java/io/github/nstdio/http/ext/ext/BodyHandlers.java b/src/main/java/io/github/nstdio/http/ext/BodyHandlers.java similarity index 97% rename from src/main/java/io/github/nstdio/http/ext/ext/BodyHandlers.java rename to src/main/java/io/github/nstdio/http/ext/BodyHandlers.java index 20eb82c..0386829 100644 --- a/src/main/java/io/github/nstdio/http/ext/ext/BodyHandlers.java +++ b/src/main/java/io/github/nstdio/http/ext/BodyHandlers.java @@ -20,7 +20,7 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.nstdio.http.ext.ext; +package io.github.nstdio.http.ext; import java.io.InputStream; import java.net.http.HttpResponse.BodyHandler; diff --git a/src/main/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandler.java b/src/main/java/io/github/nstdio/http/ext/DecompressingBodyHandler.java similarity index 98% rename from src/main/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandler.java rename to src/main/java/io/github/nstdio/http/ext/DecompressingBodyHandler.java index 6cf12aa..345ff73 100644 --- a/src/main/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandler.java +++ b/src/main/java/io/github/nstdio/http/ext/DecompressingBodyHandler.java @@ -20,7 +20,7 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.nstdio.http.ext.ext; +package io.github.nstdio.http.ext; import static java.util.function.Predicate.not; import static java.util.stream.Collectors.toList; diff --git a/src/main/java/io/github/nstdio/http/ext/ext/DecompressingBodySubscriber.java b/src/main/java/io/github/nstdio/http/ext/DecompressingBodySubscriber.java similarity index 98% rename from src/main/java/io/github/nstdio/http/ext/ext/DecompressingBodySubscriber.java rename to src/main/java/io/github/nstdio/http/ext/DecompressingBodySubscriber.java index ea06fa8..5b0b175 100644 --- a/src/main/java/io/github/nstdio/http/ext/ext/DecompressingBodySubscriber.java +++ b/src/main/java/io/github/nstdio/http/ext/DecompressingBodySubscriber.java @@ -20,7 +20,7 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.nstdio.http.ext.ext; +package io.github.nstdio.http.ext; import java.io.InputStream; import java.net.http.HttpResponse.BodySubscriber; diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index d217bf4..8f577d6 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -23,5 +23,5 @@ module http.client.ext { requires java.net.http; - exports io.github.nstdio.http.ext.ext; + exports io.github.nstdio.http.ext; } diff --git a/src/test/java/io/github/nstdio/http/ext/ext/Compression.java b/src/test/java/io/github/nstdio/http/ext/Compression.java similarity index 98% rename from src/test/java/io/github/nstdio/http/ext/ext/Compression.java rename to src/test/java/io/github/nstdio/http/ext/Compression.java index c24962f..d3594f9 100644 --- a/src/test/java/io/github/nstdio/http/ext/ext/Compression.java +++ b/src/test/java/io/github/nstdio/http/ext/Compression.java @@ -20,7 +20,7 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.nstdio.http.ext.ext; +package io.github.nstdio.http.ext; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/src/test/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandlerIntegrationTest.java b/src/test/java/io/github/nstdio/http/ext/DecompressingBodyHandlerIntegrationTest.java similarity index 98% rename from src/test/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandlerIntegrationTest.java rename to src/test/java/io/github/nstdio/http/ext/DecompressingBodyHandlerIntegrationTest.java index b2fe9f7..dbe108a 100644 --- a/src/test/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandlerIntegrationTest.java +++ b/src/test/java/io/github/nstdio/http/ext/DecompressingBodyHandlerIntegrationTest.java @@ -20,7 +20,7 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.nstdio.http.ext.ext; +package io.github.nstdio.http.ext; import static io.github.nstdio.http.ext.ext.BodyHandlers.ofDecompressing; import static com.jayway.jsonpath.matchers.JsonPathMatchers.*; diff --git a/src/test/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandlerTest.java b/src/test/java/io/github/nstdio/http/ext/DecompressingBodyHandlerTest.java similarity index 92% rename from src/test/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandlerTest.java rename to src/test/java/io/github/nstdio/http/ext/DecompressingBodyHandlerTest.java index d25bc7a..2645b5d 100644 --- a/src/test/java/io/github/nstdio/http/ext/ext/DecompressingBodyHandlerTest.java +++ b/src/test/java/io/github/nstdio/http/ext/DecompressingBodyHandlerTest.java @@ -20,11 +20,11 @@ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -package io.github.nstdio.http.ext.ext; +package io.github.nstdio.http.ext; -import static io.github.nstdio.http.ext.ext.Compression.deflate; -import static io.github.nstdio.http.ext.ext.Compression.gzip; -import static io.github.nstdio.http.ext.ext.DecompressingBodyHandler.decompressionFn; +import static io.github.nstdio.http.ext.Compression.deflate; +import static io.github.nstdio.http.ext.Compression.gzip; +import static io.github.nstdio.http.ext.DecompressingBodyHandler.decompressionFn; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;