Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<FileItem> fileItems;
private File pricatFile;
private String userLoginId;
private GenericValue userLogin;
private String pricatFileVersion;
private String currencyId;
private Map<CellReference, String> errorMessages = new HashMap<>();
private HSSFDataFormatter formatter = new HSSFDataFormatter();
private Map<String, String[]> facilities = new HashMap<>();
private HttpSession session;
private List<EntityCondition> basicCategoryConds;
private List<EntityCondition> basicBrandConds;
private String selectedPricatType = DEFAULT_PRICAT_TYPE;
private String selectedFacilityId;
private InterfaceReport report;
private Locale locale;
private long sequenceNum = -1L;
Expand Down Expand Up @@ -257,11 +251,9 @@ public Locale getLocale() {

public AbstractPricatParser(LocalDispatcher dispatcher, Delegator delegator, Locale locale, InterfaceReport report,
Map<String, String[]> 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");
}
Expand Down Expand Up @@ -687,7 +679,6 @@ public List<Object> getCellContents(XSSFRow row, List<Object[]> colNames, int si

@Override
public void setFacilityId(String selectedFacilityId) {
this.selectedFacilityId = selectedFacilityId;
}

/**
Expand Down