filter-valve: use lambdas

[controller.git] / opendaylight / commons / filter-valve / src / main / java / org / opendaylight / controller / filtervalve / cors / FilterValve.java

diff --git a/opendaylight/commons/filter-valve/src/main/java/org/opendaylight/controller/filtervalve/cors/FilterValve.java b/opendaylight/commons/filter-valve/src/main/java/org/opendaylight/controller/filtervalve/cors/FilterValve.java
index 814583f66acdbcb5d0d2df8f0a2e1871123125df..d096cf6403c07ecda9d39ab092636ad8e7e66692 100644 (file)
--- a/opendaylight/commons/filter-valve/src/main/java/org/opendaylight/controller/filtervalve/cors/FilterValve.java
+++ b/opendaylight/commons/filter-valve/src/main/java/org/opendaylight/controller/filtervalve/cors/FilterValve.java
@@ -13,8 +13,6 @@ import java.io.IOException;
 import java.util.Objects;
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
 import org.apache.catalina.connector.Request;
 import org.apache.catalina.connector.Response;
 import org.apache.catalina.valves.ValveBase;
@@ -39,19 +37,16 @@ public class FilterValve extends ValveBase {
             throw new IllegalStateException("Initialization error");
         }
 
-        FilterChain nextValveFilterChain = new FilterChain() {
-            @Override
-            public void doFilter(ServletRequest req, ServletResponse resp) throws IOException, ServletException {
-                boolean reqEquals = Objects.equals(request, req);
-                boolean respEquals = Objects.equals(response, resp);
-                if (reqEquals == false || respEquals == false) {
-                    logger.error("Illegal change was detected by valve - request {} or " +
-                            "response {} was replaced by a filter. This is not supported by this valve",
-                            reqEquals, respEquals);
-                    throw new IllegalStateException("Request or response was replaced in a filter");
-                }
-                getNext().invoke(request, response);
+        FilterChain nextValveFilterChain = (req, resp) -> {
+            boolean reqEquals = Objects.equals(request, req);
+            boolean respEquals = Objects.equals(response, resp);
+            if (reqEquals == false || respEquals == false) {
+                logger.error("Illegal change was detected by valve - request {} or " +
+                        "response {} was replaced by a filter. This is not supported by this valve",
+                        reqEquals, respEquals);
+                throw new IllegalStateException("Request or response was replaced in a filter");
             }
+            getNext().invoke(request, response);
         };
         filterProcessor.process(request, response, nextValveFilterChain);
     }
@@ -59,7 +54,7 @@ public class FilterValve extends ValveBase {
     /**
      * Called by Tomcat when configurationFile attribute is set.
      * @param fileName path to xml file containing valve configuration
-     * @throws Exception
+     * @throws Exception exception
      */
     public void setConfigurationFile(String fileName) throws Exception {
         File configurationFile = new File(fileName);