This is an automated email from the ASF dual-hosted git repository.
mridulpathak pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6c6c27710 Remove this-escape warnings in the pricat report threads,
reports and parser
6c6c27710 is described below
commit 6c6c27710443de03e9247605d33a2e2f5bc3d1e2
Author: Mridul Pathak <[email protected]>
AuthorDate: Fri Oct 30 18:58:44 2026 +0530
Remove this-escape warnings in the pricat report threads, reports and parser
---
.../apache/ofbiz/htmlreport/AbstractReport.java | 17 +++++++++++++
.../ofbiz/htmlreport/AbstractReportThread.java | 29 ++++++++++++++++------
.../org/apache/ofbiz/htmlreport/HtmlReport.java | 3 +--
.../ofbiz/htmlreport/sample/SampleHtmlThread.java | 2 +-
.../apache/ofbiz/pricat/AbstractPricatParser.java | 6 ++++-
.../ofbiz/pricat/PricatParseExcelHtmlThread.java | 2 +-
6 files changed, 47 insertions(+), 12 deletions(-)
diff --git
a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
index c6070d3a4..5bec3286f 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReport.java
@@ -52,6 +52,23 @@ public abstract class AbstractReport implements
InterfaceReport {
private static final long SECONDS = 1000;
public static final String SESSION_REPORT_CLASS = "OFBIZ_HTML_REPORT";
+ /**
+ * Constructs a report whose member variables are set later by {@link
#init(Locale)}.
+ */
+ protected AbstractReport() {
+ }
+
+ /**
+ * Constructs a report and initializes its member variables.
+ *
+ * @param locale the locale for this report
+ */
+ protected AbstractReport(Locale locale) {
+ startTime = System.currentTimeMillis();
+ this.locale = locale;
+ errors = new ArrayList<>();
+ }
+
@Override
public void addError(Object obj) {
errors.add(obj);
diff --git
a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
index 5be47a9f4..a0a0c97bf 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractReportThread.java
@@ -49,20 +49,35 @@ public abstract class AbstractReportThread extends Thread
implements InterfaceRe
* Constructs a new report Thread with the given name.
*/
protected AbstractReportThread(HttpServletRequest request,
HttpServletResponse response, String name) {
+ this(request, name, generateUUID());
+ }
- super(Thread.currentThread().getThreadGroup(), name);
- // report Threads are never daemon Threads
- setDaemon(false);
- // the session must not be updated when it is used in a report
- EthernetAddress ethernetAddress =
UUIDGenerator.getInstance().getDummyAddress();
- uuid =
UUIDGenerator.getInstance().generateTimeBasedUUID(ethernetAddress);
- setName(name + " [" + uuid.toString() + "]");
+ private AbstractReportThread(HttpServletRequest request, String name, UUID
uuid) {
+ super(Thread.currentThread().getThreadGroup(), name + " [" +
uuid.toString() + "]");
+ this.uuid = uuid;
// new Threads are not doomed
doomed = false;
// set start time
startTime = System.currentTimeMillis();
locale = UtilHttp.getLocale(request);
}
+
+ private static UUID generateUUID() {
+ // the session must not be updated when it is used in a report
+ EthernetAddress ethernetAddress =
UUIDGenerator.getInstance().getDummyAddress();
+ return
UUIDGenerator.getInstance().generateTimeBasedUUID(ethernetAddress);
+ }
+
+ /**
+ * Starts this report Thread as a non-daemon Thread.
+ */
+ @Override
+ public void start() {
+ // report Threads are never daemon Threads
+ setDaemon(false);
+ super.start();
+ }
+
@Override
public UUID getUUID() {
return uuid;
diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
index 23ea61722..03d9a1f05 100644
--- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
+++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java
@@ -187,8 +187,7 @@ public class HtmlReport extends AbstractReport {
* @param isTransient If set to <code>true</code> nothing is kept in memory
*/
public HtmlReport(HttpServletRequest request, HttpServletResponse
response, boolean writeHtml, boolean isTransient) {
-
- init(UtilHttp.getLocale(request));
+ super(UtilHttp.getLocale(request));
content = new ArrayList<>(256);
logContent = new ArrayList<>(256);
showExceptionStackTrace = true;
diff --git
a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
index 7e3ffdf5e..918b145cc 100644
---
a/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
+++
b/pricat/src/main/java/org/apache/ofbiz/htmlreport/sample/SampleHtmlThread.java
@@ -34,7 +34,7 @@ import org.apache.ofbiz.htmlreport.InterfaceReport;
/**
* Thread for running sample html report.
*/
-public class SampleHtmlThread extends AbstractReportThread {
+public final class SampleHtmlThread extends AbstractReportThread {
public static final String COUNT_DOWN = "countdown";
public static final String COUNT_UP = "countup";
diff --git
a/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
b/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
index b89b08cd9..83b4e6946 100644
--- a/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
+++ b/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java
@@ -259,7 +259,7 @@ public abstract class AbstractPricatParser implements
InterfacePricatParser {
}
this.facilities = facilities;
this.pricatFile = pricatFile;
- initBasicConds(UtilMisc.toList(userLogin.getString("partyId")));
+ setBasicConds(UtilMisc.toList(userLogin.getString("partyId")));
}
/**
@@ -499,6 +499,10 @@ public abstract class AbstractPricatParser implements
InterfacePricatParser {
@Override
public void initBasicConds(List<String> orgPartyIds) {
+ setBasicConds(orgPartyIds);
+ }
+
+ private void setBasicConds(List<String> orgPartyIds) {
basicCategoryConds = new ArrayList<>();
basicCategoryConds.add(EntityCondition.makeCondition("isPublic", "N"));
//basicCategoryConds.add(EntityCondition.makeCondition("isDefault",
"Y"));
diff --git
a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
index 7a765994c..2a3ee6faa 100644
---
a/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
+++
b/pricat/src/main/java/org/apache/ofbiz/pricat/PricatParseExcelHtmlThread.java
@@ -65,7 +65,7 @@ import org.apache.ofbiz.service.LocalDispatcher;
/**
* Thread for running pricat import excel html report.
*/
-public class PricatParseExcelHtmlThread extends AbstractReportThread {
+public final class PricatParseExcelHtmlThread extends AbstractReportThread {
public static final String PARSE_EXCEL = "parse_excel";
public static final String CONFIRM = "confirm_action";
