Improved: Make data members of class as private and added accessor methods for the same, also corrected occurences of the same in plugins component.

(OFBIZ-11963)
Also made some related checkstyle code enhancements. Thanks Jacques for review.
This commit is contained in:
Suraj Khurana
2020-09-12 11:57:19 +05:30
parent 94e77248e5
commit f21eda4542
5 changed files with 10 additions and 12 deletions
@@ -31,8 +31,7 @@ import org.apache.ofbiz.base.util.Debug;
public class ViewerServletRequest extends HttpServletRequestWrapper {
private static final String MODULE = ViewerServletRequest.class.getName();
protected String originalReportParam = null;
private String originalReportParam = null;
public ViewerServletRequest(String originalReportParam, HttpServletRequest request) {
super(request);
@@ -53,8 +53,7 @@ public class BirtViewHandler implements ViewHandler {
private static final String MODULE = BirtViewHandler.class.getName();
private static final String RES_ERROR = "BirtErrorUiLabels";
protected ServletContext servletContext = null;
private ServletContext servletContext = null;
private String name = "birt";
@@ -103,7 +102,7 @@ public class BirtViewHandler implements ViewHandler {
Map<String, Object> context = new HashMap<>();
// set parameters from request
Map<String, Object> parameters = UtilGenerics.cast(request.getAttribute(BirtWorker.getBirtParameters()));
Map<String, Object> parameters = UtilGenerics.cast(request.getAttribute(BirtWorker.getBirtParameters()));
if (parameters != null) {
context.put(BirtWorker.getBirtParameters(), parameters);
} else {
@@ -94,7 +94,7 @@ public final class OFBizActiveDirectoryAuthenticationHandler extends AbstractOFB
attribute = LdapUtils.getFilterWithValues(attribute, username);
NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
// Filter expression
"(&(" + filter + ") (" + attribute +"))",
"(&(" + filter + ") (" + attribute + "))",
controls);
if (answer.hasMoreElements()) {
result = answer.next();
@@ -79,7 +79,7 @@ public final class OFBizLdapAuthenticationHandler extends AbstractOFBizAuthentic
attribute = LdapUtils.getFilterWithValues(attribute, username);
NamingEnumeration<SearchResult> answer = ctx.search(baseDN,
// Filter expression
"(&(" + filter + ") (" + attribute +"))",
"(&(" + filter + ") (" + attribute + "))",
controls);
if (answer.hasMoreElements()) {
result = answer.next();
@@ -52,7 +52,7 @@ public class SolrTests extends OFBizTestCase {
*/
public void testAddProductToIndex() throws Exception {
GenericValue product = EntityQuery.use(delegator).from("Product").where("productId", validTestProductId).queryOne();
GenericValue product = EntityQuery.use(getDelegator()).from("Product").where("productId", validTestProductId).queryOne();
Map<String, Object> ctx = new HashMap<>();
ctx.put("instance", product);
@@ -117,8 +117,8 @@ public class SolrTests extends OFBizTestCase {
List<Map<String, Object>> products = new ArrayList<>();
Map<String, Object> product1 = new HashMap<>();
Map<String, Object> product2 = new HashMap<>();
GenericValue validTestProduct = EntityQuery.use(delegator).from("Product").where("productId", validTestProductId).queryOne();
GenericValue validTestProduct2 = EntityQuery.use(delegator).from("Product").where("productId", validTestProductId2).queryOne();
GenericValue validTestProduct = EntityQuery.use(getDelegator()).from("Product").where("productId", validTestProductId).queryOne();
GenericValue validTestProduct2 = EntityQuery.use(getDelegator()).from("Product").where("productId", validTestProductId2).queryOne();
product1.put("productId", validTestProduct);
product2.put("productId", validTestProduct2);
@@ -145,8 +145,8 @@ public class SolrTests extends OFBizTestCase {
List<Map<String, Object>> products = new ArrayList<>();
Map<String, Object> product1 = new HashMap<>();
Map<String, Object> product2 = new HashMap<>();
GenericValue testProduct = EntityQuery.use(delegator).from("Product").where("productId", validTestProductId).queryOne();
GenericValue testProduct2 = EntityQuery.use(delegator).from("Product").where("productId", validTestProductId2).queryOne();
GenericValue testProduct = EntityQuery.use(getDelegator()).from("Product").where("productId", validTestProductId).queryOne();
GenericValue testProduct2 = EntityQuery.use(getDelegator()).from("Product").where("productId", validTestProductId2).queryOne();
testProduct.replace("productId", invalidTestProductId);
testProduct.replace("productId", invalidTestProductId);