Correction utilisation optional

src/db/Table.java

@@ -24,10 +24,10 @@ public abstract class Table<T extends Persistable> {
 			return cacheMap.get(id);
 		}
 		Optional<T> opt = getFromDbById(id);
-		if(opt.isEmpty()) {
-			return null;
+		if(opt.isPresent()) {
+			return cache(opt.get());
 		}
-		return cache(opt.get());
+		return null;
 	}
 	
 	public Optional<T> findById(long id) {
@@ -61,7 +61,7 @@ public abstract class Table<T extends Persistable> {
 			throw new IllegalArgumentException("Entity is not load, can't refresh");
 		}
 		Optional<T> optObj = getFromDbById(id);
-		if(optObj.isEmpty()) {
+		if(!optObj.isPresent()) {
 			throw new IllegalStateException("Unable to find entity in the database");
 		}
 		T obj = optObj.get();
@@ -242,10 +242,10 @@ public abstract class Table<T extends Persistable> {
 			}
 		});
 		// Return
-		if(result.isEmpty()) {
-			return new ArrayList<>();
+		if(result.isPresent()) {
+			return result.get();
 		}
-		return result.get();
+		return new ArrayList<>();
 	}
 	
 	private List<T> getWhereFromDb(List<String> where, List<Object> params) {
@@ -286,10 +286,10 @@ public abstract class Table<T extends Persistable> {
 			}
 		});
 		// Return
-		if(result.isEmpty()) {
-			return new ArrayList<>();
+		if(result.isPresent()) {
+			return result.get();
 		}
-		return result.get();
+		return new ArrayList<>();
 	}
 	
 	private List<T> getAllFromDb() {
@@ -327,10 +327,10 @@ public abstract class Table<T extends Persistable> {
 			}
 		});
 		// Return
-		if(result.isEmpty()) {
-			return new ArrayList<>();
+		if(result.isPresent()) {
+			return result.get();
 		}
-		return result.get();
+		return new ArrayList<>();	
 	}
 	
 	private void insert(T obj) {