some formatting changes. sorry.

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

@@ -81,7 +81,8 @@ public class RolesApiResource {
     @Produces({ MediaType.APPLICATION_JSON })
     public String createRole(final String apiRequestBodyAsJson) {
 
-        final EntityIdentifier result = this.commandsSourceWritePlatformService.logCommandSource("CREATE", "roles", null, apiRequestBodyAsJson);
+        final EntityIdentifier result = this.commandsSourceWritePlatformService.logCommandSource("CREATE", "roles", null,
+                apiRequestBodyAsJson);
 
         return this.apiJsonSerializerService.serializeEntityIdentifier(result);
     }
@@ -109,7 +110,9 @@ public class RolesApiResource {
 
         RoleData role = this.roleReadPlatformService.retrieveRole(roleId);
         if (commandId != null) {
-//            currentChanges = handleRequestToIntegrateProposedChangesFromCommand(roleId, commandId);
+            // currentChanges =
+            // handleRequestToIntegrateProposedChangesFromCommand(roleId,
+            // commandId);
         }
 
         return this.apiJsonSerializerService.serializeRoleDataToJson(prettyPrint, responseParameters, role);
@@ -121,7 +124,8 @@ public class RolesApiResource {
     @Produces({ MediaType.APPLICATION_JSON })
     public String updateRole(@PathParam("roleId") final Long roleId, final String apiRequestBodyAsJson) {
 
-        final EntityIdentifier result = this.commandsSourceWritePlatformService.logCommandSource("UPDATE", "roles", roleId, apiRequestBodyAsJson);
+        final EntityIdentifier result = this.commandsSourceWritePlatformService.logCommandSource("UPDATE", "roles", roleId,
+                apiRequestBodyAsJson);
 
         return this.apiJsonSerializerService.serializeEntityIdentifier(result);
     }
@@ -158,7 +162,8 @@ public class RolesApiResource {
     }
 
     private Collection<PermissionUsageData> assemblePermissionChanges(final Long roleId, final CommandSourceData entry) {
-        final RolePermissionCommand changesOnly = this.commandDeserializerService.deserializeRolePermissionCommand(roleId, entry.json(), false);
+        final RolePermissionCommand changesOnly = this.commandDeserializerService.deserializeRolePermissionCommand(roleId, entry.json(),
+                false);
 
         // assemble map of string/booleans into PermissionUsageData
         Collection<PermissionUsageData> proposedChanges = new ArrayList<PermissionUsageData>();
@@ -175,7 +180,8 @@ public class RolesApiResource {
     private Collection<Collection<PermissionUsageData>> retrieveAllUnprocessedDataChanges(final Long roleId) {
         Collection<Collection<PermissionUsageData>> allChanges = new ArrayList<Collection<PermissionUsageData>>();
 
-        final Collection<CommandSourceData> unprocessedChanges = this.commandSourceReadPlatformService.retrieveUnprocessChangesByResourceId("roles", roleId);
+        final Collection<CommandSourceData> unprocessedChanges = this.commandSourceReadPlatformService
+                .retrieveUnprocessChangesByResourceId("roles", roleId);
         for (CommandSourceData commandSourceData : unprocessedChanges) {
 
             if (commandSourceData.isRoleResource() && commandSourceData.isUpdateRolePermissions()) {
@@ -198,7 +204,8 @@ public class RolesApiResource {
     @Produces({ MediaType.APPLICATION_JSON })
     public String updateRolePermissions(@PathParam("roleId") final Long roleId, final String apiRequestBodyAsJson) {
 
-        final EntityIdentifier result = this.commandsSourceWritePlatformService.logCommandSource("UPDATEPERMISSIONS", "roles", roleId, apiRequestBodyAsJson);
+        final EntityIdentifier result = this.commandsSourceWritePlatformService.logCommandSource("UPDATEPERMISSIONS", "roles", roleId,
+                apiRequestBodyAsJson);
 
         return this.apiJsonSerializerService.serializeEntityIdentifier(result);
     }

mifosng-provider/src/main/java/org/mifosng/platform/api/data/PermissionUsageData.java

@@ -22,8 +22,7 @@ public class PermissionUsageData {
         return new PermissionUsageData(null, permissionCode, null, null, isSelected, null);
     }
 
-	public PermissionUsageData(final String grouping, final String code,
+    public PermissionUsageData(final String grouping, final String code, final String entityName, final String actionName,
-			final String entityName, final String actionName,
             final Boolean selected, final Boolean isMakerChecker) {
         this.grouping = grouping;
         this.code = code;

mifosng-provider/src/main/java/org/mifosng/platform/api/data/RoleData.java

@@ -44,8 +44,7 @@ public class RoleData {
     }
 
     public RolePermissionsData toRolePermissionData(final Collection<PermissionUsageData> permissionUsageData,
-            final Collection<PermissionUsageData> currentChanges, 
+            final Collection<PermissionUsageData> currentChanges, final Collection<Collection<PermissionUsageData>> allChanges) {
-            final Collection<Collection<PermissionUsageData>> allChanges) {
         return new RolePermissionsData(id, name, description, permissionUsageData, currentChanges, allChanges);
     }
 }

mifosng-provider/src/main/java/org/mifosng/platform/api/data/RolePermissionsData.java

@@ -22,8 +22,7 @@ public class RolePermissionsData {
     private final Collection<Collection<PermissionUsageData>> allChanges;
 
     public RolePermissionsData(final Long id, final String name, final String description,
-            final Collection<PermissionUsageData> permissionUsageData, 
+            final Collection<PermissionUsageData> permissionUsageData, final Collection<PermissionUsageData> currentChanges,
-            final Collection<PermissionUsageData> currentChanges, 
             final Collection<Collection<PermissionUsageData>> allChanges) {
         this.id = id;
         this.name = name;

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

@@ -54,7 +54,8 @@ import com.google.gson.Gson;
 @Service
 public class GoogleGsonPortfolioApiJsonSerializerService implements PortfolioApiJsonSerializerService {
 
-    private static final Set<String> PERMISSION_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("grouping", "code", "entityName", "actionName", "selected", "isMakerChecker"));
+    private static final Set<String> PERMISSION_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("grouping", "code", "entityName",
+            "actionName", "selected", "isMakerChecker"));
     private static final Set<String> ROLE_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("id", "name", "description",
             "availablePermissions", "selectedPermissions"));
     private static final Set<String> ROLE_PERMISSION_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("id", "name", "description",
@@ -167,11 +168,9 @@ public class GoogleGsonPortfolioApiJsonSerializerService implements PortfolioApi
             "lockinPeriod", "lockinPeriodType"));
 
     // guarantors
-  	private static final Set<String> GUARANTOR_DATA_PARAMETERS = new HashSet<String>(
+    private static final Set<String> GUARANTOR_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("externalGuarantor", "existingClientId",
-  			Arrays.asList("externalGuarantor", "existingClientId",
+            "firstname", "lastname", "addressLine1", "addressLine2", "city", "state", "zip", "country", "mobileNumber", "housePhoneNumber",
-  					"firstname", "lastname", "addressLine1",
+            "comment", "dob"));
-  					"addressLine2", "city", "state", "zip", "country",
-  					"mobileNumber", "housePhoneNumber", "comment", "dob"));
 
     // accounting
     private static final Set<String> CHART_OF_ACCOUNTS_DATA_PARAMETERS = new HashSet<String>(Arrays.asList("id", "name"));
@@ -587,11 +586,9 @@ public class GoogleGsonPortfolioApiJsonSerializerService implements PortfolioApi
     }
 
     @Override
-	public String serializeGuarantorDataToJson(boolean prettyPrint,
+    public String serializeGuarantorDataToJson(boolean prettyPrint, Set<String> responseParameters, GuarantorData guarantorData) {
-			Set<String> responseParameters, GuarantorData guarantorData) {
+        final Gson gsonDeserializer = helper.createGsonBuilderWithParameterExclusionSerializationStrategy(GUARANTOR_DATA_PARAMETERS,
-		final Gson gsonDeserializer = helper
+                prettyPrint, responseParameters);
-				.createGsonBuilderWithParameterExclusionSerializationStrategy(
-						GUARANTOR_DATA_PARAMETERS, prettyPrint, responseParameters);
         return helper.serializedJsonFrom(gsonDeserializer, guarantorData);
     }
 }

mifosng-provider/src/main/java/org/mifosng/platform/user/service/PermissionReadPlatformServiceImpl.java

@@ -35,7 +35,6 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform
         return this.jdbcTemplate.query(sql, mapper, new Object[] {});
     }
 
-
     @Override
     public Collection<PermissionUsageData> retrieveAllRolePermissions(final Long roleId) {
 
@@ -62,8 +61,7 @@ public class PermissionReadPlatformServiceImpl implements PermissionReadPlatform
 
         public String permissionSchema() {
             return "select p.grouping, p.code, p.entity_name as entityName, p.action_name as actionName, true as selected, p.is_maker_checker as isMakerChecker"
-                    + " from m_permission p "
+                    + " from m_permission p " + " order by p.grouping, ifnull(entity_name, ''), p.code";
-                    + " order by p.grouping, ifnull(entity_name, ''), p.code";
         }
 
         public String rolePermissionSchema() {