------------------------------------------------------------ revno: 14223 committer: Morten Olav Hansen <morte...@gmail.com> branch nick: dhis2 timestamp: Fri 2014-03-14 11:40:06 +0100 message: minor fixes to filter modified: dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.java dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java
-- lp:dhis2 https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk Your team DHIS 2 developers is subscribed to branch lp:dhis2. To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java 2014-03-14 10:26:27 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultFilterService.java 2014-03-14 10:40:06 +0000 @@ -62,7 +62,7 @@ return Lists.newArrayList(); } - Filters parsed = parserService.parsePropertyFilters( filters ); + Filters parsed = parserService.parserObjectFilter( filters ); List<T> list = Lists.newArrayList(); @@ -78,7 +78,7 @@ } @Override - public <T extends IdentifiableObject> List<Object> filterFields( List<T> objects, String include, String exclude ) + public <T extends IdentifiableObject> List<Object> filterProperties( List<T> objects, String include, String exclude ) { List<Object> output = Lists.newArrayList(); @@ -98,11 +98,15 @@ fieldMap.put( property.getName(), Maps.newHashMap() ); } } - else if ( include == null ) + else if ( include != null ) + { + fieldMap = parserService.parsePropertyFilter( include ); + } + else { Schema schema = schemaService.getSchema( objects.get( 0 ).getClass() ); - Map<String, Map> excludeMap = parserService.parseObjectFilter( exclude ); + Map<String, Map> excludeMap = parserService.parsePropertyFilter( exclude ); for ( Property property : schema.getProperties() ) { @@ -112,10 +116,6 @@ } } } - else - { - fieldMap = parserService.parseObjectFilter( include ); - } for ( Object object : objects ) { === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java 2014-03-14 10:26:27 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/DefaultParserService.java 2014-03-14 10:40:06 +0000 @@ -41,7 +41,7 @@ public class DefaultParserService implements ParserService { @Override - public Filters parsePropertyFilters( List<String> filters ) + public Filters parserObjectFilter( List<String> filters ) { Filters parsed = new Filters(); @@ -68,7 +68,7 @@ } @Override - public Map<String, Map> parseObjectFilter( String fields ) + public Map<String, Map> parsePropertyFilter( String fields ) { List<String> prefixList = Lists.newArrayList(); Map<String, Map> parsed = Maps.newHashMap(); === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java 2014-03-14 10:25:42 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/FilterService.java 2014-03-14 10:40:06 +0000 @@ -39,5 +39,5 @@ { <T extends IdentifiableObject> List<T> filterObjects( List<T> objects, List<String> filters ); - <T extends IdentifiableObject> List<Object> filterFields( List<T> objects, String include, String exclude ); + <T extends IdentifiableObject> List<Object> filterProperties( List<T> objects, String include, String exclude ); } === modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.java 2014-03-14 10:26:27 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/filter/ParserService.java 2014-03-14 10:40:06 +0000 @@ -36,7 +36,7 @@ */ public interface ParserService { - Filters parsePropertyFilters( List<String> filters ); + Filters parserObjectFilter( List<String> filters ); - Map<String,Map> parseObjectFilter( String filter ); + Map<String,Map> parsePropertyFilter( String filter ); } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2014-03-14 10:25:42 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/AbstractCrudController.java 2014-03-14 10:40:06 +0000 @@ -89,10 +89,10 @@ //-------------------------------------------------------------------------- @RequestMapping( value = "/filtered", method = RequestMethod.GET ) - public void getJacksonClassMap( - @RequestParam(required = false) String include, - @RequestParam(required = false) String exclude, - @RequestParam(value = "filter", required = false) List<String> filters, + public void getObjectListFiltered( + @RequestParam( required = false ) String include, + @RequestParam( required = false ) String exclude, + @RequestParam( value = "filter", required = false ) List<String> filters, @RequestParam Map<String, String> parameters, HttpServletResponse response ) throws IOException { WebOptions options = new WebOptions( parameters ); @@ -130,7 +130,7 @@ } } - List<Object> objects = filterService.filterFields( entityList, include, exclude ); + List<Object> objects = filterService.filterProperties( entityList, include, exclude ); Map<String, Object> output = Maps.newLinkedHashMap(); if ( hasPaging ) @@ -143,7 +143,7 @@ JacksonUtils.toJson( response.getOutputStream(), output ); } - @RequestMapping(method = RequestMethod.GET) + @RequestMapping( method = RequestMethod.GET ) public String getObjectList( @RequestParam Map<String, String> parameters, Model model, HttpServletRequest request ) throws Exception { WebOptions options = new WebOptions( parameters ); @@ -170,7 +170,7 @@ return StringUtils.uncapitalize( getEntitySimpleName() ) + "List"; } - @RequestMapping(value = "/query/{query}", method = RequestMethod.GET) + @RequestMapping( value = "/query/{query}", method = RequestMethod.GET ) public String query( @PathVariable String query, @RequestParam Map<String, String> parameters, Model model, HttpServletRequest request ) throws Exception { WebOptions options = new WebOptions( parameters ); @@ -199,8 +199,8 @@ return StringUtils.uncapitalize( getEntitySimpleName() ) + "List"; } - @RequestMapping(value = "/{uid}", method = RequestMethod.GET) - public String getObject( @PathVariable("uid") String uid, @RequestParam Map<String, String> parameters, + @RequestMapping( value = "/{uid}", method = RequestMethod.GET ) + public String getObject( @PathVariable( "uid" ) String uid, @RequestParam Map<String, String> parameters, Model model, HttpServletRequest request, HttpServletResponse response ) throws Exception { WebOptions options = new WebOptions( parameters ); @@ -230,7 +230,7 @@ return StringUtils.uncapitalize( getEntitySimpleName() ); } - @RequestMapping(value = "/search/{query}", method = RequestMethod.GET) + @RequestMapping( value = "/search/{query}", method = RequestMethod.GET ) public String search( @PathVariable String query, @RequestParam Map<String, String> parameters, Model model, HttpServletRequest request, HttpServletResponse response ) throws Exception { @@ -260,13 +260,13 @@ // POST //-------------------------------------------------------------------------- - @RequestMapping(method = RequestMethod.POST, consumes = { "application/xml", "text/xml" }) + @RequestMapping( method = RequestMethod.POST, consumes = { "application/xml", "text/xml" } ) public void postXmlObject( HttpServletResponse response, HttpServletRequest request, InputStream input ) throws Exception { throw new HttpRequestMethodNotSupportedException( RequestMethod.POST.toString() ); } - @RequestMapping(method = RequestMethod.POST, consumes = "application/json") + @RequestMapping( method = RequestMethod.POST, consumes = "application/json" ) public void postJsonObject( HttpServletResponse response, HttpServletRequest request, InputStream input ) throws Exception { throw new HttpRequestMethodNotSupportedException( RequestMethod.POST.toString() ); @@ -276,16 +276,16 @@ // PUT //-------------------------------------------------------------------------- - @RequestMapping(value = "/{uid}", method = RequestMethod.PUT, consumes = { "application/xml", "text/xml" }) - @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void putXmlObject( HttpServletResponse response, HttpServletRequest request, @PathVariable("uid") String uid, InputStream input ) throws Exception + @RequestMapping( value = "/{uid}", method = RequestMethod.PUT, consumes = { "application/xml", "text/xml" } ) + @ResponseStatus( value = HttpStatus.NO_CONTENT ) + public void putXmlObject( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid, InputStream input ) throws Exception { throw new HttpRequestMethodNotSupportedException( RequestMethod.PUT.toString() ); } - @RequestMapping(value = "/{uid}", method = RequestMethod.PUT, consumes = "application/json") - @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void putJsonObject( HttpServletResponse response, HttpServletRequest request, @PathVariable("uid") String uid, InputStream input ) throws Exception + @RequestMapping( value = "/{uid}", method = RequestMethod.PUT, consumes = "application/json" ) + @ResponseStatus( value = HttpStatus.NO_CONTENT ) + public void putJsonObject( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid, InputStream input ) throws Exception { throw new HttpRequestMethodNotSupportedException( RequestMethod.PUT.toString() ); } @@ -294,9 +294,9 @@ // DELETE //-------------------------------------------------------------------------- - @RequestMapping(value = "/{uid}", method = RequestMethod.DELETE) - @ResponseStatus(value = HttpStatus.NO_CONTENT) - public void deleteObject( HttpServletResponse response, HttpServletRequest request, @PathVariable("uid") String uid ) throws Exception + @RequestMapping( value = "/{uid}", method = RequestMethod.DELETE ) + @ResponseStatus( value = HttpStatus.NO_CONTENT ) + public void deleteObject( HttpServletResponse response, HttpServletRequest request, @PathVariable( "uid" ) String uid ) throws Exception { throw new HttpRequestMethodNotSupportedException( RequestMethod.DELETE.toString() ); } @@ -445,7 +445,7 @@ private String entitySimpleName; - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) protected Class<T> getEntityClass() { if ( entityClass == null ) @@ -477,7 +477,7 @@ return entitySimpleName; } - @SuppressWarnings("unchecked") + @SuppressWarnings( "unchecked" ) protected T getEntityInstance() { try
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp