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/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/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/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());

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

@@ -68,12 +68,12 @@ public Map<String, Object> check() {
     for (RID rid : (Collection<RID>) result.get("corruptedRecords"))
       affectedBuckets.add(rid.getBucketId());
 
-    final Set<Index> affectedIndexes = new HashSet<Index>();
+    final Set<Index> affectedIndexes = new HashSet<>();
     for (Index index : database.getSchema().getIndexes())
       if (affectedBuckets.contains(index.getAssociatedBucketId()))
         affectedIndexes.add(index);
 
-    final Set<String> rebuildIndexes = affectedIndexes.stream().map(x -> x.getName()).collect(Collectors.toSet());
+    final Set<String> rebuildIndexes = affectedIndexes.stream().map(Index::getName).collect(Collectors.toSet());
     result.put("rebuiltIndexes", rebuildIndexes);
 
     if (verboseLevel > 0)

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

@@ -126,7 +126,7 @@ public void close(final boolean drop) {
       final File dir = new File(database.getDatabasePath());
       File[] walFiles = dir.listFiles((dir1, name) -> name.endsWith(".wal"));
       if (walFiles != null) {
-        Arrays.asList(walFiles).stream().forEach(File::delete);
+        Arrays.forEach(File::delete);
         walFiles = dir.listFiles((dir1, name) -> name.endsWith(".wal"));
       }
 

engine/src/main/java/com/arcadedb/graph/GraphEngine.java

@@ -556,7 +556,7 @@ public boolean isVertexConnectedTo(final VertexInternal vertex, final Identifiab
     if (edgeType == null)
       throw new IllegalArgumentException("Edge type is null");
 
-    final int[] bucketFilter = vertex.getDatabase().getSchema().getType(edgeType).getBuckets(true).stream().mapToInt(x -> x.getId()).toArray();
+    final int[] bucketFilter = vertex.getDatabase().getSchema().getType(edgeType).getBuckets(true).stream().mapToInt(Bucket::getId).toArray();
 
     if (direction == Vertex.DIRECTION.OUT || direction == Vertex.DIRECTION.BOTH) {
       final EdgeLinkedList outEdges = getEdgeHeadChunk(vertex, Vertex.DIRECTION.OUT);

engine/src/main/java/com/arcadedb/graph/ImmutableEdge.java

@@ -60,7 +60,7 @@ public Object get(final String propertyName) {
 
   public synchronized MutableEdge modify() {
     final Record recordInCache = database.getTransaction().getRecordFromCache(rid);
-    if (recordInCache != null && recordInCache != this && recordInCache instanceof MutableEdge)
+    if (recordInCache != this && recordInCache instanceof MutableEdge)
       return (MutableEdge) recordInCache;
 
     checkForLazyLoading();
@@ -133,10 +133,9 @@ protected boolean checkForLazyLoading() {
 
   @Override
   public synchronized String toString() {
-    final StringBuilder buffer = new StringBuilder();
-    buffer.append(out.toString());
-    buffer.append("<->");
-    buffer.append(in.toString());
-    return buffer.toString();
+      String buffer = out.toString() +
+              "<->" +
+              in.toString();
+    return buffer;
   }
 }

engine/src/main/java/com/arcadedb/graph/ImmutableLightEdge.java

@@ -117,10 +117,9 @@ public synchronized JSONObject toJSON() {
 
   @Override
   public synchronized String toString() {
-    final StringBuilder buffer = new StringBuilder();
-    buffer.append(out.toString());
-    buffer.append("<->");
-    buffer.append(in.toString());
-    return buffer.toString();
+      String buffer = out.toString() +
+              "<->" +
+              in.toString();
+    return buffer;
   }
 }

engine/src/main/java/com/arcadedb/index/CompressedRID2RIDsIndex.java

@@ -294,11 +294,8 @@ public void put(final RID key, final RID edgeRID, final RID vertexRID) {
           serializer.serializeValue(database, chunk, BinaryTypes.TYPE_COMPRESSED_RID, edgeRID);
           serializer.serializeValue(database, chunk, BinaryTypes.TYPE_COMPRESSED_RID, vertexRID);
 
-          if (previousEntryPos > 0)
             // THIS IS THE 3RD OR MAJOR ENTRY. APPEND THE POSITION OF THE PREVIOUS ENTRY
-            chunk.putInt(previousEntryPos);
-          else
-            chunk.putInt(0);
+            chunk.putInt(Math.max(previousEntryPos, 0));
 
           chunk.putInt(previousEntryOffset, newEntryPosition);
           ++totalEntries;

engine/src/main/java/com/arcadedb/index/MultiIndexCursor.java

@@ -196,7 +196,7 @@ public byte[] getKeyTypes() {
   }
 
   private void initCursors() {
-    cursorsNextValues = new ArrayList<Identifiable>(cursors.size());
+    cursorsNextValues = new ArrayList<>(cursors.size());
     for (int i = 0; i < cursors.size(); ++i) {
       cursorsNextValues.add(null);
 

engine/src/main/java/com/arcadedb/index/TypeIndex.java

@@ -229,8 +229,8 @@ public String getName() {
   public Map<String, Long> getStats() {
     checkIsValid();
     final Map<String, Long> stats = new HashMap<>();
-    for (Index index : indexesOnBuckets)
-      stats.putAll(((IndexInternal) index).getStats());
+    for (IndexInternal index : indexesOnBuckets)
+      stats.putAll(index.getStats());
     return stats;
   }
 

engine/src/main/java/com/arcadedb/index/lsm/LSMTreeFullTextIndex.java

@@ -132,13 +132,10 @@ public IndexCursor get(final Object[] keys, final int limit) {
       list.add(new IndexCursorEntry(keys, entry.getKey(), entry.getValue().get()));
 
     if (list.size() > 1)
-      Collections.sort(list, new Comparator<IndexCursorEntry>() {
-        @Override
-        public int compare(final IndexCursorEntry o1, final IndexCursorEntry o2) {
+      list.sort((o1, o2) -> {
           if (o1.score == o2.score)
-            return 0;
+              return 0;
           return o1.score < o2.score ? -1 : 1;
-        }
       });
 
     return new TempIndexCursor(list);
@@ -309,29 +306,23 @@ public List<String> analyzeText(final Analyzer analyzer, final Object[] text) {
     final List<String> tokens = new ArrayList<>();
 
     for (Object t : text) {
-      final TokenStream tokenizer = analyzer.tokenStream("contents", t.toString());
-      try {
-        tokenizer.reset();
-        final CharTermAttribute termAttribute = tokenizer.getAttribute(CharTermAttribute.class);
-
-        try {
-          while (tokenizer.incrementToken()) {
-            String token = termAttribute.toString();
-            tokens.add(token);
-          }
-
+        try (TokenStream tokenizer = analyzer.tokenStream("contents", t.toString())) {
+            tokenizer.reset();
+            final CharTermAttribute termAttribute = tokenizer.getAttribute(CharTermAttribute.class);
+
+            try {
+                while (tokenizer.incrementToken()) {
+                    String token = termAttribute.toString();
+                    tokens.add(token);
+                }
+
+            } catch (IOException e) {
+                throw new IndexException("Error on analyzing text", e);
+            }
         } catch (IOException e) {
-          throw new IndexException("Error on analyzing text", e);
+            throw new IndexException("Error on tokenizer", e);
         }
-      } catch (IOException e) {
-        throw new IndexException("Error on tokenizer", e);
-      } finally {
-        try {
-          tokenizer.close();
-        } catch (IOException e) {
-          // IGNORE IT
-        }
-      }
+        // IGNORE IT
     }
     return tokens;
   }

engine/src/main/java/com/arcadedb/log/DefaultLogger.java

@@ -35,7 +35,7 @@ public class DefaultLogger implements Logger {
   private static final String                                          DEFAULT_LOG                  = "com.arcadedb";
   private static final String                                          ENV_INSTALL_CUSTOM_FORMATTER = "arcadedb.installCustomFormatter";
   private static final DefaultLogger                                   instance                     = new DefaultLogger();
-  private final        ConcurrentMap<String, java.util.logging.Logger> loggersCache                 = new ConcurrentHashMap<String, java.util.logging.Logger>();
+  private final        ConcurrentMap<String, java.util.logging.Logger> loggersCache                 = new ConcurrentHashMap<>();
 
   public DefaultLogger() {
     installCustomFormatter();
@@ -103,15 +103,16 @@ else if (requester != null)
       }
     }
 
-    if (log == null) {
+      boolean argumentsNullCheck = arg1 != null || arg2 != null || arg3 != null || arg4 != null || arg5 != null || arg6 != null || arg7 != null || arg8 != null || arg9 != null
+              || arg10 != null || arg11 != null || arg12 != null || arg13 != null || arg14 != null || arg15 != null || arg16 != null || arg17 != null;
+      if (log == null) {
       if (context != null)
         message = "<" + context + "> " + message;
 
       // USE SYSERR
       try {
         String msg = message;
-        if (arg1 != null || arg2 != null || arg3 != null || arg4 != null || arg5 != null || arg6 != null || arg7 != null || arg8 != null || arg9 != null
-            || arg10 != null || arg11 != null || arg12 != null || arg13 != null || arg14 != null || arg15 != null || arg16 != null || arg17 != null)
+        if (argumentsNullCheck)
           msg = String.format(message, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17);
 
         System.err.println(msg);
@@ -129,8 +130,7 @@ else if (requester != null)
           message = "<" + context + "> " + message;
 
         String msg = message;
-        if (arg1 != null || arg2 != null || arg3 != null || arg4 != null || arg5 != null || arg6 != null || arg7 != null || arg8 != null || arg9 != null
-            || arg10 != null || arg11 != null || arg12 != null || arg13 != null || arg14 != null || arg15 != null || arg16 != null || arg17 != null)
+        if (argumentsNullCheck)
           msg = String.format(message, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17);
 
         if (exception != null)

engine/src/main/java/com/arcadedb/query/sql/executor/BreadthFirstTraverseStep.java

@@ -47,7 +47,7 @@ protected void fetchNextEntryPoints(CommandContext ctx, int nRecords) {
       ((ResultInternal) item).setMetadata("$depth", 0);
 
       List stack = new ArrayList();
-      item.getIdentity().ifPresent(x -> stack.add(x));
+      item.getIdentity().ifPresent(stack::add);
       ((ResultInternal) item).setMetadata("$stack", stack);
 
       List<Identifiable> path = new ArrayList<>();

engine/src/main/java/com/arcadedb/query/sql/executor/DeleteEdgeExecutionPlanner.java

@@ -45,7 +45,7 @@ public DeleteEdgeExecutionPlanner(DeleteEdgeStatement stm) {
       this.rids = new ArrayList<>();
       rids.add(stm.getRid().copy());
     } else {
-      this.rids = stm.getRids() == null ? null : stm.getRids().stream().map(x -> x.copy()).collect(Collectors.toList());
+      this.rids = stm.getRids() == null ? null : stm.getRids().stream().map(Rid::copy).collect(Collectors.toList());
     }
 
     this.leftExpression = stm.getLeftExpression() == null ? null : stm.getLeftExpression().copy();

engine/src/main/java/com/arcadedb/query/sql/executor/DepthFirstTraverseStep.java

@@ -47,7 +47,7 @@ protected void fetchNextEntryPoints(final CommandContext ctx, final int nRecords
       ((ResultInternal) item).setMetadata("$depth", 0);
 
       final List stack = new ArrayList();
-      item.getIdentity().ifPresent(x -> stack.add(x));
+      item.getIdentity().ifPresent(stack::add);
       ((ResultInternal) item).setMetadata("$stack", stack);
 
       final List<Identifiable> path = new ArrayList<>();

engine/src/main/java/com/arcadedb/query/sql/executor/DistinctExecutionStep.java

@@ -168,7 +168,7 @@ public void sendTimeout() {
 
   @Override
   public void close() {
-    prev.ifPresent(x -> x.close());
+    prev.ifPresent(ExecutionStepInternal::close);
   }
 
   @Override