Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[New] Allow to search activities and order by state in inspector

This commit is contained in:
Robert von Burg 2018-11-14 13:43:41 +01:00
parent 84cf1471ea
commit 7c778d334a
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
li.strolch.agent/src/main/java/li/strolch/search/SearchBuilder.java
View File

@ -6,6 +6,7 @@ import static li.strolch.search.PredicatesSupport.isEqualTo;
import static li.strolch.utils.helper.StringHelper.trimOrEmpty;
import li.strolch.model.ParameterBag;
import li.strolch.model.State;
import li.strolch.model.StrolchRootElement;
import li.strolch.model.Tags;
import li.strolch.model.parameter.Parameter;
@ -112,7 +113,20 @@ public class SearchBuilder {
String[] paramParts = parseParts(part);
if (paramParts.length != 3) {
se = add(and, negate, se, id(containsIgnoreCase(part)).or(name(containsIgnoreCase(part))));
SearchExpression<T> expression;
if (part.startsWith("$state") && (search instanceof OrderSearch || search instanceof ActivitySearch)) {
part = part.substring("$state".length() + 1);
if (part.isEmpty() || State.parseAllowNull(part) == null) {
expression = id(containsIgnoreCase(part)).or(name(containsIgnoreCase(part)));
} else {
expression = state(isEqualTo(part));
}
} else {
expression = id(containsIgnoreCase(part)).or(name(containsIgnoreCase(part)));
}
se = add(and, negate, se, expression);
} else {
String bagId = paramParts[0];
String paramId = paramParts[1];

11
li.strolch.model/src/main/java/li/strolch/model/State.java
View File

@ -161,7 +161,7 @@ public enum State {
}
/**
* @return true if {@link #STARTING} or {@link #EXECUTION} or {@link #WARNING}
* @return true if {@link #EXECUTION} or {@link #WARNING}
*/
public boolean canSetToError() {
return this == EXECUTION || this == WARNING || this == ERROR;
@ -174,6 +174,15 @@ public enum State {
return this == EXECUTION || this == WARNING || this == STOPPED;
}
public static State parseAllowNull(String s) {
for (State state : values()) {
if (state.state.toLowerCase().equals(s.toLowerCase()))
return state;
}
return null;
}
public static State parse(String s) {
DBC.PRE.assertNotEmpty("Value may not be null", s);
for (State state : values()) {