This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new ce2d4177dc Improved: Clean code according to SpotBugs in Eclipse
(OFBIZ-12912)
ce2d4177dc is described below
commit ce2d4177dcd8fedc9877e2c561fa3cfad3be4658
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Sun Feb 25 11:29:38 2024 +0100
Improved: Clean code according to SpotBugs in Eclipse (OFBIZ-12912)
FlexibleServletAccessor::equals
removes useless "this."
removes useless check if not String since check on
flexibleServletAccessor is
already done, if not OK simply returns false
ConfigXMLReader
removes not used viewMap and getViewMap()
CommonWidgetModels::Link
Fixes a possible NPE
ModelForm::UpdateArea
Fixes a possible NPE
Adds 3 false positives to spotbugs/exclude.xml
---
.../util/collections/FlexibleServletAccessor.java | 16 ++++++----------
.../apache/ofbiz/webapp/control/ConfigXMLReader.java | 9 ---------
.../apache/ofbiz/widget/model/CommonWidgetModels.java | 2 +-
.../java/org/apache/ofbiz/widget/model/ModelForm.java | 2 +-
spotbugs/exclude.xml | 19 ++++++++++++++++++-
5 files changed, 26 insertions(+), 22 deletions(-)
diff --git
a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
index 368784d63e..57de8a2411 100644
---
a/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
+++
b/framework/base/src/main/java/org/apache/ofbiz/base/util/collections/FlexibleServletAccessor.java
@@ -183,20 +183,16 @@ public class FlexibleServletAccessor<T> implements
Serializable {
if (obj == null) {
return false;
}
- if (obj instanceof FlexibleServletAccessor<?>) {
+ if (!(obj instanceof FlexibleServletAccessor<?>)) {
+ return false;
+ }
+ else {
FlexibleServletAccessor<?> flexibleServletAccessor =
(FlexibleServletAccessor<?>) obj;
- if (this.name == null) {
+ if (name == null) {
return flexibleServletAccessor.name == null;
}
- return this.name.equals(flexibleServletAccessor.name);
- }
- if (this.name == null) {
- return obj == null;
- }
- if (!(obj instanceof String)) {
- return false;
+ return name.equals(flexibleServletAccessor.name);
}
- return this.name.equals(obj);
}
/** To be used for a string representation of the accessor, returns the
original name.
diff --git
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
index a531fe6e3c..1ed0a0a8cd 100644
---
a/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
+++
b/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ConfigXMLReader.java
@@ -1034,7 +1034,6 @@ public final class ConfigXMLReader {
}
public static class ViewMap {
- private String viewMap;
private String name;
private String page;
private String type;
@@ -1129,14 +1128,6 @@ public final class ConfigXMLReader {
return encoding;
}
- /**
- * Gets viewMap.
- * @return the viewMap
- */
- public String getViewMap() {
- return viewMap;
- }
-
public ViewMap(Element viewMapElement) {
this.name = viewMapElement.getAttribute("name");
this.page = viewMapElement.getAttribute("page");
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
index 83143ba170..a399979f6f 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/CommonWidgetModels.java
@@ -399,7 +399,7 @@ public final class CommonWidgetModels {
&& formElement.getLocalName() != "form") {
formElement = formElement.getParentNode();
}
- if (formElement.getLocalName() != null) {
+ if (formElement != null && formElement.getLocalName() != null)
{
parameterList.add(new Parameter("_FORM_NAME_", ((Element)
formElement).getAttribute("name") + "_AS_PARAM_", false));
}
}
diff --git
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
index 37a9add126..6583363cc7 100644
---
a/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
+++
b/framework/widget/src/main/java/org/apache/ofbiz/widget/model/ModelForm.java
@@ -2322,7 +2322,7 @@ public abstract class ModelForm extends ModelWidget {
&& formElement.getLocalName() != "form") {
formElement = formElement.getParentNode();
}
- if (formElement.getLocalName() != null) {
+ if (formElement != null && formElement.getLocalName() != null)
{
parameterList.add(new
CommonWidgetModels.Parameter("_FORM_NAME_", ((Element)
formElement).getAttribute("name") + "_AS_PARAM_",
false));
}
diff --git a/spotbugs/exclude.xml b/spotbugs/exclude.xml
index aadcb90afd..a338b4c823 100644
--- a/spotbugs/exclude.xml
+++ b/spotbugs/exclude.xml
@@ -174,5 +174,22 @@ under the License.
<Field name="baseUrl" />
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
</Match>
-<!-- ^ ^ not a problem, false positives -->
+ <Match>
+ <!-- not a problem, as specified in org.jsoup.nodes.Element : @param
attributes initial attributes (optional, may be null) -->
+ <Class name="org.apache.ofbiz.widget.WidgetWorker" />
+ <Method name="makeHiddenFormLinkFormElement" />
+ <Bug pattern="NP_NONNULL_PARAM_VIOLATION" />
+ </Match>
+ <Match>
+ <!-- not a problem, the alert is right in SecuredUpload. But isValidText
is also called in other situations where no dereferencing is done) -->
+ <Class name="org.apache.ofbiz.security.SecuredUpload" />
+ <Method name="isValidText" />
+ <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE" />
+ </Match>
+ <Match>
+ <!-- not a problem, we check before for a Collection. Could be also a List
or a Set, we cant to be sure it's a Map-->
+ <Class name="org.apache.ofbiz.base.util.collections.GenericMapValues" />
+ <Method name="equals" />
+ <Bug pattern="EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS" />
+ </Match><!-- ^ ^ not a problem, false positives -->
</FindBugsFilter>
