diff --git a/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts index 7da523a..17b404e 100644 --- a/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts +++ b/quartz-manager-frontend/src/app/components/scheduler-config/scheduler-config.component.ts @@ -3,6 +3,9 @@ import { SchedulerService } from '../../services'; import { SchedulerConfig } from '../../model/schedulerConfig.model' import {Scheduler} from '../../model/scheduler.model'; +/** + * DEPRECATED! Not more used + */ @Component({ selector: 'qrzmng-scheduler-config', templateUrl: './scheduler-config.component.html', diff --git a/quartz-manager-frontend/src/app/services/scheduler.service.ts b/quartz-manager-frontend/src/app/services/scheduler.service.ts index 53df2bb..7320dc9 100644 --- a/quartz-manager-frontend/src/app/services/scheduler.service.ts +++ b/quartz-manager-frontend/src/app/services/scheduler.service.ts @@ -46,20 +46,22 @@ export class SchedulerService { return this.apiService.get(getBaseUrl() + '/quartz-manager/simple-triggers/my-simple-trigger'); } + // deprecated saveConfig = (config: Object) => { return this.apiService.post(getBaseUrl() + '/quartz-manager/triggers/mytrigger', config) } saveSimpleTriggerConfig = (config: SimpleTriggerCommand) => { - return this.apiService.post(getBaseUrl() + '/quartz-manager/simple-triggers/mytrigger', config) + return this.apiService.post(getBaseUrl() + '/quartz-manager/simple-triggers/my-simple-trigger', config) } + // deprecated updateConfig = (config: SchedulerConfig) => { return this.apiService.put(getBaseUrl() + '/quartz-manager/triggers/mytrigger', config) } updateSimpleTriggerConfig = (config: SimpleTriggerCommand) => { - return this.apiService.put(getBaseUrl() + '/quartz-manager/simple-triggers/mytrigger', config) + return this.apiService.put(getBaseUrl() + '/quartz-manager/simple-triggers/my-simple-trigger', config) } diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java index 065a601..6799df1 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/SchedulerController.java @@ -50,7 +50,8 @@ public class SchedulerController { @Resource private ConversionService conversionService; - //TODO replace this a list of trigger + @Deprecated + //TODO to be removed when the legacy trigger is removed @GetMapping("/config") @Operation(summary = "Get the config of the trigger") @ApiResponses(value = { diff --git a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/TriggerController.java b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/TriggerController.java index 47e60c5..47ea4a9 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/TriggerController.java +++ b/quartz-manager-parent/quartz-manager-starter-api/src/main/java/it/fabioformosa/quartzmanager/controllers/TriggerController.java @@ -24,7 +24,6 @@ import javax.validation.Valid; public class TriggerController extends AbstractTriggerController { static public final String TRIGGER_CONTROLLER_BASE_URL = "/quartz-manager/triggers"; - static public final String SIMPLE_TRIGGER_BASE_URL = "/simple-triggers"; private LegacySchedulerService schedulerService; diff --git a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml index 0b9e144..66b3ad5 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml +++ b/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/application.yml @@ -6,9 +6,9 @@ server: app: name: quartz-manager - + spring: - thymeleaf: + thymeleaf: cache: false mode: LEGACYHTML5 jpa.open-in-view: false @@ -16,7 +16,7 @@ spring: quartz: enabled: true -job: +job: frequency: 4000 repeatCount: 19 @@ -27,8 +27,10 @@ logging: org.springframework.boot.autoconfigure.security: INFO it.fabioformosa: DEBUG org.quartz: INFO - + quartz-manager: + trigger: + name: "sampletrigger" persistence: quartz: datasource: @@ -57,4 +59,4 @@ quartz-manager: - name: admin password: admin roles: - - ADMIN + - ADMIN