Merge pull request #5147 from dizzzz/refactor/misc

[refactor] Some automatic refactoring using IntelliJ

Author: line-o

exist-core/src/main/java/org/exist/backup/BackupWriter.java

@@ -25,7 +25,6 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.Writer;
-import java.nio.file.Path;
 import java.util.Properties;
 
 

exist-core/src/main/java/org/exist/backup/FileSystemWriter.java

@@ -32,7 +32,6 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
 import java.util.Properties;
 
 

exist-core/src/main/java/org/exist/backup/restore/CollectionDeferredPermission.java

@@ -31,11 +31,7 @@
 import org.exist.security.PermissionFactory;
 import org.exist.storage.DBBroker;
 import org.exist.storage.lock.Lock;
-import org.exist.storage.lock.LockManager;
-import org.exist.storage.lock.ManagedCollectionLock;
-import org.exist.storage.txn.TransactionManager;
 import org.exist.storage.txn.Txn;
-import org.exist.util.LockException;
 import org.exist.xmldb.XmldbURI;
 
 import java.io.IOException;

exist-core/src/main/java/org/exist/backup/restore/listener/RestoreListener.java

@@ -21,8 +21,6 @@
  */
 package org.exist.backup.restore.listener;
 
-import java.util.Observable;
-
 /**
  * @author <a href="mailto:[email protected]">Adam Retter</a>
  */

exist-core/src/main/java/org/exist/client/ClientFrame.java

@@ -1310,8 +1310,7 @@ private void setPermAction(final ActionEvent ev) throws PermissionDeniedExceptio
                 mode = getUpdatedMode(mode, thisPerm);
 
                 if (firstPerm) {
-                    if (thisPerm instanceof ACLPermission) {
-                        final ACLPermission thisAcl = (ACLPermission) thisPerm;
+                    if (thisPerm instanceof ACLPermission thisAcl) {
                         acl = new SimpleACLPermissionAider();
                         for (int i = 0; i < thisAcl.getACECount(); i++) {
                             acl.addACE(thisAcl.getACEAccessType(i), thisAcl.getACETarget(i), thisAcl.getACEWho(i), thisAcl.getACEMode(i));
@@ -1321,8 +1320,7 @@ private void setPermAction(final ActionEvent ev) throws PermissionDeniedExceptio
                     }
                     firstPerm = false;
                 } else {
-                    if (acl != null && thisPerm instanceof ACLPermission) {
-                        final ACLPermission thisAcl = (ACLPermission) thisPerm;
+                    if (acl != null && thisPerm instanceof ACLPermission thisAcl) {
                         if (!acl.aclEquals(thisAcl)) {
                             acl = null;
                         }
@@ -1635,20 +1633,15 @@ public int getRowCount() {
         public Object getValueAt(final int rowIndex, final int columnIndex) {
             if (getRowCount() > 0) {
                 final ResourceDescriptor row = getRow(rowIndex);
-                switch (columnIndex) {
-                    case 0:
-                        return row.getName().toString();
-                    case 1:
-                        return DATE_TIME_FORMATTER.format(row.getInstant());
-                    case 2:
-                        return row.getOwner();
-                    case 3:
-                        return row.getGroup();
-                    case 4:
-                        return row.getPermissionsDescription();
-                    default:
-                        throw new RuntimeException(Messages.getString("ClientFrame.212")); //$NON-NLS-1$
-                }
+                //$NON-NLS-1$
+                return switch (columnIndex) {
+                    case 0 -> row.getName().toString();
+                    case 1 -> DATE_TIME_FORMATTER.format(row.getInstant());
+                    case 2 -> row.getOwner();
+                    case 3 -> row.getGroup();
+                    case 4 -> row.getPermissionsDescription();
+                    default -> throw new RuntimeException(Messages.getString("ClientFrame.212")); //$NON-NLS-1$
+                };
             }
             return "";
         }

exist-core/src/main/java/org/exist/client/EnterKeyAdapter.java

@@ -23,7 +23,6 @@
 
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
 import javax.swing.AbstractButton;
 import javax.swing.JPasswordField;
 import javax.swing.JTextField;

exist-core/src/main/java/org/exist/client/IndexDialog.java

@@ -467,17 +467,14 @@ public int getRowCount()
 		 */
 		public Object getValueAt(int rowIndex, int columnIndex)
 		{
-			switch (columnIndex)
-			{
-                case 0 :
-                    return cx.getRangeIndex(rowIndex).getType();
-                case 1 :	/* XPath */
-					return cx.getRangeIndex(rowIndex).getXPath();
-				case 2 :	/* xsType */
-					return cx.getRangeIndex(rowIndex).getxsType();
-				default :
-					return null;
-			}
+            return switch (columnIndex) {
+                case 0 -> cx.getRangeIndex(rowIndex).getType();
+                case 1 ->    /* XPath */
+                        cx.getRangeIndex(rowIndex).getXPath();
+                case 2 ->    /* xsType */
+                        cx.getRangeIndex(rowIndex).getxsType();
+                default -> null;
+            };
 		}
 	}
 }

exist-core/src/main/java/org/exist/client/NewResourceDialog.java

@@ -124,15 +124,10 @@ private void setupComponents() {
         cmbResourceTypes.addActionListener(e -> {
             final Object src = e.getSource();
             if(src.equals(cmbResourceTypes)) {
-                final boolean visible1;
-                switch((ResourceType)cmbResourceTypes.getSelectedItem()) {
-                    case XQUERY_LIBRARY:
-                        visible1 = true;
-                        break;
-
-                    default:
-                        visible1 = false;
-                }
+                final boolean visible1 = switch ((ResourceType) cmbResourceTypes.getSelectedItem()) {
+                    case XQUERY_LIBRARY -> true;
+                    default -> false;
+                };
 
                 lblLibModule.setVisible(visible1);
                 panLibModule.setVisible(visible1);

exist-core/src/main/java/org/exist/client/TriggersDialog.java

@@ -363,14 +363,11 @@ public int getRowCount() {
          */
         @Override
         public Object getValueAt(final int rowIndex, final int columnIndex) {
-            switch(columnIndex) {
+            return switch (columnIndex) {
                 /* class */
-                case 0:
-                    return cx.getTrigger(rowIndex).getTriggerClass();
-                
-                default :
-                    return null;
-            }
+                case 0 -> cx.getTrigger(rowIndex).getTriggerClass();
+                default -> null;
+            };
         }
     }
 }

exist-core/src/main/java/org/exist/client/UploadDialog.java

@@ -24,8 +24,6 @@
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.util.Observable;
 import java.util.Observer;