Implemented: Fix all codenarc violation (OFBIZ-13228)

Fix codenarc violation lvl 2 :
  * AssignmentInConditional
  * LineLength
  * PackageName

Fix codenarc violation lvl 3 :
  * BlockStartsWithBlankLine
  * ConsecutiveBlankLines
  * FileEndsWithoutNewline
  * ImportFromSamePackage
  * JavadocEmptyReturnTag
  * JavadocMissingParamDescription
  * SpaceAfterComma
  * SpaceAfterOpeningBrace
  * SpaceAroundMapEntryColon
  * SpaceBeforeClosingBrace
  * UnnecessaryGString
  * UnusedImport

Author: nmalin

applications/accounting/src/main/groovy/org/apache/ofbiz/accounting/period/GPeriodServices.groovy

@@ -52,7 +52,6 @@ Map findCustomTimePeriods() {
             OR {
                 EQUALS(organizationPartyId: null)
                 EQUALS(organizationPartyId: '_NA_')
-
             }
             LESS_THAN(fromDate: parameters.findDate)
             OR {
@@ -87,4 +86,4 @@ Map getPreviousTimePeriod() {
         return success([previousTimePeriod: previousTimePeriod])
     }
     return success()
-}
+}

applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentSearchOptions.groovy

@@ -19,7 +19,6 @@
 package org.apache.ofbiz.content.content
 
 import java.sql.Timestamp
-import org.apache.ofbiz.content.content.ContentSearchSession
 
 searchOperator = parameters.get('SEARCH_OPERATOR')
 if ('AND' != searchOperator && 'OR' != searchOperator) {

applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentSearchResults.groovy

@@ -18,18 +18,17 @@
 */
 package org.apache.ofbiz.content.content
 
-import org.apache.ofbiz.content.content.ContentSearchSession
-import org.apache.ofbiz.content.content.ContentSearchEvents
-
 // note: this can be run multiple times in the same request without causing problems, will check to see on its own if it has run again
 ContentSearchSession.processSearchParameters(parameters, request)
 Map result = ContentSearchEvents.getContentSearchResult(request, delegator)
 
-context.put('contentIds', result.get('contentIds'))
-context.put('viewIndex', result.get('viewIndex'))
-context.put('viewSize', result.get('viewSize'))
-context.put('listSize', result.get('listSize'))
-context.put('lowIndex', result.get('lowIndex'))
-context.put('highIndex', result.get('highIndex'))
-context.put('searchConstraintStrings', result.get('searchConstraintStrings'))
-context.put('searchSortOrderString', result.get('searchSortOrderString'))
+context.with {
+    contentIds = result.get('contentIds')
+    viewIndex = result.get('viewIndex')
+    viewSize = result.get('viewSize')
+    listSize = result.get('listSize')
+    lowIndex = result.get('lowIndex')
+    highIndex = result.get('highIndex')
+    searchConstraintStrings = result.get('searchConstraintStrings')
+    searchSortOrderString = result.get('searchSortOrderString')
+}

applications/content/src/main/groovy/org/apache/ofbiz/content/content/ContentServicesScript.groovy

@@ -18,7 +18,6 @@
 */
 package org.apache.ofbiz.content.survey
 
-import org.apache.ofbiz.content.survey.SurveyWrapper
 import org.apache.ofbiz.base.util.UtilURL
 
 surveyResponseId = parameters.surveyResponseId

applications/content/src/main/groovy/org/apache/ofbiz/content/survey/EditSurveyResponse.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.content.survey
 
-import org.apache.ofbiz.content.survey.SurveyWrapper
-
 if (!survey) {
     surveyResponseId = parameters.surveyResponseId
     if (surveyResponseId) {

applications/content/src/main/groovy/org/apache/ofbiz/content/survey/ViewSurveyResponses.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.manufacturing.bom
 
-import org.apache.ofbiz.manufacturing.bom.BOMNode
-
 tree = request.getAttribute('tree')
 currencyUomId = parameters.currencyUomId
 facilityId = parameters.facilityId
@@ -36,7 +34,7 @@ if (tree) {
     productsData = []
     grandTotalCost = 0.0
     while (treeQtyIt) {
-        BOMNode node = (BOMNode)treeQtyIt.next()
+        BOMNode node = (BOMNode) treeQtyIt.next()
         unitCost = null
         totalCost = null
         qoh = null

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/bom/BomSimulation.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.manufacturing.jobshopmgt
 
-import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
-
 productionRunId = parameters.productionRunId ?: parameters.workEffortId
 if (productionRunId) {
     ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher)

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunAllFixedAssets.groovy

@@ -23,7 +23,6 @@ package org.apache.ofbiz.manufacturing.jobshopmgt
 
 import org.apache.ofbiz.entity.util.EntityUtil
 import org.apache.ofbiz.entity.GenericValue
-import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
 
 productionRunId = parameters.productionRunId ?: parameters.workEffortId
 if (productionRunId) {

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunDeclaration.groovy

@@ -19,7 +19,6 @@
 package org.apache.ofbiz.manufacturing.jobshopmgt
 
 import org.apache.ofbiz.base.util.UtilDateTime
-import org.apache.ofbiz.base.util.UtilProperties
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.service.ServiceUtil
 

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunServicesScript.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.manufacturing.jobshopmgt
 
-import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
-
 taskPartyAssocList = []
 productionRunId = parameters.productionRunId ?: parameters.workEffortId
 if (productionRunId) {

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunTaskParties.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.manufacturing.jobshopmgt
 
-import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
-
 productionRunId = parameters.productionRunId ?: parameters.workEffortId
 if (productionRunId) {
     ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher)

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ProductionRunTasks.groovy

@@ -21,8 +21,6 @@ package org.apache.ofbiz.manufacturing.jobshopmgt
 // The only required parameter is "productionRunId".
 // The "actionForm" parameter triggers actions (see "ProductionRunSimpleEvents.xml").
 
-import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
-
 productionRunId = parameters.productionRunId
 if (productionRunId) {
     ProductionRun productionRun = new ProductionRun(productionRunId, delegator, dispatcher)

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/ViewProductionRun.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.manufacturing.jobshopmgt
 
-import org.apache.ofbiz.manufacturing.jobshopmgt.ProductionRun
-
 // **************************************
 // ShipmentPlan list form
 // **************************************

applications/manufacturing/src/main/groovy/org/apache/ofbiz/manufacturing/jobshopmgt/WorkWithShipmentPlans.groovy

@@ -100,4 +100,4 @@ static Map billToAddress(Map parameters) {
         return error(label('PartyUiLabels', 'PartyCountryMissing'))
     }
     return processedMap
-}
+}

applications/order/src/main/groovy/org/apache/ofbiz/order/customer/CheckoutMapProcs.groovy

@@ -18,13 +18,15 @@
 */
 package org.apache.ofbiz.order.entry
 
+import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityUtil
 import org.apache.ofbiz.base.util.UtilHttp
 import org.apache.ofbiz.accounting.payment.BillingAccountWorker
+import org.apache.ofbiz.order.shoppingcart.ShoppingCart
 
-cart = session.getAttribute('shoppingCart')
-orderPartyId = cart.getPartyId()
-currencyUomId = cart.getCurrency()
+ShoppingCart cart = session.getAttribute('shoppingCart')
+String orderPartyId = cart.getPartyId()
+String currencyUomId = cart.getCurrency()
 context.cart = cart
 context.paymentMethodType = request.getParameter('paymentMethodType')
 
@@ -33,59 +35,54 @@ request.removeAttribute('_EVENT_MESSAGE_')
 
 // If there's a paymentMethodId request attribute, the user has just created a new payment method,
 //  so put the new paymentMethodId in the context for the UI
-newPaymentMethodId = request.getAttribute('paymentMethodId')
+String newPaymentMethodId = request.getAttribute('paymentMethodId')
 if (newPaymentMethodId) {
     context.checkOutPaymentId = newPaymentMethodId
 }
 
+GenericValue orderParty = null
 if (orderPartyId && '_NA_' != orderPartyId) {
-    orderParty = from('Party').where('partyId', orderPartyId).queryOne()
-    orderPerson = orderParty.getRelatedOne('Person', false)
+    orderParty = from('Party').where('partyId', orderPartyId).cache().queryOne()
     context.orderParty = orderParty
-    context.orderPerson = orderPerson
     if (orderParty) {
+        context.orderPerson = orderParty.getRelatedOne('Person', true)
         context.paymentMethodList = EntityUtil.filterByDate(orderParty.getRelated('PaymentMethod', null, null, false), true)
 
-        billingAccountList = BillingAccountWorker.makePartyBillingAccountList(userLogin, currencyUomId, orderPartyId, delegator, dispatcher)
+        List billingAccountList = BillingAccountWorker.makePartyBillingAccountList(userLogin, currencyUomId, orderPartyId, delegator, dispatcher)
         if (billingAccountList) {
             context.selectedBillingAccountId = cart.getBillingAccountId()
             context.billingAccountList = billingAccountList
         }
     }
 }
 
-if (request.getParameter('useShipAddr') && cart.getShippingContactMechId()) {
-    shippingContactMech = cart.getShippingContactMechId()
-    postalAddress = from('PostalAddress').where('contactMechId', shippingContactMech).queryOne()
-    context.postalFields = postalAddress
-} else {
-    context.postalFields = UtilHttp.getParameterMap(request)
-}
+context.postalFields = request.getParameter('useShipAddr') && cart.getShippingContactMechId()
+        ? from('PostalAddress').where('contactMechId', cart.getShippingContactMechId()).queryOne()
+        : UtilHttp.getParameterMap(request)
 
 if (cart) {
     if (cart.getPaymentMethodIds()) {
-        checkOutPaymentId = cart.getPaymentMethodIds().get(0)
+        String checkOutPaymentId = cart.getPaymentMethodIds().first()
         context.checkOutPaymentId = checkOutPaymentId
         if (!orderParty) {
-            paymentMethod = from('PaymentMethod').where('paymentMethodId', checkOutPaymentId).queryOne()
+            GenericValue account = null
+            GenericValue paymentMethod = from('PaymentMethod').where(paymentMethodId: checkOutPaymentId).queryOne()
             if (paymentMethod?.paymentMethodTypeId == 'CREDIT_CARD') {
-                paymentMethodType = 'CC'
+                String paymentMethodType = 'CC'
                 account = paymentMethod.getRelatedOne('CreditCard', false)
                 context.creditCard = account
                 context.paymentMethodType = paymentMethodType
-            } else if (paymentMethod.paymentMethodTypeId == 'EFT_ACCOUNT') {
-                paymentMethodType = 'EFT'
+            } else if (paymentMethod?.paymentMethodTypeId == 'EFT_ACCOUNT') {
+                String paymentMethodType = 'EFT'
                 account = paymentMethod.getRelatedOne('EftAccount', false)
                 context.eftAccount = account
                 context.paymentMethodType = paymentMethodType
             }
             if (account) {
-                address = account.getRelatedOne('PostalAddress', false)
-                context.postalAddress = address
+                context.postalAddress = account.getRelatedOne('PostalAddress', false)
             }
         }
     } else if (cart.getPaymentMethodTypeIds()) {
-        checkOutPaymentId = cart.getPaymentMethodTypeIds().get(0)
-        context.checkOutPaymentId = checkOutPaymentId
+        context.checkOutPaymentId = cart.getPaymentMethodTypeIds().first()
     }
 }

applications/order/src/main/groovy/org/apache/ofbiz/order/entry/BillSettings.groovy

@@ -18,20 +18,19 @@
 */
 package org.apache.ofbiz.order.order
 
- // this script is used to get the company's logo header information for orders,
-// invoices, and returns.  It can either take order, invoice, returnHeader from
- // parameters or use orderId, invoiceId, or returnId to look them up.
- // if none of these parameters are available then fromPartyId is used or "ORGANIZATION_PARTY" from general.properties as fallback
-
 import org.apache.ofbiz.base.util.UtilHttp
 import org.apache.ofbiz.content.data.DataResourceWorker
 import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.util.EntityUtil
-import org.apache.ofbiz.order.order.OrderReadHelper
 import org.apache.ofbiz.party.content.PartyContentWrapper
 
 import java.sql.Timestamp
 
+// this script is used to get the company's logo header information for orders,
+// invoices, and returns.  It can either take order, invoice, returnHeader from
+// parameters or use orderId, invoiceId, or returnId to look them up.
+// if none of these parameters are available then fromPartyId is used or "ORGANIZATION_PARTY" from general.properties as fallback
+
 orderHeader = parameters.orderHeader
 orderId = parameters.orderId
 invoice = parameters.invoice
@@ -60,7 +59,7 @@ if (!orderHeader && orderId) {
     orderHeader = shipment.getRelatedOne('PrimaryOrderHeader', false)
 }
 
-if (!invoice && invoiceId)    {
+if (!invoice && invoiceId) {
     invoice = from('Invoice').where('invoiceId', invoiceId).queryOne()
     try {
         UtilHttp.setContentDisposition(response, invoiceId + '.pdf')
@@ -98,7 +97,7 @@ if (orderHeader) {
                 partyId = productStore.payToPartyId
             }
         }
-    // purchase orders - use the BILL_TO_CUSTOMER of the order
+        // purchase orders - use the BILL_TO_CUSTOMER of the order
     } else if (orderHeader.orderTypeId == 'PURCHASE_ORDER') {
         GenericValue billToParty = orh.getBillToParty()
         if (billToParty) {
@@ -188,7 +187,7 @@ address = null
 if (addresses) {
     address = from('PostalAddress').where('contactMechId', addresses[0].contactMechId).queryOne()
 }
-if (address)    {
+if (address) {
     // get the country name and state/province abbreviation
     country = address.getRelatedOne('CountryGeo', true)
     if (country) {
@@ -232,9 +231,9 @@ if (emails) {
                       .queryList()
     if (selContacts) {
         i = selContacts.iterator()
-        while (i.hasNext())    {
+        while (i.hasNext()) {
             email = i.next().getRelatedOne('ContactMech', false)
-            if (email.contactMechTypeId == 'ELECTRONIC_ADDRESS')    {
+            if (email.contactMechTypeId == 'ELECTRONIC_ADDRESS') {
                 context.email = email
                 break
             }
@@ -257,7 +256,7 @@ if (websiteUrls) {
                       .queryList()
     if (selContacts) {
         Iterator i = selContacts.iterator()
-        while (i.hasNext())    {
+        while (i.hasNext()) {
             website = i.next().getRelatedOne('ContactMech', false)
             if (website.contactMechTypeId == 'WEB_ADDRESS') {
                 context.website = website

applications/order/src/main/groovy/org/apache/ofbiz/order/order/CompanyHeader.groovy

@@ -18,9 +18,7 @@
 */
 package org.apache.ofbiz.order.order
 
-import org.apache.ofbiz.order.order.OrderReadHelper
 import org.apache.ofbiz.product.store.ProductStoreWorker
-import org.apache.ofbiz.order.order.OrderListState
 
 orderHeaderList = context.orderHeaderList
 productStore = ProductStoreWorker.getProductStore(request)

applications/order/src/main/groovy/org/apache/ofbiz/order/order/FilterOrderList.groovy

@@ -20,7 +20,6 @@ package org.apache.ofbiz.order.order
 
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
-import org.apache.ofbiz.order.order.OrderListState
 
 partyId = request.getParameter('partyId')
 facilityId = request.getParameter('facilityId')

applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderList.groovy

@@ -26,7 +26,6 @@ import org.apache.ofbiz.entity.GenericValue
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator
 import org.apache.ofbiz.entity.util.EntityUtil
-import org.apache.ofbiz.order.order.OrderReadHelper
 import org.apache.ofbiz.party.contact.ContactHelper
 import org.apache.ofbiz.party.contact.ContactMechWorker
 import org.apache.ofbiz.product.catalog.CatalogWorker

applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderView.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.order.order
 
-import org.apache.ofbiz.order.order.OrderContentWrapper
-
 orderHeader = context.orderHeader
 
 // can anybody view an anonymous order?  this is set in the screen widget and should only be turned on by an email confirmation screen

applications/order/src/main/groovy/org/apache/ofbiz/order/order/OrderViewWebSecure.groovy

@@ -18,8 +18,6 @@
 */
 package org.apache.ofbiz.order.order
 
-import org.apache.ofbiz.order.order.OrderContentWrapper
-
 orderId = request.getParameter('orderId')
 orderItemSeqId = request.getParameter('orderItemSeqId')
 orderContentTypeId = request.getParameter('orderContentTypeId')

applications/order/src/main/groovy/org/apache/ofbiz/order/order/ViewImage.groovy

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package org.apache.ofbiz.order.orderReturn
+package org.apache.ofbiz.order.orderreturn
 
 import org.apache.ofbiz.order.order.OrderReadHelper
 import org.apache.ofbiz.party.contact.ContactHelper

applications/order/src/main/groovy/org/apache/ofbiz/order/orderReturn/QuickReturn.groovy renamed to applications/order/src/main/groovy/org/apache/ofbiz/order/orderreturn/QuickReturn.groovy

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package org.apache.ofbiz.order.orderReturn
+package org.apache.ofbiz.order.orderreturn
 
 import org.apache.ofbiz.entity.util.EntityUtil
 import org.apache.ofbiz.party.contact.ContactHelper

applications/order/src/main/groovy/org/apache/ofbiz/order/orderReturn/ReturnHeader.groovy renamed to applications/order/src/main/groovy/org/apache/ofbiz/order/orderreturn/ReturnHeader.groovy

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
 */
-package org.apache.ofbiz.order.orderReturn
+package org.apache.ofbiz.order.orderreturn
 
 import org.apache.ofbiz.entity.condition.EntityCondition
 import org.apache.ofbiz.entity.condition.EntityOperator