[refactor] Address further SonarCloud Static Analysis issues

Author: adamretter

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

@@ -456,10 +456,10 @@ void initialize() throws EXistException, DatabaseConfigurationException {
                 dataLock.release();
             }
 
-            if(e instanceof EXistException) {
-                throw (EXistException) e;
-            } else if(e instanceof DatabaseConfigurationException) {
-                throw (DatabaseConfigurationException) e;
+            if (e instanceof EXistException existException) {
+                throw existException;
+            } else if(e instanceof DatabaseConfigurationException databaseConfigurationException) {
+                throw databaseConfigurationException;
             } else {
                 throw new EXistException(e);
             }

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

@@ -145,11 +145,10 @@ public void setPermissions(final Collection child, final String owner, final Str
 
     private Optional<List<ACEAider>> getAces(@Nullable final Permission permission) {
         final Optional<List<ACEAider>> maybeAces;
-        if (permission != null && permission instanceof ACLPermission) {
-            final ACLPermission aclPerm = (ACLPermission)permission;
-            final List<ACEAider> aces = new ArrayList<>(aclPerm.getACECount());
-            for (int i = 0; i < aclPerm.getACECount(); i++) {
-                aces.add(new ACEAider(aclPerm.getACEAccessType(i), aclPerm.getACETarget(i), aclPerm.getACEWho(i), aclPerm.getACEMode(i)));
+        if (permission != null && permission instanceof ACLPermission aclPermission) {
+            final List<ACEAider> aces = new ArrayList<>(aclPermission.getACECount());
+            for (int i = 0; i < aclPermission.getACECount(); i++) {
+                aces.add(new ACEAider(aclPermission.getACEAccessType(i), aclPermission.getACETarget(i), aclPermission.getACEWho(i), aclPermission.getACEMode(i)));
             }
             maybeAces = Optional.of(aces);
         } else {
@@ -312,34 +311,34 @@ public void unlockResource(final Resource resource) throws XMLDBException {
 
     @Override
     public Permission getPermissions(final Collection coll) throws XMLDBException {
-        if(coll instanceof LocalCollection) {
-            return this.<Permission>read(((LocalCollection) coll).getPathURI()).apply((collection, broker, transaction) -> collection.getPermissionsNoLock());
+        if (coll instanceof LocalCollection localCollection) {
+            return this.<Permission>read(localCollection.getPathURI()).apply((collection, broker, transaction) -> collection.getPermissionsNoLock());
         }
         return null;
     }
 
     @Override
     public Permission getSubCollectionPermissions(final Collection parent, final String name) throws XMLDBException {
-        if(parent instanceof LocalCollection) {
-            return this.<Permission>read(((LocalCollection) parent).getPathURI()).apply((collection, broker, transaction) -> collection.getChildCollectionEntry(broker, name).getPermissions());
+        if (parent instanceof LocalCollection localCollection) {
+            return this.<Permission>read(localCollection.getPathURI()).apply((collection, broker, transaction) -> collection.getChildCollectionEntry(broker, name).getPermissions());
         } else {
             return null;
         }
     }
 
     @Override
     public Permission getSubResourcePermissions(final Collection parent, final String name) throws XMLDBException {
-        if(parent instanceof LocalCollection) {
-            return this.<Permission>read(((LocalCollection) parent).getPathURI()).apply((collection, broker, transaction) -> collection.getResourceEntry(broker, name).getPermissions());
+        if (parent instanceof LocalCollection localCollection) {
+            return this.<Permission>read(localCollection.getPathURI()).apply((collection, broker, transaction) -> collection.getResourceEntry(broker, name).getPermissions());
         } else {
             return null;
         }
     }
 
     @Override
     public Date getSubCollectionCreationTime(final Collection parent, final String name) throws XMLDBException {
-        if(parent instanceof LocalCollection) {
-            return this.<Date>read(((LocalCollection) parent).getPathURI()).apply((collection, broker, transaction) -> new Date(collection.getChildCollectionEntry(broker, name).getCreated()));
+        if (parent instanceof LocalCollection localCollection) {
+            return this.<Date>read(localCollection.getPathURI()).apply((collection, broker, transaction) -> new Date(collection.getChildCollectionEntry(broker, name).getCreated()));
         } else {
             return null;
         }

exist-core/src/main/java/org/exist/xquery/util/DocUtils.java

@@ -146,8 +146,8 @@ private static Sequence getDocumentByPathFromURL(final XQueryContext context, fi
             }
 
             try (final InputStream is = source.getInputStream()) {
-                if (source instanceof URLSource) {
-                    final int responseCode = ((URLSource) source).getResponseCode();
+                if (source instanceof URLSource urlSource) {
+                    final int responseCode = urlSource.getResponseCode();
                     if (responseCode == HttpURLConnection.HTTP_NOT_FOUND) {
                         // Special case: '404'
                         return Sequence.EMPTY_SEQUENCE;