MIFOSX-97: organise classes into new package structure.

mifosng-provider/build.gradle

@@ -22,14 +22,11 @@ sourceCompatibility = JavaVersion.VERSION_1_6
 /* define binary compatiblity version */
 targetCompatibility = JavaVersion.VERSION_1_6
 
-// targetCompatibility = 1.6
+project.ext.springVersion = '3.1.3.RELEASE'
-// sourceCompatibility = 1.6
+project.ext.springSecurityVersion = '3.1.3.RELEASE'
-
+project.ext.hibernateValidatorVersion = '4.3.1.Final'
-project.ext.springVersion = '3.1.1.RELEASE'
+project.ext.hibernateCoreVersion = '4.1.8.Final'
-project.ext.springSecurityVersion = '3.1.0.RELEASE'
+project.ext.jerseyVersion = '1.16'
-project.ext.hibernateValidatorVersion = '4.3.0.Final'
-project.ext.hibernateCoreVersion = '4.1.3.Final'
-project.ext.jerseyVersion = '1.13'
 project.ext.springDataJpaVersion = '1.0.3.RELEASE'
 
 repositories {
@@ -63,7 +60,7 @@ configurations {
 }
 
 dependencies {
-        def tomcatVersion = '7.0.29'
+        def tomcatVersion = '7.0.33'
 	    tomcat "org.apache.tomcat.embed:tomcat-embed-core:${tomcatVersion}",
 	           "org.apache.tomcat.embed:tomcat-embed-logging-juli:${tomcatVersion}"
 	    tomcat("org.apache.tomcat.embed:tomcat-embed-jasper:${tomcatVersion}") {
@@ -111,8 +108,8 @@ dependencies {
 	            [group: 'ch.qos.logback', name: 'logback-core', version: '1.0.6'],
 	            [group: 'ch.qos.logback', name: 'logback-classic', version: '1.0.6'],
 	            
-	            [group: 'mysql', name: 'mysql-connector-java', version: '5.1.21'],
+	            [group: 'mysql', name: 'mysql-connector-java', version: '5.1.22'],
-	            [group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '7.0.29'],
+	            [group: 'org.apache.tomcat', name: 'tomcat-jdbc', version: '7.0.33'],
 	            
 	            [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-core', version: '3.8.3-GA'],
 	            [group: 'pentaho-reporting-engine', name: 'pentaho-reporting-engine-classic-extensions', version: '3.8.3-GA'],

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/configuration/domain/MonetaryCurrency.java

@@ -1,12 +1,10 @@
 package org.mifosplatform.infrastructure.configuration.domain;
 
-import java.io.Serializable;
-
 import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
 @Embeddable
-public class MonetaryCurrency implements Serializable {
+public class MonetaryCurrency {
 
     @Column(name = "currency_code", length = 3, nullable = false)
     private final String code;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/configuration/domain/Money.java

@@ -1,6 +1,5 @@
 package org.mifosplatform.infrastructure.configuration.domain;
 
-import java.io.Serializable;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.Iterator;
@@ -9,7 +8,7 @@ import javax.persistence.Column;
 import javax.persistence.Embeddable;
 
 @Embeddable
-public class Money implements Comparable<Money>, Serializable {
+public class Money implements Comparable<Money> {
 
     @Column(name = "currency_code", length = 3)
     private final String currencyCode;
@@ -170,9 +169,8 @@ public class Money implements Comparable<Money>, Serializable {
     @Override
     public int compareTo(final Money other) {
         Money otherMoney = other;
-        if (this.currencyCode.equals(otherMoney.currencyCode) == false) {
+        if (this.currencyCode.equals(otherMoney.currencyCode) == false) { throw new UnsupportedOperationException(
-            throw new UnsupportedOperationException("currencies arent different");
+                "currencies arent different"); }
-        }
         return this.amount.compareTo(otherMoney.amount);
     }
 
@@ -222,17 +220,11 @@ public class Money implements Comparable<Money>, Serializable {
 
     @Override
     public String toString() {
-        return new StringBuilder()
+        return new StringBuilder().append(this.currencyCode).append(' ').append(this.amount.toPlainString()).toString();
-        .append(this.currencyCode)
-        .append(' ')
-        .append(this.amount.toPlainString())
-        .toString();
     }
 
     public Money negated() {
-        if (this.isZero()) {
+        if (this.isZero()) { return this; }
-            return this;
-        }
         return Money.of(monetaryCurrency(), this.amount.negate());
     }
 

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/GoogleGsonPortfolioApiJsonSerializerService.java

@@ -7,8 +7,6 @@ import java.util.Set;
 
 import org.mifosng.platform.api.data.DepositAccountData;
 import org.mifosng.platform.api.data.DepositProductData;
-import org.mifosng.platform.api.data.GroupAccountSummaryCollectionData;
-import org.mifosng.platform.api.data.GroupData;
 import org.mifosng.platform.api.data.SavingAccountData;
 import org.mifosng.platform.api.data.SavingProductData;
 import org.mifosplatform.commands.api.data.CommandSourceData;
@@ -33,6 +31,8 @@ import org.mifosplatform.portfolio.client.data.ClientData;
 import org.mifosplatform.portfolio.client.data.ClientIdentifierData;
 import org.mifosplatform.portfolio.client.data.NoteData;
 import org.mifosplatform.portfolio.fund.data.FundData;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryCollectionData;
+import org.mifosplatform.portfolio.group.data.GroupData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanAccountData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanChargeData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanTransactionData;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioApiDataConversionService.java

@@ -6,7 +6,6 @@ import org.mifosng.platform.api.commands.DepositAccountWithdrawalCommand;
 import org.mifosng.platform.api.commands.DepositProductCommand;
 import org.mifosng.platform.api.commands.DepositStateTransitionApprovalCommand;
 import org.mifosng.platform.api.commands.DepositStateTransitionCommand;
-import org.mifosng.platform.api.commands.GroupCommand;
 import org.mifosng.platform.api.commands.SavingAccountCommand;
 import org.mifosng.platform.api.commands.SavingProductCommand;
 import org.mifosplatform.infrastructure.codes.command.CodeCommand;
@@ -25,6 +24,7 @@ import org.mifosplatform.portfolio.client.command.ClientIdentifierCommand;
 import org.mifosplatform.portfolio.client.command.NoteCommand;
 import org.mifosplatform.portfolio.client.data.ClientData;
 import org.mifosplatform.portfolio.fund.command.FundCommand;
+import org.mifosplatform.portfolio.group.command.GroupCommand;
 import org.mifosplatform.portfolio.loanaccount.command.AdjustLoanTransactionCommand;
 import org.mifosplatform.portfolio.loanaccount.command.LoanApplicationCommand;
 import org.mifosplatform.portfolio.loanaccount.command.LoanChargeCommand;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioApiDataConversionServiceImpl.java

@@ -23,7 +23,6 @@ import org.mifosng.platform.api.commands.DepositAccountWithdrawalCommand;
 import org.mifosng.platform.api.commands.DepositProductCommand;
 import org.mifosng.platform.api.commands.DepositStateTransitionApprovalCommand;
 import org.mifosng.platform.api.commands.DepositStateTransitionCommand;
-import org.mifosng.platform.api.commands.GroupCommand;
 import org.mifosng.platform.api.commands.SavingAccountCommand;
 import org.mifosng.platform.api.commands.SavingProductCommand;
 import org.mifosplatform.infrastructure.codes.command.CodeCommand;
@@ -46,6 +45,7 @@ import org.mifosplatform.portfolio.client.command.ClientIdentifierCommand;
 import org.mifosplatform.portfolio.client.command.NoteCommand;
 import org.mifosplatform.portfolio.client.data.ClientData;
 import org.mifosplatform.portfolio.fund.command.FundCommand;
+import org.mifosplatform.portfolio.group.command.GroupCommand;
 import org.mifosplatform.portfolio.loanaccount.command.AdjustLoanTransactionCommand;
 import org.mifosplatform.portfolio.loanaccount.command.LoanApplicationCommand;
 import org.mifosplatform.portfolio.loanaccount.command.LoanChargeCommand;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/core/api/PortfolioApiJsonSerializerService.java

@@ -5,8 +5,6 @@ import java.util.Set;
 
 import org.mifosng.platform.api.data.DepositAccountData;
 import org.mifosng.platform.api.data.DepositProductData;
-import org.mifosng.platform.api.data.GroupAccountSummaryCollectionData;
-import org.mifosng.platform.api.data.GroupData;
 import org.mifosng.platform.api.data.SavingAccountData;
 import org.mifosng.platform.api.data.SavingProductData;
 import org.mifosplatform.commands.api.data.CommandSourceData;
@@ -31,6 +29,8 @@ import org.mifosplatform.portfolio.client.data.ClientData;
 import org.mifosplatform.portfolio.client.data.ClientIdentifierData;
 import org.mifosplatform.portfolio.client.data.NoteData;
 import org.mifosplatform.portfolio.fund.data.FundData;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryCollectionData;
+import org.mifosplatform.portfolio.group.data.GroupData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanAccountData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanChargeData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanTransactionData;

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/staff/data/StaffAccountSummaryCollectionData.java

@@ -3,8 +3,8 @@ package org.mifosplatform.infrastructure.staff.data;
 import java.util.Collection;
 import java.util.List;
 
-import org.mifosng.platform.api.data.GroupAccountSummaryData;
 import org.mifosplatform.portfolio.client.data.ClientAccountSummaryData;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryData;
 
 /**
  *

mifosng-provider/src/main/java/org/mifosplatform/infrastructure/staff/service/StaffReadPlatformServiceImpl.java

@@ -6,8 +6,6 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosng.platform.api.data.GroupAccountSummaryData;
-import org.mifosng.platform.group.service.GroupReadPlatformService;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
@@ -16,6 +14,8 @@ import org.mifosplatform.infrastructure.staff.data.StaffData;
 import org.mifosplatform.infrastructure.staff.exception.StaffNotFoundException;
 import org.mifosplatform.portfolio.client.data.ClientAccountSummaryData;
 import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryData;
+import org.mifosplatform.portfolio.group.service.GroupReadPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/client/api/ClientsApiResource.java

@@ -56,9 +56,6 @@ import com.sun.jersey.core.header.FormDataContentDisposition;
 import com.sun.jersey.multipart.FormDataBodyPart;
 import com.sun.jersey.multipart.FormDataParam;
 
-/**
- * test commit. again.
- */
 @Path("/clients")
 @Component
 @Scope("singleton")

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/api/GroupsApiResource.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.api;
+package org.mifosplatform.portfolio.group.api;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -20,11 +20,6 @@ import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosng.platform.api.commands.GroupCommand;
-import org.mifosng.platform.api.data.GroupAccountSummaryCollectionData;
-import org.mifosng.platform.api.data.GroupData;
-import org.mifosng.platform.group.service.GroupReadPlatformService;
-import org.mifosng.platform.group.service.GroupWritePlatformService;
 import org.mifosplatform.infrastructure.core.api.ApiParameterHelper;
 import org.mifosplatform.infrastructure.core.api.PortfolioApiDataConversionService;
 import org.mifosplatform.infrastructure.core.api.PortfolioApiJsonSerializerService;
@@ -34,6 +29,11 @@ import org.mifosplatform.infrastructure.office.service.OfficeReadPlatformService
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
 import org.mifosplatform.portfolio.client.data.ClientLookup;
 import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
+import org.mifosplatform.portfolio.group.command.GroupCommand;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryCollectionData;
+import org.mifosplatform.portfolio.group.data.GroupData;
+import org.mifosplatform.portfolio.group.service.GroupReadPlatformService;
+import org.mifosplatform.portfolio.group.service.GroupWritePlatformService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/command/GroupCommand.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.api.commands;
+package org.mifosplatform.portfolio.group.command;
 
 import java.util.Set;
 

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/command/GroupCommandValidator.java

@@ -1,9 +1,8 @@
-package org.mifosng.platform.group.service;
+package org.mifosplatform.portfolio.group.command;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.mifosng.platform.api.commands.GroupCommand;
 import org.mifosplatform.infrastructure.core.data.ApiParameterError;
 import org.mifosplatform.infrastructure.core.data.DataValidatorBuilder;
 import org.mifosplatform.infrastructure.core.exception.PlatformApiDataValidationException;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupAccountSummaryCollectionData.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.api.data;
+package org.mifosplatform.portfolio.group.data;
 
 
 import java.util.List;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupAccountSummaryData.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.api.data;
+package org.mifosplatform.portfolio.group.data;
 
 /**
  * Immutable data object for group loan accounts.

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/data/GroupData.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.api.data;
+package org.mifosplatform.portfolio.group.data;
 
 import java.util.Collection;
 

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/Group.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.group.domain;
+package org.mifosplatform.portfolio.group.domain;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -12,11 +12,11 @@ import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosng.platform.api.commands.GroupCommand;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
 import org.mifosplatform.infrastructure.office.domain.Office;
 import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.client.domain.Client;
+import org.mifosplatform.portfolio.group.command.GroupCommand;
 
 @Entity
 @Table(name = "m_group")

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/domain/GroupRepository.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.group.domain;
+package org.mifosplatform.portfolio.group.domain;
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/exception/GroupNotFoundException.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.exceptions;
+package org.mifosplatform.portfolio.group.exception;
 
 import org.mifosplatform.infrastructure.core.exception.AbstractPlatformResourceNotFoundException;
 

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformService.java

@@ -1,11 +1,11 @@
-package org.mifosng.platform.group.service;
+package org.mifosplatform.portfolio.group.service;
 
 import java.util.Collection;
 
-import org.mifosng.platform.api.data.GroupAccountSummaryCollectionData;
-import org.mifosng.platform.api.data.GroupAccountSummaryData;
-import org.mifosng.platform.api.data.GroupData;
 import org.mifosplatform.portfolio.client.data.ClientLookup;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryCollectionData;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryData;
+import org.mifosplatform.portfolio.group.data.GroupData;
 
 public interface GroupReadPlatformService {
 

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupReadPlatformServiceImpl.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.group.service;
+package org.mifosplatform.portfolio.group.service;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7,10 +7,6 @@ import java.util.Collection;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.mifosng.platform.api.data.GroupAccountSummaryCollectionData;
-import org.mifosng.platform.api.data.GroupAccountSummaryData;
-import org.mifosng.platform.api.data.GroupData;
-import org.mifosng.platform.exceptions.GroupNotFoundException;
 import org.mifosplatform.infrastructure.core.domain.JdbcSupport;
 import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSource;
 import org.mifosplatform.infrastructure.office.data.OfficeLookup;
@@ -19,6 +15,10 @@ import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext
 import org.mifosplatform.portfolio.client.data.ClientLookup;
 import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
 import org.mifosplatform.portfolio.client.service.LoanStatusMapper;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryCollectionData;
+import org.mifosplatform.portfolio.group.data.GroupAccountSummaryData;
+import org.mifosplatform.portfolio.group.data.GroupData;
+import org.mifosplatform.portfolio.group.exception.GroupNotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupWritePlatformService.java

@@ -1,7 +1,7 @@
-package org.mifosng.platform.group.service;
+package org.mifosplatform.portfolio.group.service;
 
-import org.mifosng.platform.api.commands.GroupCommand;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
+import org.mifosplatform.portfolio.group.command.GroupCommand;
 import org.springframework.security.access.prepost.PreAuthorize;
 
 public interface GroupWritePlatformService {

mifosng-provider/src/main/java/org/mifosplatform/portfolio/group/service/GroupWritePlatformServiceJpaRepositoryImpl.java

@@ -1,12 +1,8 @@
-package org.mifosng.platform.group.service;
+package org.mifosplatform.portfolio.group.service;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import org.mifosng.platform.api.commands.GroupCommand;
-import org.mifosng.platform.exceptions.GroupNotFoundException;
-import org.mifosng.platform.group.domain.Group;
-import org.mifosng.platform.group.domain.GroupRepository;
 import org.mifosplatform.infrastructure.core.data.EntityIdentifier;
 import org.mifosplatform.infrastructure.core.exception.PlatformDataIntegrityException;
 import org.mifosplatform.infrastructure.office.domain.Office;
@@ -17,6 +13,11 @@ import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext
 import org.mifosplatform.portfolio.client.domain.Client;
 import org.mifosplatform.portfolio.client.domain.ClientRepository;
 import org.mifosplatform.portfolio.client.exception.ClientNotFoundException;
+import org.mifosplatform.portfolio.group.command.GroupCommand;
+import org.mifosplatform.portfolio.group.command.GroupCommandValidator;
+import org.mifosplatform.portfolio.group.domain.Group;
+import org.mifosplatform.portfolio.group.domain.GroupRepository;
+import org.mifosplatform.portfolio.group.exception.GroupNotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/Loan.java

@@ -26,7 +26,6 @@ import org.apache.commons.lang.StringUtils;
 import org.hibernate.annotations.LazyCollection;
 import org.hibernate.annotations.LazyCollectionOption;
 import org.joda.time.LocalDate;
-import org.mifosng.platform.group.domain.Group;
 import org.mifosplatform.infrastructure.configuration.domain.MonetaryCurrency;
 import org.mifosplatform.infrastructure.configuration.domain.Money;
 import org.mifosplatform.infrastructure.core.domain.AbstractAuditableCustom;
@@ -35,6 +34,7 @@ import org.mifosplatform.infrastructure.user.domain.AppUser;
 import org.mifosplatform.portfolio.charge.exception.LoanChargeCannotBeAddedException;
 import org.mifosplatform.portfolio.client.domain.Client;
 import org.mifosplatform.portfolio.fund.domain.Fund;
+import org.mifosplatform.portfolio.group.domain.Group;
 import org.mifosplatform.portfolio.loanaccount.command.LoanApplicationCommand;
 import org.mifosplatform.portfolio.loanaccount.command.LoanChargeCommand;
 import org.mifosplatform.portfolio.loanaccount.exception.InvalidLoanStateTransitionException;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/domain/LoanTransaction.java

@@ -6,8 +6,6 @@ import java.util.Date;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.OneToOne;
@@ -57,7 +55,6 @@ public class LoanTransaction extends AbstractAuditableCustom<AppUser, Long> {
     @Column(name = "transaction_date", nullable = false)
     private final Date dateOf;
 
-    @Enumerated(EnumType.ORDINAL)
     @Column(name = "transaction_type_enum", nullable = false)
     private Integer typeOf;
 
@@ -87,7 +84,8 @@ public class LoanTransaction extends AbstractAuditableCustom<AppUser, Long> {
         return new LoanTransaction(loan, LoanTransactionType.WAIVE_INTEREST, waived.getAmount(), waiveDate);
     }
 
-	public static LoanTransaction waiveLoanCharge(final Loan loan, final Money waived, final LocalDate waiveDate, final Money feeChargesWaived, final Money penaltyChargesWaived) {
+    public static LoanTransaction waiveLoanCharge(final Loan loan, final Money waived, final LocalDate waiveDate,
+            final Money feeChargesWaived, final Money penaltyChargesWaived) {
         LoanTransaction waiver = new LoanTransaction(loan, LoanTransactionType.WAIVE_CHARGES, waived.getAmount(), waiveDate);
         waiver.updateChargesComponents(feeChargesWaived, penaltyChargesWaived);
 
@@ -95,7 +93,8 @@ public class LoanTransaction extends AbstractAuditableCustom<AppUser, Long> {
     }
 
     private static LoanTransaction contra(final LoanTransaction originalTransaction) {
-		LoanTransaction contra = new LoanTransaction(null, LoanTransactionType.CONTRA, originalTransaction.getAmount().negate(), new LocalDate(originalTransaction.getDateOf()));
+        LoanTransaction contra = new LoanTransaction(null, LoanTransactionType.CONTRA, originalTransaction.getAmount().negate(),
+                new LocalDate(originalTransaction.getDateOf()));
         contra.updateContra(originalTransaction);
         return contra;
     }
@@ -206,9 +205,11 @@ public class LoanTransaction extends AbstractAuditableCustom<AppUser, Long> {
     }
 
     /**
-	 * This updates the derived fields of a loan transaction for the principal, interest and interest waived portions.
+     * This updates the derived fields of a loan transaction for the principal,
+     * interest and interest waived portions.
      * 
-	 * This accumulates the values passed to the already existent values for each of the portions.
+     * This accumulates the values passed to the already existent values for
+     * each of the portions.
      */
     public void updateComponents(final Money principal, final Money interest, final Money feeCharges, final Money penaltyCharges) {
         final MonetaryCurrency currency = principal.getCurrency();
@@ -227,7 +228,8 @@ public class LoanTransaction extends AbstractAuditableCustom<AppUser, Long> {
         updateComponents(principal, interest, feeCharges, penaltyCharges);
 
         final MonetaryCurrency currency = principal.getCurrency();
-		this.amount = getPrincipalPortion(currency).plus(getInterestPortion(currency)).plus(getFeeChargesPortion(currency)).plus(getPenaltyChargesPortion(currency)).getAmount();
+        this.amount = getPrincipalPortion(currency).plus(getInterestPortion(currency)).plus(getFeeChargesPortion(currency))
+                .plus(getPenaltyChargesPortion(currency)).getAmount();
     }
 
     public Money getPrincipalPortion(final MonetaryCurrency currency) {
@@ -275,7 +277,7 @@ public class LoanTransaction extends AbstractAuditableCustom<AppUser, Long> {
 
     public LoanTransactionData toData(final CurrencyData currencyData) {
         final EnumOptionData transactionType = LoanEnumerations.transactionType(this.typeOf);
-		return new LoanTransactionData(this.getId(), transactionType, currencyData, getTransactionDate(), 
+        return new LoanTransactionData(this.getId(), transactionType, currencyData, getTransactionDate(), this.amount,
-				this.amount, this.principalPortion, this.interestPortion, this.feeChargesPortion, this.penaltyChargesPortion);
+                this.principalPortion, this.interestPortion, this.feeChargesPortion, this.penaltyChargesPortion);
     }
 }

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/gaurantor/api/GuarantorsApiResource.java

@@ -1,4 +1,4 @@
-package org.mifosng.platform.api;
+package org.mifosplatform.portfolio.loanaccount.gaurantor.api;
 
 import java.util.Arrays;
 import java.util.HashSet;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanAssembler.java

@@ -5,9 +5,6 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
-import org.mifosng.platform.exceptions.GroupNotFoundException;
-import org.mifosng.platform.group.domain.Group;
-import org.mifosng.platform.group.domain.GroupRepository;
 import org.mifosplatform.infrastructure.configuration.domain.MonetaryCurrency;
 import org.mifosplatform.infrastructure.staff.domain.Staff;
 import org.mifosplatform.infrastructure.staff.domain.StaffRepository;
@@ -19,6 +16,9 @@ import org.mifosplatform.portfolio.client.exception.ClientNotFoundException;
 import org.mifosplatform.portfolio.fund.domain.Fund;
 import org.mifosplatform.portfolio.fund.domain.FundRepository;
 import org.mifosplatform.portfolio.fund.exception.FundNotFoundException;
+import org.mifosplatform.portfolio.group.domain.Group;
+import org.mifosplatform.portfolio.group.domain.GroupRepository;
+import org.mifosplatform.portfolio.group.exception.GroupNotFoundException;
 import org.mifosplatform.portfolio.loanaccount.command.LoanApplicationCommand;
 import org.mifosplatform.portfolio.loanaccount.domain.DefaultLoanLifecycleStateMachine;
 import org.mifosplatform.portfolio.loanaccount.domain.Loan;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanaccount/service/LoanReadPlatformServiceImpl.java

@@ -7,8 +7,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 
 import org.joda.time.LocalDate;
-import org.mifosng.platform.api.data.GroupData;
-import org.mifosng.platform.group.service.GroupReadPlatformService;
 import org.mifosplatform.infrastructure.configuration.data.CurrencyData;
 import org.mifosplatform.infrastructure.configuration.domain.ApplicationCurrency;
 import org.mifosplatform.infrastructure.configuration.domain.ApplicationCurrencyRepository;
@@ -21,6 +19,8 @@ import org.mifosplatform.infrastructure.core.service.TenantAwareRoutingDataSourc
 import org.mifosplatform.infrastructure.security.service.PlatformSecurityContext;
 import org.mifosplatform.portfolio.client.data.ClientData;
 import org.mifosplatform.portfolio.client.service.ClientReadPlatformService;
+import org.mifosplatform.portfolio.group.data.GroupData;
+import org.mifosplatform.portfolio.group.service.GroupReadPlatformService;
 import org.mifosplatform.portfolio.loanaccount.data.DisbursementData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanBasicDetailsData;
 import org.mifosplatform.portfolio.loanaccount.data.LoanChargeData;

mifosng-provider/src/main/java/org/mifosplatform/portfolio/loanproduct/domain/LoanProductMinimumRepaymentScheduleRelatedDetail.java

@@ -1,13 +1,10 @@
 package org.mifosplatform.portfolio.loanproduct.domain;
 
-import java.io.Serializable;
-
-
 /**
  * Represents the bare minimum repayment details needed for activities related
  * to generating repayment schedules.
  */
-public interface LoanProductMinimumRepaymentScheduleRelatedDetail extends Serializable {
+public interface LoanProductMinimumRepaymentScheduleRelatedDetail {
 
     Integer getRepayEvery();