Improve fsm

common/src/main/java/bisq/common/fsm/Fsm.java

@@ -30,17 +30,12 @@
 
 @Slf4j
 
-public class Fsm {
+public class Fsm<M extends FsmModel> {
     private final Map<Pair<State, Class<? extends Event>>, Transition> transitionMap = new HashMap<>();
-    private final Object lock = new Object();
     @Getter
-    private final FsmModel model;
+    protected final M model;
 
-    public Fsm(State initialState) {
-        this(new FsmModel(initialState));
-    }
-
-    public Fsm(FsmModel model) {
+    public Fsm(M model) {
         this.model = model;
         configTransitions();
     }
@@ -52,7 +47,7 @@ protected void configTransitions() {
     public void handle(Event event) throws FsmException {
         try {
             checkNotNull(event, "event must not be null");
-            synchronized (lock) {
+            synchronized (this) {
                 State currentState = model.getState();
                 checkNotNull(currentState, "currentState must not be null");
                 if (currentState.isFinalState()) {
@@ -87,38 +82,36 @@ private void addTransition(Transition transition) throws FsmException {
             Pair<State, Class<? extends Event>> pair = new Pair<>(transition.getSourceState(), transition.getEventClass());
             checkArgument(!transitionMap.containsKey(pair),
                     "A transition exists already with the state/event pair. pair=%s", pair);
-            synchronized (lock) {
-                transitionMap.put(pair, transition);
-            }
+            transitionMap.put(pair, transition);
         } catch (Exception e) {
             throw new FsmException(e);
         }
     }
 
-    public TransitionBuilder addTransition() {
-        return new TransitionBuilder(this);
+    public TransitionBuilder<M> addTransition() {
+        return new TransitionBuilder<>(this);
     }
 
-    public static class TransitionBuilder {
+    public static class TransitionBuilder<M extends FsmModel> {
         private final Transition transition;
-        private final Fsm fsm;
+        private final Fsm<M> fsm;
 
-        private TransitionBuilder(Fsm fsm) {
+        private TransitionBuilder(Fsm<M> fsm) {
             this.fsm = fsm;
             transition = new Transition();
         }
 
-        public TransitionBuilder from(State sourceState) {
+        public TransitionBuilder<M> from(State sourceState) {
             transition.setSourceState(sourceState);
             return this;
         }
 
-        public TransitionBuilder on(Class<? extends Event> eventClass) {
+        public TransitionBuilder<M> on(Class<? extends Event> eventClass) {
             transition.setEventClass(eventClass);
             return this;
         }
 
-        public TransitionBuilder run(Class<? extends EventHandler> eventHandlerClass) {
+        public TransitionBuilder<M> run(Class<? extends EventHandler> eventHandlerClass) {
             try {
                 transition.setEventHandlerClass(Optional.of(eventHandlerClass));
             } catch (Exception e) {

common/src/test/java/bisq/common/fsm/FsmTest.java

@@ -25,10 +25,10 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 
 public class FsmTest {
-    //  @Test
+    @Test
     void testValidStateTransitions() throws FsmException {
         MockModel model = new MockModel(MockState.INIT);
-        Fsm fsm = new Fsm(model);
+        Fsm<MockModel> fsm = new Fsm<>(model);
 
         // No change in data as no handler was defined
         fsm.addTransition()
@@ -66,7 +66,7 @@ void testValidStateTransitions() throws FsmException {
     @Test
     void testTransitions() throws FsmException {
         MockModel model = new MockModel(MockState.INIT);
-        Fsm fsm = new Fsm(model);
+        Fsm<MockModel> fsm = new Fsm<>(model);
 
         // No change in data as no handler was defined
         fsm.addTransition()
@@ -107,11 +107,11 @@ void testTransitions() throws FsmException {
         assertEquals("test4", model.data);
     }
 
-    // @Test
+    @Test
     void testNoStateTransition() throws FsmException {
         // No such event defined: No state change, no handler call
         MockModel model1 = new MockModel(MockState.INIT);
-        Fsm fsm1 = new Fsm(model1);
+        Fsm<MockModel> fsm1 = new Fsm<>(model1);
         fsm1.addTransition()
                 .from(MockState.INIT)
                 .on(MockEvent1.class)
@@ -124,7 +124,7 @@ void testNoStateTransition() throws FsmException {
         // If no target state is set we do not create the transition, so no exception is thrown but no transition if
         // found at handle.
         MockModel model2 = new MockModel(MockState.INIT);
-        Fsm fsm2 = new Fsm(model2);
+        Fsm<MockModel> fsm2 = new Fsm<>(model2);
         fsm2.addTransition()
                 .from(MockState.INIT)
                 .on(MockEvent1.class)
@@ -135,7 +135,7 @@ void testNoStateTransition() throws FsmException {
 
         // If source state is already final we do not transit
         MockModel model3 = new MockModel(MockState.COMPLETED);
-        Fsm fsm3 = new Fsm(model3);
+        Fsm<MockModel> fsm3 = new Fsm<>(model3);
         fsm3.addTransition()
                 .from(MockState.COMPLETED)
                 .on(MockEvent1.class)
@@ -147,7 +147,7 @@ void testNoStateTransition() throws FsmException {
 
         // Same event and state combination: No state change, no handler call
         MockModel model4 = new MockModel(MockState.INIT);
-        Fsm fsm4 = new Fsm(model4);
+        Fsm<MockModel> fsm4 = new Fsm<>(model4);
         fsm4.addTransition()
                 .from(MockState.INIT)
                 .on(MockEvent1.class)
@@ -162,7 +162,7 @@ void testNoStateTransition() throws FsmException {
 
         // No state change as wrong event fired
         MockModel model5 = new MockModel(MockState.INIT);
-        Fsm fsm5 = new Fsm(model5);
+        Fsm<MockModel> fsm5 = new Fsm<>(model5);
         fsm5.addTransition()
                 .from(MockState.INIT)
                 .on(MockEvent1.class)
@@ -173,11 +173,11 @@ void testNoStateTransition() throws FsmException {
         assertNull(((MockModel) fsm5.getModel()).data);
     }
 
-    //  @Test
+    @Test
     void testEventHandlerNotCalled() throws FsmException {
         // No EventHandlerClass defined
         MockModel model1 = new MockModel(MockState.INIT);
-        Fsm fsm1 = new Fsm(model1);
+        Fsm<MockModel> fsm1 = new Fsm<>(model1);
         fsm1.addTransition()
                 .from(MockState.INIT)
                 .on(MockEvent1.class)
@@ -187,11 +187,11 @@ void testEventHandlerNotCalled() throws FsmException {
         assertNull(((MockModel) fsm1.getModel()).data);
     }
 
-    // @Test
+    @Test
     void testFsmExceptions() throws FsmException {
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(null)
                     .on(MockEvent1.class)
@@ -201,7 +201,7 @@ void testFsmExceptions() throws FsmException {
         });
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .on(MockEvent1.class)
                     .run(MockEventHandler.class)
@@ -210,7 +210,7 @@ void testFsmExceptions() throws FsmException {
         });
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .on(null)
@@ -220,7 +220,7 @@ void testFsmExceptions() throws FsmException {
         });
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .run(MockEventHandler.class)
@@ -229,7 +229,7 @@ void testFsmExceptions() throws FsmException {
         });
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .on(MockEvent1.class)
@@ -239,7 +239,7 @@ void testFsmExceptions() throws FsmException {
         });
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .on(MockEvent1.class)
@@ -250,7 +250,7 @@ void testFsmExceptions() throws FsmException {
         // Initial state is null
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(null);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .on(MockEvent1.class)
@@ -261,7 +261,7 @@ void testFsmExceptions() throws FsmException {
         // Same source and target state
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .on(MockEvent1.class)
@@ -273,7 +273,7 @@ void testFsmExceptions() throws FsmException {
         // MockEventHandler2 constructor not matching defined constructor signature in newEventHandlerFromClass
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .on(MockEvent1.class)
@@ -285,7 +285,7 @@ void testFsmExceptions() throws FsmException {
         // same pair sourceState/event added
         Assertions.assertThrows(FsmException.class, () -> {
             MockModel model = new MockModel(MockState.INIT);
-            Fsm fsm = new Fsm(model);
+            Fsm<MockModel> fsm = new Fsm<>(model);
             fsm.addTransition()
                     .from(MockState.INIT)
                     .on(MockEvent1.class)

gradle/libs.versions.toml

@@ -33,7 +33,6 @@ google-guava-lib = { strictly = '31.1-jre' }
 
 i2p-lib = { strictly = '1.8.0' }
 jackson-lib = { strictly = '2.13.3' }
-jeasy-easy-states-lib = { strictly = '2.0.0' }
 jeromq-lib = { strictly = '0.5.2' }
 jpackage-plugin = { strictly = '1.3.1' }
 junit-jupiter-lib = { strictly = '5.8.2' }
@@ -100,7 +99,6 @@ jackson-core = { module = 'com.fasterxml.jackson.core:jackson-core', version.ref
 jackson-annotations = { module = 'com.fasterxml.jackson.core:jackson-annotations', version.ref = 'jackson-lib' }
 jackson-databind = { module = 'com.fasterxml.jackson.core:jackson-databind', version.ref = 'jackson-lib' }
 
-jeasy-easy-states = { module = 'org.jeasy:easy-states', version.ref = 'jeasy-easy-states-lib' }
 jeromq = { module = 'org.zeromq:jeromq', version.ref = 'jeromq-lib' }
 junit-jupiter = { module = 'org.junit.jupiter:junit-jupiter', version.ref = 'junit-jupiter-lib' }
 

network/network/src/main/java/bisq/network/NetworkId.java

@@ -33,7 +33,6 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 
-@ToString
 @EqualsAndHashCode
 @Getter
 public final class NetworkId implements Proto {

trade/build.gradle

@@ -18,5 +18,4 @@ dependencies {
 
     implementation libs.google.guava
     implementation libs.typesafe.config
-    implementation libs.jeasy.easy.states
 }

trade/src/main/java/bisq/trade/ServiceProvider.java

@@ -21,7 +21,6 @@
 import bisq.identity.IdentityService;
 import bisq.network.NetworkService;
 import bisq.offer.OfferService;
-import bisq.persistence.PersistenceService;
 import bisq.support.MediationService;
 import bisq.support.SupportService;
 import lombok.Getter;
@@ -38,7 +37,6 @@ public class ServiceProvider {
 
     public ServiceProvider(NetworkService networkService,
                            IdentityService identityService,
-                           PersistenceService persistenceService,
                            OfferService offerService,
                            ContractService contractService,
                            SupportService supportService) {