From f6945ef7fb60d8f1e3139d2f9bed0a2ed590d6dc Mon Sep 17 00:00:00 2001 From: Jacopo Cappellato Date: Tue, 27 Oct 2026 12:40:42 +0100 Subject: [PATCH] Prune unused code --- .../ofbiz/passport/util/PassportUtil.java | 18 ------------------ .../ofbiz/htmlreport/AbstractHtmlReport.java | 1 - .../ofbiz/pricat/AbstractPricatParser.java | 9 --------- 3 files changed, 28 deletions(-) diff --git a/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java b/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java index 68faaf97d..96d675469 100644 --- a/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java +++ b/passport/src/main/java/org/apache/ofbiz/passport/util/PassportUtil.java @@ -29,24 +29,6 @@ public class PassportUtil { private static final String MODULE = PassportUtil.class.getName(); - private static final String CLIENT_ID_LABEL = "ClientId"; - private static final String SECRET_LABEL = "Secret"; - private static final String TOKEN_END_POINT_LABEL = "TokenEndpoint"; - private static final String GRANT_TYPE_LABEL = "grantType"; - private static final String CONTENT_TYPE_LABEL = "contentType"; - private static final String USER_PROFILE_URL_LABEL = "UserProfileUrl"; - private static final String GRANT_TYPE_PARAM = "grant_type"; - private static final String CONTENT_TYPE_PARAM = "Content-Type"; - private static final String APPLICATION_JSON = "application/json"; - private static final String RESTAPI_END_POINT_LABEL = "RESTApiEndpoint"; - private static final String COMMON_SCOPE = "scope"; - private static final String AUTHOR_CODE_GRANT_TYPE = "authorization_code"; - private static final String API_ID_LABEL = "apiId"; - private static final String APP_KEY_LABEL = "appKey"; - private static final String APP_SECRET_LABEL = "appSecret"; - private static final String APP_ID_LABEL = "appId"; - private static final String COMMON_APP_KEY = "AppKey"; - private static final String COMMON_APP_SECRET = "AppSecret"; // TODO: Following should be made private public static final String COMMON_CLIENT_SECRET = "clientSecret"; diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java index 4d03fdb7f..9756f2a3c 100644 --- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java +++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java @@ -29,7 +29,6 @@ */ public abstract class AbstractHtmlReport extends HtmlReport { - private static final String MODULE = AbstractHtmlReport.class.getName(); public static final String THREAD_TYPE = "thread_type"; public static final String FILE_REPORT_OUTPUT = "plugins/pricat/template/pricat/report.ftl"; 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 575a56ba4..b89b08cd9 100644 --- a/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java +++ b/pricat/src/main/java/org/apache/ofbiz/pricat/AbstractPricatParser.java @@ -30,7 +30,6 @@ import java.util.Map; import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpSession; import org.apache.commons.fileupload.FileItem; import org.apache.ofbiz.base.util.Debug; @@ -78,22 +77,17 @@ public abstract class AbstractPricatParser implements InterfacePricatParser { private static final String MODULE = AbstractPricatParser.class.getName(); - private LocalDispatcher dispatcher; private Delegator delegator; private List fileItems; private File pricatFile; private String userLoginId; - private GenericValue userLogin; private String pricatFileVersion; private String currencyId; private Map errorMessages = new HashMap<>(); private HSSFDataFormatter formatter = new HSSFDataFormatter(); private Map facilities = new HashMap<>(); - private HttpSession session; private List basicCategoryConds; private List basicBrandConds; - private String selectedPricatType = DEFAULT_PRICAT_TYPE; - private String selectedFacilityId; private InterfaceReport report; private Locale locale; private long sequenceNum = -1L; @@ -257,11 +251,9 @@ public Locale getLocale() { public AbstractPricatParser(LocalDispatcher dispatcher, Delegator delegator, Locale locale, InterfaceReport report, Map facilities, File pricatFile, GenericValue userLogin) { - this.dispatcher = dispatcher; this.delegator = delegator; this.locale = locale; this.report = report; - this.userLogin = userLogin; if (UtilValidate.isNotEmpty(userLogin)) { this.userLoginId = userLogin.getString("userLoginId"); } @@ -687,7 +679,6 @@ public List getCellContents(XSSFRow row, List colNames, int si @Override public void setFacilityId(String selectedFacilityId) { - this.selectedFacilityId = selectedFacilityId; } /**