Apply Rollczi's suggestions

Author: Jakubk15

src/main/java/com/eternalcode/parcellockers/content/repository/ParcelContentRepository.java

@@ -12,8 +12,6 @@ public interface ParcelContentRepository {
 
     CompletableFuture<Integer> remove(UUID uniqueId);
 
-    CompletableFuture<Void> update(ParcelContent parcelContent);
-
     CompletableFuture<Optional<ParcelContent>> find(UUID uniqueId);
 
 }

src/main/java/com/eternalcode/parcellockers/content/repository/ParcelContentRepositoryOrmLite.java

@@ -25,7 +25,6 @@ public ParcelContentRepositoryOrmLite(DatabaseManager databaseManager, Scheduler
         }
     }
 
-
     @Override
     public CompletableFuture<Void> save(ParcelContent parcelContent) {
         return this.saveIfNotExist(ParcelContentWrapper.class, ParcelContentWrapper.from(parcelContent)).thenApply(dao -> null);
@@ -36,11 +35,6 @@ public CompletableFuture<Integer> remove(UUID uniqueId) {
         return this.deleteById(ParcelContentWrapper.class, uniqueId);
     }
 
-    @Override
-    public CompletableFuture<Void> update(ParcelContent parcelContent) {
-        return this.save(ParcelContentWrapper.class, ParcelContentWrapper.from(parcelContent)).thenApply(dao -> null);
-    }
-
     @Override
     public CompletableFuture<Optional<ParcelContent>> find(UUID uniqueId) {
         return this.select(ParcelContentWrapper.class, uniqueId).thenApply(parcelContentWrapper -> Optional.ofNullable(parcelContentWrapper.toParcelContent()));

src/main/java/com/eternalcode/parcellockers/content/repository/ParcelContentWrapper.java

@@ -10,7 +10,7 @@
 import java.util.UUID;
 
 @DatabaseTable(tableName = "parcel_content")
-public class ParcelContentWrapper {
+class ParcelContentWrapper {
 
     @DatabaseField(id = true)
     private UUID uniqueId;

src/main/java/com/eternalcode/parcellockers/database/persister/ItemStackPersister.java

@@ -35,10 +35,6 @@ public static ItemStackPersister getSingleton() {
 
     @Override
     public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
-        if (javaObject == null) {
-            return null;
-        }
-
         List<ItemStack> stacks = (List<ItemStack>) javaObject;
 
         try {
@@ -52,7 +48,7 @@ public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
 
     @Override
     public Object parseDefaultString(FieldType fieldType, String defaultString) {
-        return String.valueOf(defaultString);
+        return defaultString;
     }
 
     @Override
@@ -64,10 +60,6 @@ public Object resultToSqlArg(FieldType fieldType, DatabaseResults results, int c
     public Object sqlArgToJava(FieldType fieldType, Object sqlArg, int columnPos) {
         String string = (String) sqlArg;
 
-        if (string == null) {
-            return null;
-        }
-
         try {
             return JSON.readValue(string, JSON.getTypeFactory().constructCollectionType(List.class, ItemStack.class));
         }

src/main/java/com/eternalcode/parcellockers/database/persister/PositionPersister.java

@@ -22,10 +22,6 @@ public static PositionPersister getSingleton() {
 
     @Override
     public Object javaToSqlArg(FieldType fieldType, Object javaObject) {
-        if (javaObject == null) {
-            return null;
-        }
-
         Position pos = (Position) javaObject;
         String worldName = "world";
 
@@ -45,17 +41,12 @@ public Object resultToSqlArg(FieldType fieldType, DatabaseResults results, int c
 
     @Override
     public Object parseDefaultString(FieldType fieldType, String defaultStr) {
-        return String.valueOf(defaultStr);
+        return defaultStr;
     }
 
     @Override
     public Object sqlArgToJava(FieldType fieldType, Object sqlArg, int columnPos) {
         String s = (String) sqlArg;
-
-        if (s == null) {
-            return null;
-        }
-
         String[] params = s.split("/");
 
         return new Position(

src/main/java/com/eternalcode/parcellockers/locker/repository/LockerRepositoryOrmLite.java

@@ -32,6 +32,7 @@ public LockerRepositoryOrmLite(DatabaseManager databaseManager, Scheduler schedu
         } catch (SQLException ex) {
             Sentry.captureException(ex);
             ex.printStackTrace();
+            throw new RuntimeException("Failed to initialize locker table", ex);
         }
     }
 
@@ -60,7 +61,7 @@ public CompletableFuture<Optional<Locker>> findByPosition(Position position) {
         // We have to assume that there is only one locker per position
         return this.action(LockerWrapper.class, dao -> {
             List<LockerWrapper> lockers = dao.queryForEq("position", position);
-            return lockers.isEmpty() ? Optional.empty() : Optional.of(lockers.get(0).toLocker());
+            return lockers.isEmpty() ? Optional.empty() : Optional.of(lockers.getFirst().toLocker());
         });
     }
 

src/main/java/com/eternalcode/parcellockers/locker/repository/LockerWrapper.java

@@ -17,7 +17,7 @@ class LockerWrapper {
     @DatabaseField(columnName = "description")
     private String description;
 
-    @DatabaseField(columnName = "position", persisterClass = PositionPersister.class, unique = true)
+    @DatabaseField(columnName = "position", persisterClass = PositionPersister.class, unique = true, index = true)
     private Position position;
 
     LockerWrapper() {

src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelRepository.java

@@ -27,6 +27,6 @@ public interface ParcelRepository {
 
     Map<UUID, Parcel> cache();
 
-    Optional<Parcel> findParcel(UUID uuid);
+    Optional<Parcel> findParcelFromCache(UUID uuid);
 
 }

src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelRepositoryOrmLite.java

@@ -112,8 +112,7 @@ private void removeFromCache(UUID uuid) {
         this.cache.remove(uuid);
     }
 
-    @Override
-    public Optional<Parcel> findParcel(UUID uuid) {
+    public Optional<Parcel> findParcelFromCache(UUID uuid) {
         return Optional.ofNullable(this.cache.get(uuid));
     }
 }

src/main/java/com/eternalcode/parcellockers/parcel/repository/ParcelWrapper.java

@@ -14,7 +14,7 @@ class ParcelWrapper {
     @DatabaseField(id = true, columnName = "uuid")
     private UUID uuid;
 
-    @DatabaseField(columnName = "sender")
+    @DatabaseField(columnName = "sender", index = true)
     private UUID sender;
 
     @DatabaseField(columnName = "name")
@@ -26,7 +26,7 @@ class ParcelWrapper {
     @DatabaseField(columnName = "priority")
     private boolean priority;
 
-    @DatabaseField(columnName = "receiver")
+    @DatabaseField(columnName = "receiver", index = true)
     private UUID receiver;
 
     @DatabaseField(columnName = "size")