Implementing PoC for [Server/Client] Entry / Exit point definition for

methods (low prio) #14
exense · Apr 17, 2016 · 2779827 · 2779827
1 parent f5c1207
commit 2779827
Show file tree

Hide file tree

Showing 14 changed files with 1,175 additions and 1,096 deletions.
diff --git a/client-ui/src/main/java/io/djigger/aggregation/DefaultPathTransformer.java b/client-ui/src/main/java/io/djigger/aggregation/DefaultPathTransformer.java
@@ -19,6 +19,7 @@
  *******************************************************************************/
 package io.djigger.aggregation;
 
+import io.djigger.aggregation.filter.ContextAwareFilter;
 import io.djigger.aggregation.filter.Filter;
 import io.djigger.ui.model.NodeID;
 import io.djigger.ui.model.RealNode;
@@ -42,6 +43,9 @@ public List<RealNode> transformPath(RealNode realTree, RealNodePath path) {
 		List<RealNode> transformations = new ArrayList<>(path.getFullPath().size());
 
 		RealNode currentNode = realTree;
+		if(nodeFilter instanceof ContextAwareFilter) {
+			((ContextAwareFilter)nodeFilter).startIteration();
+		}
 		for(NodeID nodeID:path.getFullPath()) {
 			currentNode = currentNode.getChild(nodeID);
 			if(nodeFilter == null || nodeFilter.isValid(nodeID)) {

diff --git a/client-ui/src/main/java/io/djigger/aggregation/RevertTreePathTransformer.java b/client-ui/src/main/java/io/djigger/aggregation/RevertTreePathTransformer.java
@@ -19,6 +19,7 @@
  *******************************************************************************/
 package io.djigger.aggregation;
 
+import io.djigger.aggregation.filter.ContextAwareFilter;
 import io.djigger.aggregation.filter.Filter;
 import io.djigger.ui.model.NodeID;
 import io.djigger.ui.model.RealNode;
@@ -42,6 +43,9 @@ public List<RealNode> transformPath(RealNode realTree, RealNodePath path) {
 		List<RealNode> transformations = new ArrayList<>(path.getFullPath().size());
 
 		RealNode currentNode = realTree;
+		if(nodeFilter instanceof ContextAwareFilter) {
+			((ContextAwareFilter)nodeFilter).startIteration();
+		}
 		for(NodeID nodeID:path.getFullPath()) {
 			currentNode = currentNode.getChild(nodeID);
 			if(nodeFilter == null || nodeFilter.isValid(nodeID)) {

diff --git a/client-ui/src/main/java/io/djigger/aggregation/filter/AndExpression.java b/client-ui/src/main/java/io/djigger/aggregation/filter/AndExpression.java
@@ -20,7 +20,7 @@
 package io.djigger.aggregation.filter;
 
 
-public class AndExpression<T> implements Filter<T> {
+public class AndExpression<T> implements Filter<T>, ContextAwareFilter {
 
 	private final Filter<T> filter1;
 
@@ -37,4 +37,24 @@ public boolean isValid(T input) {
 		return filter1.isValid(input) && filter2.isValid(input);
 	}
 
+	@Override
+	public void startIteration() {
+		if(filter1 instanceof ContextAwareFilter) {
+			((ContextAwareFilter)filter1).startIteration();
+		}
+		if(filter2 instanceof ContextAwareFilter) {
+			((ContextAwareFilter)filter2).startIteration();
+		}
+	}
+
+	@Override
+	public void stopIteration() {
+		if(filter1 instanceof ContextAwareFilter) {
+			((ContextAwareFilter)filter1).stopIteration();
+		}
+		if(filter2 instanceof ContextAwareFilter) {
+			((ContextAwareFilter)filter2).stopIteration();
+		}
+	}
+
 }
diff --git a/client-ui/src/main/java/io/djigger/aggregation/filter/ContextAwareFilter.java b/client-ui/src/main/java/io/djigger/aggregation/filter/ContextAwareFilter.java
@@ -0,0 +1,8 @@
+package io.djigger.aggregation.filter;
+
+public interface ContextAwareFilter {
+
+	public void startIteration();
+
+	public void stopIteration();
+}
diff --git a/client-ui/src/main/java/io/djigger/aggregation/filter/FilterExpression.g b/client-ui/src/main/java/io/djigger/aggregation/filter/FilterExpression.g
@@ -5,7 +5,7 @@ header {
 class FilterExpressionLexer extends Lexer;
 
 // Words, which include our operators
-WORD: ('a'..'z' | 'A'..'Z' | '0'..'9' |'.'|'$'|'_'|'-'|'<'|'>')+ ;
+WORD: ('a'..'z' | 'A'..'Z' | '0'..'9' |'.'|'$'|'_'|'-'|'<'|'>'|':')+ ;
 
 // Grouping
 LEFT_PAREN: '(';