Merge pull request #7526 from enonic/revert-7524-issue-7523

Revert "WebDispatcherImpl implementation issues #7523"

modules/web/web-impl/src/main/java/com/enonic/xp/web/impl/handler/WebDispatcherImpl.java

@@ -1,12 +1,12 @@
 package com.enonic.xp.web.impl.handler;
 
-import java.util.Comparator;
 import java.util.Iterator;
-import java.util.NavigableSet;
-import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.List;
 
 import org.osgi.service.component.annotations.Component;
 
+import com.google.common.collect.Lists;
+
 import com.enonic.xp.web.WebRequest;
 import com.enonic.xp.web.WebResponse;
 import com.enonic.xp.web.handler.WebHandler;
@@ -16,18 +16,30 @@
 public final class WebDispatcherImpl
     implements WebDispatcher
 {
-    private final NavigableSet<WebHandler> webHandlerList = new ConcurrentSkipListSet<>( Comparator.comparingInt( WebHandler::getOrder ) );
+    private final List<WebHandler> webHandlerList = Lists.newCopyOnWriteArrayList();
 
     @Override
-    public void add( final WebHandler webHandler )
+    public synchronized void add( final WebHandler webHandler )
     {
         this.webHandlerList.add( webHandler );
+        sortWebHandlerList();
     }
 
     @Override
-    public void remove( final WebHandler webHandler )
+    public synchronized void remove( final WebHandler webHandler )
     {
         this.webHandlerList.remove( webHandler );
+        sortWebHandlerList();
+    }
+
+    private void sortWebHandlerList()
+    {
+        this.webHandlerList.sort( this::compare );
+    }
+
+    private int compare( final WebHandler webHandler1, final WebHandler webHandler2 )
+    {
+        return webHandler1.getOrder() - webHandler2.getOrder();
     }
 
     @Override

modules/web/web-impl/src/test/java/com/enonic/xp/web/impl/handler/TestWebHandler.java

@@ -5,30 +5,18 @@
 import com.enonic.xp.web.handler.WebHandler;
 import com.enonic.xp.web.handler.WebHandlerChain;
 
-public class TestWebHandler
+public final class TestWebHandler
     implements WebHandler
 {
     protected WebResponse response;
 
     protected RequestVerifier verifier = req -> {
     };
 
-    private final int order;
-
-    public TestWebHandler()
-    {
-        this( 0 );
-    }
-
-    public TestWebHandler( final int order )
-    {
-        this.order = order;
-    }
-
     @Override
     public int getOrder()
     {
-        return order;
+        return 0;
     }
 
     @Override