dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #05961
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1884: More annotations
------------------------------------------------------------
revno: 1884
committer: Lars <larshelg@larshelg-laptop>
branch nick: trunk
timestamp: Tue 2010-05-18 21:22:26 +0200
message:
More annotations
modified:
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java
dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java
dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/DefaultCSVExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportObjectStore.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/exporter/DefaultIXFExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/exporter/ITextPDFExportService.java
dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java
dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java
dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java
dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java
dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml
--
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-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/calculateddataelement/DefaultCalculatedDataElementDataMart.java 2010-05-18 19:22:26 +0000
@@ -54,6 +54,7 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -82,18 +83,11 @@
this.organisationUnitService = organisationUnitService;
}
- private BatchHandlerFactory batchHandlerFactory;
-
- public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
- {
- this.batchHandlerFactory = batchHandlerFactory;
- }
-
private DataElementAggregator sumIntAggregator;
- public void setSumIntAggregator( DataElementAggregator sumIntDataElementAggregator )
+ public void setSumIntAggregator( DataElementAggregator sumIntAggregator )
{
- this.sumIntAggregator = sumIntDataElementAggregator;
+ this.sumIntAggregator = sumIntAggregator;
}
private DataElementAggregator averageIntAggregator;
@@ -131,6 +125,9 @@
this.aggregationCache = aggregationCache;
}
+ @Autowired
+ private BatchHandlerFactory batchHandlerFactory;
+
// -------------------------------------------------------------------------
// CalculatedDataElementDataMart implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/DefaultCrossTabService.java 2010-05-18 19:22:26 +0000
@@ -44,6 +44,7 @@
import org.hisp.dhis.datamart.DataMartStore;
import org.hisp.dhis.datamart.crosstab.jdbc.CrossTabStore;
import org.hisp.dhis.jdbc.batchhandler.DataValueCrossTabBatchHandler;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -60,13 +61,9 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private BatchHandlerFactory batchHandlerFactory;
- public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
- {
- this.batchHandlerFactory = batchHandlerFactory;
- }
-
private CrossTabStore crossTabStore;
public void setCrossTabStore( CrossTabStore crossTabTableManager )
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/crosstab/jdbc/JDBCCrossTabStore.java 2010-05-18 19:22:26 +0000
@@ -38,6 +38,7 @@
import org.amplecode.quick.StatementManager;
import org.hisp.dhis.dataelement.DataElementOperand;
import org.hisp.dhis.jdbc.StatementBuilder;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -50,20 +51,12 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private StatementManager statementManager;
- public void setStatementManager( StatementManager statementManager )
- {
- this.statementManager = statementManager;
- }
-
+ @Autowired
private StatementBuilder statementBuilder;
- public void setStatementBuilder( StatementBuilder statementBuilder )
- {
- this.statementBuilder = statementBuilder;
- }
-
// -------------------------------------------------------------------------
// CrossTabStore implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/indicator/DefaultIndicatorDataMart.java 2010-05-18 19:22:26 +0000
@@ -57,6 +57,7 @@
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.system.util.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -95,13 +96,6 @@
this.organisationUnitService = organisationUnitService;
}
- private BatchHandlerFactory batchHandlerFactory;
-
- public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
- {
- this.batchHandlerFactory = batchHandlerFactory;
- }
-
private DataElementAggregator sumIntAggregator;
public void setSumIntAggregator( DataElementAggregator sumIntDataElementAggregator )
@@ -143,7 +137,10 @@
{
this.systemSettingManager = systemSettingManager;
}
-
+
+ @Autowired
+ private BatchHandlerFactory batchHandlerFactory;
+
// -------------------------------------------------------------------------
// IndicatorDataMart implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java 2010-05-11 15:21:26 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/java/org/hisp/dhis/datamart/jdbc/JdbcDataMartStore.java 2010-05-18 19:22:26 +0000
@@ -61,6 +61,7 @@
import org.hisp.dhis.system.objectmapper.AggregatedMapValueRowMapper;
import org.hisp.dhis.system.objectmapper.DataValueRowMapper;
import org.hisp.dhis.system.objectmapper.DeflatedDataValueRowMapper;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -73,19 +74,11 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private StatementManager statementManager;
- public void setStatementManager( StatementManager statementManager )
- {
- this.statementManager = statementManager;
- }
-
+ @Autowired
private StatementBuilder statementBuilder;
-
- public void setStatementBuilder( StatementBuilder statementBuilder )
- {
- this.statementBuilder = statementBuilder;
- }
// -------------------------------------------------------------------------
// AggregatedDataValue
=== modified file 'dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 22:56:52 +0000
+++ dhis-2/dhis-services/dhis-service-datamart-default/src/main/resources/META-INF/dhis/beans.xml 2010-05-18 19:22:26 +0000
@@ -9,10 +9,7 @@
<!-- DataMartStore -->
<bean id="org.hisp.dhis.datamart.DataMartStore"
- class="org.hisp.dhis.datamart.jdbc.JdbcDataMartStore">
- <property name="statementManager" ref="statementManager"/>
- <property name="statementBuilder" ref="statementBuilder"/>
- </bean>
+ class="org.hisp.dhis.datamart.jdbc.JdbcDataMartStore"/>
<!-- DataMartExportStore -->
@@ -81,14 +78,10 @@
<!-- Crosstab -->
<bean id="org.hisp.dhis.datamart.crosstab.jdbc.CrossTabStore"
- class="org.hisp.dhis.datamart.crosstab.jdbc.JDBCCrossTabStore">
- <property name="statementManager" ref="statementManager"/>
- <property name="statementBuilder" ref="statementBuilder"/>
- </bean>
+ class="org.hisp.dhis.datamart.crosstab.jdbc.JDBCCrossTabStore"/>
<bean id="org.hisp.dhis.datamart.crosstab.CrossTabService"
class="org.hisp.dhis.datamart.crosstab.DefaultCrossTabService">
- <property name="batchHandlerFactory" ref="batchHandlerFactory"/>
<property name="crossTabStore"
ref="org.hisp.dhis.datamart.crosstab.jdbc.CrossTabStore"/>
<property name="dataMartStore"
@@ -164,7 +157,6 @@
ref="org.hisp.dhis.period.PeriodService"/>
<property name="organisationUnitService"
ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- <property name="batchHandlerFactory" ref="batchHandlerFactory"/>
<property name="sumIntAggregator"
ref="org.hisp.dhis.datamart.aggregation.dataelement.SumIntAggregator"/>
<property name="averageIntAggregator"
@@ -187,7 +179,6 @@
ref="org.hisp.dhis.period.PeriodService"/>
<property name="organisationUnitService"
ref="org.hisp.dhis.organisationunit.OrganisationUnitService"/>
- <property name="batchHandlerFactory" ref="batchHandlerFactory"/>
<property name="sumIntAggregator"
ref="org.hisp.dhis.datamart.aggregation.dataelement.SumIntAggregator"/>
<property name="averageIntAggregator"
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/excelitem/hibernate/HibernateExcelItemStore.java 2010-05-18 19:22:26 +0000
@@ -13,6 +13,7 @@
import org.hisp.dhis.reportexcel.excelitem.ExcelItem;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemGroup;
import org.hisp.dhis.reportexcel.excelitem.ExcelItemStore;
+import org.springframework.beans.factory.annotation.Autowired;
/*
* Copyright (c) 2004-2010, University of Oslo
@@ -53,13 +54,9 @@
// Dependencies
// ----------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
private PeriodStore periodStore;
public void setPeriodStore( PeriodStore periodStore )
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java 2010-04-26 08:34:42 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/hibernate/HibernateReportExcelStore.java 2010-05-18 19:22:26 +0000
@@ -46,6 +46,7 @@
import org.hisp.dhis.reportexcel.ReportExcelItem;
import org.hisp.dhis.reportexcel.ReportExcelStore;
import org.hisp.dhis.reportexcel.status.DataEntryStatus;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -59,13 +60,9 @@
// Dependency
// -------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
// --------------------------------------
// Service of Report
// --------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 22:56:52 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-05-18 19:22:26 +0000
@@ -6,9 +6,8 @@
<!-- ReportExcel -->
<bean id="org.hisp.dhis.reportexcel.ReportExcelStore"
- class="org.hisp.dhis.reportexcel.hibernate.HibernateReportExcelStore">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
+ class="org.hisp.dhis.reportexcel.hibernate.HibernateReportExcelStore"/>
+
<bean id="org.hisp.dhis.reportexcel.ReportExcelService"
class="org.hisp.dhis.reportexcel.DefaultReportExcelService">
<property name="reportStore"
@@ -21,7 +20,6 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<bean id="org.hisp.dhis.reportexcel.excelitem.ExcelItemStore"
class="org.hisp.dhis.reportexcel.excelitem.hibernate.HibernateExcelItemStore">
- <property name="sessionFactory" ref="sessionFactory" />
<property name="periodStore" ref="org.hisp.dhis.period.PeriodStore" />
</bean>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/DefaultCSVExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/DefaultCSVExportService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/csv/exporter/DefaultCSVExportService.java 2010-05-18 19:22:26 +0000
@@ -40,6 +40,7 @@
import org.hisp.dhis.importexport.ExportService;
import org.hisp.dhis.importexport.csv.converter.ReportTableDataConverter;
import org.hisp.dhis.reporttable.ReportTableService;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -52,12 +53,8 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
-
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
private ReportTableService reportTableService;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dhis14/xml/exporter/DefaultDhis14XMLExportService.java 2010-05-18 19:22:26 +0000
@@ -64,6 +64,7 @@
import org.hisp.dhis.importexport.dhis14.xml.converter.xsd.UserXSDConverter;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.period.PeriodService;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -82,12 +83,8 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
-
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
private DataElementService dataElementService;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2010-04-29 17:05:22 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/dxf/exporter/DefaultDXFExportService.java 2010-05-18 19:22:26 +0000
@@ -95,6 +95,7 @@
import org.hisp.dhis.period.PeriodService;
import org.hisp.dhis.reporttable.ReportTableService;
import org.hisp.dhis.validation.ValidationRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -110,13 +111,12 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
+ @Autowired
+ private StatementManager statementManager;
+
private DataElementCategoryService categoryService;
public void setCategoryService( DataElementCategoryService categoryService )
@@ -208,13 +208,6 @@
this.dataMartService = dataMartService;
}
- private StatementManager statementManager;
-
- public void setStatementManager( StatementManager statementManager )
- {
- this.statementManager = statementManager;
- }
-
// -------------------------------------------------------------------------
// ExportService implementation
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportDataValueStore.java 2010-05-18 19:22:26 +0000
@@ -37,6 +37,7 @@
import org.hisp.dhis.importexport.ImportDataValue;
import org.hisp.dhis.importexport.ImportDataValueStore;
import org.hisp.dhis.importexport.ImportObjectStatus;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
/**
@@ -50,20 +51,12 @@
// Dependencies
// ----------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
+ @Autowired
private JdbcTemplate jdbcTemplate;
- public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
- {
- this.jdbcTemplate = jdbcTemplate;
- }
-
// ----------------------------------------------------------------------
// ImportDataValueStore implementation
// ----------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportObjectStore.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportObjectStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/hibernate/HibernateImportObjectStore.java 2010-05-18 19:22:26 +0000
@@ -38,6 +38,7 @@
import org.hisp.dhis.importexport.ImportObject;
import org.hisp.dhis.importexport.ImportObjectStatus;
import org.hisp.dhis.importexport.ImportObjectStore;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -50,13 +51,9 @@
// Dependencies
// ----------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
// ----------------------------------------------------------------------
// ImportObjectStore implementation
// ----------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/exporter/DefaultIXFExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/exporter/DefaultIXFExportService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/ixf/exporter/DefaultIXFExportService.java 2010-05-18 19:22:26 +0000
@@ -57,6 +57,7 @@
import org.hisp.dhis.importexport.ixf.converter.TimePeriodConverter;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
import org.hisp.dhis.period.PeriodService;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -77,12 +78,8 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
-
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
private DataElementCategoryService categoryService;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/mapping/DefaultObjectMappingGenerator.java 2010-05-18 19:22:26 +0000
@@ -71,6 +71,7 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.reporttable.ReportTable;
import org.hisp.dhis.system.util.LoggingHashMap;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -84,12 +85,8 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private BatchHandlerFactory batchHandlerFactory;
-
- public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
- {
- this.batchHandlerFactory = batchHandlerFactory;
- }
private PeriodStore periodStore;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/exporter/ITextPDFExportService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/exporter/ITextPDFExportService.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/pdf/exporter/ITextPDFExportService.java 2010-05-18 19:22:26 +0000
@@ -46,6 +46,7 @@
import org.hisp.dhis.importexport.pdf.converter.OrganisationUnitHierarchyConverter;
import org.hisp.dhis.indicator.IndicatorService;
import org.hisp.dhis.organisationunit.OrganisationUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Lars Helge Overland
@@ -58,13 +59,9 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
private DataElementService dataElementService;
public void setDataElementService( DataElementService dataElementService )
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2010-04-30 15:38:16 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectManager.java 2010-05-18 19:22:26 +0000
@@ -112,6 +112,7 @@
import org.hisp.dhis.source.Source;
import org.hisp.dhis.validation.ValidationRule;
import org.hisp.dhis.validation.ValidationRuleService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
/**
@@ -127,12 +128,8 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private BatchHandlerFactory batchHandlerFactory;
-
- public void setBatchHandlerFactory( BatchHandlerFactory batchHandlerFactory )
- {
- this.batchHandlerFactory = batchHandlerFactory;
- }
private ObjectMappingGenerator objectMappingGenerator;
=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 22:14:26 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/resources/META-INF/dhis/beans.xml 2010-05-18 19:22:26 +0000
@@ -50,19 +50,14 @@
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<bean id="org.hisp.dhis.importexport.ImportDataValueStore"
- class="org.hisp.dhis.importexport.hibernate.HibernateImportDataValueStore">
- <property name="sessionFactory" ref="sessionFactory" />
- <property name="jdbcTemplate" ref="jdbcTemplate" />
- </bean>
+ class="org.hisp.dhis.importexport.hibernate.HibernateImportDataValueStore"/>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- ImportObjectStore -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<bean id="org.hisp.dhis.importexport.ImportObjectStore"
- class="org.hisp.dhis.importexport.hibernate.HibernateImportObjectStore">
- <property name="sessionFactory" ref="sessionFactory" />
- </bean>
+ class="org.hisp.dhis.importexport.hibernate.HibernateImportObjectStore"/>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
<!-- ImportDataValueService -->
@@ -80,7 +75,6 @@
<bean id="org.hisp.dhis.importexport.ImportObjectManager"
class="org.hisp.dhis.importexport.service.DefaultImportObjectManager">
- <property name="batchHandlerFactory" ref="batchHandlerFactory" />
<property name="objectMappingGenerator"
ref="org.hisp.dhis.importexport.mapping.ObjectMappingGenerator" />
<property name="importObjectStore" ref="org.hisp.dhis.importexport.ImportObjectStore" />
@@ -305,7 +299,6 @@
<bean id="org.hisp.dhis.importexport.DXFExportService"
class="org.hisp.dhis.importexport.dxf.exporter.DefaultDXFExportService">
- <property name="sessionFactory" ref="sessionFactory" />
<property name="categoryService"
ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
@@ -325,7 +318,6 @@
<property name="completeDataSetRegistrationService"
ref="org.hisp.dhis.dataset.CompleteDataSetRegistrationService" />
<property name="dataMartService" ref="org.hisp.dhis.datamart.DataMartService" />
- <property name="statementManager" ref="statementManager" />
</bean>
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -334,7 +326,6 @@
<bean id="org.hisp.dhis.importexport.IXFExportService"
class="org.hisp.dhis.importexport.ixf.exporter.DefaultIXFExportService">
- <property name="sessionFactory" ref="sessionFactory" />
<property name="categoryService"
ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
@@ -358,7 +349,6 @@
<bean id="org.hisp.dhis.importexport.PDFExportService"
class="org.hisp.dhis.importexport.pdf.exporter.ITextPDFExportService">
- <property name="sessionFactory" ref="sessionFactory" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
<property name="organisationUnitService"
@@ -371,7 +361,6 @@
<bean id="org.hisp.dhis.importexport.Dhis14XMLExportService"
class="org.hisp.dhis.importexport.dhis14.xml.exporter.DefaultDhis14XMLExportService">
- <property name="sessionFactory" ref="sessionFactory" />
<property name="dataElementService" ref="org.hisp.dhis.dataelement.DataElementService" />
<property name="indicatorService" ref="org.hisp.dhis.indicator.IndicatorService" />
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
@@ -385,7 +374,6 @@
<bean id="org.hisp.dhis.importexport.CSVExportService"
class="org.hisp.dhis.importexport.csv.exporter.DefaultCSVExportService">
- <property name="sessionFactory" ref="sessionFactory" />
<property name="reportTableService" ref="org.hisp.dhis.reporttable.ReportTableService" />
</bean>
@@ -395,7 +383,6 @@
<bean id="org.hisp.dhis.importexport.mapping.ObjectMappingGenerator"
class="org.hisp.dhis.importexport.mapping.DefaultObjectMappingGenerator">
- <property name="batchHandlerFactory" ref="batchHandlerFactory" />
<property name="periodStore" ref="org.hisp.dhis.period.PeriodStore" />
<property name="categoryService"
ref="org.hisp.dhis.dataelement.DataElementCategoryService" />
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java 2010-04-12 21:23:33 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/java/org/hisp/dhis/mapping/hibernate/HibernateMappingStore.java 2010-05-18 19:22:26 +0000
@@ -43,6 +43,7 @@
import org.hisp.dhis.mapping.MappingStore;
import org.hisp.dhis.organisationunit.OrganisationUnit;
import org.hisp.dhis.organisationunit.OrganisationUnitLevel;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @author Jan Henrik Overland
@@ -55,13 +56,9 @@
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
// -------------------------------------------------------------------------
// Map
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 22:56:52 +0000
+++ dhis-2/dhis-services/dhis-service-mapping/src/main/resources/META-INF/dhis/beans.xml 2010-05-18 19:22:26 +0000
@@ -27,9 +27,7 @@
<!-- Store definitions -->
<bean id="org.hisp.dhis.mapping.MappingStore"
- class="org.hisp.dhis.mapping.hibernate.HibernateMappingStore">
- <property name="sessionFactory" ref="sessionFactory"/>
- </bean>
+ class="org.hisp.dhis.mapping.hibernate.HibernateMappingStore"/>
<!-- DeletionHandlers -->
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java 2010-05-10 17:50:39 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/DefaultCaseAggregationMappingService.java 2010-05-18 19:22:26 +0000
@@ -44,7 +44,6 @@
import org.hisp.dhis.period.Period;
import org.hisp.dhis.program.ProgramInstance;
import org.hisp.dhis.program.ProgramStageInstance;
-import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.transaction.annotation.Transactional;
@Transactional
@@ -90,13 +89,6 @@
this.caseAggregationMappingStore = caseAggregationMappingStore;
}
- private JdbcTemplate jdbcTemplate;
-
- public void setJdbcTemplate( JdbcTemplate jdbcTemplate )
- {
- this.jdbcTemplate = jdbcTemplate;
- }
-
// -------------------------------------------------------------------------
// CaseAggregationMapping
// -------------------------------------------------------------------------
@@ -745,7 +737,7 @@
public static void main( String[] args )
{
String string = "SUM@ COND{ ([DE:8.57.1]) < ([VL:2500]) } AND COND{ ([CP:gender]) = ([VL:'M']) } ";
- String input = "COUNT@ COND{([DE:1.3923.1]) > ([VL:100])}";
+ //String input = "COUNT@ COND{([DE:1.3923.1]) > ([VL:100])}";
DefaultCaseAggregationMappingService test = new DefaultCaseAggregationMappingService();
CaseAggregationQuery query = test.scan( string );
System.out.println( test.buildQuery( null, null, query ) );
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java 2010-04-21 12:14:08 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationMappingStore.java 2010-05-18 19:22:26 +0000
@@ -41,22 +41,18 @@
import org.hisp.dhis.dataelement.DataElement;
import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo;
import org.hisp.dhis.patientdatavalue.PatientDataValue;
+import org.springframework.beans.factory.annotation.Autowired;
public class HibernateCaseAggregationMappingStore
implements CaseAggregationMappingStore
{
-
// -------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------
+ @Autowired
private SessionFactory sessionFactory;
- public void setSessionFactory( SessionFactory sessionFactory )
- {
- this.sessionFactory = sessionFactory;
- }
-
// -------------------------------------------------------------------------
// CaseAggregationMapping
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java 2009-11-19 19:31:31 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/patientdatavalue/aggregation/DefaultPatientDataValueAggregationEngine.java 2010-05-18 19:22:26 +0000
@@ -13,6 +13,7 @@
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.system.util.DateUtils;
import org.hisp.dhis.system.util.TextUtils;
+import org.springframework.beans.factory.annotation.Autowired;
// Work in progress!
@@ -38,13 +39,9 @@
this.periodService = periodService;
}
+ @Autowired
private StatementManager statementManager;
- public void setStatementManager( StatementManager statementManager )
- {
- this.statementManager = statementManager;
- }
-
/*
* interface: startDate, endDate, organisationUnit
*
=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2010-05-17 22:56:52 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/resources/META-INF/dhis/beans.xml 2010-05-18 19:22:26 +0000
@@ -5,10 +5,9 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd";>
<!-- Store definitions -->
+
<bean id="org.hisp.dhis.caseaggregation.CaseAggregationMappingStore"
- class="org.hisp.dhis.caseaggregation.hibernate.HibernateCaseAggregationMappingStore">
- <property name="sessionFactory" ref="sessionFactory"/>
- </bean>
+ class="org.hisp.dhis.caseaggregation.hibernate.HibernateCaseAggregationMappingStore"/>
<bean id="org.hisp.dhis.relationship.RelationshipStore"
class="org.hisp.dhis.relationship.hibernate.HibernateRelationshipStore">
@@ -68,8 +67,7 @@
<bean id="org.hisp.dhis.patientattributevalue.PatientAttributeValueStore"
class="org.hisp.dhis.patientattributevalue.hibernate.HibernatePatientAttributeValueStore">
- <property name="clazz"
- value="org.hisp.dhis.patientattributevalue.PatientAttributeValue" />
+ <property name="clazz" value="org.hisp.dhis.patientattributevalue.PatientAttributeValue" />
<property name="sessionFactory" ref="sessionFactory" />
</bean>
@@ -81,8 +79,7 @@
<bean id="org.hisp.dhis.patientdatavalue.PatientDataValueStore"
class="org.hisp.dhis.patientdatavalue.hibernate.HibernatePatientDataValueStore">
- <property name="clazz"
- value="org.hisp.dhis.patientdatavalue.PatientDataValue" />
+ <property name="clazz" value="org.hisp.dhis.patientdatavalue.PatientDataValue" />
<property name="sessionFactory" ref="sessionFactory" />
</bean>
@@ -93,15 +90,15 @@
</bean>
<bean id="org.hisp.dhis.program.ProgramStageDataElementStore"
- class="org.hisp.dhis.program.hibernate.HibernateProgramStageDataElementStore">
+ class="org.hisp.dhis.program.hibernate.HibernateProgramStageDataElementStore">
<property name="clazz" value="org.hisp.dhis.program.ProgramStageDataElement"/>
<property name="sessionFactory" ref="sessionFactory"/>
</bean>
<bean id="org.hisp.dhis.program.ProgramStageDataElementValidationStore"
- class="org.hisp.dhis.program.hibernate.HibernateProgramStageDataElementValidationStore">
- <property name="clazz" value="org.hisp.dhis.program.ProgramStageDataElementValidation" />
- <property name="sessionFactory" ref="sessionFactory" />
+ class="org.hisp.dhis.program.hibernate.HibernateProgramStageDataElementValidationStore">
+ <property name="clazz" value="org.hisp.dhis.program.ProgramStageDataElementValidation" />
+ <property name="sessionFactory" ref="sessionFactory" />
</bean>
<!-- Service definitions -->
@@ -109,14 +106,13 @@
<bean id="org.hisp.dhis.caseaggregation.CaseAggregationMappingService"
class="org.hisp.dhis.caseaggregation.DefaultCaseAggregationMappingService">
<property name="caseAggregationMappingStore"
- ref="org.hisp.dhis.caseaggregation.CaseAggregationMappingStore"/>
- <property name="jdbcTemplate" ref="jdbcTemplate"/>
+ ref="org.hisp.dhis.caseaggregation.CaseAggregationMappingStore"/>
</bean>
<bean id="org.hisp.dhis.program.ProgramStageDataElementService"
class="org.hisp.dhis.program.DefaultProgramStageDataElementService">
- <property name="programStageDataElementStore"
- ref="org.hisp.dhis.program.ProgramStageDataElementStore"/>
+ <property name="programStageDataElementStore"
+ ref="org.hisp.dhis.program.ProgramStageDataElementStore"/>
</bean>
<bean id="org.hisp.dhis.program.nextvisit.NextVisitGenerator"
@@ -225,7 +221,6 @@
class="org.hisp.dhis.patientdatavalue.aggregation.DefaultPatientDataValueAggregationEngine">
<property name="patientService" ref="org.hisp.dhis.patient.PatientService" />
<property name="periodService" ref="org.hisp.dhis.period.PeriodService" />
- <property name="statementManager" ref="statementManager" />
</bean>
<!-- DeletionHandlers -->
