[refactor] Java16: Use pattern Variable

Author: dizzzz

exist-core/src/main/java/org/exist/config/Configurator.java

@@ -229,8 +229,7 @@ public static Configuration configure(final Configurable instance, final Configu
             //XXX: throw new ConfigurationException("No configuration [" + configName + "]");
         }
 
-        if (config instanceof ConfigurationImpl) {
-            final ConfigurationImpl impl = (ConfigurationImpl) config;
+        if (config instanceof ConfigurationImpl impl) {
             //XXX: lock issue here, fix it
             Configurable configurable = null;
             if (impl.configuredObjectReference != null) {

exist-core/src/main/java/org/exist/dom/persistent/DocumentImpl.java

@@ -948,10 +948,9 @@ public int compareTo(@EnsureLocked(mode=READ_LOCK) final DocumentImpl other) {
 
     @Override
     public IStoredNode updateChild(final Txn transaction, final Node oldChild, final Node newChild) throws DOMException {
-        if(!(oldChild instanceof StoredNode)) {
+        if(!(oldChild instanceof IStoredNode<?> oldNode)) {
             throw new DOMException(DOMException.WRONG_DOCUMENT_ERR, "Node does not belong to this document");
         }
-        final IStoredNode<?> oldNode = (IStoredNode<?>) oldChild;
         final IStoredNode<?> newNode = (IStoredNode<?>) newChild;
         final IStoredNode<?> previousNode = (IStoredNode<?>) oldNode.getPreviousSibling();
         if(previousNode == null) {

exist-core/src/main/java/org/exist/jetty/JettyStart.java

@@ -320,13 +320,11 @@ public synchronized void run(final String[] args, final Observer observer) {
             final LinkedHashSet<Handler> handlers = getAllHandlers(server.getHandler());
             for (final Handler handler: handlers) {
 
-                if (handler instanceof ContextHandler) {
-                    final ContextHandler contextHandler = (ContextHandler) handler;
+                if (handler instanceof ContextHandler contextHandler) {
                     logger.info("{} ({})", contextHandler.getContextPath(), contextHandler.getDisplayName());
                 }
 
-                if (handler instanceof ServletContextHandler) {
-                    final ServletContextHandler contextHandler = (ServletContextHandler) handler;
+                if (handler instanceof ServletContextHandler contextHandler) {
                     final ServiceLoader<ExistExtensionServlet> services = ServiceLoader.load(ExistExtensionServlet.class);
 
                     for (ExistExtensionServlet existExtensionServlet : services) {

exist-core/src/main/java/org/exist/security/internal/AccountImpl.java

@@ -172,8 +172,7 @@ private void instantiate(final Account from_user) throws PermissionDeniedExcepti
         //copy umask
         setUserMask(from_user.getUserMask());
 
-        if(from_user instanceof AccountImpl) {
-            final AccountImpl user = (AccountImpl) from_user;
+        if(from_user instanceof AccountImpl user) {
 
             groups = new ArrayList<>(user.groups);
 
@@ -183,8 +182,7 @@ private void instantiate(final Account from_user) throws PermissionDeniedExcepti
             hasDbaRole = user.hasDbaRole;
 
             _cred = user._cred;
-        } else if(from_user instanceof UserAider) {
-            final UserAider user = (UserAider) from_user;
+        } else if(from_user instanceof UserAider user) {
 
             final String[] groups = user.getGroups();
             for (final String group : groups) {

exist-core/src/main/java/org/exist/util/XMLString.java

@@ -332,8 +332,7 @@ public boolean equals(final Object anObject) {
         if (this == anObject) {
             return true;
         }
-        if (anObject instanceof XMLString) {
-            final XMLString anotherString = (XMLString) anObject;
+        if (anObject instanceof XMLString anotherString) {
             if (length_ == anotherString.length_) {
                 int n = length_;
                 final char[] v1 = value_;

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

@@ -397,22 +397,18 @@ public Object invoke(final Object proxy, final Method method, final Object[] arg
              */
             Object domResult = null;
             if(method.getName().equals("equals")
-                    && proxy instanceof StoredNodeIdentity
-                    && args.length == 1 && args[0] instanceof StoredNodeIdentity) {
-                final StoredNodeIdentity ni1 = ((StoredNodeIdentity) proxy);
-                final StoredNodeIdentity ni2 = ((StoredNodeIdentity) args[0]);
+                    && proxy instanceof StoredNodeIdentity ni1
+                    && args.length == 1 && args[0] instanceof StoredNodeIdentity ni2) {
 
                 final Optional<Boolean> niEquals = ni1.getNodeId().flatMap(n1id -> ni2.getNodeId().map(n1id::equals));
                 if (niEquals.isPresent()) {
                     domResult = niEquals.get();
                 }
             } else if(method.getName().equals("equals")
-                        && proxy instanceof MemtreeNodeIdentity
-                        && args.length == 1 && args[0] instanceof MemtreeNodeIdentity) {
-                    final MemtreeNodeIdentity ni1 = ((MemtreeNodeIdentity) proxy);
-                    final MemtreeNodeIdentity ni2 = ((MemtreeNodeIdentity) args[0]);
+                        && proxy instanceof MemtreeNodeIdentity ni1
+                        && args.length == 1 && args[0] instanceof MemtreeNodeIdentity ni2) {
 
-                    final Optional<Boolean> niEquals = ni1.getNodeId().flatMap(n1id -> ni2.getNodeId().map(n2id -> n1id._1 == n2id._1 && n1id._2 == n2id._2 && n1id._3 == n2id._3));
+                final Optional<Boolean> niEquals = ni1.getNodeId().flatMap(n1id -> ni2.getNodeId().map(n2id -> n1id._1 == n2id._1 && n1id._2 == n2id._2 && n1id._3 == n2id._3));
                     if (niEquals.isPresent()) {
                         domResult = niEquals.get();
                     }

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

@@ -287,8 +287,7 @@ public void analyze(final AnalyzeContextInfo contextInfo) throws XPathException
 //		case Constants.DESCENDANT_AXIS:
             case Constants.DESCENDANT_SELF_AXIS:
                 final Expression contextStep = contextInfo.getContextStep();
-                if (contextStep instanceof LocationStep) {
-                    final LocationStep cStep = (LocationStep) contextStep;
+                if (contextStep instanceof LocationStep cStep) {
 
                     if ((
                             cStep.getTest().getType() == Type.ATTRIBUTE ||

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

@@ -295,12 +295,10 @@ public void recordAll(final PerformanceStats otherPerformanceStats) {
             return;
         }
 
-        if (!(otherPerformanceStats instanceof PerformanceStatsImpl)) {
+        if (!(otherPerformanceStats instanceof PerformanceStatsImpl other)) {
             throw new IllegalArgumentException("Argument must be of type: " + getClass().getName());
         }
 
-        final PerformanceStatsImpl other = (PerformanceStatsImpl) otherPerformanceStats;
-
         for (final QueryStats otherQueryStats : other.queries.values()) {
             final QueryStats copy = QueryStats.copy(otherQueryStats);
             @Nullable final QueryStats mine = queries.get(copy.source);