From 00a53239138e2a7e739f1b73647a5378ea128790 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 4 Sep 2021 02:19:24 +0200 Subject: [PATCH] Use netty5 package --- .../java/org/warp/filesponge/DataBlock.java | 12 +++++------- .../java/org/warp/filesponge/DiskCache.java | 8 ++------ .../java/org/warp/filesponge/DiskMetadata.java | 17 +++-------------- src/main/java/org/warp/filesponge/URL.java | 4 +--- 4 files changed, 11 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/warp/filesponge/DataBlock.java b/src/main/java/org/warp/filesponge/DataBlock.java index 456e228..ca112fb 100644 --- a/src/main/java/org/warp/filesponge/DataBlock.java +++ b/src/main/java/org/warp/filesponge/DataBlock.java @@ -18,13 +18,11 @@ package org.warp.filesponge; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.api.Buffer; -import io.netty.buffer.api.Drop; -import io.netty.buffer.api.Owned; -import io.netty.buffer.api.Send; -import io.netty.buffer.api.internal.ResourceSupport; -import it.cavallium.dbengine.database.LLEntry; +import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.api.Drop; +import io.netty5.buffer.api.Owned; +import io.netty5.buffer.api.Send; +import io.netty5.buffer.api.internal.ResourceSupport; import java.util.Objects; public final class DataBlock extends ResourceSupport { diff --git a/src/main/java/org/warp/filesponge/DiskCache.java b/src/main/java/org/warp/filesponge/DiskCache.java index 26cc309..81ab410 100644 --- a/src/main/java/org/warp/filesponge/DiskCache.java +++ b/src/main/java/org/warp/filesponge/DiskCache.java @@ -20,12 +20,8 @@ package org.warp.filesponge; import static org.warp.filesponge.FileSponge.BLOCK_SIZE; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.Unpooled; -import io.netty.buffer.api.Buffer; -import io.netty.buffer.api.CompositeBuffer; -import io.netty.buffer.api.Send; -import io.netty.util.ReferenceCounted; +import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.api.Send; import it.cavallium.dbengine.database.Column; import it.cavallium.dbengine.database.LLDatabaseConnection; import it.cavallium.dbengine.database.LLDictionary; diff --git a/src/main/java/org/warp/filesponge/DiskMetadata.java b/src/main/java/org/warp/filesponge/DiskMetadata.java index a2a1da4..9657cee 100644 --- a/src/main/java/org/warp/filesponge/DiskMetadata.java +++ b/src/main/java/org/warp/filesponge/DiskMetadata.java @@ -18,24 +18,13 @@ package org.warp.filesponge; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.ByteBufInputStream; -import io.netty.buffer.ByteBufOutputStream; -import io.netty.buffer.PooledByteBufAllocator; -import io.netty.buffer.api.Buffer; -import io.netty.buffer.api.BufferAllocator; -import io.netty.buffer.api.Send; +import io.netty5.buffer.api.Buffer; +import io.netty5.buffer.api.BufferAllocator; +import io.netty5.buffer.api.Send; import it.cavallium.dbengine.database.serialization.BufferDataInput; import it.cavallium.dbengine.database.serialization.BufferDataOutput; import it.cavallium.dbengine.database.serialization.Serializer; import it.unimi.dsi.fastutil.booleans.BooleanArrayList; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.DataInputStream; -import java.io.DataOutputStream; -import java.io.IOException; -import org.apache.commons.lang3.SerializationException; import org.jetbrains.annotations.NotNull; /** diff --git a/src/main/java/org/warp/filesponge/URL.java b/src/main/java/org/warp/filesponge/URL.java index 9ac8222..9d65542 100644 --- a/src/main/java/org/warp/filesponge/URL.java +++ b/src/main/java/org/warp/filesponge/URL.java @@ -18,9 +18,7 @@ package org.warp.filesponge; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ByteBufAllocator; -import io.netty.buffer.api.BufferAllocator; +import io.netty5.buffer.api.BufferAllocator; import it.cavallium.dbengine.database.serialization.Serializer; public interface URL {