diff --git a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryAction.java b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryAction.java index 417c2ea6..01ec24ac 100644 --- a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryAction.java +++ b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryAction.java @@ -20,6 +20,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import javax.persistence.Column; import org.springframework.statemachine.data.RepositoryAction; @@ -33,15 +34,19 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; * */ @Entity -@Table(name = "Action") -@JsonIdentityInfo(generator=ObjectIdGenerators.IntSequenceGenerator.class) +@Table(name = "action") +@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class) public class JpaRepositoryAction extends RepositoryAction { @Id @GeneratedValue(strategy = GenerationType.AUTO) - private long id; + @Column(name = "id") + private Long id; + @Column(name = "name") private String name; + + @Column(name = "spel") private String spel; @Override diff --git a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryGuard.java b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryGuard.java index d3c3c7a4..5b5cf047 100644 --- a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryGuard.java +++ b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryGuard.java @@ -20,6 +20,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import javax.persistence.Column; import org.springframework.statemachine.data.RepositoryGuard; @@ -33,15 +34,19 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; * */ @Entity -@Table(name = "Guard") -@JsonIdentityInfo(generator=ObjectIdGenerators.IntSequenceGenerator.class) +@Table(name = "guard") +@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class) public class JpaRepositoryGuard extends RepositoryGuard { @Id @GeneratedValue(strategy = GenerationType.AUTO) - private long id; + @Column(name = "id") + private Long id; + @Column(name = "name") private String name; + + @Column(name = "spel") private String spel; @Override diff --git a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryState.java b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryState.java index 3667039d..946d2161 100644 --- a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryState.java +++ b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryState.java @@ -46,21 +46,30 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; * */ @Entity -@Table(name = "State") -@JsonIdentityInfo(generator=ObjectIdGenerators.IntSequenceGenerator.class) +@Table(name = "state") +@JsonIdentityInfo(generator = ObjectIdGenerators.IntSequenceGenerator.class) public class JpaRepositoryState extends RepositoryState { @Id @GeneratedValue(strategy = GenerationType.AUTO) - private long id; + private Long id; + @Column(name = "machine_id") private String machineId; + + @Column(name = "state") private String state; + + @Column(name = "region") private String region; - @Column(name = "initialState") - private boolean initial; + @Column(name = "initial_state") + private Boolean initial; + + @Column(name = "kind") private PseudoStateKind kind; + + @Column(name = "submachine_id") private String submachineId; @OneToOne(fetch = FetchType.EAGER) @@ -84,7 +93,7 @@ public class JpaRepositoryState extends RepositoryState { private Set exitActions; @ElementCollection(fetch = FetchType.EAGER, targetClass = String.class) - @CollectionTable(name="DeferredEvents", foreignKey = @ForeignKey(name = "fk_state_deferred_events")) + @CollectionTable(name = "deferred_events", foreignKey = @ForeignKey(name = "fk_state_deferred_events")) private Set deferredEvents; /** @@ -106,10 +115,10 @@ public class JpaRepositoryState extends RepositoryState { /** * Instantiates a new jpa repository state. * - * @param state the state + * @param state the state * @param initial the initial */ - public JpaRepositoryState(String state, boolean initial) { + public JpaRepositoryState(String state, Boolean initial) { this(null, state, initial); } @@ -117,38 +126,38 @@ public class JpaRepositoryState extends RepositoryState { * Instantiates a new jpa repository state. * * @param machineId the machine id - * @param state the state - * @param initial the initial + * @param state the state + * @param initial the initial */ - public JpaRepositoryState(String machineId, String state, boolean initial) { + public JpaRepositoryState(String machineId, String state, Boolean initial) { this(machineId, null, state, initial); } /** * Instantiates a new jpa repository state. * - * @param machineId the machine id + * @param machineId the machine id * @param parentState the parent state - * @param state the state - * @param initial the initial + * @param state the state + * @param initial the initial */ - public JpaRepositoryState(String machineId, JpaRepositoryState parentState, String state, boolean initial) { + public JpaRepositoryState(String machineId, JpaRepositoryState parentState, String state, Boolean initial) { this(machineId, parentState, state, initial, null, null, null); } /** * Instantiates a new jpa repository state. * - * @param machineId the machine id - * @param parentState the parent state - * @param state the state - * @param initial the initial + * @param machineId the machine id + * @param parentState the parent state + * @param state the state + * @param initial the initial * @param stateActions the state actions * @param entryActions the entry actions - * @param exitActions the exit actions + * @param exitActions the exit actions */ - public JpaRepositoryState(String machineId, JpaRepositoryState parentState, String state, boolean initial, Set stateActions, - Set entryActions, Set exitActions) { + public JpaRepositoryState(String machineId, JpaRepositoryState parentState, String state, Boolean initial, Set stateActions, + Set entryActions, Set exitActions) { this.machineId = machineId == null ? "" : machineId; this.parentState = parentState; this.state = state; @@ -204,11 +213,11 @@ public class JpaRepositoryState extends RepositoryState { } @Override - public boolean isInitial() { + public Boolean isInitial() { return initial; } - public void setInitial(boolean initial) { + public void setInitial(Boolean initial) { this.initial = initial; } @@ -273,4 +282,4 @@ public class JpaRepositoryState extends RepositoryState { + parentState + ", stateActions=" + stateActions + ", entryActions=" + entryActions + ", exitActions=" + exitActions + ", deferredEvents=" + deferredEvents + "]"; } -} +} \ No newline at end of file diff --git a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryStateMachine.java b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryStateMachine.java index 3e6d8bf5..ec1fd88e 100644 --- a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryStateMachine.java +++ b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryStateMachine.java @@ -16,9 +16,10 @@ package org.springframework.statemachine.data.jpa; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.Lob; +import javax.persistence.Id; import javax.persistence.Table; +import javax.persistence.Column; import org.springframework.statemachine.data.RepositoryStateMachine; @@ -32,16 +33,19 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; * */ @Entity -@Table(name = "StateMachine") +@Table(name = "state_machine") @JsonIdentityInfo(generator=ObjectIdGenerators.IntSequenceGenerator.class) public class JpaRepositoryStateMachine extends RepositoryStateMachine { @Id + @Column(name = "machine_id") private String machineId; + @Column(name = "state") private String state; @Lob + @Column(name = "state_machine_context") private byte[] stateMachineContext; @Override diff --git a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryTransition.java b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryTransition.java index 1184fc1c..f152674b 100644 --- a/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryTransition.java +++ b/spring-statemachine-data/jpa/src/main/java/org/springframework/statemachine/data/jpa/JpaRepositoryTransition.java @@ -18,16 +18,17 @@ package org.springframework.statemachine.data.jpa; import java.util.Set; import javax.persistence.Entity; -import javax.persistence.FetchType; -import javax.persistence.ForeignKey; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; -import javax.persistence.JoinColumn; -import javax.persistence.JoinTable; -import javax.persistence.ManyToMany; -import javax.persistence.OneToOne; import javax.persistence.Table; +import javax.persistence.Column; +import javax.persistence.OneToOne; +import javax.persistence.FetchType; +import javax.persistence.JoinColumn; +import javax.persistence.ForeignKey; +import javax.persistence.ManyToMany; +import javax.persistence.JoinTable; import org.springframework.statemachine.data.RepositoryTransition; import org.springframework.statemachine.transition.TransitionKind; @@ -42,14 +43,16 @@ import com.fasterxml.jackson.annotation.ObjectIdGenerators; * */ @Entity -@Table(name = "Transition") +@Table(name = "transition") @JsonIdentityInfo(generator=ObjectIdGenerators.IntSequenceGenerator.class) public class JpaRepositoryTransition extends RepositoryTransition { @Id @GeneratedValue(strategy = GenerationType.AUTO) - private long id; + @Column(name = "id") + private Long id; + @Column(name = "machine_id") private String machineId; @OneToOne(fetch = FetchType.EAGER) @@ -60,7 +63,10 @@ public class JpaRepositoryTransition extends RepositoryTransition { @JoinColumn(foreignKey = @ForeignKey(name = "fk_transition_target")) private JpaRepositoryState target; + @Column(name = "event") private String event; + + @Column(name = "kind") private TransitionKind kind; @ManyToMany(fetch = FetchType.EAGER) diff --git a/spring-statemachine-data/mongodb/src/main/java/org/springframework/statemachine/data/mongodb/MongoDbRepositoryState.java b/spring-statemachine-data/mongodb/src/main/java/org/springframework/statemachine/data/mongodb/MongoDbRepositoryState.java index 134c9fce..4837ca6e 100644 --- a/spring-statemachine-data/mongodb/src/main/java/org/springframework/statemachine/data/mongodb/MongoDbRepositoryState.java +++ b/spring-statemachine-data/mongodb/src/main/java/org/springframework/statemachine/data/mongodb/MongoDbRepositoryState.java @@ -180,7 +180,7 @@ public class MongoDbRepositoryState extends RepositoryState { } @Override - public boolean isInitial() { + public Boolean isInitial() { return initial; } diff --git a/spring-statemachine-data/redis/src/main/java/org/springframework/statemachine/data/redis/RedisRepositoryState.java b/spring-statemachine-data/redis/src/main/java/org/springframework/statemachine/data/redis/RedisRepositoryState.java index 0fa95004..91699b28 100644 --- a/spring-statemachine-data/redis/src/main/java/org/springframework/statemachine/data/redis/RedisRepositoryState.java +++ b/spring-statemachine-data/redis/src/main/java/org/springframework/statemachine/data/redis/RedisRepositoryState.java @@ -190,7 +190,7 @@ public class RedisRepositoryState extends RepositoryState { } @Override - public boolean isInitial() { + public Boolean isInitial() { return initial; } diff --git a/spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryState.java b/spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryState.java index 10ec60b9..81aff865 100644 --- a/spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryState.java +++ b/spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryState.java @@ -60,7 +60,7 @@ public abstract class RepositoryState extends BaseRepositoryEntity { * * @return true, if is initial */ - public abstract boolean isInitial(); + public abstract Boolean isInitial(); /** * Gets the initial action. This is any meaningful if