Rename getInterceptors()/setInterceptors() to getFlow/setFlow() (#2186)

* rename interceptor getter and setter to flow

* adjust tests

* adjust tests

* fix name

Author: christiangoerdes

core/src/main/java/com/predic8/membrane/core/HttpRouter.java

@@ -44,7 +44,7 @@ private Transport createTransport() {
 		interceptors.add(new InternalRoutingInterceptor());
 		HTTPClientInterceptor httpClientInterceptor = new HTTPClientInterceptor();
 		interceptors.add(httpClientInterceptor);
-		transport.setInterceptors(interceptors);
+		transport.setFlow(interceptors);
 		return transport;
 	}
 
@@ -58,7 +58,7 @@ public HttpTransport getTransport() {
 	 * the list. In tests interceptors in the proxy can be used instead.
 	 */
 	public void addUserFeatureInterceptor(Interceptor i) {
-		List<Interceptor> is = getTransport().getInterceptors();
+		List<Interceptor> is = getTransport().getFlow();
 		is.add(is.size()-3, i);
 	}
 

core/src/main/java/com/predic8/membrane/core/Router.java

@@ -250,8 +250,8 @@ public ExecutorService getBackgroundInitializer() {
 
     public Proxy getParentProxy(Interceptor interceptor) {
         for (Proxy r : getRuleManager().getRules()) {
-            if (r.getInterceptors() != null)
-                for (Interceptor i : r.getInterceptors())
+            if (r.getFlow() != null)
+                for (Interceptor i : r.getFlow())
                     if (i == interceptor)
                         return r;
         }

core/src/main/java/com/predic8/membrane/core/interceptor/AbstractInterceptor.java

@@ -57,11 +57,11 @@ public void setDisplayName(String name) {
 		this.name = name;
 	}
 
-	public void setFlow(EnumSet<Flow> flow) {
+	public void setAppliedFlow(EnumSet<Flow> flow) {
 		this.flow = flow;
 	}
 
-	public EnumSet<Flow> getFlow() {
+	public EnumSet<Flow> getAppliedFlow() {
 		return flow;
 	}
 
@@ -111,17 +111,17 @@ public <T extends Proxy> T getProxy(){
 				.getRules()
 				.stream()
 				.filter(proxy -> proxy
-						.getInterceptors() != null)
+						.getFlow() != null)
 				.filter(proxy -> proxy
-						.getInterceptors()
+						.getFlow()
 						.stream().anyMatch(this::hasSameReferenceAs))
 				.findAny()
 				.get();
 	}
 
 	private boolean hasSameReferenceAs(Interceptor i){
 		if(i instanceof AbstractFlowWithChildrenInterceptor){
-			return ((AbstractFlowWithChildrenInterceptor) i).getInterceptors().stream().anyMatch(this::hasSameReferenceAs);
+			return ((AbstractFlowWithChildrenInterceptor) i).getFlow().stream().anyMatch(this::hasSameReferenceAs);
 		}
 		return i == this;
 	}

core/src/main/java/com/predic8/membrane/core/interceptor/DispatchingInterceptor.java

@@ -135,7 +135,7 @@ private String getUri(Exchange exc) throws URISyntaxException {
     }
 
     @Override
-    public EnumSet<Flow> getFlow() {
+    public EnumSet<Flow> getAppliedFlow() {
         return REQUEST_FLOW;
     }
 }

core/src/main/java/com/predic8/membrane/core/interceptor/ExchangeStoreInterceptor.java

@@ -133,7 +133,7 @@ private void searchAdminConsole() {
 		for (Proxy r : router.getRuleManager().getRules()) {
 			if (!(r instanceof AbstractServiceProxy)) continue;
 
-			for (Interceptor i : r.getInterceptors()) {
+			for (Interceptor i : r.getFlow()) {
 				if (i instanceof AdminConsoleInterceptor) {
 					serviceProxiesContainingAdminConsole.add((AbstractServiceProxy)r);
 				}

core/src/main/java/com/predic8/membrane/core/interceptor/HTTPClientInterceptor.java

@@ -57,7 +57,7 @@ public class HTTPClientInterceptor extends AbstractInterceptor {
 
     public HTTPClientInterceptor() {
         name = "http client";
-        setFlow(REQUEST_FLOW);
+        setAppliedFlow(REQUEST_FLOW);
     }
 
     @Override

core/src/main/java/com/predic8/membrane/core/interceptor/IndexInterceptor.java

@@ -54,7 +54,7 @@ public List<ServiceInfo> getServices(Exchange exc) {
 	}
 
 	private ServiceInfo getServiceInfo(Exchange exc, AbstractServiceProxy sp) {
-		if (sp.getInterceptors().size() == 1 && sp.getInterceptors().getFirst() instanceof IndexInterceptor)
+		if (sp.getFlow().size() == 1 && sp.getFlow().getFirst() instanceof IndexInterceptor)
 			return null;
 
 		ServiceProxyKey k = (ServiceProxyKey) sp.getKey();

core/src/main/java/com/predic8/membrane/core/interceptor/Interceptor.java

@@ -70,8 +70,8 @@ public boolean isAbort() {
 
 	Router getRouter();
 
-	void setFlow(EnumSet<Flow> flow);
-	EnumSet<Flow> getFlow();
+	void setAppliedFlow(EnumSet<Flow> flow);
+	EnumSet<Flow> getAppliedFlow();
 
 	/**
 	 * If interceptor can handle messages in the request flow.

core/src/main/java/com/predic8/membrane/core/interceptor/InternalRoutingInterceptor.java

@@ -101,7 +101,7 @@ public Outcome handleResponse(Exchange exc) {
         AbstractServiceProxy service = getRuleByDest(exchange);
         RuleMatchingInterceptor.assignRule(exchange, service);
         updateRequestPath(exchange);
-        Outcome outcome = callInterceptors(exchange, service.getInterceptors());
+        Outcome outcome = callInterceptors(exchange, service.getFlow());
         exchange.getDestinations().clear();
         exchange.getDestinations().add(getTargetAsUri(exchange, service));
         if (outcome == ABORT || outcome == RETURN) {

core/src/main/java/com/predic8/membrane/core/interceptor/RuleMatchingInterceptor.java

@@ -38,7 +38,7 @@ public class RuleMatchingInterceptor extends AbstractInterceptor {
 
 	public RuleMatchingInterceptor() {
 		name = "rule matching interceptor";
-		setFlow(REQUEST_FLOW);
+		setAppliedFlow(REQUEST_FLOW);
 	}
 
 	@Override