CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 46 Packages Projects Releases Wiki Activity

remove warnings

Browse Source
This commit is contained in:
Vishwas Babu A J
2014-12-06 10:37:39 -08:00
parent cb48a79e24
commit 990cab63cf
14 changed files with 86 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/service/PaginationHelper.java
+1
View File
@@ -18,6 +18,7 @@ public class PaginationHelper<E> {
final List<E> items = jt.query(sqlFetchRows, args, rowMapper); final List<E> items = jt.query(sqlFetchRows, args, rowMapper);
// determine how many rows are available // determine how many rows are available
@SuppressWarnings("deprecation")
final int totalFilteredRecords = jt.queryForInt(sqlCountRows); final int totalFilteredRecords = jt.queryForInt(sqlCountRows);
return new Page<>(items, totalFilteredRecords); return new Page<>(items, totalFilteredRecords);
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+19 -17
View File
@@ -678,6 +678,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
} }
} }
@SuppressWarnings("deprecation")
private int getCodeIdForColumn(final String dataTableNameAlias, final String name) { private int getCodeIdForColumn(final String dataTableNameAlias, final String name) {
final StringBuilder checkColumnCodeMapping = new StringBuilder(); final StringBuilder checkColumnCodeMapping = new StringBuilder();
checkColumnCodeMapping.append("select ccm.code_id from x_table_column_code_mappings ccm where ccm.column_alias_name='") checkColumnCodeMapping.append("select ccm.code_id from x_table_column_code_mappings ccm where ccm.column_alias_name='")
@@ -745,6 +746,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
.append(" WHERE i.CONSTRAINT_TYPE = 'FOREIGN KEY'").append(" AND i.TABLE_SCHEMA = DATABASE()") .append(" WHERE i.CONSTRAINT_TYPE = 'FOREIGN KEY'").append(" AND i.TABLE_SCHEMA = DATABASE()")
.append(" AND i.TABLE_NAME = '").append(datatableName).append("' AND i.CONSTRAINT_NAME = 'fk_").append(datatableAlias) .append(" AND i.TABLE_NAME = '").append(datatableName).append("' AND i.CONSTRAINT_NAME = 'fk_").append(datatableAlias)
.append("_").append(name).append("' "); .append("_").append(name).append("' ");
@SuppressWarnings("deprecation")
final int count = this.jdbcTemplate.queryForInt(findFKSql.toString()); final int count = this.jdbcTemplate.queryForInt(findFKSql.toString());
if (count > 0) { if (count > 0) {
codeMappings.add(datatableAlias + "_" + name); codeMappings.add(datatableAlias + "_" + name);
@@ -1316,9 +1318,9 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
String selectColumns = ""; String selectColumns = "";
String columnName = ""; String columnName = "";
String pValue = null; String pValue = null;
for(final ResultsetColumnHeaderData pColumnHeader : columnHeaders) { for (final ResultsetColumnHeaderData pColumnHeader : columnHeaders) {
final String key = pColumnHeader.getColumnName(); final String key = pColumnHeader.getColumnName();
if(affectedColumns.containsKey(key)) { if (affectedColumns.containsKey(key)) {
pValue = affectedColumns.get(key); pValue = affectedColumns.get(key);
if (StringUtils.isEmpty(pValue)) { if (StringUtils.isEmpty(pValue)) {
pValueWrite = "null"; pValueWrite = "null";
@@ -1326,7 +1328,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
if ("bit".equalsIgnoreCase(pColumnHeader.getColumnType())) { if ("bit".equalsIgnoreCase(pColumnHeader.getColumnType())) {
pValueWrite = BooleanUtils.toString(BooleanUtils.toBooleanObject(pValue), "1", "0", "null"); pValueWrite = BooleanUtils.toString(BooleanUtils.toBooleanObject(pValue), "1", "0", "null");
} else { } else {
pValueWrite = singleQuote + this.genericDataService.replace(pValue, singleQuote, singleQuote + singleQuote) + singleQuote; pValueWrite = singleQuote + this.genericDataService.replace(pValue, singleQuote, singleQuote + singleQuote)
+ singleQuote;
} }
} }
@@ -1395,9 +1398,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
return vaddSql; return vaddSql;
} }
private String getUpdateSql(List<ResultsetColumnHeaderData> columnHeaders, final String datatable, private String getUpdateSql(List<ResultsetColumnHeaderData> columnHeaders, final String datatable, final String keyFieldName,
final String keyFieldName, final Long keyFieldValue, final Long keyFieldValue, final Map<String, Object> changedColumns) {
final Map<String, Object> changedColumns) {
// just updating fields that have changed since pre-update read - though // just updating fields that have changed since pre-update read - though
// its possible these values are different from the page the user was // its possible these values are different from the page the user was
@@ -1415,7 +1417,7 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
String sql = "update `" + datatable + "` "; String sql = "update `" + datatable + "` ";
for (final ResultsetColumnHeaderData pColumnHeader : columnHeaders) { for (final ResultsetColumnHeaderData pColumnHeader : columnHeaders) {
final String key = pColumnHeader.getColumnName(); final String key = pColumnHeader.getColumnName();
if(changedColumns.containsKey(key)) { if (changedColumns.containsKey(key)) {
if (firstColumn) { if (firstColumn) {
sql += " set "; sql += " set ";
firstColumn = false; firstColumn = false;
@@ -1430,7 +1432,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
if ("bit".equalsIgnoreCase(pColumnHeader.getColumnType())) { if ("bit".equalsIgnoreCase(pColumnHeader.getColumnType())) {
pValueWrite = BooleanUtils.toString(BooleanUtils.toBooleanObject(pValue), "1", "0", "null"); pValueWrite = BooleanUtils.toString(BooleanUtils.toBooleanObject(pValue), "1", "0", "null");
} else { } else {
pValueWrite = singleQuote + this.genericDataService.replace(pValue, singleQuote, singleQuote + singleQuote) + singleQuote; pValueWrite = singleQuote + this.genericDataService.replace(pValue, singleQuote, singleQuote + singleQuote)
+ singleQuote;
} }
} }
sql += "`" + key + "` = " + pValueWrite; sql += "`" + key + "` = " + pValueWrite;
@@ -1528,8 +1531,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
final Locale clientApplicationLocale) { final Locale clientApplicationLocale) {
String paramValue = pValue; String paramValue = pValue;
if (columnHeader.isDateDisplayType() || columnHeader.isDateTimeDisplayType() if (columnHeader.isDateDisplayType() || columnHeader.isDateTimeDisplayType() || columnHeader.isIntegerDisplayType()
|| columnHeader.isIntegerDisplayType() || columnHeader.isDecimalDisplayType() || columnHeader.isBooleanDisplayType()) { || columnHeader.isDecimalDisplayType() || columnHeader.isBooleanDisplayType()) {
// only trim if string is not empty and is not null. // only trim if string is not empty and is not null.
// throws a NULL pointer exception if the check below is not applied // throws a NULL pointer exception if the check below is not applied
paramValue = StringUtils.isNotEmpty(paramValue) ? paramValue.trim() : paramValue; paramValue = StringUtils.isNotEmpty(paramValue) ? paramValue.trim() : paramValue;
@@ -1588,8 +1591,8 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
paramValue = tmpDate.toString(); paramValue = tmpDate.toString();
} }
} else if (columnHeader.isDateTimeDisplayType()) { } else if (columnHeader.isDateTimeDisplayType()) {
final LocalDateTime tmpDateTime = JsonParserHelper.convertDateTimeFrom(paramValue, final LocalDateTime tmpDateTime = JsonParserHelper.convertDateTimeFrom(paramValue, columnHeader.getColumnName(),
columnHeader.getColumnName(), dateFormat, clientApplicationLocale); dateFormat, clientApplicationLocale);
if (tmpDateTime == null) { if (tmpDateTime == null) {
paramValue = null; paramValue = null;
} else { } else {
@@ -1613,16 +1616,15 @@ public class ReadWriteNonCoreDataServiceImpl implements ReadWriteNonCoreDataServ
final Boolean tmpBoolean = BooleanUtils.toBooleanObject(paramValue); final Boolean tmpBoolean = BooleanUtils.toBooleanObject(paramValue);
if (tmpBoolean == null) { if (tmpBoolean == null) {
final ApiParameterError error = ApiParameterError.parameterError("validation.msg.invalid.boolean.format", "The parameter " final ApiParameterError error = ApiParameterError.parameterError("validation.msg.invalid.boolean.format",
+ columnHeader.getColumnName() + " has value: " + paramValue + " which is invalid boolean value.", "The parameter " + columnHeader.getColumnName() + " has value: " + paramValue
columnHeader.getColumnName(), paramValue); + " which is invalid boolean value.", columnHeader.getColumnName(), paramValue);
final List<ApiParameterError> dataValidationErrors = new ArrayList<>(); final List<ApiParameterError> dataValidationErrors = new ArrayList<>();
dataValidationErrors.add(error); dataValidationErrors.add(error);
throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.", throw new PlatformApiDataValidationException("validation.msg.validation.errors.exist", "Validation errors exist.",
dataValidationErrors); dataValidationErrors);
} else {
paramValue = tmpBoolean.toString();
} }
paramValue = tmpBoolean.toString();
} else if (columnHeader.isString()) { } else if (columnHeader.isString()) {
if (paramValue.length() > columnHeader.getColumnLength()) { if (paramValue.length() > columnHeader.getColumnLength()) {
final ApiParameterError error = ApiParameterError.parameterError( final ApiParameterError error = ApiParameterError.parameterError(
mifosng-provider/src/main/java/org/mifosplatform/infrastructure/jobs/service/SchedulerJobRunnerReadServiceImpl.java
+2 -1
View File
@@ -13,11 +13,11 @@ import java.util.List;
import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.core.service.Page;
import org.mifosplatform.infrastructure.core.service.PaginationHelper; import org.mifosplatform.infrastructure.core.service.PaginationHelper;
import org.mifosplatform.infrastructure.core.service.RoutingDataSource; import org.mifosplatform.infrastructure.core.service.RoutingDataSource;
import org.mifosplatform.infrastructure.core.service.SearchParameters;
import org.mifosplatform.infrastructure.jobs.data.JobDetailData; import org.mifosplatform.infrastructure.jobs.data.JobDetailData;
import org.mifosplatform.infrastructure.jobs.data.JobDetailHistoryData; import org.mifosplatform.infrastructure.jobs.data.JobDetailHistoryData;
import org.mifosplatform.infrastructure.jobs.exception.JobNotFoundException; import org.mifosplatform.infrastructure.jobs.exception.JobNotFoundException;
import org.mifosplatform.infrastructure.jobs.exception.OperationNotAllowedException; import org.mifosplatform.infrastructure.jobs.exception.OperationNotAllowedException;
import org.mifosplatform.infrastructure.core.service.SearchParameters;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
@@ -99,6 +99,7 @@ public class SchedulerJobRunnerReadServiceImpl implements SchedulerJobRunnerRead
private boolean isJobExist(final Long jobId) { private boolean isJobExist(final Long jobId) {
boolean isJobPresent = false; boolean isJobPresent = false;
final String sql = "select count(*) from job job where job.id=" + jobId; final String sql = "select count(*) from job job where job.id=" + jobId;
@SuppressWarnings("deprecation")
final int count = this.jdbcTemplate.queryForInt(sql); final int count = this.jdbcTemplate.queryForInt(sql);
if (count == 1) { if (count == 1) {
isJobPresent = true; isJobPresent = true;
mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/domain/AccountAssociations.java
-5
View File
@@ -19,17 +19,14 @@ import org.springframework.data.jpa.domain.AbstractPersistable;
@Table(name = "m_portfolio_account_associations") @Table(name = "m_portfolio_account_associations")
public class AccountAssociations extends AbstractPersistable<Long> { public class AccountAssociations extends AbstractPersistable<Long> {
@SuppressWarnings("unused")
@ManyToOne @ManyToOne
@JoinColumn(name = "loan_account_id", nullable = true) @JoinColumn(name = "loan_account_id", nullable = true)
private Loan loanAccount; private Loan loanAccount;
@SuppressWarnings("unused")
@ManyToOne @ManyToOne
@JoinColumn(name = "savings_account_id", nullable = true) @JoinColumn(name = "savings_account_id", nullable = true)
private SavingsAccount savingsAccount; private SavingsAccount savingsAccount;
@SuppressWarnings("unused")
@ManyToOne @ManyToOne
@JoinColumn(name = "linked_loan_account_id", nullable = true) @JoinColumn(name = "linked_loan_account_id", nullable = true)
private Loan linkedLoanAccount; private Loan linkedLoanAccount;
@@ -38,11 +35,9 @@ public class AccountAssociations extends AbstractPersistable<Long> {
@JoinColumn(name = "linked_savings_account_id", nullable = true) @JoinColumn(name = "linked_savings_account_id", nullable = true)
private SavingsAccount linkedSavingsAccount; private SavingsAccount linkedSavingsAccount;
@SuppressWarnings("unused")
@Column(name = "association_type_enum", nullable = false) @Column(name = "association_type_enum", nullable = false)
private Integer associationType; private Integer associationType;
@SuppressWarnings("unused")
@Column(name = "is_active", nullable = false) @Column(name = "is_active", nullable = false)
private boolean active = true; private boolean active = true;
mifosng-provider/src/main/java/org/mifosplatform/portfolio/account/service/AccountTransfersReadPlatformServiceImpl.java
+2 -1
View File
@@ -20,6 +20,7 @@ import org.mifosplatform.infrastructure.core.service.DateUtils;
import org.mifosplatform.infrastructure.core.service.Page; import org.mifosplatform.infrastructure.core.service.Page;
import org.mifosplatform.infrastructure.core.service.PaginationHelper; import org.mifosplatform.infrastructure.core.service.PaginationHelper;
import org.mifosplatform.infrastructure.core.service.RoutingDataSource; import org.mifosplatform.infrastructure.core.service.RoutingDataSource;
import org.mifosplatform.infrastructure.core.service.SearchParameters;
import org.mifosplatform.organisation.monetary.data.CurrencyData; import org.mifosplatform.organisation.monetary.data.CurrencyData;
import org.mifosplatform.organisation.office.data.OfficeData; import org.mifosplatform.organisation.office.data.OfficeData;
import org.mifosplatform.organisation.office.service.OfficeReadPlatformService; import org.mifosplatform.organisation.office.service.OfficeReadPlatformService;
@@ -31,7 +32,6 @@ import org.mifosplatform.portfolio.account.domain.AccountTransferType;
import org.mifosplatform.portfolio.account.exception.AccountTransferNotFoundException; import org.mifosplatform.portfolio.account.exception.AccountTransferNotFoundException;
import org.mifosplatform.portfolio.client.data.ClientData; import org.mifosplatform.portfolio.client.data.ClientData;
import org.mifosplatform.portfolio.client.service.ClientReadPlatformService; import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
import org.mifosplatform.infrastructure.core.service.SearchParameters;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.dao.EmptyResultDataAccessException; import org.springframework.dao.EmptyResultDataAccessException;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
@@ -373,6 +373,7 @@ public class AccountTransfersReadPlatformServiceImpl implements AccountTransfers
.append(transactionId); .append(transactionId);
} }
@SuppressWarnings("deprecation")
final int count = this.jdbcTemplate.queryForInt(sql.toString()); final int count = this.jdbcTemplate.queryForInt(sql.toString());
return count > 0; return count > 0;
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/calendar/api/CalendarsApiResource.java
+4
View File
@@ -241,6 +241,10 @@ public class CalendarsApiResource {
break; break;
case INVALID: case INVALID:
break; break;
case LOAN_RECALCULATION_DETAIL:
break;
default:
break;
} }
return resourceDetails.build(); return resourceDetails.build();
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/domain/AccountNumberGenerator.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class AccountNumberGenerator {
} }
private String generateAccountNumber(Map<String, String> propertyMap, AccountNumberFormat accountNumberFormat) { private String generateAccountNumber(Map<String, String> propertyMap, AccountNumberFormat accountNumberFormat) {
String accountNumber = StringUtils.leftPad(propertyMap.get(ID), this.maxLength, '0'); String accountNumber = StringUtils.leftPad(propertyMap.get(ID), AccountNumberGenerator.maxLength, '0');
if (accountNumberFormat != null && accountNumberFormat.getPrefixEnum() != null) { if (accountNumberFormat != null && accountNumberFormat.getPrefixEnum() != null) {
AccountNumberPrefixType accountNumberPrefixType = AccountNumberPrefixType.fromInt(accountNumberFormat.getPrefixEnum()); AccountNumberPrefixType accountNumberPrefixType = AccountNumberPrefixType.fromInt(accountNumberFormat.getPrefixEnum());
String prefix = null; String prefix = null;
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/guarantor/data/GuarantorDTO.java
+2 -1
View File
@@ -9,10 +9,11 @@ import java.math.BigDecimal;
import org.mifosplatform.portfolio.loanaccount.domain.Loan; import org.mifosplatform.portfolio.loanaccount.domain.Loan;
public class GuarantorDTO { public class GuarantorDTO {
@SuppressWarnings("unused")
private BigDecimal paidAmount; private BigDecimal paidAmount;
@SuppressWarnings("unused")
private Loan loan; private Loan loan;
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleAssembler.java
+14 -13
View File
@@ -36,10 +36,10 @@ import org.mifosplatform.portfolio.calendar.exception.MeetingFrequencyMismatchEx
import org.mifosplatform.portfolio.calendar.service.CalendarUtils; import org.mifosplatform.portfolio.calendar.service.CalendarUtils;
import org.mifosplatform.portfolio.client.domain.Client; import org.mifosplatform.portfolio.client.domain.Client;
import org.mifosplatform.portfolio.client.domain.ClientRepositoryWrapper; import org.mifosplatform.portfolio.client.domain.ClientRepositoryWrapper;
import org.mifosplatform.portfolio.common.domain.DayOfWeekType;
import org.mifosplatform.portfolio.common.domain.DaysInMonthType; import org.mifosplatform.portfolio.common.domain.DaysInMonthType;
import org.mifosplatform.portfolio.common.domain.DaysInYearType; import org.mifosplatform.portfolio.common.domain.DaysInYearType;
import org.mifosplatform.portfolio.common.domain.PeriodFrequencyType; import org.mifosplatform.portfolio.common.domain.PeriodFrequencyType;
import org.mifosplatform.portfolio.common.domain.DayOfWeekType;
import org.mifosplatform.portfolio.group.domain.Group; import org.mifosplatform.portfolio.group.domain.Group;
import org.mifosplatform.portfolio.group.domain.GroupRepositoryWrapper; import org.mifosplatform.portfolio.group.domain.GroupRepositoryWrapper;
import org.mifosplatform.portfolio.loanaccount.api.LoanApiConstants; import org.mifosplatform.portfolio.loanaccount.api.LoanApiConstants;
@@ -181,12 +181,12 @@ public class LoanScheduleAssembler {
* be either same frequency or loan freq is multiple of center/group * be either same frequency or loan freq is multiple of center/group
* meeting freq multiples * meeting freq multiples
*/ */
if (loanType.isJLGAccount() && calendarId != null ) { if (loanType.isJLGAccount() && calendarId != null) {
calendar = this.calendarRepository.findOne(calendarId); calendar = this.calendarRepository.findOne(calendarId);
if (calendar == null) { throw new CalendarNotFoundException(calendarId); } if (calendar == null) { throw new CalendarNotFoundException(calendarId); }
final PeriodFrequencyType meetingPeriodFrequency = CalendarUtils.getMeetingPeriodFrequencyType(calendar.getRecurrence()); final PeriodFrequencyType meetingPeriodFrequency = CalendarUtils.getMeetingPeriodFrequencyType(calendar.getRecurrence());
validateRepaymentFrequencyIsSameAsMeetingFrequency(meetingPeriodFrequency.getValue(), repaymentFrequencyType, validateRepaymentFrequencyIsSameAsMeetingFrequency(meetingPeriodFrequency.getValue(), repaymentFrequencyType,
CalendarUtils.getInterval(calendar.getRecurrence()), repaymentEvery); CalendarUtils.getInterval(calendar.getRecurrence()), repaymentEvery);
} }
/* /*
@@ -287,12 +287,12 @@ public class LoanScheduleAssembler {
final boolean isInterestRecalculationEnabled = loanProduct.isInterestRecalculationEnabled(); final boolean isInterestRecalculationEnabled = loanProduct.isInterestRecalculationEnabled();
return LoanApplicationTerms.assembleFrom(applicationCurrency, loanTermFrequency, loanTermPeriodFrequencyType, numberOfRepayments, return LoanApplicationTerms.assembleFrom(applicationCurrency, loanTermFrequency, loanTermPeriodFrequencyType, numberOfRepayments,
repaymentEvery, repaymentPeriodFrequencyType, nthDay, weekDayType, amortizationMethod, repaymentEvery, repaymentPeriodFrequencyType, nthDay, weekDayType, amortizationMethod, interestMethod,
interestMethod, interestRatePerPeriod, interestRatePeriodFrequencyType, annualNominalInterestRate, interestRatePerPeriod, interestRatePeriodFrequencyType, annualNominalInterestRate, interestCalculationPeriodMethod,
interestCalculationPeriodMethod, principalMoney, expectedDisbursementDate, repaymentsStartingFromDate, principalMoney, expectedDisbursementDate, repaymentsStartingFromDate, calculatedRepaymentsStartingFromDate,
calculatedRepaymentsStartingFromDate, graceOnPrincipalPayment, graceOnInterestPayment, graceOnInterestCharged, graceOnPrincipalPayment, graceOnInterestPayment, graceOnInterestCharged, interestChargedFromDate, inArrearsToleranceMoney,
interestChargedFromDate, inArrearsToleranceMoney, loanProduct.isMultiDisburseLoan(), emiAmount, disbursementDatas, loanProduct.isMultiDisburseLoan(), emiAmount, disbursementDatas, maxOutstandingBalance, loanVariationTermsData,
maxOutstandingBalance, loanVariationTermsData, graceOnArrearsAgeing, daysInMonthType, daysInYearType, isInterestRecalculationEnabled); graceOnArrearsAgeing, daysInMonthType, daysInYearType, isInterestRecalculationEnabled);
} }
private List<DisbursementData> fetchDisbursementData(final JsonObject command) { private List<DisbursementData> fetchDisbursementData(final JsonObject command) {
@@ -469,6 +469,7 @@ public class LoanScheduleAssembler {
} }
} }
@SuppressWarnings("null")
private LocalDate deriveFirstRepaymentDate(final AccountType loanType, final Integer repaymentEvery, private LocalDate deriveFirstRepaymentDate(final AccountType loanType, final Integer repaymentEvery,
final LocalDate expectedDisbursementDate, final PeriodFrequencyType repaymentPeriodFrequencyType, final LocalDate expectedDisbursementDate, final PeriodFrequencyType repaymentPeriodFrequencyType,
final Integer minimumDaysBetweenDisbursalAndFirstRepayment, final Calendar calendar) { final Integer minimumDaysBetweenDisbursalAndFirstRepayment, final Calendar calendar) {
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/loanschedule/service/LoanScheduleHistoryReadPlatformServiceImpl.java
+1
View File
@@ -43,6 +43,7 @@ public class LoanScheduleHistoryReadPlatformServiceImpl implements LoanScheduleH
this.jdbcTemplate = new JdbcTemplate(dataSource); this.jdbcTemplate = new JdbcTemplate(dataSource);
} }
@SuppressWarnings("deprecation")
@Override @Override
public Integer fetchCurrentVersionNumber(Long loanId) { public Integer fetchCurrentVersionNumber(Long loanId) {
final String sql = "select MAX(lrs.version) from m_loan_repayment_schedule_history lrs where lrs.loan_id = ?"; final String sql = "select MAX(lrs.version) from m_loan_repayment_schedule_history lrs where lrs.loan_id = ?";
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAccrualWritePlatformServiceImpl.java
+1
View File
@@ -315,6 +315,7 @@ public class LoanAccrualWritePlatformServiceImpl implements LoanAccrualWritePlat
this.jdbcTemplate.update(transactionSql, scheduleAccrualData.getLoanId(), scheduleAccrualData.getOfficeId(), this.jdbcTemplate.update(transactionSql, scheduleAccrualData.getLoanId(), scheduleAccrualData.getOfficeId(),
LoanTransactionType.ACCRUAL.getValue(), accruedTill.toDate(), amount, interestportion, feeportion, penaltyportion, LoanTransactionType.ACCRUAL.getValue(), accruedTill.toDate(), amount, interestportion, feeportion, penaltyportion,
DateUtils.getDateOfTenant()); DateUtils.getDateOfTenant());
@SuppressWarnings("deprecation")
final Long transactonId = this.jdbcTemplate.queryForLong("SELECT LAST_INSERT_ID()"); final Long transactonId = this.jdbcTemplate.queryForLong("SELECT LAST_INSERT_ID()");
Map<LoanChargeData, BigDecimal> applicableCharges = scheduleAccrualData.getApplicableCharges(); Map<LoanChargeData, BigDecimal> applicableCharges = scheduleAccrualData.getApplicableCharges();
mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductRelatedDetail.java
+22 -24
View File
@@ -23,10 +23,8 @@ import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder;
import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException; import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException;
import org.mifosplatform.organisation.monetary.domain.MonetaryCurrency; import org.mifosplatform.organisation.monetary.domain.MonetaryCurrency;
import org.mifosplatform.organisation.monetary.domain.Money; import org.mifosplatform.organisation.monetary.domain.Money;
import org.mifosplatform.portfolio.common.domain.DayOfWeekType;
import org.mifosplatform.portfolio.common.domain.DaysInMonthType; import org.mifosplatform.portfolio.common.domain.DaysInMonthType;
import org.mifosplatform.portfolio.common.domain.DaysInYearType; import org.mifosplatform.portfolio.common.domain.DaysInYearType;
import org.mifosplatform.portfolio.common.domain.NthDayType;
import org.mifosplatform.portfolio.common.domain.PeriodFrequencyType; import org.mifosplatform.portfolio.common.domain.PeriodFrequencyType;
import org.mifosplatform.portfolio.loanaccount.domain.Loan; import org.mifosplatform.portfolio.loanaccount.domain.Loan;
import org.mifosplatform.portfolio.loanaccount.loanschedule.domain.AprCalculator; import org.mifosplatform.portfolio.loanaccount.loanschedule.domain.AprCalculator;
@@ -172,12 +170,12 @@ public class LoanProductRelatedDetail implements LoanProductMinimumRepaymentSche
} }
@Override @Override
public MonetaryCurrency getCurrency() { public MonetaryCurrency getCurrency() {
return this.currency.copy(); return this.currency.copy();
} }
@Override @Override
public Money getPrincipal() { public Money getPrincipal() {
return Money.of(this.currency, this.principal); return Money.of(this.currency, this.principal);
} }
@@ -186,47 +184,47 @@ public class LoanProductRelatedDetail implements LoanProductMinimumRepaymentSche
} }
@Override @Override
public Integer graceOnInterestCharged() { public Integer graceOnInterestCharged() {
return this.graceOnInterestCharged; return this.graceOnInterestCharged;
} }
@Override @Override
public Integer graceOnInterestPayment() { public Integer graceOnInterestPayment() {
return this.graceOnInterestPayment; return this.graceOnInterestPayment;
} }
@Override @Override
public Integer graceOnPrincipalPayment() { public Integer graceOnPrincipalPayment() {
return this.graceOnPrincipalPayment; return this.graceOnPrincipalPayment;
} }
@Override @Override
public Money getInArrearsTolerance() { public Money getInArrearsTolerance() {
return Money.of(this.currency, this.inArrearsTolerance); return Money.of(this.currency, this.inArrearsTolerance);
} }
@Override @Override
public BigDecimal getNominalInterestRatePerPeriod() { public BigDecimal getNominalInterestRatePerPeriod() {
return BigDecimal.valueOf(Double.valueOf(this.nominalInterestRatePerPeriod.stripTrailingZeros().toString())); return BigDecimal.valueOf(Double.valueOf(this.nominalInterestRatePerPeriod.stripTrailingZeros().toString()));
} }
@Override @Override
public PeriodFrequencyType getInterestPeriodFrequencyType() { public PeriodFrequencyType getInterestPeriodFrequencyType() {
return this.interestPeriodFrequencyType; return this.interestPeriodFrequencyType;
} }
@Override @Override
public BigDecimal getAnnualNominalInterestRate() { public BigDecimal getAnnualNominalInterestRate() {
return BigDecimal.valueOf(Double.valueOf(this.annualNominalInterestRate.stripTrailingZeros().toString())); return BigDecimal.valueOf(Double.valueOf(this.annualNominalInterestRate.stripTrailingZeros().toString()));
} }
@Override @Override
public InterestMethod getInterestMethod() { public InterestMethod getInterestMethod() {
return this.interestMethod; return this.interestMethod;
} }
@Override @Override
public InterestCalculationPeriodMethod getInterestCalculationPeriodMethod() { public InterestCalculationPeriodMethod getInterestCalculationPeriodMethod() {
return this.interestCalculationPeriodMethod; return this.interestCalculationPeriodMethod;
} }
@@ -240,13 +238,13 @@ public class LoanProductRelatedDetail implements LoanProductMinimumRepaymentSche
return this.repaymentPeriodFrequencyType; return this.repaymentPeriodFrequencyType;
} }
@Override @Override
public Integer getNumberOfRepayments() { public Integer getNumberOfRepayments() {
return this.numberOfRepayments; return this.numberOfRepayments;
} }
@Override @Override
public AmortizationMethod getAmortizationMethod() { public AmortizationMethod getAmortizationMethod() {
return this.amortizationMethod; return this.amortizationMethod;
} }
@@ -320,14 +318,14 @@ public class LoanProductRelatedDetail implements LoanProductMinimumRepaymentSche
actualChanges.put("locale", localeAsInput); actualChanges.put("locale", localeAsInput);
this.repaymentPeriodFrequencyType = PeriodFrequencyType.fromInt(newValue); this.repaymentPeriodFrequencyType = PeriodFrequencyType.fromInt(newValue);
if(this.repaymentPeriodFrequencyType == PeriodFrequencyType.MONTHS) { if (this.repaymentPeriodFrequencyType == PeriodFrequencyType.MONTHS) {
final String repaymentFrequencyNthDayTypeParamName = "repaymentFrequencyNthDayType"; final String repaymentFrequencyNthDayTypeParamName = "repaymentFrequencyNthDayType";
newValue = command.integerValueOfParameterNamed(repaymentFrequencyNthDayTypeParamName); newValue = command.integerValueOfParameterNamed(repaymentFrequencyNthDayTypeParamName);
actualChanges.put(repaymentFrequencyNthDayTypeParamName, newValue); actualChanges.put(repaymentFrequencyNthDayTypeParamName, newValue);
final String repaymentFrequencyDayOfWeekTypeParamName = "repaymentFrequencyDayOfWeekType"; final String repaymentFrequencyDayOfWeekTypeParamName = "repaymentFrequencyDayOfWeekType";
newValue = command.integerValueOfParameterNamed(repaymentFrequencyDayOfWeekTypeParamName); newValue = command.integerValueOfParameterNamed(repaymentFrequencyDayOfWeekTypeParamName);
actualChanges.put(repaymentFrequencyDayOfWeekTypeParamName, newValue); actualChanges.put(repaymentFrequencyDayOfWeekTypeParamName, newValue);
actualChanges.put("locale", localeAsInput); actualChanges.put("locale", localeAsInput);
} }
@@ -493,7 +491,7 @@ public class LoanProductRelatedDetail implements LoanProductMinimumRepaymentSche
} }
@Override @Override
public Integer getGraceOnDueDate() { public Integer getGraceOnDueDate() {
return this.graceOnArrearsAgeing; return this.graceOnArrearsAgeing;
} }
@@ -514,6 +512,6 @@ public class LoanProductRelatedDetail implements LoanProductMinimumRepaymentSche
} }
public void updateNumberOfRepayments(Integer numberOfRepayments) { public void updateNumberOfRepayments(Integer numberOfRepayments) {
this.numberOfRepayments = numberOfRepayments; this.numberOfRepayments = numberOfRepayments;
} }
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/meeting/api/MeetingsApiResource.java
+4
View File
@@ -252,6 +252,10 @@ public class MeetingsApiResource {
break; break;
case INVALID: case INVALID:
break; break;
case LOAN_RECALCULATION_DETAIL:
break;
default:
break;
} }
return resourceDetails.build(); return resourceDetails.build();
} }
mifosng-provider/src/main/java/org/mifosplatform/portfolio/savings/domain/DepositAccountOnHoldTransaction.java
-3
View File
@@ -18,8 +18,6 @@ import javax.persistence.Table;
import javax.persistence.Temporal; import javax.persistence.Temporal;
import javax.persistence.TemporalType; import javax.persistence.TemporalType;
import org.hibernate.annotations.LazyCollection;
import org.hibernate.annotations.LazyCollectionOption;
import org.joda.time.LocalDate; import org.joda.time.LocalDate;
import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorFundingTransaction; import org.mifosplatform.portfolio.loanaccount.guarantor.domain.GuarantorFundingTransaction;
import org.mifosplatform.portfolio.savings.DepositAccountOnHoldTransactionType; import org.mifosplatform.portfolio.savings.DepositAccountOnHoldTransactionType;
@@ -29,7 +27,6 @@ import org.springframework.data.jpa.domain.AbstractPersistable;
@Table(name = "m_deposit_account_on_hold_transaction") @Table(name = "m_deposit_account_on_hold_transaction")
public class DepositAccountOnHoldTransaction extends AbstractPersistable<Long> { public class DepositAccountOnHoldTransaction extends AbstractPersistable<Long> {
@SuppressWarnings("unused")
@ManyToOne @ManyToOne
@JoinColumn(name = "savings_account_id", nullable = true) @JoinColumn(name = "savings_account_id", nullable = true)
private SavingsAccount savingsAccount; private SavingsAccount savingsAccount;