0033125: Minor cleanup in AdvPaymentMngtDao.getFinancialAccountPaymentMethod to simplify code

Description

Small clean up + maybe style improvement

That function add an extra isActive filter even is same is auto-added by dal filtering (at sql level) twice of isActive true.

Also i has a slightly strange way to get for 'rows found' via capturing IndexOutOfBoundsException instead of a simple != null

(end of ) SQL run for the function:
ticurrency as Payin29_266_0_, this_.Payout_IsMulticurrency as Payout30_266_0_, this_.Isdefault as Isdefault266_0_, this_.Payin_Invoicepaidstatus as Payin32_266_0_, this_.Payout_Invoicepaidstatus as Payout33_266_0_ from FIN_FinAcc_PaymentMethod this_ where this_.FIN_Financial_Account_ID=$1 and this_.FIN_Paymentmethod_ID=$2 and this_.Isactive=$3 and this_.Isactive=$4
parameters: $1 = 'DC15B7D80B3A4C6D80D0558A2EC5922D', $2 = '29F862983F3B45739C1507E416123129', $3 = 'Y', $4 = 'Y'

notice the double isactive filter mentioned above

Steps To Reproduce

Tags

No tags attached.

Attached Files

33125.diff [^] (1,421 bytes) 2016-06-02 18:52 [Show Content] [Hide Content]

diff -r ab794c23a556 modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java
--- a/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Wed Jun 01 09:24:38 2016 +0200
+++ b/modules/org.openbravo.advpaymentmngt/src/org/openbravo/advpaymentmngt/dao/AdvPaymentMngtDao.java	Thu Jun 02 18:52:15 2016 +0200
@@ -1693,16 +1693,16 @@
       FIN_PaymentMethod paymentMethod) {
     final OBCriteria<FinAccPaymentMethod> obc = OBDal.getInstance().createCriteria(
         FinAccPaymentMethod.class);
+    // combination of those 2 fields has unique constraint
     obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACCOUNT, account));
     obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_PAYMENTMETHOD, paymentMethod));
-    obc.add(Restrictions.eq(FinAccPaymentMethod.PROPERTY_ACTIVE, true));
     obc.setFilterOnReadableClients(false);
     obc.setFilterOnReadableOrganization(false);
-    try {
-      return obc.list().get(0);
-    } catch (IndexOutOfBoundsException e) {
-      throw new OBException(FIN_Utility.messageBD("APRM_PaymentMethod"));
+    FinAccPaymentMethod result = (FinAccPaymentMethod) obc.uniqueResult();
+    if (result != null) {
+      return result;
     }
+    throw new OBException(FIN_Utility.messageBD("APRM_PaymentMethod"));
   }
 
   public boolean isAutomatedExecutionPayment(FIN_FinancialAccount account,

Relationships [ Relation Graph ] [ Dependency Graph ]

Notes
(0086957) shuehner (administrator) 2016-06-02 18:52	Note: patch is untested

Issue History
Date Modified	Username	Field	Change
2016-06-02 18:52	shuehner	New Issue
2016-06-02 18:52	shuehner	Assigned To	=> Triage Finance
2016-06-02 18:52	shuehner	OBNetwork customer	=> No
2016-06-02 18:52	shuehner	Modules	=> Core
2016-06-02 18:52	shuehner	Triggers an Emergency Pack	=> No
2016-06-02 18:52	shuehner	File Added: 33125.diff
2016-06-02 18:52	shuehner	Note Added: 0086957