This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-3271
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/ISIS-3271 by this push:
new 0936a5eca8 ISIS-3271: further fixes of compile issue
0936a5eca8 is described below
commit 0936a5eca8e841b1a13a2c56475c1b4cfc29ecda
Author: Dan Haywood <[email protected]>
AuthorDate: Fri Nov 4 09:27:31 2022 +0000
ISIS-3271: further fixes of compile issue
---
.../CausewayModuleExtCommandReplaySecondary.java | 34 +++++---------
...ondaryStatusData.java => JobExecutionData.java} | 52 +++++++++++-----------
.../secondary/job/ReplicateAndReplayJob.java | 1 +
.../secondary/job/SecondaryStatusData.java | 2 -
pom.xml | 1 +
5 files changed, 39 insertions(+), 51 deletions(-)
diff --git
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java
index 178158765d..0b9e19af02 100644
---
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java
+++
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/CausewayModuleExtCommandReplaySecondary.java
@@ -19,41 +19,32 @@
package org.apache.causeway.extensions.commandreplay.secondary;
+import lombok.val;
+
import javax.inject.Inject;
+import org.apache.causeway.core.config.CausewayConfiguration;
import org.apache.causeway.core.runtime.CausewayModuleCoreRuntime;
+import
org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
+import
org.apache.causeway.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserException;
+import
org.apache.causeway.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserResult;
+import
org.apache.causeway.extensions.commandreplay.secondary.analysis.CommandReplayAnalysisService;
+import
org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
+import
org.apache.causeway.extensions.commandreplay.secondary.fetch.CommandFetcher;
+import
org.apache.causeway.extensions.commandreplay.secondary.job.ReplicateAndReplayJob;
+import
org.apache.causeway.extensions.commandreplay.secondary.mixins.Object_openOnPrimary;
+import
org.apache.causeway.extensions.commandreplay.secondary.ui.CommandReplayOnSecondaryService;
import org.apache.causeway.schema.CausewayModuleSchema;
import
org.apache.causeway.testing.fixtures.applib.CausewayModuleTestingFixturesApplib;
import org.quartz.JobDetail;
-import org.quartz.Scheduler;
-import org.quartz.SchedulerException;
import org.quartz.SimpleTrigger;
-import org.quartz.Trigger;
import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Profile;
import org.springframework.scheduling.quartz.JobDetailFactoryBean;
-import org.springframework.scheduling.quartz.SchedulerFactoryBean;
import org.springframework.scheduling.quartz.SimpleTriggerFactoryBean;
-import org.springframework.scheduling.quartz.SpringBeanJobFactory;
-
-import org.apache.causeway.core.config.CausewayConfiguration;
-import
org.apache.causeway.extensions.commandlog.applib.CausewayModuleExtCommandLogApplib;
-import
org.apache.causeway.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserException;
-import
org.apache.causeway.extensions.commandreplay.secondary.analyser.CommandReplayAnalyserResult;
-import
org.apache.causeway.extensions.commandreplay.secondary.analysis.CommandReplayAnalysisService;
-import
org.apache.causeway.extensions.commandreplay.secondary.config.SecondaryConfig;
-import
org.apache.causeway.extensions.commandreplay.secondary.fetch.CommandFetcher;
-import
org.apache.causeway.extensions.commandreplay.secondary.job.ReplicateAndReplayJob;
-import
org.apache.causeway.extensions.commandreplay.secondary.mixins.Object_openOnPrimary;
-import
org.apache.causeway.extensions.commandreplay.secondary.ui.CommandReplayOnSecondaryService;
-import org.apache.causeway.extensions.quartz.CausewayModuleExtQuartzImpl;
-import
org.apache.causeway.extensions.quartz.spring.AutowiringSpringBeanJobFactory;
-
-import lombok.val;
/**
* Activates with <i>Spring profile</i> 'commandreplay-secondary'.
@@ -98,7 +89,6 @@ public class CausewayModuleExtCommandReplaySecondary {
public abstract static class PropertyDomainEvent<S,T>
extends
org.apache.causeway.applib.events.domain.PropertyDomainEvent<S,T> { }
- @Inject ApplicationContext applicationContext;
@Inject CausewayConfiguration causewayConfiguration;
@Bean(name = "ReplicateAndReplayJob")
diff --git
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/JobExecutionData.java
similarity index 50%
copy from
incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
copy to
incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/JobExecutionData.java
index a3ff4f799e..2c2cceb359 100644
---
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
+++
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/JobExecutionData.java
@@ -18,40 +18,38 @@
*/
package org.apache.causeway.extensions.commandreplay.secondary.job;
-import org.quartz.JobExecutionContext;
-
-import
org.apache.causeway.extensions.commandreplay.secondary.status.SecondaryStatus;
-import org.apache.causeway.extensions.quartz.context.JobExecutionData;
-
-import lombok.val;
+import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
+import org.quartz.JobExecutionContext;
+
/**
+ * Requires that the job is annotated with the {@link
org.quartz.PersistJobDataAfterExecution} annotation.
+ *
* @since 2.0 {@index}
*/
-@Log4j2
-class SecondaryStatusData {
-
- private static final String KEY_SECONDARY_STATUS =
SecondaryStatusData.class.getCanonicalName();
-
- private final JobExecutionData jobExecutionData;
-
- SecondaryStatusData(final JobExecutionContext jobExecutionContext) {
- this.jobExecutionData = new JobExecutionData((jobExecutionContext));
- }
-
- SecondaryStatus getSecondaryStatus() {
- return getSecondaryStatus(SecondaryStatus.UNKNOWN_STATE);
+@RequiredArgsConstructor
+class JobExecutionData {
+
+ private final JobExecutionContext context;
+
+ /**
+ * Lookup property from the job detail.
+ */
+ public String getString(String key, final String defaultValue) {
+ try {
+ String v = context.getJobDetail().getJobDataMap().getString(key);
+ return v != null ? v : defaultValue;
+ } catch (Exception e) {
+ return defaultValue;
+ }
}
- SecondaryStatus getSecondaryStatus(final SecondaryStatus defaultStatus) {
- val mode = jobExecutionData.getString( KEY_SECONDARY_STATUS,
defaultStatus.name());
- return SecondaryStatus.valueOf(mode);
- }
-
- void setSecondaryStatus(final SecondaryStatus mode) {
- jobExecutionData.setString(KEY_SECONDARY_STATUS, mode.name());
+ /**
+ * Save key into the job detail obtained from context.
+ */
+ public void setString(String key, String value) {
+ context.getJobDetail().getJobDataMap().put(key, value);
}
}
-
diff --git
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
index 573610061a..42c92ed7d3 100644
---
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
+++
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/ReplicateAndReplayJob.java
@@ -68,6 +68,7 @@ public class ReplicateAndReplayJob implements Job {
@Inject protected InteractionService interactionService;
private void exec(final JobExecutionContext quartzContext) {
+
val ssh = new SecondaryStatusData(quartzContext);
val secondaryStatus = ssh.getSecondaryStatus(SecondaryStatus.OK);
diff --git
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
index a3ff4f799e..10bc63906b 100644
---
a/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
+++
b/incubator/extensions/core/commandreplay/secondary/src/main/java/org/apache/causeway/extensions/commandreplay/secondary/job/SecondaryStatusData.java
@@ -21,7 +21,6 @@ package
org.apache.causeway.extensions.commandreplay.secondary.job;
import org.quartz.JobExecutionContext;
import
org.apache.causeway.extensions.commandreplay.secondary.status.SecondaryStatus;
-import org.apache.causeway.extensions.quartz.context.JobExecutionData;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -29,7 +28,6 @@ import lombok.extern.log4j.Log4j2;
/**
* @since 2.0 {@index}
*/
-@Log4j2
class SecondaryStatusData {
private static final String KEY_SECONDARY_STATUS =
SecondaryStatusData.class.getCanonicalName();
diff --git a/pom.xml b/pom.xml
index 08bfde8582..c41f3f75c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,7 @@
<module>incubator/viewers/javafx</module>
<module>incubator/viewers/vaadin</module>
<module>valuetypes/asciidoc/ui/vaadin</module>
+
<module>incubator/extensions/core/commandreplay</module>
<module>regressiontests</module>
<module>tooling</module>
