Sheldan/abstracto
1
0
Fork 0
mirror of https://github.com/Sheldan/abstracto.git synced 2026-03-24 05:39:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AB-327] adding a third state to the result of a system condition: Ignored, this means that the condition was not evaluated, and is neither true nor false, this is for example used when the feature the condition is about is disabled

Browse Source 
adding server ID to has level condition parameters
This commit is contained in:
Sheldan
2021-11-27 22:08:12 +01:00
parent 15fb9d95a8
commit c10296251c
6 changed files with 56 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
abstracto-application/core/core-impl/src/main/java/dev/sheldan/abstracto/core/service/ConditionServiceBean.java
View File

@@ -9,7 +9,6 @@ import org.springframework.stereotype.Component;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@Component
@Slf4j
@@ -19,32 +18,31 @@ public class ConditionServiceBean implements ConditionService {
private List<SystemCondition> conditionList;
@Override
public boolean checkConditions(ConditionContextInstance context) {
if(conditionList == null || conditionList.isEmpty()) {
return true;
public SystemCondition.Result checkConditions(ConditionContextInstance context) {
if (conditionList == null || conditionList.isEmpty()) {
return SystemCondition.Result.SUCCESSFUL;
}
Optional<SystemCondition> matchingCondition = conditionList
log.debug("Checking condition {}.", context.getConditionName());
return conditionList
.stream()
.filter(systemCondition -> systemCondition.getConditionName().equalsIgnoreCase(context.getConditionName()))
.findAny();
log.debug("Checking condition {}.", context.getConditionName());
return matchingCondition.map(systemCondition -> {
verifyConditionContext(context, systemCondition);
boolean result = systemCondition.checkCondition(context);
log.debug("Condition resulted in {}.", result);
return result;
}).orElse(true);
.findAny().map(systemCondition -> {
verifyConditionContext(context, systemCondition);
SystemCondition.Result result = systemCondition.checkCondition(context);
log.debug("Condition resulted in {}.", result);
return result;
}).orElse(SystemCondition.Result.SUCCESSFUL);
}
private void verifyConditionContext(ConditionContextInstance contextInstance, SystemCondition condition) {
for (ConditionContextVariable conditionContextVariable : condition.getExpectedContext().getRequiredVariables()) {
Map<String, Object> providedParameters = contextInstance.getParameters();
if(!providedParameters.containsKey(conditionContextVariable.getName())) {
if (!providedParameters.containsKey(conditionContextVariable.getName())) {
throw new InvalidConditionParametersException(String.format("Variable %s was not present", conditionContextVariable.getName()));
}
Class expectedType = conditionContextVariable.getType();
Object providedParameter = providedParameters.get(conditionContextVariable.getName());
if(!expectedType.isInstance(providedParameter)) {
if (!expectedType.isInstance(providedParameter)) {
throw new InvalidConditionParametersException(String.format("Variable %s was of type %s instead of %s.",
conditionContextVariable.getName(), providedParameter.getClass(), expectedType));
}