diff --git a/mifosng-data/src/main/java/org/mifosng/data/CurrencyList.java b/mifosng-data/src/main/java/org/mifosng/data/CurrencyList.java deleted file mode 100644 index 96304a9a1..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/CurrencyList.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.mifosng.data; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class CurrencyList { - - private Collection currencies = new ArrayList(); - - protected CurrencyList() { - // - } - - public CurrencyList(final List currencyOptions) { - this.currencies = currencyOptions; - } - - public Collection getCurrencies() { - return this.currencies; - } - - public void setCurrencies(final Collection currencies) { - this.currencies = currencies; - } -} \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/OrganisationList.java b/mifosng-data/src/main/java/org/mifosng/data/OrganisationList.java deleted file mode 100644 index ed92ac0ac..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/OrganisationList.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.mifosng.data; - -import java.util.ArrayList; -import java.util.Collection; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class OrganisationList { - - private Collection organisations = new ArrayList(); - - protected OrganisationList() { - // - } - - public OrganisationList( - final Collection organisations) { - this.organisations = organisations; - } - - public Collection getOrganisations() { - return this.organisations; - } - - public void setOrganisations( - final Collection organisations) { - this.organisations = organisations; - } -} diff --git a/mifosng-data/src/main/java/org/mifosng/data/PermissionList.java b/mifosng-data/src/main/java/org/mifosng/data/PermissionList.java deleted file mode 100644 index ccc9efb06..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/PermissionList.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.mifosng.data; - -import java.util.ArrayList; -import java.util.Collection; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class PermissionList { - - private Collection permissions = new ArrayList(); - - protected PermissionList() { - // - } - - public PermissionList(final Collection permissions) { - this.permissions = permissions; - } - - public Collection getPermissions() { - return this.permissions; - } - - public void setPermissions(final Collection permissions) { - this.permissions = permissions; - } -} \ No newline at end of file diff --git a/mifosng-data/src/main/java/org/mifosng/data/UserList.java b/mifosng-data/src/main/java/org/mifosng/data/UserList.java deleted file mode 100644 index 38b218efc..000000000 --- a/mifosng-data/src/main/java/org/mifosng/data/UserList.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.mifosng.data; - -import java.util.ArrayList; -import java.util.Collection; - -import javax.xml.bind.annotation.XmlRootElement; - -@XmlRootElement -public class UserList { - - private Collection users = new ArrayList(); - - protected UserList() { - // - } - - public UserList(final Collection users) { - this.users = users; - } - - public Collection getUsers() { - return this.users; - } - - public void setUsers(final Collection users) { - this.users = users; - } -} \ No newline at end of file diff --git a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java index 2981c1386..d4359a572 100644 --- a/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java +++ b/mifosng-provider/src/main/java/org/mifosng/platform/api/ClientApiResource.java @@ -22,6 +22,7 @@ import org.mifosng.data.NoteDataList; import org.mifosng.data.command.ClientCommand; import org.mifosng.data.command.NoteCommand; import org.mifosng.platform.api.infrastructure.ApiDataConversionService; +import org.mifosng.platform.api.infrastructure.ApiJSONFormattingService; import org.mifosng.platform.client.service.ClientReadPlatformService; import org.mifosng.platform.client.service.ClientWritePlatformService; import org.springframework.beans.factory.annotation.Autowired; @@ -32,6 +33,10 @@ import org.springframework.stereotype.Component; @Component @Scope("singleton") public class ClientApiResource { + + private String defaultFieldList = "openingDate"; + private String allowedFieldList = "allowedParents"; + private String filterName = "myFilter"; @Autowired private ClientReadPlatformService clientReadPlatformService; @@ -41,7 +46,10 @@ public class ClientApiResource { @Autowired private ApiDataConversionService apiDataConversionService; - + + @Autowired + private ApiJSONFormattingService jsonFormattingService; + @GET @Consumes({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) @Produces({MediaType.APPLICATION_JSON})