Merge pull request #4171 from Coduz/fix-schedTriggerAligner

🐛 [Scheduler] Fixed update of TriggerDefinitionProperty.propertyType and definitions
eclipse-kapua · Jan 13, 2025 · b851b8e · b851b8e
2 parents 4e2973c + 68a6b87
commit b851b8e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/...g/eclipse/kapua/service/scheduler/trigger/definition/quartz/CronJobTriggerDefinition.java b/...g/eclipse/kapua/service/scheduler/trigger/definition/quartz/CronJobTriggerDefinition.java
@@ -47,7 +47,7 @@ public CronJobTriggerDefinition() {
                         new TriggerPropertyRecord(
                                 CronJobTriggerDefinitionPropertyKeys.CRON_EXPRESSION,
                                 "The cron expression that defines the schedule of executions. Check documentation for CRON syntax",
-                                KapuaId.class.getName(),
+                                String.class.getName(),
                                 null)
                 )
         );

diff --git a/...lipse/kapua/service/scheduler/trigger/definition/quartz/IntervalJobTriggerDefinition.java b/...lipse/kapua/service/scheduler/trigger/definition/quartz/IntervalJobTriggerDefinition.java
@@ -47,7 +47,7 @@ public IntervalJobTriggerDefinition() {
                         new TriggerPropertyRecord(
                                 IntervalJobTriggerDefinitionPropertyKeys.INTERVAL,
                                 "Fixed time between job executions in seconds",
-                                KapuaId.class.getName(),
+                                Integer.class.getName(),
                                 null)
                 )
         );

diff --git a/...g/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionAligner.java b/...g/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerDefinitionAligner.java
@@ -169,7 +169,7 @@ private boolean triggerDefinitionPropertiesAreEqual(TriggerDefinition dbTriggerD
             if (dbTriggerDefinitionProperty == null) {
                 LOG.warn("Wired TriggerProperty '{}' of TriggerDefinition '{}' is not aligned with the database one",
                         wiredTriggerDefinitionProperty.getName(),
-                        wiredTriggerDefinitionProperty.getName());
+                        wiredTriggerDefinition.getName());
 
                 return false;
             }

diff --git a/...va/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerPropertyImpl.java b/...va/org/eclipse/kapua/service/scheduler/trigger/definition/quartz/TriggerPropertyImpl.java
@@ -36,11 +36,11 @@ public class TriggerPropertyImpl implements TriggerProperty {
     private String description;
 
     @Basic
-    @Column(name = "property_type", nullable = false, updatable = false)
+    @Column(name = "property_type", nullable = false, updatable = true)
     private String propertyType;
 
     @Basic
-    @Column(name = "property_value", nullable = false, updatable = false)
+    @Column(name = "property_value", nullable = false, updatable = true)
     private String propertyValue;
 
     /**