Skip to content

Commit

Permalink
Merge pull request #5147 from dizzzz/refactor/misc
Browse files Browse the repository at this point in the history 
[refactor] Some automatic refactoring using IntelliJ
  • Loading branch information
@line-o
line-o authored Dec 11, 2023
2 parents a565a0b + 3ecf900 commit 6feea2c
Show file tree
Hide file tree
Showing 242 changed files with 1,150 additions and 2,568 deletions.
1 change: 0 additions & 1 deletion exist-core/src/main/java/org/exist/backup/BackupWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
1 change: 0 additions & 1 deletion exist-core/src/main/java/org/exist/backup/FileSystemWriter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;


Expand Down
4 changes: 0 additions & 4 deletions exist-core/src/main/java/org/exist/backup/restore/CollectionDeferredPermission.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions exist-core/src/main/java/org/exist/backup/restore/listener/RestoreListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
*/
package org.exist.backup.restore.listener;

import java.util.Observable;

/**
* @author <a href="mailto:[email protected]">Adam Retter</a>
*/
Expand Down
29 changes: 11 additions & 18 deletions exist-core/src/main/java/org/exist/client/ClientFrame.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -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;
}
Expand Down Expand Up @@ -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 "";
}
Expand Down
1 change: 0 additions & 1 deletion exist-core/src/main/java/org/exist/client/EnterKeyAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
19 changes: 8 additions & 11 deletions exist-core/src/main/java/org/exist/client/IndexDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
}
}
13 changes: 4 additions & 9 deletions exist-core/src/main/java/org/exist/client/NewResourceDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 4 additions & 7 deletions exist-core/src/main/java/org/exist/client/TriggersDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}
}
}
2 changes: 0 additions & 2 deletions exist-core/src/main/java/org/exist/client/UploadDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 1 addition & 2 deletions exist-core/src/main/java/org/exist/client/security/AclTableModel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ public AclTableModel(final Permission permission) {
super();

final Object[][] aces;
if(permission instanceof ACLPermission) {
final ACLPermission aclPermission = (ACLPermission)permission;
if(permission instanceof ACLPermission aclPermission) {
aces = new Object[aclPermission.getACECount()][6];
for(int i = 0; i < aclPermission.getACECount(); i++) {
aces[i] = new Object[]{
Expand Down
3 changes: 1 addition & 2 deletions exist-core/src/main/java/org/exist/client/security/EditPropertiesDialog.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,8 +458,7 @@ private void btnSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST

final List<ACEAider> dlgAces = new ArrayList<>();
if (acl == null) {
if (existingPermission instanceof ACLPermission) {
final ACLPermission existingAclPermission = (ACLPermission)existingPermission;
if (existingPermission instanceof ACLPermission existingAclPermission) {
for (int i = 0; i < existingAclPermission.getACECount(); i++) {
dlgAces.add(new ACEAider(existingAclPermission.getACEAccessType(i), existingAclPermission.getACETarget(i), existingAclPermission.getACEWho(i), existingAclPermission.getACEMode(i)));
}
Expand Down
1 change: 0 additions & 1 deletion exist-core/src/main/java/org/exist/client/security/ModeDisplay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import org.exist.security.Permission;
import org.exist.security.PermissionDeniedException;
import org.exist.security.internal.aider.UnixStylePermissionAider;

/**
* Used for Tri-State display of a permission mode
Expand Down
15 changes: 5 additions & 10 deletions exist-core/src/main/java/org/exist/client/tristatecheckbox/TristateState.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,10 @@ public static TristateState fromBoolean(@Nullable final Boolean state) {
}

public static @Nullable Boolean toBoolean(final TristateState state) {
switch (state) {
case DESELECTED:
return false;
case SELECTED:
return true;

case INDETERMINATE:
default:
return null;
}
return switch (state) {
case DESELECTED -> false;
case SELECTED -> true;
default -> null;
};
}
}
3 changes: 1 addition & 2 deletions exist-core/src/main/java/org/exist/collections/CollectionURI.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,7 @@ public int hashCode() {
}

public boolean equals(Object object) {
if (object instanceof CollectionURI) {
final CollectionURI otherCollectionURI = (CollectionURI)object;
if (object instanceof CollectionURI otherCollectionURI) {
if (this.length == otherCollectionURI.length) {
int pos = length - 1;
while (pos > -1) {
Expand Down
46 changes: 17 additions & 29 deletions exist-core/src/main/java/org/exist/collections/MutableCollection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -556,21 +556,11 @@ private void addDocumentsToSet(final DBBroker broker, final Iterator<DocumentImp
while(documentIterator.hasNext()) {
final DocumentImpl doc = documentIterator.next();
if(doc.getPermissions().validate(broker.getCurrentSubject(), requiredPermission)) {
final ManagedDocumentLock documentLock;
switch(lockType) {
case WRITE_LOCK:
documentLock = lockManager.acquireDocumentWriteLock(doc.getURI());
break;

case READ_LOCK:
documentLock = lockManager.acquireDocumentReadLock(doc.getURI());
break;

case NO_LOCK:
default:
documentLock = ManagedSingleLockDocumentLock.notLocked(doc.getURI());
break;
}
final ManagedDocumentLock documentLock = switch (lockType) {
case WRITE_LOCK -> lockManager.acquireDocumentWriteLock(doc.getURI());
case READ_LOCK -> lockManager.acquireDocumentReadLock(doc.getURI());
default -> ManagedSingleLockDocumentLock.notLocked(doc.getURI());
};

docs.add(doc);
lockMap.add(new LockedDocument(documentLock, doc));
Expand Down Expand Up @@ -696,23 +686,21 @@ public LockedDocument getDocumentWithLock(final DBBroker broker, final XmldbURI

// lock the document
final ManagedDocumentLock documentLock;
final Runnable unlockFn; // we unlock on error, or if there is no Collection
switch (lockMode) {
case WRITE_LOCK:
final Runnable unlockFn = switch (lockMode) {
case WRITE_LOCK -> {
documentLock = lockManager.acquireDocumentWriteLock(getURI().append(name.lastSegment()));
unlockFn = documentLock::close;
break;

case READ_LOCK:
yield documentLock::close;
}
case READ_LOCK -> {
documentLock = lockManager.acquireDocumentReadLock(getURI().append(name.lastSegment()));
unlockFn = documentLock::close;
break;

case NO_LOCK:
default:
yield documentLock::close;
}
default -> {
documentLock = ManagedSingleLockDocumentLock.notLocked(getURI().append(name.lastSegment()));
unlockFn = () -> {};
}
yield () -> {
};
}
}; // we unlock on error, or if there is no Collection


final DocumentImpl doc = documents.get(name.lastSegmentString());
Expand Down
39 changes: 13 additions & 26 deletions exist-core/src/main/java/org/exist/collections/triggers/DeferrableFilteringTrigger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,54 +241,41 @@ public void comment(final char[] ch, final int start, final int length) throws S
protected void applyDeferredEvents() throws SAXException {
SAXEvent event = null;
while((event = deferred.poll()) != null) {
if(event instanceof SetDocumentLocator) {
final SetDocumentLocator setDocumentLocator = (SetDocumentLocator)event;
if(event instanceof SetDocumentLocator setDocumentLocator) {
setDocumentLocator_deferred(setDocumentLocator.locator);
} else if(event instanceof StartDocument) {
startDocument_deferred();
} else if(event instanceof EndDocument) {
endDocument_deferred();
} else if(event instanceof StartPrefixMapping) {
final StartPrefixMapping startPrefixMapping = (StartPrefixMapping) event;
} else if(event instanceof StartPrefixMapping startPrefixMapping) {
startPrefixMapping_deferred(startPrefixMapping.prefix, startPrefixMapping.uri);
} else if(event instanceof EndPrefixMapping) {
final EndPrefixMapping endPrefixMapping = (EndPrefixMapping) event;
} else if(event instanceof EndPrefixMapping endPrefixMapping) {
endPrefixMapping_deferred(endPrefixMapping.prefix);
} else if(event instanceof StartElement) {
final StartElement startElement = (StartElement) event;
} else if(event instanceof StartElement startElement) {
startElement_deferred(startElement.namespaceURI, startElement.localName, startElement.qname, startElement.attributes);
} else if(event instanceof EndElement) {
final EndElement endElement = (EndElement) event;
} else if(event instanceof EndElement endElement) {
endElement_deferred(endElement.namespaceURI, endElement.localName, endElement.qname);
} else if(event instanceof Characters) {
final Characters characters = (Characters) event;
} else if(event instanceof Characters characters) {
characters_deferred(characters.ch, 0, characters.ch.length);
} else if(event instanceof IgnorableWhitespace) {
final IgnorableWhitespace ignorableWhitespace = (IgnorableWhitespace) event;
} else if(event instanceof IgnorableWhitespace ignorableWhitespace) {
ignorableWhitespace_deferred(ignorableWhitespace.ch, 0, ignorableWhitespace.ch.length);
} else if(event instanceof ProcessingInstruction) {
final ProcessingInstruction processingInstruction = (ProcessingInstruction) event;
} else if(event instanceof ProcessingInstruction processingInstruction) {
processingInstruction_deferred(processingInstruction.target, processingInstruction.data);
} else if(event instanceof SkippedEntity) {
final SkippedEntity skippedEntity = (SkippedEntity) event;
} else if(event instanceof SkippedEntity skippedEntity) {
skippedEntity_deferred(skippedEntity.name);
} else if(event instanceof StartDTD) {
final StartDTD startDTD = (StartDTD) event;
} else if(event instanceof StartDTD startDTD) {
startDTD_deferred(startDTD.name, startDTD.publicId, startDTD.systemId);
} else if(event instanceof EndDTD) {
endDTD_deferred();
} else if(event instanceof StartEntity) {
final StartEntity startEntity = (StartEntity) event;
} else if(event instanceof StartEntity startEntity) {
startEntity_deferred(startEntity.name);
} else if(event instanceof EndEntity) {
final EndEntity endEntity = (EndEntity) event;
} else if(event instanceof EndEntity endEntity) {
endEntity_deferred(endEntity.name);
} else if(event instanceof StartCDATA) {
startCDATA_deferred();
} else if(event instanceof EndCDATA) {
endCDATA_deferred();
} else if(event instanceof Comment) {
final Comment comment = (Comment) event;
} else if(event instanceof Comment comment) {
comment_deferred(comment.ch, 0, comment.ch.length);
}
}
Expand Down
6 changes: 2 additions & 4 deletions exist-core/src/main/java/org/exist/collections/triggers/DocumentTriggers.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,10 +113,8 @@ private void finishPreparation(Indexer indexer) {
}

private void register(DocumentTrigger trigger) {
if (trigger instanceof SAXTrigger) {

SAXTrigger filteringTrigger = (SAXTrigger) trigger;

if (trigger instanceof SAXTrigger filteringTrigger) {

if (last == null) {
contentHandler = filteringTrigger;
lexicalHandler = filteringTrigger;
Expand Down
13 changes: 5 additions & 8 deletions exist-core/src/main/java/org/exist/collections/triggers/TriggerPhase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,10 @@ public enum TriggerPhase {

@Deprecated
public String legacyPhaseName() {
switch(this) {
case BEFORE:
return "prepare";
case AFTER:
return "finish";
default:
throw new IllegalStateException();
}
return switch (this) {
case BEFORE -> "prepare";
case AFTER -> "finish";
default -> throw new IllegalStateException();
};
}
}
Loading

0 comments on commit 6feea2c

Please sign in to comment.