add golden signals filter into IndyDeployment because filter ordering is important (#1494)

Author: jdcasey

addons/sli/jaxrs/src/main/java/org/commonjava/indy/sli/jaxrs/GoldenSignalsFilterMapper.java

@@ -27,14 +27,16 @@
 import javax.servlet.DispatcherType;
 import javax.ws.rs.core.Application;
 
-@ApplicationScoped
+// NOTE: I've added this initialization logic directly to the IndyDeployment so I can control the filter ordering.
+
+//@ApplicationScoped
 public class GoldenSignalsFilterMapper
-        extends IndyDeploymentProvider
+//        extends IndyDeploymentProvider
 {
     @Inject
     private GoldenSignalsFilter goldenSignalsFilter;
 
-    @Override
+//    @Override
     public DeploymentInfo getDeploymentInfo( final String contextRoot, final Application application )
     {
         DeploymentInfo di = new DeploymentInfo();

subsys/jaxrs/pom.xml

@@ -101,6 +101,10 @@
       <groupId>org.commonjava.indy</groupId>
       <artifactId>indy-subsys-honeycomb</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.commonjava.indy</groupId>
+      <artifactId>indy-sli-jaxrs</artifactId>
+    </dependency>
     <dependency>
       <groupId>io.swagger</groupId>
       <artifactId>swagger-annotations</artifactId>

subsys/jaxrs/src/main/java/org/commonjava/indy/bind/jaxrs/IndyDeployment.java

@@ -26,6 +26,7 @@
 import org.commonjava.indy.bind.jaxrs.util.DeploymentInfoUtils;
 import org.commonjava.indy.bind.jaxrs.util.RequestScopeListener;
 import org.commonjava.indy.conf.UIConfiguration;
+import org.commonjava.indy.sli.jaxrs.GoldenSignalsFilter;
 import org.commonjava.indy.stats.IndyVersioning;
 import org.commonjava.indy.subsys.honeycomb.HoneycombFilter;
 import org.jboss.resteasy.plugins.server.servlet.HttpServlet30Dispatcher;
@@ -77,6 +78,9 @@ public class IndyDeployment
     @Inject
     private HoneycombFilter honeycombFilter;
 
+    @Inject
+    private GoldenSignalsFilter goldenSignalsFilter;
+
     @Inject
     private IndyVersioning versioning;
 
@@ -162,6 +166,10 @@ public Set<Class<?>> getClasses()
                                  new ImmediateInstanceFactory<HoneycombFilter>(
                                          this.honeycombFilter ) );
 
+        final FilterInfo goldenSignalsFilter = Servlets.filter( "Golden-Signals", GoldenSignalsFilter.class,
+                                                                new ImmediateInstanceFactory<>(
+                                                                        this.goldenSignalsFilter ) );
+
         final FilterInfo resourceManagementFilter =
                 Servlets.filter( "Naming and Resource Management", ResourceManagementFilter.class,
                                  new ImmediateInstanceFactory<ResourceManagementFilter>(
@@ -170,7 +178,6 @@ public Set<Class<?>> getClasses()
                         Servlets.filter( "ApiVersioning", ApiVersioningFilter.class,
                                          new ImmediateInstanceFactory<ApiVersioningFilter>(
                                                          this.apiVersioningFilter ) );
-        
 
         final DeploymentInfo di = new DeploymentInfo().addListener( Servlets.listener( RequestScopeListener.class ) )
                                                       //.addInitParameter( "resteasy.scan", Boolean.toString( true ) )
@@ -179,9 +186,28 @@ public Set<Class<?>> getClasses()
                                                                                    deployment )
                                                       .addServlet( resteasyServlet )
 
+                                                      .addFilter( goldenSignalsFilter )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/folo/*", DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/content/*", DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/promotion/*", DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/admin/stores/*",
+                                                                            DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/browse/*", DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/remote/*", DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/hosted/*", DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( goldenSignalsFilter.getName(),
+                                                                            "/api/group/*", DispatcherType.REQUEST )
+
                                                       .addFilter( honeycombFilter )
-                                                      .addFilterUrlMapping( honeycombFilter.getName(),
-                                                                            "/api/*", DispatcherType.REQUEST )
+                                                      .addFilterUrlMapping( honeycombFilter.getName(), "/api/*",
+                                                                            DispatcherType.REQUEST )
 
                                                       .addFilter( resourceManagementFilter )
                                                       .addFilterUrlMapping( resourceManagementFilter.getName(),