=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java 2013-05-07 07:07:09 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/DimensionalObject.java 2013-05-07 08:37:33 +0000 @@ -46,6 +46,14 @@ public abstract class DimensionalObject extends BaseIdentifiableObject { + public static final String DATA_X_DIM_ID = "dx"; // in, de, ds + public static final String INDICATOR_DIM_ID = "in"; + public static final String DATAELEMENT_DIM_ID = "de"; + public static final String DATASET_DIM_ID = "ds"; + public static final String CATEGORYOPTIONCOMBO_DIM_ID = "co"; + public static final String PERIOD_DIM_ID = "pe"; + public static final String ORGUNIT_DIM_ID = "ou"; + @JsonProperty @JsonView({ DimensionalView.class }) @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0) === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AggregationType.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AggregationType.java 2013-01-28 12:50:32 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AggregationType.java 2013-05-07 08:37:33 +0000 @@ -27,6 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/** + * @author Lars Helge Overland + */ public enum AggregationType { SUM, AVERAGE_INT, AVERAGE_INT_DISAGGREGATION, AVERAGE_BOOL, COUNT === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsIndex.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsIndex.java 2013-02-19 13:19:21 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsIndex.java 2013-05-07 08:37:33 +0000 @@ -27,6 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/** + * @author Lars Helge Overland + */ public class AnalyticsIndex { private String table; === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsManager.java 2013-02-26 18:33:01 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsManager.java 2013-05-07 08:37:33 +0000 @@ -33,6 +33,9 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.ListMap; +/** + * @author Lars Helge Overland + */ public interface AnalyticsManager { /** === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsService.java 2013-05-02 13:32:45 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsService.java 2013-05-07 08:37:33 +0000 @@ -33,6 +33,9 @@ import org.hisp.dhis.common.Grid; import org.hisp.dhis.i18n.I18nFormat; +/** + * @author Lars Helge Overland + */ public interface AnalyticsService { final String NAMES_META_KEY = "names"; === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java 2013-03-15 11:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableManager.java 2013-05-07 08:37:33 +0000 @@ -33,6 +33,9 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Future; +/** + * @author Lars Helge Overland + */ public interface AnalyticsTableManager { public static final String TABLE_TEMP_SUFFIX = "_temp"; === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableService.java 2013-04-22 08:10:07 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/AnalyticsTableService.java 2013-05-07 08:37:33 +0000 @@ -29,6 +29,9 @@ import org.hisp.dhis.scheduling.TaskId; +/** + * @author Lars Helge Overland + */ public interface AnalyticsTableService { /** === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2013-05-03 15:06:31 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DataQueryParams.java 2013-05-07 08:37:33 +0000 @@ -31,6 +31,13 @@ import static org.hisp.dhis.analytics.DimensionType.DATASET; import static org.hisp.dhis.analytics.DimensionType.ORGANISATIONUNIT; import static org.hisp.dhis.analytics.DimensionType.ORGANISATIONUNIT_GROUPSET; +import static org.hisp.dhis.common.DimensionalObject.CATEGORYOPTIONCOMBO_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.DATAELEMENT_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.DATASET_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.DATA_X_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.INDICATOR_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.ORGUNIT_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID; import static org.hisp.dhis.common.IdentifiableObjectUtils.asList; import static org.hisp.dhis.common.IdentifiableObjectUtils.getList; import static org.hisp.dhis.system.util.CollectionUtils.emptyIfNull; @@ -61,15 +68,11 @@ import org.hisp.dhis.system.util.MapMap; import org.hisp.dhis.system.util.MathUtils; +/** + * @author Lars Helge Overland + */ public class DataQueryParams { - public static final String DATA_X_DIM_ID = "dx"; // IN, DE, DS - public static final String INDICATOR_DIM_ID = "in"; - public static final String DATAELEMENT_DIM_ID = "de"; - public static final String DATASET_DIM_ID = "ds"; - public static final String CATEGORYOPTIONCOMBO_DIM_ID = "co"; - public static final String PERIOD_DIM_ID = "pe"; - public static final String ORGUNIT_DIM_ID = "ou"; public static final String VALUE_ID = "value"; public static final String LEVEL_PREFIX = "uidlevel"; === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/Dimension.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/Dimension.java 2013-03-12 17:07:05 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/Dimension.java 2013-05-07 08:37:33 +0000 @@ -32,6 +32,9 @@ import org.hisp.dhis.common.IdentifiableObject; +/** + * @author Lars Helge Overland + */ public class Dimension { private String dimension; === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DimensionItem.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DimensionItem.java 2013-02-25 15:15:07 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DimensionItem.java 2013-05-07 08:37:33 +0000 @@ -30,9 +30,13 @@ import java.util.ArrayList; import java.util.List; +import org.hisp.dhis.common.DimensionalObject; import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.system.util.CollectionUtils; +/** + * @author Lars Helge Overland + */ public class DimensionItem { private String dimension; @@ -129,7 +133,7 @@ { for ( DimensionItem item : items ) { - if ( DataQueryParams.PERIOD_DIM_ID.equals( item.getDimension() ) ) + if ( DimensionalObject.PERIOD_DIM_ID.equals( item.getDimension() ) ) { return item.getItem(); } === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DimensionType.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DimensionType.java 2013-04-22 17:49:11 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/DimensionType.java 2013-05-07 08:37:33 +0000 @@ -27,6 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/** + * @author Lars Helge Overland + */ public enum DimensionType { INDICATOR, === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/IllegalQueryException.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/IllegalQueryException.java 2013-01-30 08:53:54 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/IllegalQueryException.java 2013-05-07 08:37:33 +0000 @@ -27,6 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/** + * @author Lars Helge Overland + */ public class IllegalQueryException extends RuntimeException { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/MeasureFilter.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/MeasureFilter.java 2013-01-28 13:31:44 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/MeasureFilter.java 2013-05-07 08:37:33 +0000 @@ -27,6 +27,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +/** + * @author Lars Helge Overland + */ public enum MeasureFilter { EQ, GT, GE, LT, LE === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/QueryPlanner.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/QueryPlanner.java 2013-02-01 14:57:34 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/QueryPlanner.java 2013-05-07 08:37:33 +0000 @@ -29,6 +29,9 @@ import java.util.List; +/** + * @author Lars Helge Overland + */ public interface QueryPlanner { /** === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2013-05-02 20:51:27 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2013-05-07 08:37:33 +0000 @@ -30,19 +30,12 @@ import static org.hisp.dhis.analytics.AnalyticsTableManager.ANALYTICS_TABLE_NAME; import static org.hisp.dhis.analytics.AnalyticsTableManager.COMPLETENESS_TABLE_NAME; import static org.hisp.dhis.analytics.AnalyticsTableManager.COMPLETENESS_TARGET_TABLE_NAME; -import static org.hisp.dhis.analytics.DataQueryParams.CATEGORYOPTIONCOMBO_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.DATAELEMENT_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.DATASET_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.DATA_X_DIM_ID; import static org.hisp.dhis.analytics.DataQueryParams.DIMENSION_SEP; import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_CATEGORYOPTIONCOMBO; import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_DATA_X; import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_ORGUNIT; import static org.hisp.dhis.analytics.DataQueryParams.DISPLAY_NAME_PERIOD; import static org.hisp.dhis.analytics.DataQueryParams.FIXED_DIMS; -import static org.hisp.dhis.analytics.DataQueryParams.INDICATOR_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.ORGUNIT_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.PERIOD_DIM_ID; import static org.hisp.dhis.analytics.DataQueryParams.getDimensionFromParam; import static org.hisp.dhis.analytics.DataQueryParams.getDimensionItemsFromParam; import static org.hisp.dhis.common.IdentifiableObjectUtils.asList; @@ -50,6 +43,7 @@ import static org.hisp.dhis.common.IdentifiableObjectUtils.getUids; import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT; import static org.hisp.dhis.organisationunit.OrganisationUnit.KEY_USER_ORGUNIT_CHILDREN; +import static org.hisp.dhis.common.DimensionalObject.*; import java.util.ArrayList; import java.util.Arrays; @@ -111,6 +105,9 @@ import org.hisp.dhis.user.User; import org.springframework.beans.factory.annotation.Autowired; +/** + * @author Lars Helge Overland + */ public class DefaultAnalyticsService implements AnalyticsService { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2013-04-04 18:08:40 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultQueryPlanner.java 2013-05-07 08:37:33 +0000 @@ -31,15 +31,12 @@ import static org.hisp.dhis.analytics.AggregationType.AVERAGE_INT; import static org.hisp.dhis.analytics.AggregationType.AVERAGE_INT_DISAGGREGATION; import static org.hisp.dhis.analytics.AggregationType.SUM; -import static org.hisp.dhis.analytics.DataQueryParams.CATEGORYOPTIONCOMBO_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.INDICATOR_DIM_ID; import static org.hisp.dhis.analytics.DataQueryParams.LEVEL_PREFIX; import static org.hisp.dhis.analytics.DataQueryParams.MAX_DIM_OPT_PERM; -import static org.hisp.dhis.analytics.DataQueryParams.ORGUNIT_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.PERIOD_DIM_ID; import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_AVERAGE; import static org.hisp.dhis.dataelement.DataElement.AGGREGATION_OPERATOR_SUM; import static org.hisp.dhis.dataelement.DataElement.VALUE_TYPE_BOOL; +import static org.hisp.dhis.common.DimensionalObject.*; import java.util.ArrayList; import java.util.Collection; @@ -66,6 +63,9 @@ import org.hisp.dhis.system.util.PaginatedList; import org.springframework.beans.factory.annotation.Autowired; +/** + * @author Lars Helge Overland + */ public class DefaultQueryPlanner implements QueryPlanner { @@ -126,7 +126,7 @@ violation = "Dimensions cannot be specified more than once: " + params.getDuplicateDimensions(); } - if ( params.hasDimensionOrFilter( DataQueryParams.DATASET_DIM_ID ) && !params.getDataElementGroupSets().isEmpty() ) + if ( params.hasDimensionOrFilter( DATASET_DIM_ID ) && !params.getDataElementGroupSets().isEmpty() ) { violation = "Data sets and data element group sets cannot be specified simultaneously"; } @@ -201,7 +201,7 @@ // Group by data element // --------------------------------------------------------------------- - queries = splitByDimension( queries, DataQueryParams.DATAELEMENT_DIM_ID, optimalQueries ); + queries = splitByDimension( queries, DATAELEMENT_DIM_ID, optimalQueries ); if ( queries.size() >= optimalQueries ) { @@ -212,7 +212,7 @@ // Group by data set // --------------------------------------------------------------------- - queries = splitByDimension( queries, DataQueryParams.DATASET_DIM_ID, optimalQueries ); + queries = splitByDimension( queries, DATASET_DIM_ID, optimalQueries ); if ( queries.size() >= optimalQueries ) { @@ -223,7 +223,7 @@ // Group by organisation unit // --------------------------------------------------------------------- - queries = splitByDimension( queries, DataQueryParams.ORGUNIT_DIM_ID, optimalQueries ); + queries = splitByDimension( queries, ORGUNIT_DIM_ID, optimalQueries ); return queries; } === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java 2013-04-22 17:22:52 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java 2013-05-07 08:37:33 +0000 @@ -47,6 +47,9 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.scheduling.annotation.Async; +/** + * @author Lars Helge Overland + */ public abstract class AbstractJdbcTableManager implements AnalyticsTableManager { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java 2013-04-22 08:10:07 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/DefaultAnalyticsTableService.java 2013-05-07 08:37:33 +0000 @@ -52,6 +52,9 @@ import org.hisp.dhis.system.util.SystemUtils; import org.springframework.beans.factory.annotation.Autowired; +/** + * @author Lars Helge Overland + */ public class DefaultAnalyticsTableService implements AnalyticsTableService { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java 2013-03-15 11:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTableManager.java 2013-05-07 08:37:33 +0000 @@ -41,6 +41,9 @@ import org.hisp.dhis.system.util.DateUtils; import org.springframework.scheduling.annotation.Async; +/** + * @author Lars Helge Overland + */ public class JdbcCompletenessTableManager extends AbstractJdbcTableManager { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java 2013-03-15 11:10:10 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/JdbcCompletenessTargetTableManager.java 2013-05-07 08:37:33 +0000 @@ -38,6 +38,9 @@ import org.hisp.dhis.organisationunit.OrganisationUnitLevel; import org.springframework.scheduling.annotation.Async; +/** + * @author Lars Helge Overland + */ public class JdbcCompletenessTargetTableManager extends AbstractJdbcTableManager { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/PartitionUtils.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/PartitionUtils.java 2013-03-14 13:07:10 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/PartitionUtils.java 2013-05-07 08:37:33 +0000 @@ -39,6 +39,9 @@ import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.period.YearlyPeriodType; +/** + * @author Lars Helge Overland + */ public class PartitionUtils { private static final YearlyPeriodType PERIODTYPE = new YearlyPeriodType(); === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DataQueryParamsTest.java' --- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DataQueryParamsTest.java 2013-02-25 15:15:07 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DataQueryParamsTest.java 2013-05-07 08:37:33 +0000 @@ -27,6 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.common.DimensionalObject.DATAELEMENT_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -36,15 +42,16 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.period.Period; import org.junit.Test; -import static org.junit.Assert.*; -import static org.hisp.dhis.analytics.DataQueryParams.*; +/** + * @author Lars Helge Overland + */ public class DataQueryParamsTest { @Test public void testGetDimensionFromParam() { - assertEquals( DataQueryParams.DATAELEMENT_DIM_ID, DataQueryParams.getDimensionFromParam( "de:D348asd782j;kj78HnH6hgT;9ds9dS98s2" ) ); + assertEquals( DATAELEMENT_DIM_ID, DataQueryParams.getDimensionFromParam( "de:D348asd782j;kj78HnH6hgT;9ds9dS98s2" ) ); } @Test === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DimensionOptionTest.java' --- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DimensionOptionTest.java 2013-02-25 15:15:07 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/DimensionOptionTest.java 2013-05-07 08:37:33 +0000 @@ -40,7 +40,11 @@ import static org.junit.Assert.*; import static org.hisp.dhis.analytics.DataQueryParams.*; import static org.hisp.dhis.system.util.TextUtils.EMPTY; +import static org.hisp.dhis.common.DimensionalObject.*; +/** + * @author Lars Helge Overland + */ public class DimensionOptionTest extends DhisConvenienceTest { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsManagerTest.java' --- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsManagerTest.java 2013-02-26 18:33:01 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsManagerTest.java 2013-05-07 08:37:33 +0000 @@ -45,6 +45,9 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +/** + * @author Lars Helge Overland + */ public class AnalyticsManagerTest extends DhisSpringTest { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java' --- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java 2013-01-31 10:59:22 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/AnalyticsServiceTest.java 2013-05-07 08:37:33 +0000 @@ -46,6 +46,9 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +/** + * @author Lars Helge Overland + */ public class AnalyticsServiceTest extends DhisSpringTest { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/QueryPlannerTest.java' --- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/QueryPlannerTest.java 2013-03-11 08:24:17 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/data/QueryPlannerTest.java 2013-05-07 08:37:33 +0000 @@ -27,11 +27,12 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +import static org.hisp.dhis.analytics.AnalyticsTableManager.ANALYTICS_TABLE_NAME; import static org.hisp.dhis.analytics.DataQueryParams.DIMENSION_SEP; -import static org.hisp.dhis.analytics.DataQueryParams.ORGUNIT_DIM_ID; -import static org.hisp.dhis.analytics.DataQueryParams.*; +import static org.hisp.dhis.common.DimensionalObject.DATA_X_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.ORGUNIT_DIM_ID; +import static org.hisp.dhis.common.DimensionalObject.PERIOD_DIM_ID; import static org.hisp.dhis.common.IdentifiableObjectUtils.getList; -import static org.hisp.dhis.analytics.AnalyticsTableManager.ANALYTICS_TABLE_NAME; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -49,6 +50,7 @@ import org.hisp.dhis.analytics.IllegalQueryException; import org.hisp.dhis.analytics.QueryPlanner; import org.hisp.dhis.common.IdentifiableObject; +import org.hisp.dhis.common.ListMap; import org.hisp.dhis.dataelement.DataElement; import org.hisp.dhis.dataelement.DataElementCategoryOptionCombo; import org.hisp.dhis.dataelement.DataElementCategoryService; @@ -66,10 +68,12 @@ import org.hisp.dhis.period.PeriodType; import org.hisp.dhis.period.QuarterlyPeriodType; import org.hisp.dhis.period.YearlyPeriodType; -import org.hisp.dhis.common.ListMap; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +/** + * @author Lars Helge Overland + */ public class QueryPlannerTest extends DhisSpringTest { === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/PartitionUtilsTest.java' --- dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/PartitionUtilsTest.java 2013-03-10 16:13:56 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/test/java/org/hisp/dhis/analytics/table/PartitionUtilsTest.java 2013-05-07 08:37:33 +0000 @@ -43,6 +43,9 @@ import org.hisp.dhis.common.ListMap; import org.junit.Test; +/** + * @author Lars Helge Overland + */ public class PartitionUtilsTest { private static final String TABLE_NAME_TEMP = ANALYTICS_TABLE_NAME + TABLE_TEMP_SUFFIX;