spider: SAST (SonarLint) Fixes

kingthorin · kingthorin · commit c86a13505f04 · 2025-06-20T07:38:32.000-04:00
- Use isEmpty vs length checks.
- Use instanceof assignment where applicable.
- Use text blocks vs concatenation where applicable.
- Use computeIfAbsent vs get/put where applicable.
- Use charset constants from JRE vs string literals.
- Use constants from base classes vs extended classes.
- Remove useless conditions/assignments.

Signed-off-by: kingthorin &lt;kingthorin@users.noreply.github.com&gt;
diff --git a/addOns/spider/CHANGELOG.md b/addOns/spider/CHANGELOG.md
@@ -5,7 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
-
+### Changed
+- Maintenance changes.
 
 ## [0.15.0] - 2025-06-20
 ### Changed
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/DomainsAlwaysInScopeTableModel.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/DomainsAlwaysInScopeTableModel.java
@@ -79,8 +79,8 @@ public Object getValueAt(int rowIndex, int columnIndex) {
 
     @Override
     public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-        if (columnIndex == 0 && aValue instanceof Boolean) {
-            domainsInScope.get(rowIndex).setEnabled((Boolean) aValue);
+        if (columnIndex == 0 && aValue instanceof Boolean val) {
+            domainsInScope.get(rowIndex).setEnabled(val);
             fireTableCellUpdated(rowIndex, columnIndex);
         }
     }
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/ExtensionSpider2.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/ExtensionSpider2.java
@@ -21,6 +21,7 @@
 
 import java.awt.Dimension;
 import java.awt.EventQueue;
+import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -489,8 +490,8 @@ private String createDisplayName(Target target, Object[] customConfigurations) {
         } else if (target.getStartNode() == null) {
             if (customConfigurations != null) {
                 for (Object customConfiguration : customConfigurations) {
-                    if (customConfiguration instanceof URI) {
-                        return abbreviateDisplayName(((URI) customConfiguration).toString());
+                    if (customConfiguration instanceof URI uri) {
+                        return abbreviateDisplayName(uri.toString());
                     }
                 }
             }
@@ -508,8 +509,8 @@ private String createDisplayName(Target target, Object[] customConfigurations) {
     private HttpPrefixFetchFilter getUriPrefixFecthFilter(Object[] customConfigurations) {
         if (customConfigurations != null) {
             for (Object customConfiguration : customConfigurations) {
-                if (customConfiguration instanceof HttpPrefixFetchFilter) {
-                    return (HttpPrefixFetchFilter) customConfiguration;
+                if (customConfiguration instanceof HttpPrefixFetchFilter prefixFetchFilter) {
+                    return prefixFetchFilter;
                 }
             }
         }
@@ -630,8 +631,8 @@ protected String getTargetUriOutOfScope(Target target, Object[] contextSpecificO
                 if (node == null) {
                     continue;
                 }
-                if (node instanceof StructuralSiteNode) {
-                    SiteNode siteNode = ((StructuralSiteNode) node).getSiteNode();
+                if (node instanceof StructuralSiteNode ssNode) {
+                    SiteNode siteNode = ssNode.getSiteNode();
                     if (!siteNode.isIncludedInScope()) {
                         return node.getURI().toString();
                     }
@@ -645,10 +646,10 @@ protected String getTargetUriOutOfScope(Target target, Object[] contextSpecificO
         }
         if (contextSpecificObjects != null) {
             for (Object obj : contextSpecificObjects) {
-                if (obj instanceof URI) {
-                    String uri = ((URI) obj).toString();
-                    if (!isTargetUriInScope(uri)) {
-                        return uri;
+                if (obj instanceof URI uri) {
+                    String uriStr = uri.toString();
+                    if (!isTargetUriInScope(uriStr)) {
+                        return uriStr;
                     }
                 }
             }
@@ -758,7 +759,7 @@ private ZapMenuItem getMenuItemCustomScan() {
                             "menu.tools.spider",
                             getView()
                                     .getMenuShortcutKeyStroke(
-                                            KeyEvent.VK_S, KeyEvent.ALT_DOWN_MASK, false));
+                                            KeyEvent.VK_S, InputEvent.ALT_DOWN_MASK, false));
             menuItemCustomScan.setEnabled(Control.getSingleton().getMode() != Mode.safe);
 
             menuItemCustomScan.addActionListener(e -> showSpiderDialog((Target) null));
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/OptionsSpiderPanel.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/OptionsSpiderPanel.java
@@ -390,11 +390,7 @@ private JCheckBox getChkProcessForm() {
                     new ChangeListener() {
                         @Override
                         public void stateChanged(ChangeEvent ev) {
-                            if (chkProcessForm.isSelected()) {
-                                chkPostForm.setEnabled(true);
-                            } else {
-                                chkPostForm.setEnabled(false);
-                            }
+                            chkPostForm.setEnabled(chkProcessForm.isSelected());
                         }
                     });
         }
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderAPI.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderAPI.java
@@ -231,7 +231,7 @@ public ApiResponse handleApiAction(String name, JSONObject params) throws ApiExc
                 String url = ApiUtils.getOptionalStringParam(params, PARAM_URL);
                 if (params.containsKey(PARAM_MAX_CHILDREN)) {
                     String maxChildrenStr = params.getString(PARAM_MAX_CHILDREN);
-                    if (maxChildrenStr != null && maxChildrenStr.length() > 0) {
+                    if (maxChildrenStr != null && !maxChildrenStr.isEmpty()) {
                         try {
                             maxChildren = Integer.parseInt(maxChildrenStr);
                         } catch (NumberFormatException e) {
@@ -276,7 +276,7 @@ public ApiResponse handleApiAction(String name, JSONObject params) throws ApiExc
                 }
                 if (params.containsKey(PARAM_MAX_CHILDREN)) {
                     String maxChildrenStr = params.getString(PARAM_MAX_CHILDREN);
-                    if (maxChildrenStr != null && maxChildrenStr.length() > 0) {
+                    if (maxChildrenStr != null && !maxChildrenStr.isEmpty()) {
                         try {
                             maxChildren = Integer.parseInt(maxChildrenStr);
                         } catch (NumberFormatException e) {
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderDialog.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderDialog.java
@@ -151,7 +151,7 @@ public void init(Target target) {
         this.addCheckBoxField(1, FIELD_LOGOUT_AVOIDANCE, getSpiderParam().isLogoutAvoidance());
         this.addPadding(1);
 
-        if (!getBoolValue(FIELD_PROCESS_FORMS)) {
+        if (!getBoolValue(FIELD_PROCESS_FORMS).booleanValue()) {
             setFieldValue(FIELD_POST_FORMS, false);
             getField(FIELD_POST_FORMS).setEnabled(false);
         }
@@ -169,7 +169,7 @@ public void actionPerformed(ActionEvent e) {
                 new ActionListener() {
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        if (getBoolValue(FIELD_PROCESS_FORMS)) {
+                        if (getBoolValue(FIELD_PROCESS_FORMS).booleanValue()) {
                             getField(FIELD_POST_FORMS).setEnabled(true);
                         } else {
                             setFieldValue(FIELD_POST_FORMS, false);
@@ -238,7 +238,7 @@ public void targetSelected(String field, Target node) {
             }
         }
         this.setComboFields(FIELD_CONTEXT, ctxNames, "");
-        this.getField(FIELD_CONTEXT).setEnabled(ctxNames.size() > 0);
+        this.getField(FIELD_CONTEXT).setEnabled(!ctxNames.isEmpty());
     }
 
     private Context getSelectedContext() {
@@ -325,7 +325,7 @@ public void save() {
         } catch (Exception e1) {
             // Ignore - will have been checked in validateParams
         }
-        if (this.getBoolValue(FIELD_ADVANCED)) {
+        if (this.getBoolValue(FIELD_ADVANCED).booleanValue()) {
             // Set the advanced options
             spiderParam.setMaxDepth(this.getIntValue(FIELD_MAX_DEPTH));
             spiderParam.setMaxDuration(this.getIntValue(FIELD_MAX_DURATION));
@@ -351,7 +351,7 @@ public void save() {
         if (startUri != null) {
             contextSpecificObjects.add(startUri);
 
-            if (getBoolValue(FIELD_SUBTREE_ONLY)) {
+            if (getBoolValue(FIELD_SUBTREE_ONLY).booleanValue()) {
                 contextSpecificObjects.add(new HttpPrefixFetchFilter(startUri));
             }
         }
@@ -428,7 +428,7 @@ public String validateFields() {
             }
         }
 
-        if (getBoolValue(FIELD_SUBTREE_ONLY) && noStartUri) {
+        if (getBoolValue(FIELD_SUBTREE_ONLY).booleanValue() && noStartUri) {
             return Constant.messages.getString("spider.custom.noStartSubtreeOnly.error");
         }
 
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderMessagesTable.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderMessagesTable.java
@@ -131,14 +131,14 @@ protected Component doHighlight(Component component, ComponentAdapter adapter) {
 
             boolean processed = cell.isSuccessful();
             Icon icon = getProcessedIcon(processed);
-            if (component instanceof IconAware) {
-                ((IconAware) component).setIcon(icon);
-            } else if (component instanceof JLabel) {
-                ((JLabel) component).setIcon(icon);
+            if (component instanceof IconAware iconAware) {
+                iconAware.setIcon(icon);
+            } else if (component instanceof JLabel label) {
+                label.setIcon(icon);
             }
 
-            if (component instanceof JLabel) {
-                ((JLabel) component).setText(processed ? "" : cell.getLabel());
+            if (component instanceof JLabel label) {
+                label.setText(processed ? "" : cell.getLabel());
             }
 
             return component;
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderMessagesTableModel.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderMessagesTableModel.java
@@ -149,12 +149,8 @@ private ProcessedCellItem getProcessedCellItem(boolean processed, String reasonN
         if (processed) {
             return SUCCESSFULLY_PROCESSED_CELL_ITEM;
         }
-        ProcessedCellItem processedCellItem = cacheProcessedCellItems.get(reasonNotProcessed);
-        if (processedCellItem == null) {
-            processedCellItem = new ProcessedCellItem(processed, reasonNotProcessed);
-            cacheProcessedCellItems.put(reasonNotProcessed, processedCellItem);
-        }
-        return processedCellItem;
+        return cacheProcessedCellItems.computeIfAbsent(
+                reasonNotProcessed, k -> new ProcessedCellItem(processed, k));
     }
 
     @Override
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderScanController.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderScanController.java
@@ -107,14 +107,14 @@ public int startScan(String name, Target target, User user, Object[] contextSpec
                     if (obj instanceof SpiderParam) {
                         LOGGER.debug("Setting custom spider params");
                         spiderParams = (SpiderParam) obj;
-                    } else if (obj instanceof SpiderParser) {
-                        customSpiderParsers.add((SpiderParser) obj);
-                    } else if (obj instanceof FetchFilter) {
-                        customFetchFilters.add((FetchFilter) obj);
-                    } else if (obj instanceof ParseFilter) {
-                        customParseFilters.add((ParseFilter) obj);
-                    } else if (obj instanceof URI) {
-                        startUri = (URI) obj;
+                    } else if (obj instanceof SpiderParser parser) {
+                        customSpiderParsers.add(parser);
+                    } else if (obj instanceof FetchFilter fetchFilter) {
+                        customFetchFilters.add(fetchFilter);
+                    } else if (obj instanceof ParseFilter parseFilter) {
+                        customParseFilters.add(parseFilter);
+                    } else if (obj instanceof URI uri) {
+                        startUri = uri;
                     } else {
                         LOGGER.error(
                                 "Unexpected contextSpecificObject: {}",
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderTask.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/SpiderTask.java
@@ -117,7 +117,7 @@ public SpiderTask(Spider parent, SpiderResourceFound resourceFound, URI uri) {
             if (resourceFound.getMessage() != null
                     && parent.getSpiderParam().isSendRefererHeader()) {
                 requestHeader.setHeader(
-                        HttpRequestHeader.REFERER,
+                        HttpHeader.REFERER,
                         resourceFound.getMessage().getRequestHeader().getURI().toString());
             }
             HttpMessage msg = new HttpMessage(requestHeader);
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/UrlCanonicalizer.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/UrlCanonicalizer.java
@@ -156,7 +156,7 @@ public static String getCanonicalUrl(ParseContext ctx, String url, String baseUR
             queryString = (canonicalParams.isEmpty() ? "" : "?" + canonicalParams);
 
             /* Add starting slash if needed */
-            if (path.length() == 0) {
+            if (path.isEmpty()) {
                 path = "/" + path;
             }
 
@@ -255,7 +255,7 @@ static String buildCleanedParametersUriRepresentation(
             String cleanedQuery = getCleanedQuery(uri.getEscapedQuery(), irrelevantParameter);
 
             // Add the parameters' names to the uri representation.
-            if (cleanedQuery.length() > 0) {
+            if (!cleanedQuery.isEmpty()) {
                 retVal.append('?').append(cleanedQuery);
             }
 
@@ -344,9 +344,7 @@ private static String getCleanedQuery(
     private static String cleanODataPath(String path, HandleParametersOption handleParameters) {
         String cleanedPath = path;
 
-        if (HandleParametersOption.USE_ALL.equals(handleParameters)) {
-            cleanedPath = path;
-        } else {
+        if (!HandleParametersOption.USE_ALL.equals(handleParameters)) {
 
             // check for single ID (unnamed)
             Matcher matcher = PATTERN_RESOURCE_IDENTIFIER_UNQUOTED.matcher(path);
@@ -429,7 +427,7 @@ private static SortedSet<QueryParameter> createSortedParameters(final String que
         final SortedSet<QueryParameter> params = new TreeSet<>();
 
         for (final String pair : pairs) {
-            if (pair.length() == 0) {
+            if (pair.isEmpty()) {
                 continue;
             }
 
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/automation/SpiderJobDialog.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/automation/SpiderJobDialog.java
@@ -98,8 +98,8 @@ public SpiderJobDialog(SpiderJob job) {
         // Cannot select the node as it might not be present in the Sites tree
         this.addNodeSelectField(0, URL_PARAM, null, true, false);
         Component urlField = this.getField(URL_PARAM);
-        if (urlField instanceof JTextField) {
-            ((JTextField) urlField).setText(this.job.getParameters().getUrl());
+        if (urlField instanceof JTextField field) {
+            field.setText(this.job.getParameters().getUrl());
         }
         this.addNumberField(
                 0,
@@ -179,9 +179,9 @@ public Component getListCellRendererComponent(
                                 (JLabel)
                                         super.getListCellRendererComponent(
                                                 list, value, index, isSelected, cellHasFocus);
-                        if (value instanceof HandleParametersOption) {
+                        if (value instanceof HandleParametersOption hpo) {
                             // The name is i18n'ed
-                            label.setText(((HandleParametersOption) value).getName());
+                            label.setText(hpo.getName());
                         }
                         return label;
                     }
@@ -280,9 +280,7 @@ public void save() {
             this.job.getParameters().setLogoutAvoidance(this.getBoolValue(LOGOUT_AVOIDANCE_PARAM));
 
             Object hpoObj = handleParamsModel.getSelectedItem();
-            if (hpoObj instanceof SpiderParam.HandleParametersOption) {
-                SpiderParam.HandleParametersOption hpo =
-                        (SpiderParam.HandleParametersOption) hpoObj;
+            if (hpoObj instanceof SpiderParam.HandleParametersOption hpo) {
                 this.job.getParameters().setHandleParameters(hpo);
             }
 
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/filters/HttpPrefixFetchFilter.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/filters/HttpPrefixFetchFilter.java
@@ -234,13 +234,8 @@ public String getNormalisedPrefix() {
      *     false} otherwise
      */
     private static boolean isDefaultHttpOrHttpsPort(String scheme, int port) {
-        if (port == DEFAULT_HTTP_PORT && isHttp(scheme)) {
-            return true;
-        }
-        if (port == DEFAULT_HTTPS_PORT && isHttps(scheme)) {
-            return true;
-        }
-        return false;
+        return (port == DEFAULT_HTTP_PORT && isHttp(scheme))
+                || (port == DEFAULT_HTTPS_PORT && isHttps(scheme));
     }
 
     /**
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/internal/ui/IrrelevantParametersTableModel.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/internal/ui/IrrelevantParametersTableModel.java
@@ -82,8 +82,8 @@ public Object getValueAt(int rowIndex, int columnIndex) {
 
     @Override
     public void setValueAt(Object aValue, int rowIndex, int columnIndex) {
-        if (columnIndex == 0 && aValue instanceof Boolean) {
-            irrelevantParameters.get(rowIndex).setEnabled((Boolean) aValue);
+        if (columnIndex == 0 && aValue instanceof Boolean val) {
+            irrelevantParameters.get(rowIndex).setEnabled(val);
             fireTableCellUpdated(rowIndex, columnIndex);
         }
     }
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderGitParser.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderGitParser.java
@@ -198,14 +198,15 @@ public boolean parseResource(ParseContext ctx) {
                         ++n;
                         byte byteRead = dataBuffer.get();
                         entryBytesRead++;
-                        if (n == 1) // zero the msb of the first byte read
-                        removeNfromPreviousName =
+                        if (n == 1) { // zero the msb of the first byte read
+                            removeNfromPreviousName =
                                     (removeNfromPreviousName << 8)
                                             | (0xFF & (byteRead & msbunsetmask));
-                        else // set the msb of subsequent bytes read
-                        removeNfromPreviousName =
+                        } else { // set the msb of subsequent bytes read
+                            removeNfromPreviousName =
                                     (removeNfromPreviousName << 8)
                                             | (0xFF & (byteRead | msbsetmask));
+                        }
                         if ((byteRead & msbsetmask) == 0)
                             msbSet = false; // break if msb is NOT set in the byte
                     }
@@ -283,7 +284,7 @@ public boolean parseResource(ParseContext ctx) {
 
                 // Git does not store entries for directories, but just files/symlinks/Git links, so
                 // no need to handle directories here, unlike with SVN, for instance.
-                if (indexEntryName != null && indexEntryName.length() > 0) {
+                if (indexEntryName != null && !indexEntryName.isEmpty()) {
                     getLogger()
                             .info(
                                     "Found file/symbolic link/gitlink {} in the Git entries file",
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderHtmlFormParser.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderHtmlFormParser.java
@@ -212,7 +212,7 @@ private List<FormAction> processFormActions(
                                     element ->
                                             Objects.equals(
                                                     element.getAttributeValue("form"), targetId))
-                            .collect(Collectors.toList()));
+                            .toList());
         }
 
         if (!formButtonElements.isEmpty()) {
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderHtmlParser.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderHtmlParser.java
@@ -305,7 +305,7 @@ private boolean parseSource(ParseContext ctx, Source source, String baseURL) {
         String basePath = "";
         if (baseUrlElements.length > 3) {
             basePath = baseUrlElements[3];
-            if (basePath.length() > 0) {
+            if (!basePath.isEmpty()) {
                 basePath = "/" + basePath + "/";
             }
         }
@@ -321,7 +321,7 @@ private boolean parseSource(ParseContext ctx, Source source, String baseURL) {
                     if (baseTagSet) {
                         if (foundMatch.charAt(0) == '/'
                                 && foundMatch.indexOf("//") != 0
-                                && (basePath.length() == 0 || !foundMatch.startsWith(basePath))) {
+                                && (basePath.isEmpty() || !foundMatch.startsWith(basePath))) {
                             // Do not trim first slash off if it starts with the basePath
                             // This is to prevent matching text with the same path and then looping
                             // down
diff --git a/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderSvnEntriesParser.java b/addOns/spider/src/main/java/org/zaproxy/addon/spider/parser/SpiderSvnEntriesParser.java
diff --git a/addOns/spider/src/test/java/org/zaproxy/addon/spider/automation/SpiderJobUnitTest.java b/addOns/spider/src/test/java/org/zaproxy/addon/spider/automation/SpiderJobUnitTest.java
diff --git a/addOns/spider/src/test/java/org/zaproxy/addon/spider/parser/SvgHrefParserUnitTest.java b/addOns/spider/src/test/java/org/zaproxy/addon/spider/parser/SvgHrefParserUnitTest.java

Original file line number	Diff line number	Diff line change
`@@ -79,8 +79,8 @@ public Object getValueAt(int rowIndex, int columnIndex) {`
`79`	`79`
`80`	`80`	`@Override`
`81`	`81`	`public void setValueAt(Object aValue, int rowIndex, int columnIndex) {`
`82`		`- if (columnIndex == 0 && aValue instanceof Boolean) {`
`83`		`- domainsInScope.get(rowIndex).setEnabled((Boolean) aValue);`
	`82`	`+ if (columnIndex == 0 && aValue instanceof Boolean val) {`
	`83`	`+ domainsInScope.get(rowIndex).setEnabled(val);`
`84`	`84`	`fireTableCellUpdated(rowIndex, columnIndex);`
`85`	`85`	`}`
`86`	`86`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`
`22`	`22`	`import java.awt.Dimension;`
`23`	`23`	`import java.awt.EventQueue;`
	`24`	`+import java.awt.event.InputEvent;`
`24`	`25`	`import java.awt.event.KeyEvent;`
`25`	`26`	`import java.text.MessageFormat;`
`26`	`27`	`import java.util.ArrayList;`
`@@ -489,8 +490,8 @@ private String createDisplayName(Target target, Object[] customConfigurations) {`
`489`	`490`	`} else if (target.getStartNode() == null) {`
`490`	`491`	`if (customConfigurations != null) {`
`491`	`492`	`for (Object customConfiguration : customConfigurations) {`
`492`		`- if (customConfiguration instanceof URI) {`
`493`		`- return abbreviateDisplayName(((URI) customConfiguration).toString());`
	`493`	`+ if (customConfiguration instanceof URI uri) {`
	`494`	`+ return abbreviateDisplayName(uri.toString());`
`494`	`495`	`}`
`495`	`496`	`}`
`496`	`497`	`}`
`@@ -508,8 +509,8 @@ private String createDisplayName(Target target, Object[] customConfigurations) {`
`508`	`509`	`private HttpPrefixFetchFilter getUriPrefixFecthFilter(Object[] customConfigurations) {`
`509`	`510`	`if (customConfigurations != null) {`
`510`	`511`	`for (Object customConfiguration : customConfigurations) {`
`511`		`- if (customConfiguration instanceof HttpPrefixFetchFilter) {`
`512`		`- return (HttpPrefixFetchFilter) customConfiguration;`
	`512`	`+ if (customConfiguration instanceof HttpPrefixFetchFilter prefixFetchFilter) {`
	`513`	`+ return prefixFetchFilter;`
`513`	`514`	`}`
`514`	`515`	`}`
`515`	`516`	`}`
`@@ -630,8 +631,8 @@ protected String getTargetUriOutOfScope(Target target, Object[] contextSpecificO`
`630`	`631`	`if (node == null) {`
`631`	`632`	`continue;`
`632`	`633`	`}`
`633`		`- if (node instanceof StructuralSiteNode) {`
`634`		`- SiteNode siteNode = ((StructuralSiteNode) node).getSiteNode();`
	`634`	`+ if (node instanceof StructuralSiteNode ssNode) {`
	`635`	`+ SiteNode siteNode = ssNode.getSiteNode();`
`635`	`636`	`if (!siteNode.isIncludedInScope()) {`
`636`	`637`	`return node.getURI().toString();`
`637`	`638`	`}`
`@@ -645,10 +646,10 @@ protected String getTargetUriOutOfScope(Target target, Object[] contextSpecificO`
`645`	`646`	`}`
`646`	`647`	`if (contextSpecificObjects != null) {`
`647`	`648`	`for (Object obj : contextSpecificObjects) {`
`648`		`- if (obj instanceof URI) {`
`649`		`- String uri = ((URI) obj).toString();`
`650`		`- if (!isTargetUriInScope(uri)) {`
`651`		`- return uri;`
	`649`	`+ if (obj instanceof URI uri) {`
	`650`	`+ String uriStr = uri.toString();`
	`651`	`+ if (!isTargetUriInScope(uriStr)) {`
	`652`	`+ return uriStr;`
`652`	`653`	`}`
`653`	`654`	`}`
`654`	`655`	`}`
`@@ -758,7 +759,7 @@ private ZapMenuItem getMenuItemCustomScan() {`
`758`	`759`	`"menu.tools.spider",`
`759`	`760`	`getView()`
`760`	`761`	`.getMenuShortcutKeyStroke(`
`761`		`- KeyEvent.VK_S, KeyEvent.ALT_DOWN_MASK, false));`
	`762`	`+ KeyEvent.VK_S, InputEvent.ALT_DOWN_MASK, false));`
`762`	`763`	`menuItemCustomScan.setEnabled(Control.getSingleton().getMode() != Mode.safe);`
`763`	`764`
`764`	`765`	`menuItemCustomScan.addActionListener(e -> showSpiderDialog((Target) null));`
Original file line number	Diff line number	Diff line change
`@@ -390,11 +390,7 @@ private JCheckBox getChkProcessForm() {`
`390`	`390`	`new ChangeListener() {`
`391`	`391`	`@Override`
`392`	`392`	`public void stateChanged(ChangeEvent ev) {`
`393`		`- if (chkProcessForm.isSelected()) {`
`394`		`- chkPostForm.setEnabled(true);`
`395`		`- } else {`
`396`		`- chkPostForm.setEnabled(false);`
`397`		`- }`
	`393`	`+ chkPostForm.setEnabled(chkProcessForm.isSelected());`
`398`	`394`	`}`
`399`	`395`	`});`
`400`	`396`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public void init(Target target) {`
`151`	`151`	`this.addCheckBoxField(1, FIELD_LOGOUT_AVOIDANCE, getSpiderParam().isLogoutAvoidance());`
`152`	`152`	`this.addPadding(1);`
`153`	`153`
`154`		`- if (!getBoolValue(FIELD_PROCESS_FORMS)) {`
	`154`	`+ if (!getBoolValue(FIELD_PROCESS_FORMS).booleanValue()) {`
`155`	`155`	`setFieldValue(FIELD_POST_FORMS, false);`
`156`	`156`	`getField(FIELD_POST_FORMS).setEnabled(false);`
`157`	`157`	`}`
`@@ -169,7 +169,7 @@ public void actionPerformed(ActionEvent e) {`
`169`	`169`	`new ActionListener() {`
`170`	`170`	`@Override`
`171`	`171`	`public void actionPerformed(ActionEvent e) {`
`172`		`- if (getBoolValue(FIELD_PROCESS_FORMS)) {`
	`172`	`+ if (getBoolValue(FIELD_PROCESS_FORMS).booleanValue()) {`
`173`	`173`	`getField(FIELD_POST_FORMS).setEnabled(true);`
`174`	`174`	`} else {`
`175`	`175`	`setFieldValue(FIELD_POST_FORMS, false);`
`@@ -238,7 +238,7 @@ public void targetSelected(String field, Target node) {`
`238`	`238`	`}`
`239`	`239`	`}`
`240`	`240`	`this.setComboFields(FIELD_CONTEXT, ctxNames, "");`
`241`		`- this.getField(FIELD_CONTEXT).setEnabled(ctxNames.size() > 0);`
	`241`	`+ this.getField(FIELD_CONTEXT).setEnabled(!ctxNames.isEmpty());`
`242`	`242`	`}`
`243`	`243`
`244`	`244`	`private Context getSelectedContext() {`
`@@ -325,7 +325,7 @@ public void save() {`
`325`	`325`	`} catch (Exception e1) {`
`326`	`326`	`// Ignore - will have been checked in validateParams`
`327`	`327`	`}`
`328`		`- if (this.getBoolValue(FIELD_ADVANCED)) {`
	`328`	`+ if (this.getBoolValue(FIELD_ADVANCED).booleanValue()) {`
`329`	`329`	`// Set the advanced options`
`330`	`330`	`spiderParam.setMaxDepth(this.getIntValue(FIELD_MAX_DEPTH));`
`331`	`331`	`spiderParam.setMaxDuration(this.getIntValue(FIELD_MAX_DURATION));`
`@@ -351,7 +351,7 @@ public void save() {`
`351`	`351`	`if (startUri != null) {`
`352`	`352`	`contextSpecificObjects.add(startUri);`
`353`	`353`
`354`		`- if (getBoolValue(FIELD_SUBTREE_ONLY)) {`
	`354`	`+ if (getBoolValue(FIELD_SUBTREE_ONLY).booleanValue()) {`
`355`	`355`	`contextSpecificObjects.add(new HttpPrefixFetchFilter(startUri));`
`356`	`356`	`}`
`357`	`357`	`}`
`@@ -428,7 +428,7 @@ public String validateFields() {`
`428`	`428`	`}`
`429`	`429`	`}`
`430`	`430`
`431`		`- if (getBoolValue(FIELD_SUBTREE_ONLY) && noStartUri) {`
	`431`	`+ if (getBoolValue(FIELD_SUBTREE_ONLY).booleanValue() && noStartUri) {`
`432`	`432`	`return Constant.messages.getString("spider.custom.noStartSubtreeOnly.error");`
`433`	`433`	`}`
`434`	`434`
Original file line number	Diff line number	Diff line change
`@@ -149,12 +149,8 @@ private ProcessedCellItem getProcessedCellItem(boolean processed, String reasonN`
`149`	`149`	`if (processed) {`
`150`	`150`	`return SUCCESSFULLY_PROCESSED_CELL_ITEM;`
`151`	`151`	`}`
`152`		`- ProcessedCellItem processedCellItem = cacheProcessedCellItems.get(reasonNotProcessed);`
`153`		`- if (processedCellItem == null) {`
`154`		`- processedCellItem = new ProcessedCellItem(processed, reasonNotProcessed);`
`155`		`- cacheProcessedCellItems.put(reasonNotProcessed, processedCellItem);`
`156`		`- }`
`157`		`- return processedCellItem;`
	`152`	`+ return cacheProcessedCellItems.computeIfAbsent(`
	`153`	`+ reasonNotProcessed, k -> new ProcessedCellItem(processed, k));`
`158`	`154`	`}`
`159`	`155`
`160`	`156`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ public SpiderTask(Spider parent, SpiderResourceFound resourceFound, URI uri) {`
`117`	`117`	`if (resourceFound.getMessage() != null`
`118`	`118`	`&& parent.getSpiderParam().isSendRefererHeader()) {`
`119`	`119`	`requestHeader.setHeader(`
`120`		`- HttpRequestHeader.REFERER,`
	`120`	`+ HttpHeader.REFERER,`
`121`	`121`	`resourceFound.getMessage().getRequestHeader().getURI().toString());`
`122`	`122`	`}`
`123`	`123`	`HttpMessage msg = new HttpMessage(requestHeader);`