Menu
▾
▴
[Jdhis-inf5750] [SVN] r57 - in code/dhis-2/dhis-data-store/src: main/java/org/hisp/dhis/datastore main/java/org/hisp/dhis/datastore/hibernate test/java/org/hisp/dhis/datastore/hibernate
Author: trygvela
Date: 2005-01-09 17:50:30 +0100 (Sun, 09 Jan 2005)
New Revision: 57
Modified:
code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/DataStore.java
code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/hibernate/HibernateDataStore.java
code/dhis-2/dhis-data-store/src/test/java/org/hisp/dhis/datastore/hibernate/HibernateDataStoreTest.java
Log:
o Adding DataStore.getAllPeriodTypes().
Modified: code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/DataStore.java
===================================================================
--- code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/DataStore.java 2005-01-09 16:49:45 UTC (rev 56)
+++ code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/DataStore.java 2005-01-09 16:50:30 UTC (rev 57)
@@ -1,6 +1,7 @@
package org.hisp.dhis.datastore;
import java.util.Date;
+import java.util.Iterator;
/**
* @author kristian
@@ -13,7 +14,7 @@
// ----------------------------------------------------------------------
// PeriodType
// ----------------------------------------------------------------------
-
+
void addPeriodType( String name )
throws DataStoreException;
@@ -23,6 +24,9 @@
PeriodType getPeriodType( String name )
throws DataStoreException;
+ Iterator getAllPeriodTypes()
+ throws DataStoreException;
+
// ----------------------------------------------------------------------
// Period
// ----------------------------------------------------------------------
Modified: code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/hibernate/HibernateDataStore.java
===================================================================
--- code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/hibernate/HibernateDataStore.java 2005-01-09 16:49:45 UTC (rev 56)
+++ code/dhis-2/dhis-data-store/src/main/java/org/hisp/dhis/datastore/hibernate/HibernateDataStore.java 2005-01-09 16:50:30 UTC (rev 57)
@@ -1,6 +1,7 @@
package org.hisp.dhis.datastore.hibernate;
import java.util.Date;
+import java.util.Iterator;
import java.util.List;
import net.sf.hibernate.Criteria;
@@ -8,8 +9,6 @@
import net.sf.hibernate.Session;
import net.sf.hibernate.expression.Example;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.hisp.dhis.datastore.DataElement;
import org.hisp.dhis.datastore.DataStore;
import org.hisp.dhis.datastore.DataStoreException;
@@ -25,8 +24,6 @@
public class HibernateDataStore
implements DataStore
{
- private static Log log = LogFactory.getLog( HibernateDataStore.class );
-
private HibernateSessionManager sessionManager;
// ----------------------------------------------------------------------
@@ -92,6 +89,23 @@
}
}
+ public Iterator getAllPeriodTypes()
+ throws DataStoreException
+ {
+ try
+ {
+ Session session = sessionManager.getCurrentSession();
+
+ List periodTypes = session.find( "from " + PeriodType.class.getName() );
+
+ return periodTypes.iterator();
+ }
+ catch ( HibernateException ex )
+ {
+ throw new DataStoreException( "Error while getting all period types.", ex );
+ }
+ }
+
// ----------------------------------------------------------------------
// Period
// ----------------------------------------------------------------------
@@ -230,7 +244,6 @@
{
throw new DataStoreException( "Could not get data element", ex );
}
-
}
// ----------------------------------------------------------------------
Modified: code/dhis-2/dhis-data-store/src/test/java/org/hisp/dhis/datastore/hibernate/HibernateDataStoreTest.java
===================================================================
--- code/dhis-2/dhis-data-store/src/test/java/org/hisp/dhis/datastore/hibernate/HibernateDataStoreTest.java 2005-01-09 16:49:45 UTC (rev 56)
+++ code/dhis-2/dhis-data-store/src/test/java/org/hisp/dhis/datastore/hibernate/HibernateDataStoreTest.java 2005-01-09 16:50:30 UTC (rev 57)
@@ -40,9 +40,9 @@
{
Session session = sessionManager.getCurrentSession();
tx = session.beginTransaction();
-
+
String periodTypeName = "testAddPeriodType.name";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addPeriodType( periodTypeName );
@@ -65,7 +65,7 @@
tx = session.beginTransaction();
String periodTypeName = "testDelPeriodType.name";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addPeriodType( periodTypeName );
@@ -108,7 +108,7 @@
tx = session.beginTransaction();
String periodTypeName = "testAddPeriod.name";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addPeriodType( periodTypeName );
@@ -133,7 +133,7 @@
{
Session session = sessionManager.getCurrentSession();
tx = session.beginTransaction();
-
+
String periodTypeName = "testDelPeriod.name";
DataStore dataStore = (DataStore) getBean( DataStore.ID );
@@ -183,7 +183,7 @@
String dataElementId = "testAddDataElement.id";
String dataElementName = "testAddDataElement.name";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addDataElement( dataElementId, dataElementName, true );
@@ -207,7 +207,7 @@
String dataElementId = "testDelDataElement.id";
String dataElementName = "testDelDataElement.name";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addDataElement( dataElementId, dataElementName, true );
@@ -216,7 +216,7 @@
session = sessionManager.getCurrentSession();
tx = session.beginTransaction();
-
+
dataStore.delDataElement( dataElementId );
tx.commit();
@@ -247,7 +247,7 @@
String dataElementId = "testUpdateDataElement.id";
String dataElementName = "testUpdateDataElement.name";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addDataElement( dataElementId, dataElementName, true );
@@ -284,7 +284,7 @@
tx = session.beginTransaction();
String periodTypeName = "testAddDataValue.periodTypeName";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addPeriodType( periodTypeName );
@@ -295,7 +295,7 @@
String dataElementId = "testAddDataValue.dataElementId";
String dataElementName = "testAddDataValue.dataElementName";
dataStore.addDataElement( dataElementId, dataElementName, true );
-
+
String source = "testAddDataValue.source";
String value = "testAddDataValue.value";
dataStore.addDataValue( dataElementId, periodTypeName, startDate, endDate, source, value );
@@ -319,7 +319,7 @@
tx = session.beginTransaction();
String periodTypeName = "testDelDataValue.periodTypeName";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addPeriodType( periodTypeName );
@@ -330,7 +330,7 @@
String dataElementId = "testDelDataValue.dataElementId";
String dataElementName = "testDelDataValue.dataElementName";
dataStore.addDataElement( dataElementId, dataElementName, true );
-
+
String source = "testDelDataValue.source";
String value = "testDelDataValue.value";
dataStore.addDataValue( dataElementId, periodTypeName, startDate, endDate, source, value );
@@ -340,7 +340,7 @@
session = sessionManager.getCurrentSession();
tx = session.beginTransaction();
-
+
dataStore.delDataValue( dataElementId, periodTypeName, startDate, endDate, source );
tx.commit();
@@ -370,7 +370,7 @@
tx = session.beginTransaction();
String periodTypeName = "testUpdateDataValue.periodTypeName";
-
+
DataStore dataStore = (DataStore) getBean( DataStore.ID );
dataStore.addPeriodType( periodTypeName );
@@ -381,7 +381,7 @@
String dataElementId = "testUpdateDataValue.dataElementId";
String dataElementName = "testUpdateDataValue.dataElementName";
dataStore.addDataElement( dataElementId, dataElementName, true );
-
+
String source = "testUpdateDataValue.source";
String value = "testUpdateDataValue.value";
dataStore.addDataValue( dataElementId, periodTypeName, startDate, endDate, source, value );
@@ -391,7 +391,7 @@
session = sessionManager.getCurrentSession();
tx = session.beginTransaction();
-
+
String valueUpdated = "testUpdateDataValue.valueUpdated";
dataStore.updateDataValue( dataElementId, periodTypeName, startDate, endDate, source, valueUpdated );
|