Next fixes

console/src/main/java/com/arcadedb/console/Console.java

@@ -105,13 +105,11 @@ public Console(final boolean interactive) throws IOException {
 
           lineReader.getHistory().save();
 
-        } catch (UserInterruptException e) {
-          return;
-        } catch (EndOfFileException e) {
+        } catch (UserInterruptException | EndOfFileException e) {
           return;
         }
 
-        try {
+          try {
           if (!parse(line, false))
             return;
         } catch (Exception e) {
@@ -205,10 +203,7 @@ else if (line.startsWith("set"))
       }
 
       return true;
-    } catch (IOException e) {
-      outputError(e);
-      throw e;
-    } catch (RuntimeException e) {
+    } catch (IOException | RuntimeException e) {
       outputError(e);
       throw e;
     }

console/src/test/java/com/arcadedb/console/ConsoleTest.java

@@ -67,7 +67,7 @@ public void testCreateClass() throws IOException {
     Assertions.assertTrue(console.parse("create document type Person", false));
 
     final StringBuilder buffer = new StringBuilder();
-    console.setOutput(output -> buffer.append(output));
+    console.setOutput(buffer::append);
     Assertions.assertTrue(console.parse("info types", false));
     Assertions.assertTrue(buffer.toString().contains("Person"));
   }
@@ -79,7 +79,7 @@ public void testInsertAndSelectRecord() throws IOException {
     Assertions.assertTrue(console.parse("insert into Person set name = 'Jay', lastname='Miner'", false));
 
     final StringBuilder buffer = new StringBuilder();
-    console.setOutput(output -> buffer.append(output));
+    console.setOutput(buffer::append);
     Assertions.assertTrue(console.parse("select from Person", false));
     Assertions.assertTrue(buffer.toString().contains("Jay"));
   }
@@ -93,15 +93,15 @@ public void testInsertAndRollback() throws IOException {
     Assertions.assertTrue(console.parse("rollback", false));
 
     final StringBuilder buffer = new StringBuilder();
-    console.setOutput(output -> buffer.append(output));
+    console.setOutput(buffer::append);
     Assertions.assertTrue(console.parse("select from Person", false));
     Assertions.assertFalse(buffer.toString().contains("Jay"));
   }
 
   @Test
   public void testHelp() throws IOException {
     final StringBuilder buffer = new StringBuilder();
-    console.setOutput(output -> buffer.append(output));
+    console.setOutput(buffer::append);
     Assertions.assertTrue(console.parse("?", false));
     Assertions.assertTrue(buffer.toString().contains("quit"));
   }
@@ -130,7 +130,7 @@ public void testAllRecordTypes() throws IOException {
     Assertions.assertTrue(console.parse("create edge E from (select from V where name ='Jay') to (select from V where name ='Elon')", false));
 
     final StringBuilder buffer = new StringBuilder();
-    console.setOutput(output -> buffer.append(output));
+    console.setOutput(buffer::append);
     Assertions.assertTrue(console.parse("select from D", false));
     Assertions.assertTrue(buffer.toString().contains("Jay"));
 

e2e/pom.xml

@@ -25,7 +25,7 @@
     <parent>
         <groupId>com.arcadedb</groupId>
         <artifactId>arcadedb-parent</artifactId>
-        <version>22.1.1-SNAPSHOT</version>
+        <version>22.1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

engine/src/main/java/com/arcadedb/Constants.java

@@ -33,20 +33,12 @@ public class Constants {
   private static final Properties properties = new Properties();
 
   static {
-    final InputStream inputStream = Constants.class.getResourceAsStream("/com/arcadedb/arcadedb.properties");
-    try {
-      properties.load(inputStream);
-    } catch (IOException e) {
-      LogManager.instance().log(Constants.class, Level.SEVERE, "Failed to load ArcadeDB properties", e);
-    } finally {
-      if (inputStream != null) {
-        try {
-          inputStream.close();
-        } catch (IOException ignore) {
-          // Ignore
-        }
+      try (InputStream inputStream = Constants.class.getResourceAsStream("/com/arcadedb/arcadedb.properties")) {
+          properties.load(inputStream);
+      } catch (IOException e) {
+          LogManager.instance().log(Constants.class, Level.SEVERE, "Failed to load ArcadeDB properties", e);
       }
-    }
+      // Ignore
 
   }
 

engine/src/main/java/com/arcadedb/ContextConfiguration.java

@@ -160,7 +160,7 @@ public boolean getValueAsBoolean(final GlobalConfiguration iConfig) {
     final Object v = getValue(iConfig);
     if (v == null)
       return false;
-    return v instanceof Boolean ? ((Boolean) v).booleanValue() : Boolean.parseBoolean(v.toString());
+    return v instanceof Boolean ? (Boolean) v : Boolean.parseBoolean(v.toString());
   }
 
   public String getValueAsString(final String iName, final String iDefaultValue) {
@@ -179,21 +179,21 @@ public int getValueAsInteger(final GlobalConfiguration iConfig) {
     final Object v = getValue(iConfig);
     if (v == null)
       return 0;
-    return v instanceof Integer ? ((Integer) v).intValue() : Integer.parseInt(v.toString());
+    return v instanceof Integer ? (Integer) v : Integer.parseInt(v.toString());
   }
 
   public long getValueAsLong(final GlobalConfiguration iConfig) {
     final Object v = getValue(iConfig);
     if (v == null)
       return 0;
-    return v instanceof Long ? ((Long) v).longValue() : Long.parseLong(v.toString());
+    return v instanceof Long ? (Long) v : Long.parseLong(v.toString());
   }
 
   public float getValueAsFloat(final GlobalConfiguration iConfig) {
     final Object v = getValue(iConfig);
     if (v == null)
       return 0;
-    return v instanceof Float ? ((Float) v).floatValue() : Float.parseFloat(v.toString());
+    return v instanceof Float ? (Float) v : Float.parseFloat(v.toString());
   }
 
   public int getContextSize() {

engine/src/main/java/com/arcadedb/database/BaseRecord.java

@@ -70,7 +70,7 @@ public void delete() {
   public boolean equals(final Object o) {
     if (this == o)
       return true;
-    if (o == null || !(o instanceof Identifiable))
+    if (!(o instanceof Identifiable))
       return false;
 
     final RID pRID = ((Identifiable) o).getIdentity();

engine/src/main/java/com/arcadedb/database/DatabaseEventsRegistry.java

@@ -116,56 +116,53 @@ public boolean onBeforeCreate(final Record record) {
     if (beforeCreateListeners.isEmpty())
       return true;
 
-    for (int i = 0; i < beforeCreateListeners.size(); i++) {
-      if (!beforeCreateListeners.get(i).onBeforeCreate(record))
-        return false;
-    }
+      for (BeforeRecordCreateListener beforeCreateListener : beforeCreateListeners) {
+          if (!beforeCreateListener.onBeforeCreate(record))
+              return false;
+      }
     return true;
   }
 
   public boolean onBeforeUpdate(final Record record) {
     if (beforeUpdateListeners.isEmpty())
       return true;
 
-    for (int i = 0; i < beforeUpdateListeners.size(); i++) {
-      if (!beforeUpdateListeners.get(i).onBeforeUpdate(record))
-        return false;
-    }
+      for (BeforeRecordUpdateListener beforeUpdateListener : beforeUpdateListeners) {
+          if (!beforeUpdateListener.onBeforeUpdate(record))
+              return false;
+      }
     return true;
   }
 
   public boolean onBeforeDelete(final Record record) {
     if (beforeDeleteListeners.isEmpty())
       return true;
 
-    for (int i = 0; i < beforeDeleteListeners.size(); i++) {
-      if (!beforeDeleteListeners.get(i).onBeforeDelete(record))
-        return false;
-    }
+      for (BeforeRecordDeleteListener beforeDeleteListener : beforeDeleteListeners) {
+          if (!beforeDeleteListener.onBeforeDelete(record))
+              return false;
+      }
     return true;
   }
 
   public void onAfterCreate(final Record record) {
     if (afterCreateListeners.isEmpty())
       return;
 
-    for (int i = 0; i < afterCreateListeners.size(); i++)
-      afterCreateListeners.get(i).onAfterCreate(record);
+      for (AfterRecordCreateListener afterCreateListener : afterCreateListeners) afterCreateListener.onAfterCreate(record);
   }
 
   public void onAfterUpdate(final Record record) {
     if (afterUpdateListeners.isEmpty())
       return;
 
-    for (int i = 0; i < afterUpdateListeners.size(); i++)
-      afterUpdateListeners.get(i).onAfterUpdate(record);
+      for (AfterRecordUpdateListener afterUpdateListener : afterUpdateListeners) afterUpdateListener.onAfterUpdate(record);
   }
 
   public void onAfterDelete(final Record record) {
     if (afterDeleteListeners.isEmpty())
       return;
 
-    for (int i = 0; i < afterDeleteListeners.size(); i++)
-      afterDeleteListeners.get(i).onAfterDelete(record);
+      for (AfterRecordDeleteListener afterDeleteListener : afterDeleteListeners) afterDeleteListener.onAfterDelete(record);
   }
 }

engine/src/main/java/com/arcadedb/database/DatabaseFactory.java

@@ -120,12 +120,8 @@ public DatabaseFactory setSecurity(final SecurityManager security) {
    * Test only API
    */
   public void registerCallback(final DatabaseInternal.CALLBACK_EVENT event, Callable<Void> callback) {
-    List<Callable<Void>> callbacks = this.callbacks.get(event);
-    if (callbacks == null) {
-      callbacks = new ArrayList<>();
-      this.callbacks.put(event, callbacks);
-    }
-    callbacks.add(callback);
+      List<Callable<Void>> callbacks = this.callbacks.computeIfAbsent(event, k -> new ArrayList<>());
+      callbacks.add(callback);
   }
 
   public static Database getActiveDatabaseInstance(final String databasePath) {

engine/src/main/java/com/arcadedb/database/EmbeddedDatabase.java

@@ -1312,7 +1312,7 @@ public ResultSet query(final String language, final String query, final Map<Stri
   public boolean equals(final Object o) {
     if (this == o)
       return true;
-    if (o == null || !(o instanceof Database))
+    if (!(o instanceof Database))
       return false;
 
     final Database other = (Database) o;

engine/src/main/java/com/arcadedb/database/JSONSerializer.java

@@ -70,8 +70,7 @@ private Object convertToJSONType(Object value) {
     } else if (value instanceof Collection) {
       final Collection c = (Collection) value;
       final JSONArray array = new JSONArray();
-      for (Iterator it = c.iterator(); it.hasNext(); )
-        array.put(convertToJSONType(it.next()));
+        for (Object o : c) array.put(convertToJSONType(o));
       value = array;
     } else if (value instanceof Date)
       value = ((Date) value).getTime();

engine/src/main/java/com/arcadedb/database/RecordEventsRegistry.java

@@ -138,10 +138,10 @@ public boolean onBeforeCreate(final Record record) {
       if (beforeCreateListeners.isEmpty())
         return true;
 
-      for (int i = 0; i < beforeCreateListeners.size(); i++) {
-        if (!beforeCreateListeners.get(i).onBeforeCreate(record))
-          return false;
-      }
+        for (BeforeRecordCreateListener beforeCreateListener : beforeCreateListeners) {
+            if (!beforeCreateListener.onBeforeCreate(record))
+                return false;
+        }
     }
     return true;
   }
@@ -151,10 +151,10 @@ public boolean onBeforeUpdate(final Record record) {
       if (beforeUpdateListeners.isEmpty())
         return true;
 
-      for (int i = 0; i < beforeUpdateListeners.size(); i++) {
-        if (!beforeUpdateListeners.get(i).onBeforeUpdate(record))
-          return false;
-      }
+        for (BeforeRecordUpdateListener beforeUpdateListener : beforeUpdateListeners) {
+            if (!beforeUpdateListener.onBeforeUpdate(record))
+                return false;
+        }
     }
     return true;
   }
@@ -164,10 +164,10 @@ public boolean onBeforeDelete(final Record record) {
       if (beforeDeleteListeners.isEmpty())
         return true;
 
-      for (int i = 0; i < beforeDeleteListeners.size(); i++) {
-        if (!beforeDeleteListeners.get(i).onBeforeDelete(record))
-          return false;
-      }
+        for (BeforeRecordDeleteListener beforeDeleteListener : beforeDeleteListeners) {
+            if (!beforeDeleteListener.onBeforeDelete(record))
+                return false;
+        }
     }
     return true;
   }
@@ -177,8 +177,7 @@ public void onAfterCreate(final Record record) {
       if (afterCreateListeners.isEmpty())
         return;
 
-      for (int i = 0; i < afterCreateListeners.size(); i++)
-        afterCreateListeners.get(i).onAfterCreate(record);
+        for (AfterRecordCreateListener afterCreateListener : afterCreateListeners) afterCreateListener.onAfterCreate(record);
     }
   }
 
@@ -187,8 +186,7 @@ public void onAfterUpdate(final Record record) {
       if (afterUpdateListeners.isEmpty())
         return;
 
-      for (int i = 0; i < afterUpdateListeners.size(); i++)
-        afterUpdateListeners.get(i).onAfterUpdate(record);
+        for (AfterRecordUpdateListener afterUpdateListener : afterUpdateListeners) afterUpdateListener.onAfterUpdate(record);
     }
   }
 
@@ -197,8 +195,7 @@ public void onAfterDelete(final Record record) {
       if (afterDeleteListeners.isEmpty())
         return;
 
-      for (int i = 0; i < afterDeleteListeners.size(); i++)
-        afterDeleteListeners.get(i).onAfterDelete(record);
+        for (AfterRecordDeleteListener afterDeleteListener : afterDeleteListeners) afterDeleteListener.onAfterDelete(record);
     }
   }
 }

engine/src/main/java/com/arcadedb/database/TransactionContext.java

@@ -61,7 +61,7 @@ public class TransactionContext implements Transaction {
 
   public enum STATUS {INACTIVE, BEGUN, COMMIT_1ST_PHASE, COMMIT_2ND_PHASE}
 
-  public class TransactionPhase1 {
+  public static class TransactionPhase1 {
     public final Binary            result;
     public final List<MutablePage> modifiedPages;
 

engine/src/main/java/com/arcadedb/database/TransactionIndexContext.java

@@ -220,8 +220,8 @@ public void addFilesToLock(final Set<Integer> modifiedFiles) {
         for (Bucket b : buckets)
           modifiedFiles.add(b.getId());
 
-        for (Index typeIndex : type.getAllIndexes(true))
-          for (Index idx : ((TypeIndex) typeIndex).getIndexesOnBuckets())
+        for (TypeIndex typeIndex : type.getAllIndexes(true))
+          for (Index idx : typeIndex.getIndexesOnBuckets())
             modifiedFiles.add(((IndexInternal) idx).getFileId());
       } else
         modifiedFiles.add(index.getAssociatedBucketId());