=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-02-18 13:43:10 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/IdentifiableObjectManager.java 2015-02-20 09:31:37 +0000 @@ -29,10 +29,6 @@ */ import org.hisp.dhis.common.NameableObject.NameableProperty; -import org.hisp.dhis.query.Order; -import org.hisp.dhis.query.Query; -import org.hisp.dhis.query.Result; -import org.hisp.dhis.query.ResultTransformer; import java.util.Collection; import java.util.Date; @@ -73,10 +69,6 @@ Collection getAll( Class clazz ); - Collection getAll( Class clazz, Order order ); - - Collection getAll( Class clazz, List order ); - Collection getAllByName( Class clazz, String name ); Collection getAllByNameIgnoreCase( Class clazz, String name ); @@ -93,10 +85,6 @@ List getBetween( Class clazz, int first, int max ); - List getBetween( Class clazz, int first, int max, Order order ); - - List getBetween( Class clazz, int first, int max, List order ); - List getBetweenSorted( Class clazz, int first, int max ); List getBetweenLikeName( Class clazz, String name, int first, int max ); @@ -145,10 +133,6 @@ int getCountLikeShortName( Class clazz, String shortName ); - Result query( Query query ); - - Result query( Query query, ResultTransformer transformer ); - void refresh( Object object ); // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2015-02-18 13:43:10 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java 2015-02-20 09:31:37 +0000 @@ -28,17 +28,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.SessionFactory; import org.hisp.dhis.common.NameableObject.NameableProperty; import org.hisp.dhis.common.comparator.IdentifiableObjectNameComparator; -import org.hisp.dhis.query.Order; -import org.hisp.dhis.query.Query; import org.hisp.dhis.query.QueryService; -import org.hisp.dhis.query.Result; -import org.hisp.dhis.query.ResultTransformer; import org.hisp.dhis.user.UserCredentials; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; @@ -275,26 +270,6 @@ } @Override - public Collection getAll( Class clazz, Order order ) - { - return getAll( clazz, Lists.newArrayList( order ) ); - } - - @Override - @SuppressWarnings( "unchecked" ) - public Collection getAll( Class clazz, List order ) - { - GenericIdentifiableObjectStore store = getIdentifiableObjectStore( clazz ); - - if ( store == null ) - { - return new ArrayList<>(); - } - - return (Collection) store.getAll( order ); - } - - @Override @SuppressWarnings( "unchecked" ) public Collection getAllByName( Class clazz, String name ) { @@ -498,26 +473,6 @@ } @Override - public List getBetween( Class clazz, int first, int max, Order order ) - { - return getBetween( clazz, first, max, Lists.newArrayList( order ) ); - } - - @Override - @SuppressWarnings( "unchecked" ) - public List getBetween( Class clazz, int first, int max, List order ) - { - GenericIdentifiableObjectStore store = getIdentifiableObjectStore( clazz ); - - if ( store == null ) - { - return new ArrayList<>(); - } - - return (List) store.getAll( first, max, order ); - } - - @Override @SuppressWarnings( "unchecked" ) public List getBetweenSorted( Class clazz, int first, int max ) { @@ -863,18 +818,6 @@ } @Override - public Result query( Query query ) - { - return queryService.query( query ); - } - - @Override - public Result query( Query query, ResultTransformer transformer ) - { - return queryService.query( query, transformer ); - } - - @Override @SuppressWarnings( "unchecked" ) public T getNoAcl( Class clazz, String uid ) { === modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/common/IdentifiableObjectManagerTest.java' --- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/common/IdentifiableObjectManagerTest.java 2015-02-17 08:00:44 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/common/IdentifiableObjectManagerTest.java 2015-02-20 09:31:37 +0000 @@ -571,70 +571,4 @@ assertTrue( cd.contains( dataElementC ) ); assertTrue( cd.contains( dataElementD ) ); } - - @Test - public void orderTest() - { - DataElement dataElementC = createDataElement( 'C' ); - DataElement dataElementA = createDataElement( 'A' ); - DataElement dataElementD = createDataElement( 'D' ); - DataElement dataElementB = createDataElement( 'B' ); - - identifiableObjectManager.save( dataElementA ); - identifiableObjectManager.save( dataElementB ); - identifiableObjectManager.save( dataElementC ); - identifiableObjectManager.save( dataElementD ); - - Property property = new Property( DataElement.class, null, null ); - property.setSimple( true ); - property.setPersisted( true ); - property.setFieldName( "name" ); - - List asc = new ArrayList<>( identifiableObjectManager.getAll( DataElement.class, Order.asc( property ) ) ); - assertTrue( "DataElementA".equals( asc.get( 0 ).getName() ) ); - assertTrue( "DataElementB".equals( asc.get( 1 ).getName() ) ); - assertTrue( "DataElementC".equals( asc.get( 2 ).getName() ) ); - assertTrue( "DataElementD".equals( asc.get( 3 ).getName() ) ); - - List desc = new ArrayList<>( identifiableObjectManager.getAll( DataElement.class, Order.desc( property ) ) ); - assertTrue( "DataElementD".equals( desc.get( 0 ).getName() ) ); - assertTrue( "DataElementC".equals( desc.get( 1 ).getName() ) ); - assertTrue( "DataElementB".equals( desc.get( 2 ).getName() ) ); - assertTrue( "DataElementA".equals( desc.get( 3 ).getName() ) ); - } - - @Test - public void pagedOrderTest() - { - DataElement dataElementC = createDataElement( 'C' ); - DataElement dataElementA = createDataElement( 'A' ); - DataElement dataElementD = createDataElement( 'D' ); - DataElement dataElementB = createDataElement( 'B' ); - - identifiableObjectManager.save( dataElementA ); - identifiableObjectManager.save( dataElementB ); - identifiableObjectManager.save( dataElementC ); - identifiableObjectManager.save( dataElementD ); - - Property property = new Property( DataElement.class, null, null ); - property.setSimple( true ); - property.setPersisted( true ); - property.setFieldName( "name" ); - - List asc = new ArrayList<>( identifiableObjectManager.getBetween( DataElement.class, 0, 2, Order.asc( property ) ) ); - assertTrue( "DataElementA".equals( asc.get( 0 ).getName() ) ); - assertTrue( "DataElementB".equals( asc.get( 1 ).getName() ) ); - - asc = new ArrayList<>( identifiableObjectManager.getBetween( DataElement.class, 2, 2, Order.asc( property ) ) ); - assertTrue( "DataElementC".equals( asc.get( 0 ).getName() ) ); - assertTrue( "DataElementD".equals( asc.get( 1 ).getName() ) ); - - List desc = new ArrayList<>( identifiableObjectManager.getBetween( DataElement.class, 0, 2, Order.desc( property ) ) ); - assertTrue( "DataElementD".equals( desc.get( 0 ).getName() ) ); - assertTrue( "DataElementC".equals( desc.get( 1 ).getName() ) ); - - desc = new ArrayList<>( identifiableObjectManager.getBetween( DataElement.class, 2, 2, Order.desc( property ) ) ); - assertTrue( "DataElementB".equals( desc.get( 0 ).getName() ) ); - assertTrue( "DataElementA".equals( desc.get( 1 ).getName() ) ); - } }