tidy up typical response parameters for loan GET requests.

mifosng-provider/src/main/java/org/mifosng/platform/api/LoansApiResource.java

@@ -94,18 +94,10 @@ public class LoansApiResource {
 	@Autowired
 	private StaffReadPlatformService staffReadPlatformService;
 	
-	@GET
+	private final static Set<String> typicalResponseParameters = new HashSet<String>(
-	@Path("template")
-	@Consumes({ MediaType.APPLICATION_JSON })
-	@Produces({ MediaType.APPLICATION_JSON })
-	public String retrieveDetailsForNewLoanApplicationStepOne(
-			@QueryParam("clientId") final Long clientId,
-			@QueryParam("productId") final Long productId,
-			@Context final UriInfo uriInfo) {
-		
-		Set<String> typicalResponseParameters = new HashSet<String>(
 			Arrays.asList("id", "externalId", "clientId", "clientName", "fundId", "fundName",
 					"loanProductId", "loanProductName", "loanProductDescription", 
+					"loanOfficerName", "loanOfficerId",
 					"currency", "principal",
 					"inArrearsTolerance", "numberOfRepayments",
 					"repaymentEvery", "interestRatePerPeriod",
@@ -117,10 +109,17 @@ public class LoansApiResource {
 					"expectedFirstRepaymentOnDate", "interestChargedFromDate",
 					"closedOnDate", "expectedMaturityDate",
 					"status",
-						"lifeCycleStatusDate", "summary", "repaymentSchedule",
+					"lifeCycleStatusDate"));
-						"loanRepayments", "permissions", "convenienceData", "charges",
+	
-						"loanOfficerOptions")
+	@GET
-				);
+	@Path("template")
+	@Consumes({ MediaType.APPLICATION_JSON })
+	@Produces({ MediaType.APPLICATION_JSON })
+	public String retrieveDetailsForNewLoanApplicationStepOne(
+			@QueryParam("clientId") final Long clientId,
+			@QueryParam("productId") final Long productId,
+			@Context final UriInfo uriInfo) {
+		
 		
 		Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
 		if (responseParameters.isEmpty()) {
@@ -156,7 +155,6 @@ public class LoansApiResource {
 		final boolean convenienceDataRequired = false;
 		Collection<ChargeData> charges = loanBasicDetails.getCharges();
 		
-		// populate loan officers if query param is passed in
 		Collection<StaffData> allowedLoanOfficers =  this.staffReadPlatformService.retrieveAllLoanOfficersByOffice(loanBasicDetails.getClientOfficeId());
 		
 		final LoanAccountData newLoanAccount = new LoanAccountData(loanBasicDetails, convenienceDataRequired, null, null, null, charges, 
@@ -175,17 +173,6 @@ public class LoansApiResource {
 			@PathParam("loanId") final Long loanId,
 			@Context final UriInfo uriInfo) {
 
-		Set<String> typicalResponseParameters = new HashSet<String>(
-				Arrays.asList("id", "externalId", "clientId", "clientName", "fundId", "fundName", "loanProductId", "loanProductName", "loanProductDescription",
-						"currency",
-						"principal", "inArrearsTolerance", "numberOfRepayments",
-						"repaymentEvery", "interestRatePerPeriod", "annualInterestRate", 
-						"repaymentFrequencyType", "interestRateFrequencyType", "amortizationType", "interestType", "interestCalculationPeriodType",
-						"submittedOnDate", "approvedOnDate", "expectedDisbursementDate", "actualDisbursementDate", 
-						"expectedFirstRepaymentOnDate", "interestChargedFromDate", "closedOnDate", "expectedMaturityDate", 
-						"status", "lifeCycleStatusDate", "loanOfficerName", "loanOfficerId")
-				);
-		
 		Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
 		if (responseParameters.isEmpty()) {
 			responseParameters.addAll(typicalResponseParameters);