From a271ef5527a6fa3540cb2eb7a4c946af78b38293 Mon Sep 17 00:00:00 2001 From: prasanthomanakuttan Date: Sat, 10 Sep 2022 13:10:15 +0530 Subject: [PATCH 1/3] Refactor - reorder modifier as per java spec --- .../statemachine/action/DistributedLeaderAction.java | 2 +- .../annotation/AbstractConfiguredAnnotationBuilder.java | 2 +- .../AutowireBeanFactoryObjectPostProcessor.java | 2 +- .../configuration/ObjectPostProcessorConfiguration.java | 2 +- .../statemachine/ensemble/DistributedStateMachine.java | 2 +- .../statemachine/service/DefaultStateMachineService.java | 2 +- .../statemachine/state/ChoicePseudoState.java | 2 +- .../statemachine/state/EntryPseudoState.java | 2 +- .../statemachine/state/ExitPseudoState.java | 2 +- .../statemachine/state/JoinPseudoState.java | 8 +++----- .../statemachine/state/JunctionPseudoState.java | 2 +- .../statemachine/transition/AbstractTransition.java | 2 +- 12 files changed, 14 insertions(+), 16 deletions(-) diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/action/DistributedLeaderAction.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/action/DistributedLeaderAction.java index ed6c5d1c8..d48f8ab92 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/action/DistributedLeaderAction.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/action/DistributedLeaderAction.java @@ -39,7 +39,7 @@ */ public class DistributedLeaderAction implements Action { - private final static Log log = LogFactory.getLog(DistributedLeaderAction.class); + private static final Log log = LogFactory.getLog(DistributedLeaderAction.class); private final Action action; private final StateMachineEnsemble ensemble; diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractConfiguredAnnotationBuilder.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractConfiguredAnnotationBuilder.java index 6bcc1449b..7ae1e668a 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractConfiguredAnnotationBuilder.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/AbstractConfiguredAnnotationBuilder.java @@ -46,7 +46,7 @@ public abstract class AbstractConfiguredAnnotationBuilder> extends AbstractAnnotationBuilder { - private final static Log log = LogFactory.getLog(AbstractConfiguredAnnotationBuilder.class); + private static final Log log = LogFactory.getLog(AbstractConfiguredAnnotationBuilder.class); /** Configurers which are added to this builder before the configure step */ private final LinkedHashMap>, List>> mainConfigurers = diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java index 745186358..cba26cc4e 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/AutowireBeanFactoryObjectPostProcessor.java @@ -36,7 +36,7 @@ */ final class AutowireBeanFactoryObjectPostProcessor implements ObjectPostProcessor, DisposableBean, SmartLifecycle { - private final static Log log = LogFactory.getLog(AutowireBeanFactoryObjectPostProcessor.class); + private static final Log log = LogFactory.getLog(AutowireBeanFactoryObjectPostProcessor.class); private final AutowireCapableBeanFactory autowireBeanFactory; private final List disposableBeans = new ArrayList(); diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java index 89c8cb3fa..977b491e9 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/config/common/annotation/configuration/ObjectPostProcessorConfiguration.java @@ -34,7 +34,7 @@ @Configuration public class ObjectPostProcessorConfiguration { - private final static String POST_PROCESSOR_BEAN_ID = "org.springframework.statemachine.config.common.annotation.configuration.objectPostProcessor"; + private static final String POST_PROCESSOR_BEAN_ID = "org.springframework.statemachine.config.common.annotation.configuration.objectPostProcessor"; @Bean(name = POST_PROCESSOR_BEAN_ID) public ObjectPostProcessor objectPostProcessor(AutowireCapableBeanFactory beanFactory) { diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java index cbc6d30fc..8549c1514 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/ensemble/DistributedStateMachine.java @@ -59,7 +59,7 @@ */ public class DistributedStateMachine extends LifecycleObjectSupport implements StateMachine { - private final static Log log = LogFactory.getLog(DistributedStateMachine.class); + private static final Log log = LogFactory.getLog(DistributedStateMachine.class); private final StateMachineEnsemble ensemble; private final StateMachine delegate; private final LocalEnsembleListener listener = new LocalEnsembleListener(); diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java index 8b97337f2..64b3b8651 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/service/DefaultStateMachineService.java @@ -42,7 +42,7 @@ */ public class DefaultStateMachineService implements StateMachineService, DisposableBean { - private final static Log log = LogFactory.getLog(DefaultStateMachineService.class); + private static final Log log = LogFactory.getLog(DefaultStateMachineService.class); private final StateMachineFactory stateMachineFactory; private final Map> machines = new HashMap>(); private StateMachinePersist stateMachinePersist; diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ChoicePseudoState.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ChoicePseudoState.java index 2b98e792e..2ca83ecd4 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ChoicePseudoState.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ChoicePseudoState.java @@ -38,7 +38,7 @@ */ public class ChoicePseudoState implements PseudoState { - private final static Log log = LogFactory.getLog(ChoicePseudoState.class); + private static final Log log = LogFactory.getLog(ChoicePseudoState.class); private final List> choices; /** diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/EntryPseudoState.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/EntryPseudoState.java index a56d86336..c7c0524fc 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/EntryPseudoState.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/EntryPseudoState.java @@ -43,7 +43,7 @@ public EntryPseudoState(State state) { } @Override - final public PseudoStateKind getKind() { + public final PseudoStateKind getKind() { return PseudoStateKind.ENTRY; } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ExitPseudoState.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ExitPseudoState.java index 41e83bfca..162dbe522 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ExitPseudoState.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/ExitPseudoState.java @@ -45,7 +45,7 @@ public ExitPseudoState(StateHolder state) { } @Override - final public PseudoStateKind getKind() { + public final PseudoStateKind getKind() { return PseudoStateKind.EXIT; } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JoinPseudoState.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JoinPseudoState.java index 566be7e25..ab39724ed 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JoinPseudoState.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JoinPseudoState.java @@ -41,7 +41,7 @@ */ public class JoinPseudoState extends AbstractPseudoState { - private final static Log log = LogFactory.getLog(JoinPseudoState.class); + private static final Log log = LogFactory.getLog(JoinPseudoState.class); private final List>> joins; private final JoinTracker tracker; private final List> joinTargets; @@ -68,15 +68,13 @@ public Mono> entry(StateContext context) { return Flux.fromIterable(joinTargets) .filterWhen(jst -> evaluateInternal(jst.guard, context)) .next() - .map(jst -> jst.getState()); + .map(JoinStateData::getState); }); } @Override public Mono exit(StateContext context) { - return Mono.fromRunnable(() -> { - tracker.reset(); - }); + return Mono.fromRunnable(tracker::reset); } /** diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JunctionPseudoState.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JunctionPseudoState.java index e1dbcf278..b7348e3d3 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JunctionPseudoState.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/JunctionPseudoState.java @@ -38,7 +38,7 @@ */ public class JunctionPseudoState implements PseudoState { - private final static Log log = LogFactory.getLog(JunctionPseudoState.class); + private static final Log log = LogFactory.getLog(JunctionPseudoState.class); private final List> junctions; /** diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/AbstractTransition.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/AbstractTransition.java index c54a2f00c..6b12cb035 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/AbstractTransition.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/transition/AbstractTransition.java @@ -41,7 +41,7 @@ */ public abstract class AbstractTransition implements Transition { - private final static Log log = LogFactory.getLog(AbstractTransition.class); + private static final Log log = LogFactory.getLog(AbstractTransition.class); protected final State target; protected final Collection, Mono>> actions; private final State source; From b2899434b4640b6edd137b99eabd2228e127b9d6 Mon Sep 17 00:00:00 2001 From: prasanthomanakuttan Date: Sat, 10 Sep 2022 13:11:30 +0530 Subject: [PATCH 2/3] Refactor - Replace anonymous inner class with lambda and usage of method references --- .../statemachine/state/AbstractState.java | 12 ++++-------- .../statemachine/support/AbstractStateMachine.java | 8 ++++---- .../statemachine/support/LifecycleObjectSupport.java | 8 ++++---- .../statemachine/support/tree/TreeTraverser.java | 7 +------ 4 files changed, 13 insertions(+), 22 deletions(-) diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/AbstractState.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/AbstractState.java index 1327dc27d..214f693a6 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/AbstractState.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/state/AbstractState.java @@ -236,9 +236,7 @@ public Mono exit(StateContext context) { } return Mono.empty(); }) - .then(Mono.fromRunnable(() -> { - completionListeners.clear(); - })) + .then(Mono.fromRunnable(completionListeners::clear)) .then(cancelStateActions()) .then(Mono.fromRunnable(() -> { stateListener.onExit(context); @@ -360,12 +358,12 @@ public void removeActionListener(ActionListener listener) { @Override protected Mono doPreStartReactively() { - return Mono.fromRunnable(() -> armTriggers()); + return Mono.fromRunnable(this::armTriggers); } @Override protected Mono doPreStopReactively() { - return Mono.fromRunnable(() -> disarmTriggers()); + return Mono.fromRunnable(this::disarmTriggers); } /** @@ -525,9 +523,7 @@ private Mono cancelStateActions() { } }) // we're done, clear state scheduled state actions - .thenEmpty(Mono.fromRunnable(() -> { - scheduledActions.clear(); - })); + .thenEmpty(Mono.fromRunnable(scheduledActions::clear)); } /** diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java index ec12d739b..a7544a213 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/AbstractStateMachine.java @@ -241,17 +241,17 @@ public boolean sendEvent(E event) { @Override public Flux> sendEvents(Flux> events) { - return events.flatMap(e -> handleEvent(e)); + return events.flatMap(this::handleEvent); } @Override public Flux> sendEvent(Mono> event) { - return event.flatMapMany(e -> handleEvent(e)); + return event.flatMapMany(this::handleEvent); } @Override public Mono>> sendEventCollect(Mono> event) { - return event.flatMapMany(e -> handleEvent(e)).collectList(); + return event.flatMapMany(this::handleEvent).collectList(); } @Override @@ -319,7 +319,7 @@ public Mono doOnComplete(StateContext context) { @Override public Mono transit(Transition t, StateContext ctx, Message message) { - return Mono.fromSupplier(() -> System.currentTimeMillis()) + return Mono.fromSupplier(System::currentTimeMillis) .doOnNext(now -> { notifyTransitionStart(buildStateContext(Stage.TRANSITION_START, message, t, getRelayStateMachine())); }) diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/LifecycleObjectSupport.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/LifecycleObjectSupport.java index a797553da..ff638b349 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/LifecycleObjectSupport.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/LifecycleObjectSupport.java @@ -57,10 +57,10 @@ public abstract class LifecycleObjectSupport public LifecycleObjectSupport() { this.reactiveLifecycleManager = new ReactiveLifecycleManager( - () -> doPreStartReactively(), - () -> doPreStopReactively(), - () -> doPostStartReactively(), - () -> doPostStopReactively() + this::doPreStartReactively, + this::doPreStopReactively, + this::doPostStartReactively, + this::doPostStopReactively ); this.reactiveLifecycleManager.setOwner(this); } diff --git a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/tree/TreeTraverser.java b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/tree/TreeTraverser.java index 6362ca4bd..cb3bd5693 100644 --- a/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/tree/TreeTraverser.java +++ b/spring-statemachine-core/src/main/java/org/springframework/statemachine/support/tree/TreeTraverser.java @@ -32,12 +32,7 @@ public abstract class TreeTraverser { public final Iterable postOrderTraversal(final T root) { Assert.notNull(root, "root cannot be null"); - return new Iterable() { - @Override - public Iterator iterator() { - return postOrderIterator(root); - } - }; + return () -> postOrderIterator(root); } Iterator postOrderIterator(T root) { From 383fd9b815e34de7e8dc65964eb890f3aca40fff Mon Sep 17 00:00:00 2001 From: prasanthomanakuttan Date: Sat, 10 Sep 2022 13:18:11 +0530 Subject: [PATCH 3/3] Refactor - Reorder modifier as per java spec --- .../zookeeper/ZookeeperStateMachineEnsemble.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java b/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java index c3a6d6ea7..d7f452eb4 100644 --- a/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java +++ b/spring-statemachine-zookeeper/src/main/java/org/springframework/statemachine/zookeeper/ZookeeperStateMachineEnsemble.java @@ -58,13 +58,13 @@ */ public class ZookeeperStateMachineEnsemble extends StateMachineEnsembleObjectSupport { - private final static Log log = LogFactory.getLog(ZookeeperStateMachineEnsemble.class); + private static final Log log = LogFactory.getLog(ZookeeperStateMachineEnsemble.class); private final String uuid = UUID.randomUUID().toString(); - private final static int DEFAULT_LOGSIZE = 32; - private final static String PATH_CURRENT = "current"; - private final static String PATH_LOG = "log"; - private final static String PATH_MEMBERS = "members"; - private final static String PATH_MUTEX = "mutex"; + private static final int DEFAULT_LOGSIZE = 32; + private static final String PATH_CURRENT = "current"; + private static final String PATH_LOG = "log"; + private static final String PATH_MEMBERS = "members"; + private static final String PATH_MUTEX = "mutex"; private final CuratorFramework curatorClient; private final String baseDataPath; private final String statePath; @@ -121,7 +121,7 @@ protected void onInit() throws Exception { @Override protected Mono doPreStartReactively() { - return Mono.fromRunnable(() -> doStart()); + return Mono.fromRunnable(this::doStart); } protected void doStart() { @@ -149,7 +149,7 @@ protected void doStart() { @Override protected Mono doPreStopReactively() { - return Mono.fromRunnable(() -> doStop()); + return Mono.fromRunnable(this::doStop); } protected void doStop() {