EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-22 21:26:46 +01:00
Code Issues Projects Releases Wiki Activity

More nullability annotations

Browse Source
This commit is contained in:
nossr50 2021-01-02 15:55:37 -08:00
parent 05f07c174b
commit 26ef4cc411
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/gmail/nossr50/util/blockmeta/BitSetChunkStore.java
View File

@ -161,7 +161,7 @@ public class BitSetChunkStore implements ChunkStore {
public static final short STREAM_MAGIC = (short)0xACDC; // Rock on public static final short STREAM_MAGIC = (short)0xACDC; // Rock on
public static @Nullable ChunkStore readChunkStore(DataInputStream inputStream) throws IOException { public static @Nullable ChunkStore readChunkStore(@NotNull DataInputStream inputStream) throws IOException {
if (inputStream.markSupported()) if (inputStream.markSupported())
inputStream.mark(2); inputStream.mark(2);
short magicNumber = inputStream.readShort(); short magicNumber = inputStream.readShort();

24
src/test/java/ChunkStoreTest.java
View File

@ -4,6 +4,7 @@ import org.bukkit.Bukkit;
import org.bukkit.World; import org.bukkit.World;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.*; import org.junit.*;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mockito; import org.mockito.Mockito;
@ -162,7 +163,7 @@ public class ChunkStoreTest {
void run(); void run();
} }
private void assertThrows(Delegate delegate, Class<?> clazz) { private void assertThrows(@NotNull Delegate delegate, @NotNull Class<?> clazz) {
try { try {
delegate.run(); delegate.run();
Assert.fail(); // We didn't throw Assert.fail(); // We didn't throw
@ -183,7 +184,7 @@ public class ChunkStoreTest {
Assert.assertTrue(expected.isTrue(x, y, z) == actual.isTrue(x, y, z)); Assert.assertTrue(expected.isTrue(x, y, z) == actual.isTrue(x, y, z));
} }
private static void recursiveDelete(File directoryToBeDeleted) { private static void recursiveDelete(@NotNull File directoryToBeDeleted) {
if (directoryToBeDeleted.isDirectory()) { if (directoryToBeDeleted.isDirectory()) {
for (File file : directoryToBeDeleted.listFiles()) { for (File file : directoryToBeDeleted.listFiles()) {
recursiveDelete(file); recursiveDelete(file);
@ -192,7 +193,7 @@ public class ChunkStoreTest {
directoryToBeDeleted.delete(); directoryToBeDeleted.delete();
} }
private static byte[] serializeChunkstore(ChunkStore chunkStore) throws IOException { private static byte[] serializeChunkstore(@NotNull ChunkStore chunkStore) throws IOException {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
if (chunkStore instanceof BitSetChunkStore) if (chunkStore instanceof BitSetChunkStore)
BitSetChunkStore.Serialization.writeChunkStore(new DataOutputStream(byteArrayOutputStream), chunkStore); BitSetChunkStore.Serialization.writeChunkStore(new DataOutputStream(byteArrayOutputStream), chunkStore);
@ -201,18 +202,17 @@ public class ChunkStoreTest {
return byteArrayOutputStream.toByteArray(); return byteArrayOutputStream.toByteArray();
} }
public static class LegacyChunkStore implements ChunkStore, Serializable { public static class LegacyChunkStore implements ChunkStore, Serializable {
private static final long serialVersionUID = -1L; private static final long serialVersionUID = -1L;
transient private boolean dirty = false; transient private boolean dirty = false;
public boolean[][][] store; public boolean[][][] store;
private static final int CURRENT_VERSION = 7; private static final int CURRENT_VERSION = 7;
private static final int MAGIC_NUMBER = 0xEA5EDEBB; private static final int MAGIC_NUMBER = 0xEA5EDEBB;
private int cx; private final int cx;
private int cz; private final int cz;
private UUID worldUid; private final @NotNull UUID worldUid;
public LegacyChunkStore(World world, int cx, int cz) { public LegacyChunkStore(@NotNull World world, int cx, int cz) {
this.cx = cx; this.cx = cx;
this.cz = cz; this.cz = cz;
this.worldUid = world.getUID(); this.worldUid = world.getUID();
@ -287,7 +287,7 @@ public class ChunkStoreTest {
return true; return true;
} }
private void writeObject(ObjectOutputStream out) throws IOException { private void writeObject(@NotNull ObjectOutputStream out) throws IOException {
out.writeInt(MAGIC_NUMBER); out.writeInt(MAGIC_NUMBER);
out.writeInt(CURRENT_VERSION); out.writeInt(CURRENT_VERSION);
@ -300,18 +300,18 @@ public class ChunkStoreTest {
dirty = false; dirty = false;
} }
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { private void readObject(@NotNull ObjectInputStream in) throws IOException, ClassNotFoundException {
throw new UnsupportedOperationException(); throw new UnsupportedOperationException();
} }
} }
private static class UnitTestObjectOutputStream extends ObjectOutputStream { private static class UnitTestObjectOutputStream extends ObjectOutputStream {
public UnitTestObjectOutputStream(OutputStream outputStream) throws IOException { public UnitTestObjectOutputStream(@NotNull OutputStream outputStream) throws IOException {
super(outputStream); super(outputStream);
} }
@Override @Override
public void writeUTF(String str) throws IOException { public void writeUTF(@NotNull String str) throws IOException {
// Pretend to be the old class // Pretend to be the old class
if (str.equals(LegacyChunkStore.class.getName())) if (str.equals(LegacyChunkStore.class.getName()))
str = "com.gmail.nossr50.util.blockmeta.chunkmeta.PrimitiveChunkStore"; str = "com.gmail.nossr50.util.blockmeta.chunkmeta.PrimitiveChunkStore";