dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #39414
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 19952: remove get data elements by type, not in use anywhere except for tests
------------------------------------------------------------
revno: 19952
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2015-09-03 11:31:39 +0700
message:
remove get data elements by type, not in use anywhere except for tests
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java
dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.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-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java 2015-09-03 04:03:56 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementService.java 2015-09-03 04:31:39 +0000
@@ -189,14 +189,6 @@
List<DataElement> getDataElementsByDomainType( DataElementDomain domainType, int first, int max );
/**
- * Returns all DataElements with the given type.
- *
- * @param type the type.
- * @return all DataElements with the given type.
- */
- List<DataElement> getDataElementsByType( String type );
-
- /**
* Returns all DataElements with the given value types.
*
* @param valueTypes The value types.
=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java 2015-09-03 04:03:56 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementStore.java 2015-09-03 04:31:39 +0000
@@ -95,14 +95,6 @@
List<DataElement> getDataElementsByDomainType( DataElementDomain domainType, int first, int max );
/**
- * Returns all DataElements with the given type.
- *
- * @param type the type.
- * @return all DataElements with the given type.
- */
- List<DataElement> getDataElementsByType( String type );
-
- /**
* Returns all DataElements with the given value types.
*
* @param valueTypes The value types.
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java 2015-09-03 04:03:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementService.java 2015-09-03 04:31:39 +0000
@@ -210,12 +210,6 @@
}
@Override
- public List<DataElement> getDataElementsByType( String type )
- {
- return i18n( i18nService, dataElementStore.getDataElementsByType( type ) );
- }
-
- @Override
public List<DataElement> getDataElementsByValueTypes( List<ValueType> valueTypes )
{
return i18n( i18nService, dataElementStore.getDataElementsByValueTypes( valueTypes ) );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2015-09-03 04:20:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/hibernate/HibernateDataElementStore.java 2015-09-03 04:31:39 +0000
@@ -96,13 +96,6 @@
@Override
@SuppressWarnings( "unchecked" )
- public List<DataElement> getDataElementsByType( String type )
- {
- return getCriteria( Restrictions.eq( "type", type ) ).list();
- }
-
- @Override
- @SuppressWarnings( "unchecked" )
public List<DataElement> getDataElementsByValueTypes( List<ValueType> valueTypes )
{
return getCriteria( Restrictions.in( "valueType", valueTypes ) ).list();
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java 2015-09-02 05:15:31 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementServiceTest.java 2015-09-03 04:31:39 +0000
@@ -28,19 +28,16 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import org.hisp.dhis.DhisSpringTest;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.hisp.dhis.DhisSpringTest;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
+import static org.junit.Assert.*;
/**
* @author Kristian Nordal
@@ -156,9 +153,9 @@
DataElement dataElementB = createDataElement( 'B' );
DataElement dataElementC = createDataElement( 'C' );
- dataElementA.setCode( "codeA");
- dataElementB.setCode( "codeB");
- dataElementC.setCode( "codeC");
+ dataElementA.setCode( "codeA" );
+ dataElementB.setCode( "codeB" );
+ dataElementC.setCode( "codeC" );
int idA = dataElementService.addDataElement( dataElementA );
int idB = dataElementService.addDataElement( dataElementB );
@@ -302,58 +299,8 @@
dataElementService.addDataElement( dataElementC );
dataElementService.addDataElement( dataElementD );
- assertEquals( 1, dataElementService.getDataElementsByAggregationOperator(
- DataElement.AGGREGATION_OPERATOR_AVERAGE_SUM ).size() );
- assertEquals( 3, dataElementService.getDataElementsByAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM )
- .size() );
- }
-
- @Test
- public void testGetDataElementsByDomainType()
- {
- assertEquals( 0, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_INT ).size() );
- assertEquals( 0, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_BOOL ).size() );
-
- DataElement dataElementA = createDataElement( 'A' );
- dataElementA.setType( DataElement.VALUE_TYPE_INT );
- DataElement dataElementB = createDataElement( 'B' );
- dataElementB.setType( DataElement.VALUE_TYPE_BOOL );
- DataElement dataElementC = createDataElement( 'C' );
- dataElementC.setType( DataElement.VALUE_TYPE_BOOL );
- DataElement dataElementD = createDataElement( 'D' );
- dataElementD.setType( DataElement.VALUE_TYPE_BOOL );
-
- dataElementService.addDataElement( dataElementA );
- dataElementService.addDataElement( dataElementB );
- dataElementService.addDataElement( dataElementC );
- dataElementService.addDataElement( dataElementD );
-
- assertEquals( 1, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_INT ).size() );
- assertEquals( 3, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_BOOL ).size() );
- }
-
- @Test
- public void testGetDataElementsByType()
- {
- assertEquals( 0, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_INT ).size() );
- assertEquals( 0, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_BOOL ).size() );
-
- DataElement dataElementA = createDataElement( 'A' );
- dataElementA.setType( DataElement.VALUE_TYPE_INT );
- DataElement dataElementB = createDataElement( 'B' );
- dataElementB.setType( DataElement.VALUE_TYPE_BOOL );
- DataElement dataElementC = createDataElement( 'C' );
- dataElementC.setType( DataElement.VALUE_TYPE_BOOL );
- DataElement dataElementD = createDataElement( 'D' );
- dataElementD.setType( DataElement.VALUE_TYPE_BOOL );
-
- dataElementService.addDataElement( dataElementA );
- dataElementService.addDataElement( dataElementB );
- dataElementService.addDataElement( dataElementC );
- dataElementService.addDataElement( dataElementD );
-
- assertEquals( 1, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_INT ).size() );
- assertEquals( 3, dataElementService.getDataElementsByType( DataElement.VALUE_TYPE_BOOL ).size() );
+ assertEquals( 1, dataElementService.getDataElementsByAggregationOperator( DataElement.AGGREGATION_OPERATOR_AVERAGE_SUM ).size() );
+ assertEquals( 3, dataElementService.getDataElementsByAggregationOperator( DataElement.AGGREGATION_OPERATOR_SUM ).size() );
}
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java'
--- dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2015-06-16 05:11:29 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/dataelement/DataElementStoreTest.java 2015-09-03 04:31:39 +0000
@@ -307,30 +307,6 @@
}
@Test
- public void testGetDataElementsByType()
- {
- assertEquals( 0, dataElementStore.getDataElementsByType( DataElement.VALUE_TYPE_INT ).size() );
- assertEquals( 0, dataElementStore.getDataElementsByType( DataElement.VALUE_TYPE_BOOL ).size() );
-
- DataElement dataElementA = createDataElement( 'A' );
- dataElementA.setType( DataElement.VALUE_TYPE_INT );
- DataElement dataElementB = createDataElement( 'B' );
- dataElementB.setType( DataElement.VALUE_TYPE_BOOL );
- DataElement dataElementC = createDataElement( 'C' );
- dataElementC.setType( DataElement.VALUE_TYPE_BOOL );
- DataElement dataElementD = createDataElement( 'D' );
- dataElementD.setType( DataElement.VALUE_TYPE_BOOL );
-
- dataElementStore.save( dataElementA );
- dataElementStore.save( dataElementB );
- dataElementStore.save( dataElementC );
- dataElementStore.save( dataElementD );
-
- assertEquals( 1, dataElementStore.getDataElementsByType( DataElement.VALUE_TYPE_INT ).size() );
- assertEquals( 3, dataElementStore.getDataElementsByType( DataElement.VALUE_TYPE_BOOL ).size() );
- }
-
- @Test
public void testGetDataElementAggregationLevels()
{
List<Integer> aggregationLevels = Arrays.asList( 3, 5 );
