KFSPTS-36246 upgrade to the 11/20/2024 version of financials

pom.xml

@@ -21,7 +21,7 @@
         <skipTests>true</skipTests>
         <test.excludes>**/*Test.java.bogus</test.excludes>
 
-        <kfs.version>2024-09-25</kfs.version>
+        <kfs.version>2024-11-20</kfs.version>
 
         <backport-util-concurrent.version>2.2</backport-util-concurrent.version>
         <checkstyle.version>10.17.0</checkstyle.version>
@@ -34,8 +34,8 @@
         <hibernate-validator.version>6.2.5.Final</hibernate-validator.version>
         <hibernate-validator-annotation-processor.version>6.2.5.Final</hibernate-validator-annotation-processor.version>
         <hsqldb.version>2.7.4</hsqldb.version>
-        <httpclient.version>5.3.1</httpclient.version>
-        <httpcore.version>5.2.5</httpcore.version>
+        <httpclient.version>5.4.1</httpclient.version>
+        <httpcore.version>5.3.1</httpcore.version>
         <!--Backport FINP-11623-->
         <jackson.version>2.18.1</jackson.version>
         <jakarta.el.el-api.version>3.0.3</jakarta.el.el-api.version>
@@ -55,12 +55,12 @@
         <jersey.version>2.25.1</jersey.version>
         <jotm-core.version>2.1.10-kuali-1</jotm-core.version>
         <jsr311-api.version>1.1.1</jsr311-api.version>
-        <junit.version>5.11.0</junit.version>
+        <junit.version>5.11.3</junit.version>
         <ojdbc.version>19.18.0.0</ojdbc.version>
         <opencsv.version>5.9</opencsv.version>
         <plexus-utils.version>3.0.24</plexus-utils.version>
-        <mockito.version>5.13.0</mockito.version>
-        <pw-iso20022.version>SRU2023-10.1.7</pw-iso20022.version>
+        <mockito.version>5.14.2</mockito.version>
+        <pw-iso20022.version>SRU2024-10.2.3</pw-iso20022.version>
         <squiggly-filter-jackson.version>1.3.18</squiggly-filter-jackson.version>
         <spring.version>5.3.39</spring.version>
         <xapool.version>1.5.0-patch7</xapool.version>
@@ -145,7 +145,7 @@
                     </dependency>
                 </dependencies>
                 <configuration>
-                    <argLine>-Xms1024m -Xmx1024m -Doracle.jdbc.DateZeroTime=true</argLine>
+                    <argLine>-Doracle.jdbc.DateZeroTime=true</argLine>
                     <excludes>
                         <exclude>${test.excludes}</exclude>
                     </excludes>

src/main/java/com/rsmart/kuali/kfs/cr/batch/CheckReconciliationImportStep.java

@@ -54,7 +54,7 @@
 import org.kuali.kfs.core.api.config.property.ConfigurationService;
 import org.kuali.kfs.core.api.util.type.KualiDecimal;
 import org.kuali.kfs.core.api.util.type.KualiInteger;
-import org.kuali.kfs.krad.bo.KualiCode;
+import org.kuali.kfs.core.api.mo.common.Coded;
 import org.kuali.kfs.krad.service.BusinessObjectService;
 import org.kuali.kfs.pdp.PdpConstants.PaymentStatusCodes;
 import org.kuali.kfs.pdp.businessobject.PaymentGroup;
@@ -1170,7 +1170,7 @@ private String updateCheckStatus(CheckReconciliation cr, Collection<Bank> banks,
                 defaultStatus = statusMap.get(cr.getStatus());
                 oldStatus = paymentGroup.getPaymentStatusCode();
                 // Update PDP status and save
-                KualiCode code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, defaultStatus);
+                Coded code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, defaultStatus);
                 if (paymentGroup.getPaymentStatus() != ((PaymentStatus) code)) {
                     paymentGroup.setPaymentStatus((PaymentStatus) code);
                     paymentGroup.setLastUpdatedTimestamp(new Timestamp(cr.getStatusChangeDate().getTime()));

src/main/java/com/rsmart/kuali/kfs/cr/batch/GlTransactionStep.java

@@ -33,7 +33,7 @@
 import org.kuali.kfs.sys.batch.AbstractStep;
 import org.kuali.kfs.sys.businessobject.Bank;
 import org.kuali.kfs.sys.context.SpringContext;
-import org.kuali.kfs.krad.bo.KualiCode;
+import org.kuali.kfs.core.api.mo.common.Coded;
 import org.kuali.kfs.krad.service.BusinessObjectService;
 import org.kuali.kfs.krad.util.ObjectUtils;
 
@@ -107,7 +107,7 @@ public boolean execute(String jobName, LocalDateTime jobRunDate) throws Interrup
 
                         //glTransactionService.generateGlPendingTransactionStop(paymentGroup);
 
-                        KualiCode code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
+                        Coded code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
                         if (paymentGroup.getPaymentStatus() != ((PaymentStatus) code)) {
                             paymentGroup.setPaymentStatus((PaymentStatus) code);
                         }
@@ -155,7 +155,7 @@ public boolean execute(String jobName, LocalDateTime jobRunDate) throws Interrup
                     	glPendingTransactionService.generateCRCancellationGeneralLedgerPendingEntry(paymentGroup);
                         //glTransactionService.generateGlPendingTransactionCancel(paymentGroup);
 
-                        KualiCode code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
+                        Coded code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
                         if (paymentGroup.getPaymentStatus() != ((PaymentStatus) code)) {
                             paymentGroup.setPaymentStatus((PaymentStatus) code);
                         }
@@ -218,7 +218,7 @@ public boolean execute(String jobName, LocalDateTime jobRunDate) throws Interrup
 
 //                        glTransactionService.generateGlPendingTransactionStop(paymentGroup);
 
-                        KualiCode code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
+                        Coded code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
                         if (paymentGroup.getPaymentStatus() != ((PaymentStatus) code)) {
                             paymentGroup.setPaymentStatus((PaymentStatus) code);
                         }
@@ -271,7 +271,7 @@ public boolean execute(String jobName, LocalDateTime jobRunDate) throws Interrup
                     	 glPendingTransactionService.generateStaleGeneralLedgerPendingEntry(paymentGroup);
                          //glPendingTransactionService.g .generateStaleGeneralLedgerPendingEntry(paymentGroup);
 
-                         KualiCode code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
+                         Coded code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, cr.getStatus());
                          if (paymentGroup.getPaymentStatus() != ((PaymentStatus) code)) {
                              paymentGroup.setPaymentStatus((PaymentStatus) code);
                          }

src/main/java/edu/cornell/kfs/coa/businessobject/CuAccountGlobal.java

@@ -57,7 +57,6 @@ public class CuAccountGlobal extends AccountGlobal implements GlobalObjectWithIn
     protected String contractControlFinCoaCode;
     protected String contractControlAccountNumber;
     protected String acctIndirectCostRcvyTypeCd;
-    protected Integer contractsAndGrantsAccountResponsibilityId;
     protected String invoiceFrequencyCode;
     protected String invoiceTypeCode;
     protected Long costShareForProjectNumber;
@@ -300,10 +299,6 @@ private void updateAccountBasicFields(final Account account) {
 		    account.setFinancialIcrSeriesIdentifier(financialIcrSeriesIdentifier);
 		}
 
-		if (ObjectUtils.isNotNull(contractsAndGrantsAccountResponsibilityId)) {
-		    account.setContractsAndGrantsAccountResponsibilityId(contractsAndGrantsAccountResponsibilityId);
-		}
-
 		if (StringUtils.isNotBlank(invoiceFrequencyCode)) {
 		    ((AccountExtendedAttribute) account.getExtension()).setInvoiceFrequencyCode(invoiceFrequencyCode);
 		}
@@ -587,14 +582,6 @@ public void setAcctIndirectCostRcvyTypeCd(final String acctIndirectCostRcvyTypeC
         this.acctIndirectCostRcvyTypeCd = acctIndirectCostRcvyTypeCd;
     }
 
-    public Integer getContractsAndGrantsAccountResponsibilityId() {
-        return contractsAndGrantsAccountResponsibilityId;
-    }
-
-    public void setContractsAndGrantsAccountResponsibilityId(final Integer contractsAndGrantsAccountResponsibilityId) {
-        this.contractsAndGrantsAccountResponsibilityId = contractsAndGrantsAccountResponsibilityId;
-    }
-
     public String getInvoiceFrequencyCode() {
         return invoiceFrequencyCode;
     }

src/main/java/edu/cornell/kfs/fp/document/web/struts/YearEndJournalVoucherAction.java

@@ -17,7 +17,7 @@ public YearEndJournalVoucherAction() {
 	@Override
 	protected ActionForward processRouteOutOfBalanceDocumentConfirmationQuestion(
 			ActionMapping mapping, ActionForm form, HttpServletRequest request,
-			HttpServletResponse response) throws Exception {
+			HttpServletResponse response) {
 		// we return null as we don't want pre rule to check if doc is out of balance, BR is going to check if doc is out of balance
 		return null;
 	}

src/main/java/edu/cornell/kfs/fp/service/impl/RecurringDisbursementVoucherPaymentMaintenanceServiceImpl.java

@@ -21,7 +21,7 @@
 import org.kuali.kfs.core.api.util.type.KualiInteger;
 import org.kuali.kfs.kim.impl.identity.Person;
 import org.kuali.kfs.kim.api.permission.PermissionService;
-import org.kuali.kfs.krad.bo.KualiCode;
+import org.kuali.kfs.krad.bo.CodedBase;
 import org.kuali.kfs.krad.service.BusinessObjectService;
 import org.kuali.kfs.krad.util.GlobalVariables;
 import org.kuali.kfs.krad.util.ObjectUtils;
@@ -109,7 +109,7 @@ protected void changeStatus(PaymentGroup paymentGroup, String newPaymentStatus,
         }
 
         PaymentGroupHistory paymentGroupHistory = new PaymentGroupHistory();
-        KualiCode cd = businessObjectService.findBySinglePrimaryKey(PaymentChangeCode.class, changeStatus);
+        CodedBase cd = businessObjectService.findBySinglePrimaryKey(PaymentChangeCode.class, changeStatus);
         paymentGroupHistory.setPaymentChange((PaymentChangeCode) cd);
         paymentGroupHistory.setOrigPaymentStatus(paymentGroup.getPaymentStatus());
         paymentGroupHistory.setChangeUser(user);
@@ -119,7 +119,7 @@ protected void changeStatus(PaymentGroup paymentGroup, String newPaymentStatus,
 
         this.businessObjectService.save(paymentGroupHistory);
 
-        KualiCode code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, newPaymentStatus);
+        CodedBase code = businessObjectService.findBySinglePrimaryKey(PaymentStatus.class, newPaymentStatus);
         paymentGroup.setPaymentStatus((PaymentStatus) code);
         this.businessObjectService.save(paymentGroup);
         LOG.debug("changeStatus() Status has been changed; exit method.");

src/main/java/edu/cornell/kfs/gl/businessobject/lookup/CuCurrentAccountBalanceLookupableHelperServiceImpl.java

@@ -33,7 +33,10 @@ public class CuCurrentAccountBalanceLookupableHelperServiceImpl extends CurrentA
      * org.kuali.kfs.gl.businessobject.CurrentAccountBalance, org.kuali.kfs.gl.businessobject.Balance, java.lang.String)
      */
     @Override
-    protected void updateCurrentBalance(final CurrentAccountBalance currentBalance, final Balance balance, final String fiscalPeriod) {
+    protected void updateCurrentBalance(
+            final CurrentAccountBalance currentBalance, 
+            final Balance balance, 
+            final String fiscalPeriod) {
         new BalanceUpdaterHelper(currentBalance, balance, fiscalPeriod)
                 .updateCurrentBalance();
     }

src/main/java/edu/cornell/kfs/module/ar/document/web/struts/CuContractsGrantsInvoiceDocumentAction.java

@@ -43,7 +43,7 @@ public class CuContractsGrantsInvoiceDocumentAction extends ContractsGrantsInvoi
     @Override
     public ActionForward prorateBill(
             final ActionMapping mapping, final ActionForm form, final HttpServletRequest request,
-            final HttpServletResponse response) throws Exception {
+            final HttpServletResponse response) {
         final ContractsGrantsInvoiceDocumentForm contractsGrantsInvoiceDocumentForm = (ContractsGrantsInvoiceDocumentForm) form;
         KualiDecimal budgetTotalAmount = findAwardBudgetTotal(contractsGrantsInvoiceDocumentForm);
 
@@ -208,7 +208,7 @@ protected ActionForward promptForFinalBillConfirmation(ActionMapping mapping, Ac
     protected ActionForward promptForSuspensionCategories(
             final ActionMapping mapping, final ActionForm form,
             final HttpServletRequest request, final HttpServletResponse response,
-            final ContractsGrantsInvoiceDocument contractsGrantsInvoiceDocument, final String caller) throws Exception {
+            final ContractsGrantsInvoiceDocument contractsGrantsInvoiceDocument, final String caller) {
         ActionForward forward = null;
 
         if (CollectionUtils.size(contractsGrantsInvoiceDocument.getInvoiceSuspensionCategories()) > 0) {

src/main/java/edu/cornell/kfs/module/cam/batch/service/impl/CuAssetDepreciationServiceImpl.java

@@ -29,7 +29,7 @@ public class CuAssetDepreciationServiceImpl extends AssetDepreciationServiceImpl
     private static final Logger LOG = LogManager.getLogger();
 
     @Override
-    protected boolean runAssetDepreciation() throws ParseException {
+    protected boolean runAssetDepreciation() {
         return true;
     }
 

src/main/java/edu/cornell/kfs/module/cg/businessobject/AgencyOrigin.java

@@ -1,9 +1,9 @@
 package edu.cornell.kfs.module.cg.businessobject;
 
-import org.kuali.kfs.krad.bo.KualiCodeBase;
+import org.kuali.kfs.krad.bo.CodedBase;
 import org.kuali.kfs.core.api.mo.common.active.MutableInactivatable;
 
-public class AgencyOrigin extends KualiCodeBase implements MutableInactivatable {
+public class AgencyOrigin extends CodedBase implements MutableInactivatable {
 
     private static final long serialVersionUID = 4258338743530843504L;
 

src/main/java/edu/cornell/kfs/module/ld/batch/service/impl/CuFileEnterpriseFeederHelperServiceImpl.java

@@ -11,6 +11,7 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -34,6 +35,7 @@
 import org.kuali.kfs.module.ld.businessobject.LaborOriginEntry;
 import org.kuali.kfs.module.ld.businessobject.PositionObjectBenefit;
 import org.kuali.kfs.module.ld.report.EnterpriseFeederReportData;
+import org.kuali.kfs.module.ld.util.BenefitOffsetKey;
 import org.kuali.kfs.module.ld.util.LaborOriginEntryFileIterator;
 import org.kuali.kfs.sys.KFSConstants;
 import org.kuali.kfs.sys.KFSPropertyConstants;
@@ -89,6 +91,9 @@ public void feedOnFile(
             if (reconciliationProcessSucceeded(errorMessages)) {
                 String line;
                 int count = 0;
+
+                // placeholder of all generated offset entries
+                final Map<BenefitOffsetKey, List<LaborOriginEntry>> salaryBenefitOffsets = new LinkedHashMap<>();
 
                 Collection<String> offsetDocTypes = parameterService.getParameterValuesAsString(
                         LaborEnterpriseFeedStep.class, LaborParameterConstants.BENEFITS_DOCUMENT_TYPES);
@@ -108,7 +113,7 @@ public void feedOnFile(
                         feederReportData.incrementNumberOfRecordsWritten();
                         feederReportData.addToTotalAmountWritten(tempEntry.getTransactionLedgerEntryAmount());
 
-                        final List<LaborOriginEntry> benefitEntries = generateBenefits(tempEntry, errorStatisticsReport, feederReportData);
+                        final List<LaborOriginEntry> benefitEntries = generateBenefits(tempEntry, errorStatisticsReport, feederReportData, salaryBenefitOffsets);
                         KualiDecimal benefitTotal = new KualiDecimal (0);
                         KualiDecimal offsetTotal = new KualiDecimal (0);
 

src/main/java/edu/cornell/kfs/module/purap/businessobject/LevelOrganization.java

@@ -1,9 +1,9 @@
 package edu.cornell.kfs.module.purap.businessobject;
 
-import org.kuali.kfs.krad.bo.KualiCodeBase;
+import org.kuali.kfs.krad.bo.CodedBase;
 
 
-public class LevelOrganization extends KualiCodeBase{
+public class LevelOrganization extends CodedBase{
 
 	private static final long serialVersionUID = 1L;
 

src/main/java/edu/cornell/kfs/module/purap/document/service/impl/CuB2BShoppingServiceImpl.java

@@ -402,7 +402,7 @@ protected RequisitionItem createRequisitionItem(
             reqItem.setItemDescription(reqItem.getItemDescription().substring(0, requisitionItemDescriptionMaxLength));
         }
 
-         final boolean commCodeParam = parameterService.getParameterValueAsBoolean(RequisitionDocument.class, PurapParameterConstants.ENABLE_DEFAULT_VENDOR_COMMODITY_CODE_IND);
+         final boolean commCodeParam = parameterService.getParameterValueAsBoolean(RequisitionDocument.class, PurapParameterConstants.COMMODITY_CODE_TO_LINE_ITEM_IND);
 
          if (commCodeParam) {
              if (reqItem.getCommodityCode() != null && !reqItem.getCommodityCode().isActive() && StringUtils.isNotBlank(defaultCommodityCode)) {

src/main/java/edu/cornell/kfs/module/purap/document/service/impl/CuCreditMemoServiceImpl.java

@@ -28,7 +28,7 @@ public class CuCreditMemoServiceImpl extends CreditMemoServiceImpl {
     private CUPaymentMethodGeneralLedgerPendingEntryService paymentMethodGeneralLedgerPendingEntryService;
 
     @Override
-    public VendorCreditMemoDocument addHoldOnCreditMemo(final VendorCreditMemoDocument cmDocument, final String note) throws Exception {
+    public VendorCreditMemoDocument addHoldOnCreditMemo(final VendorCreditMemoDocument cmDocument, final String note) {
         // save the note
         final Note noteObj = documentService.createNoteFromDocument(cmDocument, note);
         cmDocument.addNote(noteObj);
@@ -56,7 +56,7 @@ public VendorCreditMemoDocument addHoldOnCreditMemo(final VendorCreditMemoDocume
      *      java.lang.String)
      */
     @Override
-    public VendorCreditMemoDocument removeHoldOnCreditMemo(final VendorCreditMemoDocument cmDocument, final String note) throws Exception {
+    public VendorCreditMemoDocument removeHoldOnCreditMemo(final VendorCreditMemoDocument cmDocument, final String note) {
         // save the note
         final Note noteObj = documentService.createNoteFromDocument(cmDocument, note);
         cmDocument.addNote(noteObj);

src/main/java/edu/cornell/kfs/module/purap/document/web/struts/CuRequisitionAction.java

@@ -54,15 +54,15 @@ public class CuRequisitionAction extends RequisitionAction {
     @Override
     public ActionForward addItem(
             final ActionMapping mapping, final ActionForm form, final HttpServletRequest request, 
-            final HttpServletResponse response) throws Exception {
+            final HttpServletResponse response) {
         final PurchasingFormBase purchasingForm = (PurchasingFormBase) form;
         PurApItem item = purchasingForm.getNewPurchasingItemLine();
         final RequisitionItem requisitionItem = (RequisitionItem) item;
         final PurchasingDocument purDocument = (PurchasingDocument) purchasingForm.getDocument();
 
         if (StringUtils.isBlank(requisitionItem.getPurchasingCommodityCode())) {
             final boolean commCodeParam = SpringContext.getBean(ParameterService.class).getParameterValueAsBoolean(
-                    CuRequisitionDocument.class, PurapParameterConstants.ENABLE_DEFAULT_VENDOR_COMMODITY_CODE_IND);
+                    CuRequisitionDocument.class, PurapParameterConstants.COMMODITY_CODE_TO_LINE_ITEM_IND);
 
             if (commCodeParam && purchasingForm instanceof RequisitionForm) {
                 final CuRequisitionDocument reqs = (CuRequisitionDocument) purchasingForm.getDocument();
@@ -95,7 +95,7 @@ public ActionForward addItem(
 
     public ActionForward clearVendor(
             final ActionMapping mapping, final ActionForm form, final HttpServletRequest request, 
-            final HttpServletResponse response) throws Exception {
+            final HttpServletResponse response) {
         final PurchasingFormBase baseForm = (PurchasingFormBase) form;
         final CuRequisitionDocument document = (CuRequisitionDocument) baseForm.getDocument();
 

src/main/java/edu/cornell/kfs/module/purap/document/web/struts/IWantDocumentAction.java

@@ -928,7 +928,7 @@ private boolean documentRoutingSuccessMessageIsPresent() {
     @Override
     public ActionForward promptBeforeValidation(
             final ActionMapping mapping, final ActionForm form, final HttpServletRequest request,
-            final HttpServletResponse response, final String methodToCall) throws Exception {
+            final HttpServletResponse response, final String methodToCall) {
         final IWantDocumentForm iWantDocForm = (IWantDocumentForm) form;
         if (!StringUtils.equalsIgnoreCase(iWantDocForm.getStep(), CUPurapConstants.IWantDocumentSteps.REGULAR)) {
             return null;

src/main/java/edu/cornell/kfs/module/purap/document/workflow/CuPurchaseOrderActionListAttribute.java

@@ -9,7 +9,7 @@
 
 public class CuPurchaseOrderActionListAttribute extends PurchaseOrderActionListAttribute {
     @Override
-    public ActionSet getLegalActions(final String principalId, final ActionItem actionItem) throws Exception {
+    public ActionSet getLegalActions(final String principalId, final ActionItem actionItem) {
         final List<String> actionSetList = new ArrayList<>();
         actionSetList.add(KewApiConstants.ACTION_TAKEN_FYI_CD);        
         return new ActionSet(actionSetList);