Spring/spring-statemachine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add repository config actions

Browse Source 
- Add action to RepositoryTransition, state/entry/exit
  actions to RepositoryState.
- New ActionsRepository.
- Relates to #262
This commit is contained in:
Janne Valkealahti
2016-10-02 14:42:12 +01:00
parent de556f0d54
commit 0b6f67ece4
12 changed files with 466 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-statemachine-data/src/main/java/org/springframework/statemachine/data/ActionRepository.java Normal file
View File

@@ -0,0 +1,31 @@
/*
* Copyright 2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.statemachine.data;
import org.springframework.data.repository.CrudRepository;
import org.springframework.data.repository.NoRepositoryBean;
import org.springframework.data.repository.Repository;
/**
* Generic {@link Repository} interface for actions.
*
* @author Janne Valkealahti
*
* @param <T> the transition entity type
*/
@NoRepositoryBean
public interface ActionRepository <T extends RepositoryAction> extends CrudRepository<T, Long> {
}

39
spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryAction.java Normal file
View File

@@ -0,0 +1,39 @@
/*
* Copyright 2016 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.statemachine.data;
/**
* Generic interface representing action entity.
*
* @author Janne Valkealahti
*
*/
public interface RepositoryAction {
/**
* Gets the name.
*
* @return the name
*/
String getName();
/**
* Gets the spel.
*
* @return the spel
*/
String getSpel();
}

23
spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryState.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.statemachine.data;
import java.util.Set;
/**
* Generic interface representing state entity.
*
@@ -50,4 +52,25 @@ public interface RepositoryState {
* @return true, if is initial
*/
boolean isInitial();
/**
* Gets the state actions.
*
* @return the state actions
*/
Set<? extends RepositoryAction> getStateActions();
/**
* Gets the entry actions.
*
* @return the entry actions
*/
Set<? extends RepositoryAction> getEntryActions();
/**
* Gets the exit actions.
*
* @return the exit actions
*/
Set<? extends RepositoryAction> getExitActions();
}

102
spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryStateMachineModelFactory.java
View File

@@ -17,7 +17,14 @@ package org.springframework.statemachine.data;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
import org.springframework.expression.spel.SpelCompilerMode;
import org.springframework.expression.spel.SpelParserConfiguration;
import org.springframework.expression.spel.standard.SpelExpressionParser;
import org.springframework.statemachine.action.Action;
import org.springframework.statemachine.action.SpelExpressionAction;
import org.springframework.statemachine.config.model.AbstractStateMachineModelFactory;
import org.springframework.statemachine.config.model.ConfigurationData;
import org.springframework.statemachine.config.model.DefaultStateMachineModel;
import org.springframework.statemachine.config.model.StateData;
@@ -26,6 +33,8 @@ import org.springframework.statemachine.config.model.StateMachineModelFactory;
import org.springframework.statemachine.config.model.StatesData;
import org.springframework.statemachine.config.model.TransitionData;
import org.springframework.statemachine.config.model.TransitionsData;
import org.springframework.statemachine.transition.TransitionKind;
import org.springframework.util.StringUtils;
/**
* A generic {@link StateMachineModelFactory} which is backed by a Spring Data
@@ -34,7 +43,8 @@ import org.springframework.statemachine.config.model.TransitionsData;
* @author Janne Valkealahti
*
*/
public class RepositoryStateMachineModelFactory implements StateMachineModelFactory<String, String> {
public class RepositoryStateMachineModelFactory extends AbstractStateMachineModelFactory<String, String>
implements StateMachineModelFactory<String, String> {
private final StateRepository<? extends RepositoryState> stateRepository;
private final TransitionRepository<? extends RepositoryTransition> transitionRepository;
@@ -60,15 +70,97 @@ public class RepositoryStateMachineModelFactory implements StateMachineModelFact
public StateMachineModel<String, String> build(String machineId) {
ConfigurationData<String, String> configurationData = new ConfigurationData<>();
Collection<StateData<String, String>> stateData = new ArrayList<>();
Collection<StateData<String, String>> stateDatas = new ArrayList<>();
for (RepositoryState s : stateRepository.findByMachineId(machineId)) {
stateData.add(new StateData<String, String>(s.getParentState(), null, s.getState(), s.isInitial()));
Collection<Action<String, String>> stateActions = new ArrayList<Action<String, String>>();
Set<? extends RepositoryAction> repositoryStateActions = s.getStateActions();
if (repositoryStateActions != null) {
for (RepositoryAction repositoryAction : repositoryStateActions) {
Action<String, String> action = null;
if (StringUtils.hasText(repositoryAction.getName())) {
action = resolveAction(repositoryAction.getName());
} else if (StringUtils.hasText(repositoryAction.getSpel())) {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.MIXED, null));
action = new SpelExpressionAction<String, String>(parser.parseExpression(repositoryAction.getSpel()));
}
if (action != null) {
stateActions.add(action);
}
}
}
Collection<Action<String, String>> entryActions = new ArrayList<Action<String, String>>();
Set<? extends RepositoryAction> repositoryEntryActions = s.getEntryActions();
if (repositoryEntryActions != null) {
for (RepositoryAction repositoryAction : repositoryEntryActions) {
Action<String, String> action = null;
if (StringUtils.hasText(repositoryAction.getName())) {
action = resolveAction(repositoryAction.getName());
} else if (StringUtils.hasText(repositoryAction.getSpel())) {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.MIXED, null));
action = new SpelExpressionAction<String, String>(parser.parseExpression(repositoryAction.getSpel()));
}
if (action != null) {
stateActions.add(action);
}
}
}
Collection<Action<String, String>> exitActions = new ArrayList<Action<String, String>>();
Set<? extends RepositoryAction> repositoryExitActions = s.getExitActions();
if (repositoryExitActions != null) {
for (RepositoryAction repositoryAction : repositoryExitActions) {
Action<String, String> action = null;
if (StringUtils.hasText(repositoryAction.getName())) {
action = resolveAction(repositoryAction.getName());
} else if (StringUtils.hasText(repositoryAction.getSpel())) {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.MIXED, null));
action = new SpelExpressionAction<String, String>(parser.parseExpression(repositoryAction.getSpel()));
}
if (action != null) {
stateActions.add(action);
}
}
}
StateData<String,String> stateData = new StateData<String, String>(s.getParentState(), null, s.getState(), s.isInitial());
stateData.setStateActions(stateActions);
stateData.setEntryActions(entryActions);
stateData.setExitActions(exitActions);
stateDatas.add(stateData);
}
StatesData<String, String> statesData = new StatesData<>(stateData);
StatesData<String, String> statesData = new StatesData<>(stateDatas);
Collection<TransitionData<String, String>> transitionData = new ArrayList<>();
for (RepositoryTransition t : transitionRepository.findByMachineId(machineId)) {
transitionData.add(new TransitionData<String, String>(t.getSource(), t.getTarget(), t.getEvent()));
Collection<Action<String, String>> actions = new ArrayList<Action<String, String>>();
Set<? extends RepositoryAction> repositoryActions = t.getActions();
if (repositoryActions != null) {
for (RepositoryAction repositoryAction : repositoryActions) {
Action<String, String> action = null;
if (StringUtils.hasText(repositoryAction.getName())) {
action = resolveAction(repositoryAction.getName());
} else if (StringUtils.hasText(repositoryAction.getSpel())) {
SpelExpressionParser parser = new SpelExpressionParser(
new SpelParserConfiguration(SpelCompilerMode.MIXED, null));
action = new SpelExpressionAction<String, String>(parser.parseExpression(repositoryAction.getSpel()));
}
if (action != null) {
actions.add(action);
}
}
}
transitionData.add(new TransitionData<>(t.getSource(), t.getTarget(), t.getEvent(), actions, null, TransitionKind.EXTERNAL));
}
TransitionsData<String, String> transitionsData = new TransitionsData<>(transitionData);

9
spring-statemachine-data/src/main/java/org/springframework/statemachine/data/RepositoryTransition.java
View File

@@ -15,6 +15,8 @@
*/
package org.springframework.statemachine.data;
import java.util.Set;
/**
* Generic interface representing transition entity.
*
@@ -50,4 +52,11 @@ public interface RepositoryTransition {
* @return the event
*/
String getEvent();
/**
* Gets the actions.
*
* @return the actions
*/
Set<? extends RepositoryAction> getActions();
}