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 87f9981 Improved: Handle remaining checkstyle errors (OFBIZ-12169)
87f9981 is described below
commit 87f9981f713df21ce4f206ecd266d9243243343e
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sun Oct 17 10:48:24 2021 +0200
Improved: Handle remaining checkstyle errors (OFBIZ-12169)
Fixes wrong methods names in EntityFunction class
---
.../accounting/payment/PaymentGatewayServices.java | 4 +-
.../entry/cart/LookupBulkAddProducts.groovy | 2 +-
.../cart/LookupBulkAddSupplierProducts.groovy | 2 +-
.../ofbiz/order/shoppingcart/CheckOutHelper.java | 8 +-
.../apache/ofbiz/party/party/PartyServices.java | 180 ++++++++++-----------
.../org/apache/ofbiz/party/party/PartyWorker.java | 2 +-
.../workeffort/workeffort/WorkEffortSearch.java | 4 +-
build.gradle | 2 +-
.../groovyScripts/FindAutocompleteOptions.groovy | 2 +-
.../java/org/apache/ofbiz/common/FindServices.java | 2 +-
.../apache/ofbiz/common/login/LoginServices.java | 4 +-
.../ofbiz/entity/condition/EntityFunction.java | 18 +--
.../apache/ofbiz/entity/condition/OrderByItem.java | 4 +-
.../ofbiz/entity/finder/EntityFinderUtil.java | 8 +-
.../apache/ofbiz/entity/model/ModelViewEntity.java | 4 +-
15 files changed, 123 insertions(+), 123 deletions(-)
diff --git
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
index 4aa7e4a..8a0316b 100644
---
a/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
+++
b/applications/accounting/src/main/java/org/apache/ofbiz/accounting/payment/PaymentGatewayServices.java
@@ -2780,8 +2780,8 @@ public class PaymentGatewayServices {
List<GenericValue> transactions =
orderPaymentPreference.getRelated("PaymentGatewayResponse", null, order, false);
List<EntityExpr> exprs = UtilMisc.toList(
EntityCondition.makeCondition("paymentServiceTypeEnumId",
EntityOperator.EQUALS, CAPTURE_SERVICE_TYPE),
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("referenceNum"),
EntityComparisonOperator.NOT_EQUAL,
- EntityFunction.UPPER("ERROR")));
+
EntityCondition.makeCondition(EntityFunction.upperField("referenceNum"),
EntityComparisonOperator.NOT_EQUAL,
+ EntityFunction.upper("ERROR")));
List<GenericValue> capTransactions =
EntityUtil.filterByAnd(transactions, exprs);
capTrans = EntityUtil.getFirst(capTransactions);
} catch (GenericEntityException e) {
diff --git
a/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy
b/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy
index 88542e9..3f67bdb 100644
--- a/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy
+++ b/applications/order/groovyScripts/entry/cart/LookupBulkAddProducts.groovy
@@ -30,7 +30,7 @@ mainConditionList = []
if (productId) {
//make sure the look up is case insensitive
-
conditionList.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue("productId")),
+
conditionList.add(EntityCondition.makeCondition(EntityFunction.upper(EntityFieldValue.makeFieldValue("productId")),
EntityOperator.LIKE, productId.toUpperCase() + "%"))
}
diff --git
a/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy
b/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy
index e035ec7..199ce84 100644
---
a/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy
+++
b/applications/order/groovyScripts/entry/cart/LookupBulkAddSupplierProducts.groovy
@@ -62,7 +62,7 @@ conditionList = []
if (productId) {
// make sure the look up is case insensitive
-
conditionList.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue("productId")),
+
conditionList.add(EntityCondition.makeCondition(EntityFunction.upper(EntityFieldValue.makeFieldValue("productId")),
EntityOperator.LIKE,
productId.toUpperCase() + "%"))
}
if (!supplier) {
diff --git
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
index c031b07..2789302 100644
---
a/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
+++
b/applications/order/src/main/java/org/apache/ofbiz/order/shoppingcart/CheckOutHelper.java
@@ -1392,8 +1392,8 @@ public class CheckOutHelper {
String shippingAddress =
UtilFormatOut.checkNull(shippingAddressObj.getString("address1")).toUpperCase(Locale.getDefault());
shippingAddress = UtilFormatOut.makeSqlSafe(shippingAddress);
List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition(
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("denylistString"),
EntityOperator.EQUALS,
- EntityFunction.UPPER(shippingAddress)),
+
EntityCondition.makeCondition(EntityFunction.upperField("denylistString"),
EntityOperator.EQUALS,
+ EntityFunction.upper(shippingAddress)),
EntityOperator.AND,
EntityCondition.makeCondition("orderDenylistTypeId",
EntityOperator.EQUALS, "DENYLIST_ADDRESS")));
String errMsg = null;
@@ -1423,8 +1423,8 @@ public class CheckOutHelper {
String address =
UtilFormatOut.checkNull(billingAddress.getString("address1").toUpperCase(Locale.getDefault()));
address = UtilFormatOut.makeSqlSafe(address);
exprs.add(EntityCondition.makeCondition(
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("denylistString"),
EntityOperator.EQUALS,
- EntityFunction.UPPER(address)),
+
EntityCondition.makeCondition(EntityFunction.upperField("denylistString"),
EntityOperator.EQUALS,
+ EntityFunction.upper(address)),
EntityOperator.AND,
EntityCondition.makeCondition("orderDenylistTypeId", EntityOperator.EQUALS,
"DENYLIST_ADDRESS")));
}
diff --git
a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
index 8e44a20c..f731dcb 100644
---
a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
+++
b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyServices.java
@@ -727,8 +727,8 @@ public class PartyServices {
try {
List<GenericValue> c =
EntityQuery.use(delegator).from("PartyAndContactMech")
-
.where(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("infoString"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(email.toUpperCase(Locale.getDefault()))))
+
.where(EntityCondition.makeCondition(EntityFunction.upperField("infoString"),
+ EntityOperator.EQUALS,
EntityFunction.upper(email.toUpperCase(Locale.getDefault()))))
.orderBy("infoString").filterByDate().queryList();
if (Debug.verboseOn()) {
@@ -770,8 +770,8 @@ public class PartyServices {
try {
List<GenericValue> c =
EntityQuery.use(delegator).from("PartyAndContactMech")
-
.where(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("infoString"),
EntityOperator.LIKE,
- EntityFunction.UPPER(("%" +
email.toUpperCase(Locale.getDefault())) + "%")))
+
.where(EntityCondition.makeCondition(EntityFunction.upperField("infoString"),
EntityOperator.LIKE,
+ EntityFunction.upper(("%" +
email.toUpperCase(Locale.getDefault())) + "%")))
.orderBy("infoString").filterByDate().queryList();
if (Debug.verboseOn()) {
@@ -820,8 +820,8 @@ public class PartyServices {
try {
Collection<GenericValue> ulc =
EntityQuery.use(delegator).from("PartyAndUserLogin")
-
.where(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("userLoginId"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" +
userLoginId.toUpperCase(Locale.getDefault()) +
"%"))).orderBy("userLoginId").queryList();
+
.where(EntityCondition.makeCondition(EntityFunction.upperField("userLoginId"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" +
userLoginId.toUpperCase(Locale.getDefault()) +
"%"))).orderBy("userLoginId").queryList();
if (Debug.verboseOn()) {
Debug.logVerbose("Collection: " + ulc, MODULE);
@@ -874,10 +874,10 @@ public class PartyServices {
try {
EntityConditionList<EntityExpr> ecl =
EntityCondition.makeCondition(EntityOperator.AND,
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("firstName"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" +
firstName.toUpperCase(Locale.getDefault()) + "%")),
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("lastName"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" +
lastName.toUpperCase(Locale.getDefault()) + "%")));
+
EntityCondition.makeCondition(EntityFunction.upperField("firstName"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" +
firstName.toUpperCase(Locale.getDefault()) + "%")),
+
EntityCondition.makeCondition(EntityFunction.upperField("lastName"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" +
lastName.toUpperCase(Locale.getDefault()) + "%")));
Collection<GenericValue> pc =
EntityQuery.use(delegator).from("Person").where(ecl).orderBy("lastName",
"firstName", "partyId")
.queryList();
@@ -923,8 +923,8 @@ public class PartyServices {
try {
Collection<GenericValue> pc =
EntityQuery.use(delegator).from("PartyGroup")
-
.where(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("groupName"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" +
groupName.toUpperCase(Locale.getDefault()) + "%")))
+
.where(EntityCondition.makeCondition(EntityFunction.upperField("groupName"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" +
groupName.toUpperCase(Locale.getDefault()) + "%")))
.orderBy("groupName", "partyId")
.queryList();
@@ -965,8 +965,8 @@ public class PartyServices {
try {
parties = EntityQuery.use(delegator).from("Party")
-
.where(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("externalId"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(externalId)))
+
.where(EntityCondition.makeCondition(EntityFunction.upperField("externalId"),
+ EntityOperator.EQUALS,
EntityFunction.upper(externalId)))
.orderBy("externalId", "partyId")
.queryList();
} catch (GenericEntityException e) {
@@ -1150,8 +1150,8 @@ public class PartyServices {
if (UtilValidate.isEmpty(ownerPartyIds)) {
String partyIdFrom = userLogin.getString("partyId");
paramList = paramList + "&partyIdFrom=" + partyIdFrom;
- relationshipCond =
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyIdFrom"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(partyIdFrom));
+ relationshipCond =
EntityCondition.makeCondition(EntityFunction.upperField("partyIdFrom"),
+ EntityOperator.EQUALS,
EntityFunction.upper(partyIdFrom));
} else {
relationshipCond =
EntityCondition.makeCondition("partyIdFrom", EntityOperator.IN, ownerPartyIds);
}
@@ -1159,8 +1159,8 @@ public class PartyServices {
// add the expr
andExprs.add(EntityCondition.makeCondition(
relationshipCond, EntityOperator.AND,
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyRelationshipTypeId"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(partyRelationshipTypeId))));
+
EntityCondition.makeCondition(EntityFunction.upperField("partyRelationshipTypeId"),
+ EntityOperator.EQUALS,
EntityFunction.upper(partyRelationshipTypeId))));
fieldsToSelect.add("partyIdTo");
}
@@ -1176,8 +1176,8 @@ public class PartyServices {
// check for a partyId
if (UtilValidate.isNotEmpty(partyId)) {
paramList = paramList + "&partyId=" + partyId;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyId"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
partyId + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("partyId"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
partyId + "%")));
}
// now the statusId - send ANY for all statuses; leave null
for just enabled; or pass a specific status
@@ -1194,8 +1194,8 @@ public class PartyServices {
// check for partyTypeId
if (partyTypeId != null && !"ANY".equals(partyTypeId)) {
paramList = paramList + "&partyTypeId=" + partyTypeId;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyTypeId"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
partyTypeId + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("partyTypeId"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
partyTypeId + "%")));
}
// ----
@@ -1212,8 +1212,8 @@ public class PartyServices {
dynamicView.addViewLink("PT", "UL", Boolean.FALSE,
ModelKeyMap.makeKeyMapList("partyId"));
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("userLoginId"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
userLoginId + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("userLoginId"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
userLoginId + "%")));
fieldsToSelect.add("userLoginId");
}
@@ -1232,8 +1232,8 @@ public class PartyServices {
dynamicView.addViewLink("PT", "PG", Boolean.FALSE,
ModelKeyMap.makeKeyMapList("partyId"));
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("groupName"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
groupName + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("groupName"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
groupName + "%")));
fieldsToSelect.add("groupName");
}
@@ -1258,15 +1258,15 @@ public class PartyServices {
// filter on firstName
if (UtilValidate.isNotEmpty(firstName)) {
paramList = paramList + "&firstName=" + firstName;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("firstName"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
firstName + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("firstName"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
firstName + "%")));
}
// filter on lastName
if (UtilValidate.isNotEmpty(lastName)) {
paramList = paramList + "&lastName=" + lastName;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("lastName"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
lastName + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("lastName"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
lastName + "%")));
}
// ----
@@ -1306,24 +1306,24 @@ public class PartyServices {
paramList = paramList + "&inventoryItemId=" +
inventoryItemId;
dynamicView.addAlias("II", "inventoryItemId");
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("inventoryItemId"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
inventoryItemId + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("inventoryItemId"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
inventoryItemId + "%")));
fieldsToSelect.add("inventoryItemId");
}
if (UtilValidate.isNotEmpty(serialNumber)) {
paramList = paramList + "&serialNumber=" + serialNumber;
dynamicView.addAlias("II", "serialNumber");
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("serialNumber"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
serialNumber + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("serialNumber"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
serialNumber + "%")));
fieldsToSelect.add("serialNumber");
}
if (UtilValidate.isNotEmpty(softIdentifier)) {
paramList = paramList + "&softIdentifier=" +
softIdentifier;
dynamicView.addAlias("II", "softIdentifier");
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("softIdentifier"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
softIdentifier + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("softIdentifier"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
softIdentifier + "%")));
fieldsToSelect.add("softIdentifier");
}
@@ -1348,24 +1348,24 @@ public class PartyServices {
String address1 = (String) context.get("address1");
if (UtilValidate.isNotEmpty(address1)) {
paramList = paramList + "&address1=" + address1;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("address1"),
- EntityOperator.LIKE, EntityFunction.UPPER("%"
+ address1 + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("address1"),
+ EntityOperator.LIKE, EntityFunction.upper("%"
+ address1 + "%")));
}
// filter on address2
String address2 = (String) context.get("address2");
if (UtilValidate.isNotEmpty(address2)) {
paramList = paramList + "&address2=" + address2;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("address2"),
- EntityOperator.LIKE, EntityFunction.UPPER("%"
+ address2 + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("address2"),
+ EntityOperator.LIKE, EntityFunction.upper("%"
+ address2 + "%")));
}
// filter on city
String city = (String) context.get("city");
if (UtilValidate.isNotEmpty(city)) {
paramList = paramList + "&city=" + city;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("city"),
- EntityOperator.LIKE, EntityFunction.UPPER("%"
+ city + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("city"),
+ EntityOperator.LIKE, EntityFunction.upper("%"
+ city + "%")));
}
// filter on state geo
@@ -1378,8 +1378,8 @@ public class PartyServices {
String postalCode = (String) context.get("postalCode");
if (UtilValidate.isNotEmpty(postalCode)) {
paramList = paramList + "&postalCode=" + postalCode;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("postalCode"),
- EntityOperator.LIKE, EntityFunction.UPPER("%"
+ postalCode + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("postalCode"),
+ EntityOperator.LIKE, EntityFunction.upper("%"
+ postalCode + "%")));
}
fieldsToSelect.add("postalCode");
@@ -1403,8 +1403,8 @@ public class PartyServices {
String infoString = (String) context.get("infoString");
if (UtilValidate.isNotEmpty(infoString)) {
paramList = paramList + "&infoString=" + infoString;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("infoString"),
- EntityOperator.LIKE, EntityFunction.UPPER("%"
+ infoString + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("infoString"),
+ EntityOperator.LIKE, EntityFunction.upper("%"
+ infoString + "%")));
fieldsToSelect.add("infoString");
}
@@ -1428,24 +1428,24 @@ public class PartyServices {
String countryCode = (String) context.get("countryCode");
if (UtilValidate.isNotEmpty(countryCode)) {
paramList = paramList + "&countryCode=" + countryCode;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("countryCode"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(countryCode)));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("countryCode"),
+ EntityOperator.EQUALS,
EntityFunction.upper(countryCode)));
}
// filter on areaCode
String areaCode = (String) context.get("areaCode");
if (UtilValidate.isNotEmpty(areaCode)) {
paramList = paramList + "&areaCode=" + areaCode;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("areaCode"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(areaCode)));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("areaCode"),
+ EntityOperator.EQUALS,
EntityFunction.upper(areaCode)));
}
// filter on contact number
String contactNumber = (String)
context.get("contactNumber");
if (UtilValidate.isNotEmpty(contactNumber)) {
paramList = paramList + "&contactNumber=" +
contactNumber;
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("contactNumber"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(contactNumber)));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("contactNumber"),
+ EntityOperator.EQUALS,
EntityFunction.upper(contactNumber)));
}
fieldsToSelect.add("contactNumber");
@@ -1572,8 +1572,8 @@ public class PartyServices {
EntityCondition relationshipCond = null;
if (UtilValidate.isEmpty(ownerPartyIds)) {
String partyIdFrom = userLogin.getString("partyId");
- relationshipCond =
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyIdFrom"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(partyIdFrom));
+ relationshipCond =
EntityCondition.makeCondition(EntityFunction.upperField("partyIdFrom"),
+ EntityOperator.EQUALS,
EntityFunction.upper(partyIdFrom));
} else {
relationshipCond =
EntityCondition.makeCondition("partyIdFrom", EntityOperator.IN, ownerPartyIds);
}
@@ -1581,8 +1581,8 @@ public class PartyServices {
// add the expr
andExprs.add(EntityCondition.makeCondition(
relationshipCond, EntityOperator.AND,
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyRelationshipTypeId"),
EntityOperator.EQUALS,
- EntityFunction.UPPER(partyRelationshipTypeId))));
+
EntityCondition.makeCondition(EntityFunction.upperField("partyRelationshipTypeId"),
EntityOperator.EQUALS,
+ EntityFunction.upper(partyRelationshipTypeId))));
fieldsToSelect.add("partyIdTo");
}
@@ -1599,8 +1599,8 @@ public class PartyServices {
// check for a partyId
if (UtilValidate.isNotEmpty(partyId)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("partyId"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + partyId + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("partyId"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + partyId + "%")));
}
// now the statusId - send ANY for all statuses; leave null for just
enabled; or pass a specific status
@@ -1632,8 +1632,8 @@ public class PartyServices {
dynamicView.addViewLink("PT", "UL", Boolean.FALSE,
ModelKeyMap.makeKeyMapList("partyId"));
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("userLoginId"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + userLoginId + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("userLoginId"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + userLoginId + "%")));
fieldsToSelect.add("userLoginId");
}
@@ -1650,8 +1650,8 @@ public class PartyServices {
dynamicView.addViewLink("PT", "PG", Boolean.FALSE,
ModelKeyMap.makeKeyMapList("partyId"));
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("groupName"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + groupName + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("groupName"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + groupName + "%")));
fieldsToSelect.add("groupName");
}
@@ -1674,14 +1674,14 @@ public class PartyServices {
// filter on firstName
if (UtilValidate.isNotEmpty(firstName)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("firstName"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + firstName + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("firstName"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + firstName + "%")));
}
// filter on lastName
if (UtilValidate.isNotEmpty(lastName)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("lastName"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + lastName + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("lastName"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + lastName + "%")));
}
// ----
@@ -1732,8 +1732,8 @@ public class PartyServices {
fieldsToSelect.add("idValue");
fieldsToSelect.add("partyIdentificationTypeId");
if (UtilValidate.isNotEmpty(idValue)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("idValue"),
EntityOperator.LIKE,
-
EntityFunction.UPPER("%".concat(idValue).concat("%"))));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("idValue"),
EntityOperator.LIKE,
+
EntityFunction.upper("%".concat(idValue).concat("%"))));
}
if (UtilValidate.isNotEmpty(partyIdentificationTypeId)) {
andExprs.add(EntityCondition.makeCondition("partyIdentificationTypeId",
partyIdentificationTypeId));
@@ -1760,22 +1760,22 @@ public class PartyServices {
if (UtilValidate.isNotEmpty(inventoryItemId)) {
dynamicView.addAlias("II", "inventoryItemId");
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("inventoryItemId"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + inventoryItemId + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("inventoryItemId"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + inventoryItemId + "%")));
fieldsToSelect.add("inventoryItemId");
}
if (UtilValidate.isNotEmpty(serialNumber)) {
dynamicView.addAlias("II", "serialNumber");
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("serialNumber"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + serialNumber + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("serialNumber"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + serialNumber + "%")));
fieldsToSelect.add("serialNumber");
}
if (UtilValidate.isNotEmpty(softIdentifier)) {
dynamicView.addAlias("II", "softIdentifier");
// add the expr
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("softIdentifier"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + softIdentifier + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("softIdentifier"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + softIdentifier + "%")));
fieldsToSelect.add("softIdentifier");
}
@@ -1803,22 +1803,22 @@ public class PartyServices {
// filter on address1
String address1 = (String) context.get("address1");
if (UtilValidate.isNotEmpty(address1)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("address1"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + address1 + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("address1"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + address1 + "%")));
}
// filter on address2
String address2 = (String) context.get("address2");
if (UtilValidate.isNotEmpty(address2)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("address2"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + address2 + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("address2"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + address2 + "%")));
}
// filter on city
String city = (String) context.get("city");
if (UtilValidate.isNotEmpty(city)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("city"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + city + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("city"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + city + "%")));
}
// filter on state geo
@@ -1829,8 +1829,8 @@ public class PartyServices {
// filter on postal code
String postalCode = (String) context.get("postalCode");
if (UtilValidate.isNotEmpty(postalCode)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("postalCode"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + postalCode + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("postalCode"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + postalCode + "%")));
}
fieldsToSelect.add("postalCode");
@@ -1853,8 +1853,8 @@ public class PartyServices {
// filter on infoString
String infoString = (String) context.get("infoString");
if (UtilValidate.isNotEmpty(infoString)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("infoString"),
EntityOperator.LIKE,
- EntityFunction.UPPER("%" + infoString + "%")));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("infoString"),
EntityOperator.LIKE,
+ EntityFunction.upper("%" + infoString + "%")));
fieldsToSelect.add("infoString");
}
}
@@ -1879,22 +1879,22 @@ public class PartyServices {
// filter on countryCode
String countryCode = (String) context.get("countryCode");
if (UtilValidate.isNotEmpty(countryCode)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("countryCode"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(countryCode)));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("countryCode"),
+ EntityOperator.EQUALS,
EntityFunction.upper(countryCode)));
}
// filter on areaCode
String areaCode = (String) context.get("areaCode");
if (UtilValidate.isNotEmpty(areaCode)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("areaCode"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(areaCode)));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("areaCode"),
+ EntityOperator.EQUALS,
EntityFunction.upper(areaCode)));
}
// filter on contact number
String contactNumber = (String) context.get("contactNumber");
if (UtilValidate.isNotEmpty(contactNumber)) {
-
andExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("contactNumber"),
- EntityOperator.EQUALS,
EntityFunction.UPPER(contactNumber)));
+
andExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("contactNumber"),
+ EntityOperator.EQUALS,
EntityFunction.upper(contactNumber)));
}
fieldsToSelect.add("contactNumber");
fieldsToSelect.add("areaCode");
diff --git
a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
index 486fde3..c93a5b2 100644
---
a/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
+++
b/applications/party/src/main/java/org/apache/ofbiz/party/party/PartyWorker.java
@@ -364,7 +364,7 @@ public class PartyWorker {
addrExprs.add(EntityCondition.makeCondition("postalCodeExt",
EntityOperator.EQUALS, postalCodeExt));
}
-
addrExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("city"),
EntityOperator.EQUALS, EntityFunction.UPPER(city)));
+
addrExprs.add(EntityCondition.makeCondition(EntityFunction.upperField("city"),
EntityOperator.EQUALS, EntityFunction.upper(city)));
if (countryGeoId != null) {
addrExprs.add(EntityCondition.makeCondition("countryGeoId",
EntityOperator.EQUALS, countryGeoId.toUpperCase(Locale.getDefault())));
diff --git
a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java
b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java
index ab5d7f8..7b617a6 100644
---
a/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java
+++
b/applications/workeffort/src/main/java/org/apache/ofbiz/workeffort/workeffort/WorkEffortSearch.java
@@ -709,8 +709,8 @@ public class WorkEffortSearch {
workEffortSearchContext.dynamicViewEntity.addMemberEntity(entityAlias,
"WorkEffortReview");
workEffortSearchContext.dynamicViewEntity.addAlias(entityAlias,
prefix + "ReviewText", "reviewText", null, null, null, null);
workEffortSearchContext.dynamicViewEntity.addViewLink("WEFF",
entityAlias, Boolean.FALSE, ModelKeyMap.makeKeyMapList("workEffortId"));
-
workEffortSearchContext.entityConditionList.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(prefix
+ "ReviewText"),
- EntityOperator.LIKE, EntityFunction.UPPER("%" +
reviewTextString + "%")));
+
workEffortSearchContext.entityConditionList.add(EntityCondition.makeCondition(EntityFunction.upperField(prefix
+ "ReviewText"),
+ EntityOperator.LIKE, EntityFunction.upper("%" +
reviewTextString + "%")));
Map<String, String> valueMap = UtilMisc.toMap("constraintName",
CONSTRAINT_NAME, "infoString", this.reviewTextString);
workEffortSearchContext.workEffortSearchConstraintList.add(workEffortSearchContext.getDelegator()
.makeValue("WorkEffortSearchConstraint", valueMap));
diff --git a/build.gradle b/build.gradle
index 54de18e..34e21e9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -350,7 +350,7 @@ checkstyle {
// the sum of errors found last time it was changed after using the
// ‘checkstyle’ tool present in the framework and in the official
// plugins.
- tasks.checkstyleMain.maxErrors = 48
+ tasks.checkstyleMain.maxErrors = 39
// Currently there are still errors so we need to temporarily
// hide them to avoid polluting the terminal output.
showViolations = false
diff --git a/framework/common/groovyScripts/FindAutocompleteOptions.groovy
b/framework/common/groovyScripts/FindAutocompleteOptions.groovy
index 595d75c..6073c18 100644
--- a/framework/common/groovyScripts/FindAutocompleteOptions.groovy
+++ b/framework/common/groovyScripts/FindAutocompleteOptions.groovy
@@ -88,7 +88,7 @@ if (searchFields && fieldValue) {
orExprs.add(EntityCondition.makeCondition(EntityFieldValue.makeFieldValue(searchFieldsList[0]),
EntityOperator.EQUALS, searchValue))
return //in case of EQUALS, we search only a match for the
returned field
} else {
-
orExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER(EntityFieldValue.makeFieldValue(fieldName)),
EntityOperator.LIKE, searchValue))
+
orExprs.add(EntityCondition.makeCondition(EntityFunction.upper(EntityFieldValue.makeFieldValue(fieldName)),
EntityOperator.LIKE, searchValue))
}
}
}
diff --git
a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
index 5b505bd..e96001f 100644
--- a/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
+++ b/framework/common/src/main/java/org/apache/ofbiz/common/FindServices.java
@@ -381,7 +381,7 @@ public class FindServices {
fieldObject =
modelField.getModelEntity().convertFieldValue(modelField, fieldValue,
delegator, context);
}
if (ignoreCase && fieldObject instanceof String) {
- cond =
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(fieldName), fieldOp,
EntityFunction.UPPER(((String)
+ cond =
EntityCondition.makeCondition(EntityFunction.upperField(fieldName), fieldOp,
EntityFunction.upper(((String)
fieldValue).toUpperCase(Locale.getDefault())));
} else {
if (fieldObject.equals(GenericEntity.NULL_FIELD.toString())) {
diff --git
a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
index edb820a..145d58e 100644
---
a/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
+++
b/framework/common/src/main/java/org/apache/ofbiz/common/login/LoginServices.java
@@ -707,8 +707,8 @@ public class LoginServices {
}
try {
- EntityCondition condition =
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("userLoginId"),
EntityOperator.EQUALS,
- EntityFunction.UPPER(userLoginId));
+ EntityCondition condition =
EntityCondition.makeCondition(EntityFunction.upperField("userLoginId"),
EntityOperator.EQUALS,
+ EntityFunction.upper(userLoginId));
if
(UtilValidate.isNotEmpty(EntityQuery.use(delegator).from("UserLogin").where(condition).queryList()))
{
Map<String, String> messageMap = UtilMisc.toMap("userLoginId",
userLoginId);
errMsg = UtilProperties.getMessage(RESOURCE,
"loginservices.could_not_create_login_user_with_ID_exists", messageMap, locale);
diff --git
a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
index e202a8f..188d43f 100644
---
a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
+++
b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/EntityFunction.java
@@ -50,39 +50,39 @@ public abstract class EntityFunction<T extends
Comparable<?>> extends EntityCond
public static final int ID_UPPER = SQLFunction.UPPER.ordinal();
public static final int ID_LOWER = SQLFunction.LOWER.ordinal();
- public static EntityFunction<Integer> LENGTH(EntityConditionValue nested) {
+ public static EntityFunction<Integer> length(EntityConditionValue nested) {
return new LENGTH(nested);
}
- public static EntityFunction<Integer> LENGTH(Object value) {
+ public static EntityFunction<Integer> length(Object value) {
return new LENGTH(value);
}
- public static EntityFunction<String> TRIM(EntityConditionValue nested) {
+ public static EntityFunction<String> trim(EntityConditionValue nested) {
return new TRIM(nested);
}
- public static EntityFunction<String> TRIM(Object value) {
+ public static EntityFunction<String> trim(Object value) {
return new TRIM(value);
}
- public static EntityFunction<String> UPPER(EntityConditionValue nested) {
+ public static EntityFunction<String> upper(EntityConditionValue nested) {
return new UPPER(nested);
}
- public static EntityFunction<String> UPPER(Object value) {
+ public static EntityFunction<String> upper(Object value) {
return new UPPER(value);
}
- public static EntityFunction<String> UPPER_FIELD(String fieldName) {
+ public static EntityFunction<String> upperField(String fieldName) {
return new UPPER(EntityFieldValue.makeFieldValue(fieldName));
}
- public static EntityFunction<String> LOWER(EntityConditionValue nested) {
+ public static EntityFunction<String> lower(EntityConditionValue nested) {
return new LOWER(nested);
}
- public static EntityFunction<String> LOWER(Object value) {
+ public static EntityFunction<String> lower(Object value) {
return new LOWER(value);
}
diff --git
a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java
b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java
index ccd7719..d1458c4 100644
---
a/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java
+++
b/framework/entity/src/main/java/org/apache/ofbiz/entity/condition/OrderByItem.java
@@ -147,10 +147,10 @@ public class OrderByItem implements
Comparator<GenericEntity> {
EntityConditionValue value = EntityFieldValue.makeFieldValue(text);
switch (caseSensitivity) {
case UPPER:
- value = EntityFunction.UPPER(value);
+ value = EntityFunction.upper(value);
break;
case LOWER:
- value = EntityFunction.LOWER(value);
+ value = EntityFunction.lower(value);
break;
default:
break;
diff --git
a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
index 5c46338..409eb96 100644
---
a/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
+++
b/framework/entity/src/main/java/org/apache/ofbiz/entity/finder/EntityFinderUtil.java
@@ -243,8 +243,8 @@ public final class EntityFinderUtil {
// that is true by default
if (ignoreCase) {
return EntityCondition.makeCondition(
-
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(fieldName),
- UtilGenerics.<EntityComparisonOperator<?,
?>>cast(operator), EntityFunction.UPPER(value)),
+
EntityCondition.makeCondition(EntityFunction.upperField(fieldName),
+ UtilGenerics.<EntityComparisonOperator<?,
?>>cast(operator), EntityFunction.upper(value)),
EntityOperator.OR,
EntityCondition.makeCondition(fieldName,
EntityOperator.EQUALS, null));
}
@@ -255,8 +255,8 @@ public final class EntityFinderUtil {
}
if (ignoreCase) {
// use the stuff to upper case both sides
- return
EntityCondition.makeCondition(EntityFunction.UPPER_FIELD(fieldName),
- UtilGenerics.<EntityComparisonOperator<?,
?>>cast(operator), EntityFunction.UPPER(value));
+ return
EntityCondition.makeCondition(EntityFunction.upperField(fieldName),
+ UtilGenerics.<EntityComparisonOperator<?,
?>>cast(operator), EntityFunction.upper(value));
}
return EntityCondition.makeCondition(fieldName,
UtilGenerics.<EntityComparisonOperator<?, ?>>cast(operator), value);
}
diff --git
a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
index ff18492..f67b7c4 100644
---
a/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
+++
b/framework/entity/src/main/java/org/apache/ofbiz/entity/model/ModelViewEntity.java
@@ -1580,7 +1580,7 @@ public class ModelViewEntity extends ModelEntity {
// "or-null" attribute that is true by default
if (ignoreCase) {
entityCondition = EntityCondition.makeCondition(
-
EntityCondition.makeCondition(EntityFunction.UPPER(lhs), this.operator,
EntityFunction.UPPER(rhs)),
+
EntityCondition.makeCondition(EntityFunction.upper(lhs), this.operator,
EntityFunction.upper(rhs)),
EntityOperator.OR,
EntityCondition.makeCondition(lhs,
EntityOperator.EQUALS, null));
} else {
@@ -1595,7 +1595,7 @@ public class ModelViewEntity extends ModelEntity {
} else {
if (ignoreCase) {
// use the stuff to upper case both sides
- entityCondition =
EntityCondition.makeCondition(EntityFunction.UPPER(lhs), this.operator,
EntityFunction.UPPER(rhs));
+ entityCondition =
EntityCondition.makeCondition(EntityFunction.upper(lhs), this.operator,
EntityFunction.upper(rhs));
} else {
entityCondition = EntityCondition.makeCondition(lhs,
this.operator, rhs);
}
