Replace with method references

Author: dizzzz

exist-core/src/main/java/org/exist/client/security/EditPropertiesDialog.java

@@ -214,25 +214,25 @@ private void initComponents() {
         lblSizeValue = new javax.swing.JLabel();
 
         miInsertAceBefore.setText("Insert ACE before...");
-        miInsertAceBefore.addActionListener(evt -> miInsertAceBeforeActionPerformed(evt));
+        miInsertAceBefore.addActionListener(this::miInsertAceBeforeActionPerformed);
         pmAcl.add(miInsertAceBefore);
 
         miInsertAceAfter.setText("Insert ACE after...");
-        miInsertAceAfter.addActionListener(evt -> miInsertAceAfterActionPerformed(evt));
+        miInsertAceAfter.addActionListener(this::miInsertAceAfterActionPerformed);
         pmAcl.add(miInsertAceAfter);
         pmAcl.add(jSeparator3);
 
         miMoveUp.setText("Move ACE up");
-        miMoveUp.addActionListener(evt -> miMoveUpActionPerformed(evt));
+        miMoveUp.addActionListener(this::miMoveUpActionPerformed);
         pmAcl.add(miMoveUp);
 
         miMoveDown.setText("Move ACE down");
-        miMoveDown.addActionListener(evt -> miMoveDownActionPerformed(evt));
+        miMoveDown.addActionListener(this::miMoveDownActionPerformed);
         pmAcl.add(miMoveDown);
         pmAcl.add(jSeparator4);
 
         miRemoveAce.setText("Remove ACE");
-        miRemoveAce.addActionListener(evt -> miRemoveAceActionPerformed(evt));
+        miRemoveAce.addActionListener(this::miRemoveAceActionPerformed);
         pmAcl.add(miRemoveAce);
 
         jTextArea1.setColumns(20);
@@ -267,10 +267,10 @@ private void initComponents() {
         lblGroupValue.setText("<group>");
 
         btnChangeOwner.setText("...");
-        btnChangeOwner.addActionListener(evt -> btnChangeOwnerActionPerformed(evt));
+        btnChangeOwner.addActionListener(this::btnChangeOwnerActionPerformed);
 
         btnChangeGroup.setText("...");
-        btnChangeGroup.addActionListener(evt -> btnChangeGroupActionPerformed(evt));
+        btnChangeGroup.addActionListener(this::btnChangeGroupActionPerformed);
 
         tblBasePermissions.setModel(getBasicPermissionsTableModel());
         tblBasePermissions.setRowSelectionAllowed(false);
@@ -290,13 +290,13 @@ public void mouseClicked(java.awt.event.MouseEvent evt) {
         jScrollPane3.setViewportView(tblAcl);
 
         btnSave.setText("Save");
-        btnSave.addActionListener(evt -> btnSaveActionPerformed(evt));
+        btnSave.addActionListener(this::btnSaveActionPerformed);
 
         btnClose.setText("Close");
-        btnClose.addActionListener(evt -> btnCloseActionPerformed(evt));
+        btnClose.addActionListener(this::btnCloseActionPerformed);
 
         btnAddAce.setText("Add Access Control Entry...");
-        btnAddAce.addActionListener(evt -> btnAddAceActionPerformed(evt));
+        btnAddAce.addActionListener(this::btnAddAceActionPerformed);
 
         lblDigest.setText("Digest:");
 

exist-core/src/main/java/org/exist/storage/BrokerPool.java

@@ -495,7 +495,7 @@ private void _initialize() throws EXistException, DatabaseConfigurationException
         this.notificationService = servicesManager.register(new NotificationService());
 
         this.journalManager = recoveryEnabled ? Optional.of(new JournalManager()) : Optional.empty();
-        journalManager.ifPresent(manager -> servicesManager.register(manager));
+        journalManager.ifPresent(servicesManager::register);
 
         final SystemTaskManager systemTaskManager = servicesManager.register(new SystemTaskManager(this));
         this.transactionManager = servicesManager.register(new TransactionManager(this, journalManager, systemTaskManager));
@@ -505,7 +505,7 @@ private void _initialize() throws EXistException, DatabaseConfigurationException
         this.symbols = servicesManager.register(new SymbolTable());
 
         this.expathRepo = Optional.ofNullable(new ExistRepository());
-        expathRepo.ifPresent(existRepository -> servicesManager.register(existRepository));
+        expathRepo.ifPresent(servicesManager::register);
         servicesManager.register(new ClasspathHelper());
 
         this.indexManager = servicesManager.register(new IndexManager(this));

exist-core/src/main/java/org/exist/xmldb/LocalXMLResource.java

@@ -355,7 +355,7 @@ public Object intercept(final Object obj, final Method method, final Object[] ar
                     @Override
                     public Node item(final int index) {
                         return Optional.ofNullable(underlying.item(index))
-                                .map(n -> exportInternalNode(n))
+                                .map(LocalXMLResource.this::exportInternalNode)
                                 .orElse(null);
                     }
 

exist-core/src/main/java/org/exist/xquery/VariableDeclaration.java

@@ -217,7 +217,7 @@ public void dump(final ExpressionDumper dumper) {
 
     @Override
     public int returnsType() {
-        return expression.map(value -> value.returnsType()).orElse(Type.ITEM);
+        return expression.map(Expression::returnsType).orElse(Type.ITEM);
     }
 
     @Override

exist-core/src/main/java/org/exist/xquery/functions/session/GetID.java

@@ -30,6 +30,7 @@
 import org.exist.xquery.value.Type;
 
 import javax.annotation.Nonnull;
+import java.util.Objects;
 
 /**
  * Returns the ID of the current session or an empty sequence
@@ -54,7 +55,7 @@ public GetID(XQueryContext context) {
     public Sequence eval(final Sequence[] args, @Nonnull final SessionWrapper session) throws XPathException {
 
         return withValidSession(session, SessionWrapper::getId)
-                .filter(id -> id != null)
+                .filter(Objects::nonNull)
                 .map(id -> (Sequence)new StringValue(id))
                 .orElse(Sequence.EMPTY_SEQUENCE);
     }

exist-start/src/main/java/org/exist/start/Classpath.java

@@ -134,9 +134,9 @@ public EXistClassLoader getClassLoader(ClassLoader parent) {
                     } catch(final MalformedURLException e) {
                         return Optional.<URL>empty();
                     }
-                }).filter(ou -> ou.isPresent())
+                }).filter(Optional::isPresent)
                 .map(Optional::get)
-                .toArray(sz -> new URL[sz]);
+                .toArray(URL[]::new);
 
         // try and ensure we have a classloader
         parent = or(

extensions/exquery/restxq/src/main/java/org/exist/extensions/exquery/restxq/impl/RestXqServiceRegistryPersistence.java

@@ -88,8 +88,8 @@ public void loadRegistry() {
 
         //only load the registry if a serialized registry exists on disk
         getRegistryFile(false)
-                .filter(r -> Files.exists(r))
-                .filter(r -> Files.isRegularFile(r))
+                .filter(Files::exists)
+                .filter(Files::isRegularFile)
                 .ifPresent(this::loadRegistry);
     }
 

extensions/indexes/lucene/src/main/java/org/exist/indexing/lucene/LuceneIndex.java

@@ -181,7 +181,7 @@ public void remove() throws DBException {
         close();
         Path dir = getDataDir().resolve(getDirName());
         try {
-            Files.list(dir).forEach(path -> FileUtils.deleteQuietly(path));
+            Files.list(dir).forEach(FileUtils::deleteQuietly);
         } catch (Exception e) {
             // never abort at this point, so recovery can continue
             LOG.warn(e.getMessage(), e);

extensions/indexes/lucene/src/main/java/org/exist/xquery/modules/lucene/QueryOptions.java

@@ -252,7 +252,7 @@ public void configureParser(CommonQueryParserConfiguration parser) {
         }
         if (allowLeadingWildcard)
             parser.setAllowLeadingWildcard(true);
-        phraseSlop.ifPresent(integer -> parser.setPhraseSlop(integer));
+        phraseSlop.ifPresent(parser::setPhraseSlop);
         if (filterRewrite)
             parser.setMultiTermRewriteMethod(MultiTermQuery.CONSTANT_SCORE_FILTER_REWRITE);
         else