=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2015-10-06 17:18:17 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2015-10-06 17:44:37 +0000 @@ -29,13 +29,11 @@ */ import java.io.Serializable; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.hisp.dhis.calendar.CalendarService; import org.hisp.dhis.period.MonthlyPeriodType; import org.hisp.dhis.period.QuarterlyPeriodType; import org.hisp.dhis.period.YearlyPeriodType; @@ -112,38 +110,6 @@ String KEY_DATA_IMPORT_REQUIRE_CATEGORY_OPTION_COMBO = "keyDataImportRequireCategoryOptionCombo"; String KEY_DATA_IMPORT_REQUIRE_ATTRIBUTE_OPTION_COMBO = "keyDataImportRequireAttributeOptionCombo"; - String DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY = "lastMonth"; - String DEFAULT_FLAG = "dhis2"; - double DEFAULT_FACTOR_OF_DEVIATION = 2.0; - String DEFAULT_START_MODULE = "dhis-web-dashboard-integration"; - String DEFAULT_APPLICATION_TITLE = "District Health Information Software 2"; - int DEFAULT_EMAIL_PORT = 587; - String DEFAULT_TIME_FOR_SENDING_MESSAGE = "08:00"; - String DEFAULT_CACHE_STRATEGY = "CACHE_6AM_TOMORROW"; - int DEFAULT_ANALYTICS_MAX_LIMIT = 50000; - int DEFAULT_DATABASE_SERVER_CPUS = 0; // Detect automatically - String DEFAULT_HELP_PAGE_LINK = "../dhis-web-commons-about/help.action"; - String DEFAULT_ANALYSIS_RELATIVE_PERIOD = "LAST_12_MONTHS"; - String DEFAULT_METADATA_REPO_URL = "http://metadata.dhis2.org"; - - Map DEFAULT_SETTINGS_VALUES = new HashMap() - { - { - put( KEY_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY, DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY ); - put( KEY_FLAG, DEFAULT_FLAG ); - put( CalendarService.KEY_CALENDAR, CalendarService.DEFAULT_CALENDAR ); - put( CalendarService.KEY_DATE_FORMAT, CalendarService.DEFAULT_DATE_FORMAT ); - put( KEY_FACTOR_OF_DEVIATION, DEFAULT_FACTOR_OF_DEVIATION ); - put( KEY_START_MODULE, DEFAULT_START_MODULE ); - put( KEY_APPLICATION_TITLE, DEFAULT_APPLICATION_TITLE ); - put( KEY_EMAIL_PORT, DEFAULT_EMAIL_PORT ); - put( KEY_TIME_FOR_SENDING_MESSAGE, DEFAULT_TIME_FOR_SENDING_MESSAGE ); - put( KEY_CACHE_STRATEGY, DEFAULT_CACHE_STRATEGY ); - put( KEY_ANALYTICS_MAX_LIMIT, DEFAULT_ANALYTICS_MAX_LIMIT ); - put( KEY_ANALYSIS_RELATIVE_PERIOD, DEFAULT_ANALYSIS_RELATIVE_PERIOD ); - } - }; - String SYSPROP_PORTAL = "runningAsPortal"; HashSet DEFAULT_SCHEDULED_PERIOD_TYPES = new HashSet() @@ -201,5 +167,5 @@ Map getSystemSettingsAsMap(); - Map getSystemSettings( Set names ); + Map getSystemSettingsAsMap( Set names ); } === 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 2015-10-01 17:52:03 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/DefaultAnalyticsService.java 2015-10-06 17:44:37 +0000 @@ -140,6 +140,7 @@ import org.hisp.dhis.program.ProgramService; import org.hisp.dhis.program.ProgramStageService; import org.hisp.dhis.reporttable.ReportTable; +import org.hisp.dhis.setting.Setting; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.grid.ListGrid; import org.hisp.dhis.system.util.MathUtils; @@ -1525,6 +1526,6 @@ */ private int getMaxLimit() { - return (Integer) systemSettingManager.getSystemSetting( SystemSettingManager.KEY_ANALYTICS_MAX_LIMIT, SystemSettingManager.DEFAULT_ANALYTICS_MAX_LIMIT ); + return (Integer) systemSettingManager.getSystemSetting( Setting.ANALYTICS_MAX_LIMIT ); } } === modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventQueryPlanner.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventQueryPlanner.java 2015-09-16 18:31:45 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventQueryPlanner.java 2015-10-06 17:44:37 +0000 @@ -49,6 +49,7 @@ import org.hisp.dhis.organisationunit.OrganisationUnitService; import org.hisp.dhis.period.Period; import org.hisp.dhis.program.ProgramIndicator; +import org.hisp.dhis.setting.Setting; import org.hisp.dhis.setting.SystemSettingManager; import org.springframework.beans.factory.annotation.Autowired; @@ -206,7 +207,7 @@ @Override public int getMaxLimit() { - return (Integer) systemSettingManager.getSystemSetting( SystemSettingManager.KEY_ANALYTICS_MAX_LIMIT, SystemSettingManager.DEFAULT_ANALYTICS_MAX_LIMIT ); + return (Integer) systemSettingManager.getSystemSetting( Setting.ANALYTICS_MAX_LIMIT ); } // ------------------------------------------------------------------------- === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java 2015-10-06 17:18:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java 2015-10-06 17:44:37 +0000 @@ -38,6 +38,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; /** @@ -248,9 +249,15 @@ for ( SystemSetting systemSetting : systemSettings ) { Serializable settingValue = systemSetting.getValue(); + if ( settingValue == null ) { - settingValue = DEFAULT_SETTINGS_VALUES.get( systemSetting.getName() ); + Optional setting = Setting.getByName( systemSetting.getName() ); + + if ( setting.isPresent() ) + { + settingValue = setting.get().getDefaultValue(); + } } settingsMap.put( systemSetting.getName(), settingValue ); @@ -260,17 +267,27 @@ } @Override - public Map getSystemSettings( Set names ) + public Map getSystemSettingsAsMap( Set names ) { Map map = new HashMap<>(); for ( String name : names ) { - Serializable setting = getSystemSetting( name, DEFAULT_SETTINGS_VALUES.get( name ) ); + Serializable settingValue = getSystemSetting( name ); - if ( setting != null ) - { - map.put( name, setting ); + if ( settingValue == null ) + { + Optional setting = Setting.getByName( name ); + + if ( setting.isPresent() ) + { + settingValue = setting.get().getDefaultValue(); + } + } + + if ( settingValue != null ) + { + map.put( name, settingValue ); } } === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultTranslateSystemSettingManager.java 2015-10-06 17:44:37 +0000 @@ -28,7 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.setting.SystemSettingManager.DEFAULT_APPLICATION_TITLE; import static org.hisp.dhis.setting.SystemSettingManager.KEY_APPLICATION_FOOTER; import static org.hisp.dhis.setting.SystemSettingManager.KEY_APPLICATION_INTRO; import static org.hisp.dhis.setting.SystemSettingManager.KEY_APPLICATION_NOTIFICATION; @@ -63,7 +62,7 @@ { Map translations = new Hashtable<>(); - translations.put( KEY_APPLICATION_TITLE, getSystemSettingWithFallbacks( KEY_APPLICATION_TITLE, localeStr, DEFAULT_APPLICATION_TITLE ) ); + translations.put( KEY_APPLICATION_TITLE, getSystemSettingWithFallbacks( KEY_APPLICATION_TITLE, localeStr, Setting.APPLICATION_TITLE.getDefaultValue().toString() ) ); translations.put( KEY_APPLICATION_INTRO, getSystemSettingWithFallbacks( KEY_APPLICATION_INTRO, localeStr, "" ) ); translations.put( KEY_APPLICATION_NOTIFICATION, getSystemSettingWithFallbacks( KEY_APPLICATION_NOTIFICATION, localeStr, "" ) ); translations.put( KEY_APPLICATION_FOOTER, getSystemSettingWithFallbacks( KEY_APPLICATION_FOOTER, localeStr, "" ) ); @@ -76,7 +75,7 @@ { Map translations = new Hashtable<>(); - translations.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE + localeStr, DEFAULT_APPLICATION_TITLE ).toString() ); + translations.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE + localeStr, Setting.APPLICATION_TITLE.getDefaultValue().toString() ).toString() ); translations.put( KEY_APPLICATION_INTRO, systemSettingManager.getSystemSetting( KEY_APPLICATION_INTRO + localeStr, "" ).toString() ); translations.put( KEY_APPLICATION_NOTIFICATION, systemSettingManager.getSystemSetting( KEY_APPLICATION_NOTIFICATION + localeStr, "" ).toString() ); translations.put( KEY_APPLICATION_FOOTER, systemSettingManager.getSystemSetting( KEY_APPLICATION_FOOTER + localeStr, "" ).toString() ); === modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/CaseAggregateConditionTask.java' --- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/CaseAggregateConditionTask.java 2015-10-03 11:02:47 +0000 +++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/scheduling/CaseAggregateConditionTask.java 2015-10-06 17:44:37 +0000 @@ -28,8 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.setting.SystemSettingManager.DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY; -import static org.hisp.dhis.setting.SystemSettingManager.KEY_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY; import static org.hisp.dhis.system.notification.NotificationLevel.INFO; import java.util.ArrayList; @@ -37,6 +35,7 @@ import org.hisp.dhis.caseaggregation.CaseAggregateSchedule; import org.hisp.dhis.caseaggregation.CaseAggregationConditionService; +import org.hisp.dhis.setting.Setting; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.notification.Notifier; import org.hisp.dhis.system.util.Clock; @@ -102,8 +101,7 @@ "Aggregate process started, number of CPU cores: " + cpuCores + ", " + SystemUtils.getMemoryString() ); notifier.clear( taskId ).notify( taskId, "Aggregate process started" ); - String taskStrategy = (String) systemSettingManager.getSystemSetting( - KEY_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY, DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY ); + String taskStrategy = (String) systemSettingManager.getSystemSetting( Setting.SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY ); String sql = "select cagg.caseaggregationconditionid as caseaggregationconditionid, cagg.name as caseaggregationconditionname, pt.name as periodtypename "; sql += "from caseaggregationcondition cagg inner join datasetmembers dm "; === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java 2015-09-25 09:54:36 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SynchronizationController.java 2015-10-06 17:44:37 +0000 @@ -38,7 +38,7 @@ import org.hisp.dhis.dxf2.importsummary.ImportSummary; import org.hisp.dhis.dxf2.synch.AvailabilityStatus; import org.hisp.dhis.dxf2.synch.SynchronizationManager; -import org.hisp.dhis.setting.SystemSettingManager; +import org.hisp.dhis.setting.Setting; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; @@ -94,6 +94,6 @@ @RequestMapping( value = "/metadataRepo", method = RequestMethod.GET, produces = "application/json" ) public @ResponseBody String getMetadataRepoIndex() { - return restTemplate.getForObject( SystemSettingManager.DEFAULT_METADATA_REPO_URL, String.class ); + return restTemplate.getForObject( Setting.METADATA_REPO_URL.getDefaultValue().toString(), String.class ); } } === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java 2015-10-06 16:57:39 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/SystemSettingController.java 2015-10-06 17:44:37 +0000 @@ -146,7 +146,7 @@ if ( key != null && !key.isEmpty() ) { - value = systemSettingManager.getSystemSettings( key ); + value = systemSettingManager.getSystemSettingsAsMap( key ); } else { === modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java' --- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2015-10-04 20:52:33 +0000 +++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/ContextUtils.java 2015-10-06 17:44:37 +0000 @@ -29,8 +29,6 @@ */ import static org.apache.commons.lang3.StringUtils.trimToNull; -import static org.hisp.dhis.setting.SystemSettingManager.DEFAULT_CACHE_STRATEGY; -import static org.hisp.dhis.setting.SystemSettingManager.KEY_CACHE_STRATEGY; import java.io.IOException; import java.io.PrintWriter; @@ -48,8 +46,9 @@ import org.hisp.dhis.common.IdentifiableObject; import org.hisp.dhis.common.IdentifiableObjectUtils; import org.hisp.dhis.common.cache.CacheStrategy; +import org.hisp.dhis.setting.Setting; +import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.util.CodecUtils; -import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.util.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; @@ -105,7 +104,7 @@ if ( cacheStrategy.equals( CacheStrategy.RESPECT_SYSTEM_SETTING ) ) { - String strategy = trimToNull( (String) systemSettingManager.getSystemSetting( KEY_CACHE_STRATEGY, DEFAULT_CACHE_STRATEGY ) ); + String strategy = trimToNull( (String) systemSettingManager.getSystemSetting( Setting.CACHE_STRATEGY ) ); cacheStrategy = strategy != null ? CacheStrategy.valueOf( strategy ) : CacheStrategy.NO_CACHE; } === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2015-10-06 15:28:14 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2015-10-06 17:44:37 +0000 @@ -33,6 +33,7 @@ import org.hisp.dhis.calendar.CalendarService; import org.hisp.dhis.configuration.ConfigurationService; +import org.hisp.dhis.setting.Setting; import org.hisp.dhis.setting.SystemSettingManager; import org.springframework.beans.factory.annotation.Autowired; @@ -96,18 +97,18 @@ map.put( CalendarService.KEY_DATE_FORMAT, calendarService.getSystemDateFormatKey() ); map.put( DATE_FORMAT, calendarService.getSystemDateFormat() ); - map.put( KEY_CACHE_STRATEGY, systemSettingManager.getSystemSetting( KEY_CACHE_STRATEGY, DEFAULT_CACHE_STRATEGY ) ); - map.put( KEY_ANALYTICS_MAX_LIMIT, systemSettingManager.getSystemSetting( KEY_ANALYTICS_MAX_LIMIT, DEFAULT_ANALYTICS_MAX_LIMIT ) ); - map.put( KEY_ANALYSIS_RELATIVE_PERIOD, systemSettingManager.getSystemSetting( KEY_ANALYSIS_RELATIVE_PERIOD, DEFAULT_ANALYSIS_RELATIVE_PERIOD ) ); - map.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE, DEFAULT_APPLICATION_TITLE ) ); + map.put( KEY_CACHE_STRATEGY, systemSettingManager.getSystemSetting( Setting.CACHE_STRATEGY ) ); + map.put( KEY_ANALYTICS_MAX_LIMIT, systemSettingManager.getSystemSetting( Setting.ANALYTICS_MAX_LIMIT ) ); + map.put( KEY_ANALYSIS_RELATIVE_PERIOD, systemSettingManager.getSystemSetting( Setting.ANALYSIS_RELATIVE_PERIOD ) ); + map.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( Setting.APPLICATION_TITLE ) ); map.put( KEY_APPLICATION_INTRO, systemSettingManager.getSystemSetting( KEY_APPLICATION_INTRO ) ); map.put( KEY_APPLICATION_NOTIFICATION, systemSettingManager.getSystemSetting( KEY_APPLICATION_NOTIFICATION ) ); map.put( KEY_APPLICATION_FOOTER, systemSettingManager.getSystemSetting( KEY_APPLICATION_FOOTER ) ); map.put( KEY_APPLICATION_RIGHT_FOOTER, systemSettingManager.getSystemSetting( KEY_APPLICATION_RIGHT_FOOTER ) ); - map.put( KEY_FLAG, systemSettingManager.getSystemSetting( KEY_FLAG, DEFAULT_FLAG ) ); + map.put( KEY_FLAG, systemSettingManager.getSystemSetting( Setting.FLAG ) ); map.put( KEY_FLAG_IMAGE, systemSettingManager.getFlagImage() ); - map.put( KEY_START_MODULE, systemSettingManager.getSystemSetting( KEY_START_MODULE, DEFAULT_START_MODULE ) ); - map.put( KEY_FACTOR_OF_DEVIATION, systemSettingManager.getSystemSetting( KEY_FACTOR_OF_DEVIATION, DEFAULT_FACTOR_OF_DEVIATION ) ); + map.put( KEY_START_MODULE, systemSettingManager.getSystemSetting( Setting.START_MODULE ) ); + map.put( KEY_FACTOR_OF_DEVIATION, systemSettingManager.getSystemSetting( Setting.FACTOR_OF_DEVIATION ) ); map.put( KEY_PHONE_NUMBER_AREA_CODE, systemSettingManager.getSystemSetting( KEY_PHONE_NUMBER_AREA_CODE, "" ) ); map.put( KEY_MULTI_ORGANISATION_UNIT_FORMS, systemSettingManager.getSystemSetting( KEY_MULTI_ORGANISATION_UNIT_FORMS, false ) ); map.put( KEY_ACCOUNT_RECOVERY, systemSettingManager.getSystemSetting( KEY_ACCOUNT_RECOVERY, false ) ); @@ -123,8 +124,8 @@ map.put( KEY_CUSTOM_LOGIN_PAGE_LOGO, systemSettingManager.getSystemSetting( KEY_CUSTOM_LOGIN_PAGE_LOGO, false ) ); map.put( KEY_CUSTOM_TOP_MENU_LOGO, systemSettingManager.getSystemSetting( KEY_CUSTOM_TOP_MENU_LOGO, false ) ); map.put( KEY_ANALYTICS_MAINTENANCE_MODE, systemSettingManager.getSystemSetting( KEY_ANALYTICS_MAINTENANCE_MODE, false ) ); - map.put( KEY_DATABASE_SERVER_CPUS, systemSettingManager.getSystemSetting( KEY_DATABASE_SERVER_CPUS, DEFAULT_DATABASE_SERVER_CPUS ) ); - map.put( KEY_HELP_PAGE_LINK, systemSettingManager.getSystemSetting( KEY_HELP_PAGE_LINK, DEFAULT_HELP_PAGE_LINK ) ); + map.put( KEY_DATABASE_SERVER_CPUS, systemSettingManager.getSystemSetting( Setting.DATABASE_SERVER_CPUS ) ); + map.put( KEY_HELP_PAGE_LINK, systemSettingManager.getSystemSetting( Setting.HELP_PAGE_LINK ) ); map.put( KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS, systemSettingManager.getSystemSetting( KEY_HIDE_UNAPPROVED_DATA_IN_ANALYTICS, false ) ); map.put( KEY_ACCEPTANCE_REQUIRED_FOR_APPROVAL, systemSettingManager.getSystemSetting( KEY_ACCEPTANCE_REQUIRED_FOR_APPROVAL, false ) ); map.put( KEY_SYSTEM_NOTIFICATIONS_EMAIL, systemSettingManager.getSystemSetting( KEY_SYSTEM_NOTIFICATIONS_EMAIL ) ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleAggQueryBuilderParamsAction.java 2015-10-06 17:44:37 +0000 @@ -28,10 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.setting.SystemSettingManager.DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY; -import static org.hisp.dhis.setting.SystemSettingManager.KEY_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY; - import org.hisp.dhis.scheduling.CaseAggregateConditionSchedulingManager; +import org.hisp.dhis.setting.Setting; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.scheduling.Scheduler; @@ -97,8 +95,7 @@ public String execute() throws Exception { - taskStrategy = (String) systemSettingManager.getSystemSetting( - KEY_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY, DEFAULT_SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY ); + taskStrategy = (String) systemSettingManager.getSystemSetting( Setting.SCHEDULE_AGGREGATE_QUERY_BUILDER_TASK_STRATEGY ); status = schedulingManager.getTaskStatus(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java 2015-01-17 07:41:26 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/GetScheduleParamsAction.java 2015-10-06 17:44:37 +0000 @@ -28,10 +28,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.setting.SystemSettingManager.DEFAULT_TIME_FOR_SENDING_MESSAGE; -import static org.hisp.dhis.setting.SystemSettingManager.KEY_TIME_FOR_SENDING_MESSAGE; - import org.hisp.dhis.scheduling.ProgramSchedulingManager; +import org.hisp.dhis.setting.Setting; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.scheduling.Scheduler; @@ -96,7 +94,7 @@ public String execute() throws Exception { - timeSendingMessage = (String)systemSettingManager.getSystemSetting( KEY_TIME_FOR_SENDING_MESSAGE, DEFAULT_TIME_FOR_SENDING_MESSAGE ); + timeSendingMessage = (String)systemSettingManager.getSystemSetting( Setting.TIME_FOR_SENDING_MESSAGE ); status = schedulingManager.getTaskStatus(); running = Scheduler.STATUS_RUNNING.equals( status ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java 2015-10-06 16:57:39 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/schedule/ScheduleSendMessageTasksAction.java 2015-10-06 17:44:37 +0000 @@ -28,7 +28,6 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -import static org.hisp.dhis.setting.SystemSettingManager.DEFAULT_TIME_FOR_SENDING_MESSAGE; import static org.hisp.dhis.setting.SystemSettingManager.KEY_SCHEDULE_MESSAGE_TASKS; import static org.hisp.dhis.setting.SystemSettingManager.KEY_SEND_MESSAGE_SCHEDULED_TASKS; import static org.hisp.dhis.setting.SystemSettingManager.KEY_TIME_FOR_SENDING_MESSAGE; @@ -40,6 +39,7 @@ import org.hisp.dhis.scheduling.SendScheduledMessageTask; import org.hisp.dhis.scheduling.TaskCategory; import org.hisp.dhis.scheduling.TaskId; +import org.hisp.dhis.setting.Setting; import org.hisp.dhis.setting.SystemSettingManager; import org.hisp.dhis.system.notification.Notifier; import org.hisp.dhis.system.scheduling.Scheduler; @@ -156,8 +156,7 @@ else { Map keyCronMap = new HashMap<>(); - String time = (String) systemSettingManager.getSystemSetting( KEY_TIME_FOR_SENDING_MESSAGE, - DEFAULT_TIME_FOR_SENDING_MESSAGE ); + String time = (String) systemSettingManager.getSystemSetting( Setting.TIME_FOR_SENDING_MESSAGE ); // Schedule for sending messages String[] infor = time.split( ":" );