diff --git a/src/main/lombok/org/warp/filesponge/DataBlock.java b/src/main/lombok/org/warp/filesponge/DataBlock.java index d69d0b8..7b917ca 100644 --- a/src/main/lombok/org/warp/filesponge/DataBlock.java +++ b/src/main/lombok/org/warp/filesponge/DataBlock.java @@ -30,6 +30,6 @@ public class DataBlock { public int getId() { - return offset / Web.BLOCK_SIZE; + return offset / FileSponge.BLOCK_SIZE; } } diff --git a/src/main/lombok/org/warp/filesponge/DiskCache.java b/src/main/lombok/org/warp/filesponge/DiskCache.java index 65c1934..a28a34f 100644 --- a/src/main/lombok/org/warp/filesponge/DiskCache.java +++ b/src/main/lombok/org/warp/filesponge/DiskCache.java @@ -18,7 +18,7 @@ package org.warp.filesponge; -import static org.warp.filesponge.Web.BLOCK_SIZE; +import static org.warp.filesponge.FileSponge.BLOCK_SIZE; import com.google.common.primitives.Ints; import it.cavallium.dbengine.database.Column; diff --git a/src/main/lombok/org/warp/filesponge/DiskMetadata.java b/src/main/lombok/org/warp/filesponge/DiskMetadata.java index 317b7b9..1e14e0e 100644 --- a/src/main/lombok/org/warp/filesponge/DiskMetadata.java +++ b/src/main/lombok/org/warp/filesponge/DiskMetadata.java @@ -51,7 +51,7 @@ public class DiskMetadata { } private int getBlocksCount() { - var expectedBlocksCount = getBlocksCount(size, Web.BLOCK_SIZE); + var expectedBlocksCount = getBlocksCount(size, FileSponge.BLOCK_SIZE); if (this.getDownloadedBlocks().size() != expectedBlocksCount) { throw new IllegalStateException("Blocks array length != expected blocks count"); } @@ -74,7 +74,7 @@ public class DiskMetadata { var bais = new ByteArrayInputStream(serialized); var dis = new DataInputStream(bais); int size = dis.readInt(); - int blocksCount = getBlocksCount(size, Web.BLOCK_SIZE); + int blocksCount = getBlocksCount(size, FileSponge.BLOCK_SIZE); boolean[] downloadedBlocks = new boolean[blocksCount]; for (int i = 0; i < blocksCount; i++) { downloadedBlocks[i] = dis.readBoolean(); diff --git a/src/main/lombok/org/warp/filesponge/Web.java b/src/main/lombok/org/warp/filesponge/FileSponge.java similarity index 97% rename from src/main/lombok/org/warp/filesponge/Web.java rename to src/main/lombok/org/warp/filesponge/FileSponge.java index de8a7d2..ff19491 100644 --- a/src/main/lombok/org/warp/filesponge/Web.java +++ b/src/main/lombok/org/warp/filesponge/FileSponge.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentHashMap; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -public class Web implements URLsHandler { +public class FileSponge implements URLsHandler { public static final int BLOCK_SIZE = 8 * 1024 * 1024; // 8 MiB public static final int MAX_BLOCKS = 256; // 2 GiB @@ -33,7 +33,7 @@ public class Web implements URLsHandler { private final Set cacheAccess = new ConcurrentHashMap().keySet(new Object()); private final Set cacheWrite = new ConcurrentHashMap().keySet(new Object()); - public Web() { + public FileSponge() { }