Merge "Jersey server-side request routing refactoring."

Author: Michal Gajdos

core-server/src/main/java/org/glassfish/jersey/server/ApplicationHandler.java

@@ -96,6 +96,7 @@
 import org.glassfish.jersey.model.internal.RankedComparator;
 import org.glassfish.jersey.model.internal.RankedComparator.Order;
 import org.glassfish.jersey.model.internal.RankedProvider;
+import org.glassfish.jersey.process.internal.ChainableStage;
 import org.glassfish.jersey.process.internal.Stage;
 import org.glassfish.jersey.process.internal.Stages;
 import org.glassfish.jersey.server.internal.ConfigHelper;
@@ -108,15 +109,11 @@
 import org.glassfish.jersey.server.internal.monitoring.MonitoringContainerListener;
 import org.glassfish.jersey.server.internal.process.ReferencesInitializer;
 import org.glassfish.jersey.server.internal.process.RequestProcessingContext;
-import org.glassfish.jersey.server.internal.routing.RoutedInflectorExtractorStage;
-import org.glassfish.jersey.server.internal.routing.Router;
-import org.glassfish.jersey.server.internal.routing.RoutingStage;
-import org.glassfish.jersey.server.internal.routing.RuntimeModelBuilder;
+import org.glassfish.jersey.server.internal.routing.Routing;
 import org.glassfish.jersey.server.model.ComponentModelValidator;
 import org.glassfish.jersey.server.model.ModelProcessor;
 import org.glassfish.jersey.server.model.ModelValidationException;
 import org.glassfish.jersey.server.model.Resource;
-import org.glassfish.jersey.server.model.ResourceMethodInvoker;
 import org.glassfish.jersey.server.model.ResourceModel;
 import org.glassfish.jersey.server.model.internal.ModelErrors;
 import org.glassfish.jersey.server.monitoring.ApplicationEvent;
@@ -162,7 +159,6 @@
  * @author Jakub Podlesak (jakub.podlesak at oracle.com)
  * @author Marek Potociar (marek.potociar at oracle.com)
  * @author Libor Kramolis (libor.kramolis at oracle.com)
- *
  * @see ResourceConfig
  * @see javax.ws.rs.core.Configuration
  * @see org.glassfish.jersey.server.spi.ContainerProvider
@@ -446,7 +442,9 @@ private void initialize() {
 
             if (extScopes.length == 1) {
                 for (final ComponentProvider p : componentProviders) {
-                    if (p.bind(extScopes[0], new HashSet<Class<?>>(){{add(ExternalRequestScope.class);}})) {
+                    if (p.bind(extScopes[0], new HashSet<Class<?>>() {{
+                        add(ExternalRequestScope.class);
+                    }})) {
                         extScopesFound = true;
                         break;
                     }
@@ -463,7 +461,7 @@ private void initialize() {
 
             if (!extScopesFound) {
                 final DynamicConfiguration configuration = Injections.getConfiguration(locator);
-                final ScopedBindingBuilder<ExternalRequestScope> binder = Injections.newBinder((ExternalRequestScope)ServerRuntime.NOOP_EXTERNAL_REQ_SCOPE).to(ExternalRequestScope.class);
+                final ScopedBindingBuilder<ExternalRequestScope> binder = Injections.newBinder((ExternalRequestScope) ServerRuntime.NOOP_EXTERNAL_REQ_SCOPE).to(ExternalRequestScope.class);
                 Injections.addBinding(binder, configuration);
                 configuration.commit();
             }
@@ -474,7 +472,7 @@ private void initialize() {
             }
 
             final Iterable<ApplicationEventListener> appEventListeners = Providers.getAllProviders(locator,
-                            ApplicationEventListener.class, new RankedComparator<ApplicationEventListener>());
+                    ApplicationEventListener.class, new RankedComparator<ApplicationEventListener>());
 
             if (appEventListeners.iterator().hasNext()) {
                 compositeListener = new CompositeApplicationEventListener(appEventListeners);
@@ -520,25 +518,20 @@ private void initialize() {
 
         msgBodyWorkers = locator.getService(MessageBodyWorkers.class);
 
-        final RuntimeModelBuilder runtimeModelBuilder = new RuntimeModelBuilder(locator, runtimeConfig, msgBodyWorkers,
-                locator.getService(ResourceMethodInvoker.Builder.class));
-        runtimeModelBuilder.setProcessingProviders(processingProviders);
-
         // assembly request processing chain
-        /**
-         * Root hierarchical request matching acceptor.
-         * Invoked in a single linear stage as part of the main linear accepting chain.
-         */
-        final Router resourceRoutingRoot = runtimeModelBuilder.buildModel(resourceModel.getRuntimeResourceModel(), false);
-
         final ReferencesInitializer referencesInitializer = locator.createAndInitialize(ReferencesInitializer.class);
         final ContainerFilteringStage preMatchRequestFilteringStage = new ContainerFilteringStage(
                 processingProviders.getPreMatchFilters(),
                 processingProviders.getGlobalResponseFilters());
-        final RoutingStage routingStage = new RoutingStage(resourceRoutingRoot);
-        final ContainerFilteringStage resourceFilteringStage = new ContainerFilteringStage(
-                processingProviders.getGlobalRequestFilters(), null);
-        final RoutedInflectorExtractorStage routedInflectorExtractorStage = new RoutedInflectorExtractorStage();
+        final ChainableStage<RequestProcessingContext> routingStage = Routing.forModel(resourceModel.getRuntimeResourceModel())
+                .locator(locator)
+                .resourceContext(jerseyResourceContext)
+                .configuration(runtimeConfig)
+                .entityProviders(msgBodyWorkers)
+                .processingProviders(processingProviders)
+                .buildStage();
+        final ContainerFilteringStage resourceFilteringStage =
+                new ContainerFilteringStage(processingProviders.getGlobalRequestFilters(), null);
         /**
          *  Root linear request acceptor. This is the main entry point for the whole request processing.
          */
@@ -547,7 +540,7 @@ private void initialize() {
                 .to(preMatchRequestFilteringStage)
                 .to(routingStage)
                 .to(resourceFilteringStage)
-                .build(routedInflectorExtractorStage);
+                .build(Routing.matchedEndpointExtractor());
         this.runtime = locator.createAndInitialize(ServerRuntime.Builder.class)
                 .build(rootStage, compositeListener, processingProviders);
 

core-server/src/main/java/org/glassfish/jersey/server/ContainerRequest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -366,7 +366,7 @@ Iterable<WriterInterceptor> getWriterInterceptors() {
     }
 
     private Inflector<RequestProcessingContext, ContainerResponse> getInflector() {
-        return uriRoutingContext.getInflector();
+        return uriRoutingContext.getEndpoint();
     }
 
     private static <T> Iterable<T> emptyIfNull(Iterable<T> iterable) {

core-server/src/main/java/org/glassfish/jersey/server/internal/routing/AbstractRouteToPathBuilder.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2013 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -55,7 +55,7 @@
  * @author Jakub Podlesak
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
  */
-class CombinedClientServerMediaType {
+final class CombinedMediaType {
 
     private static int wildcardsMatched(MediaType clientMt, EffectiveMediaType serverMt) {
         return b2i(clientMt.isWildcardType() ^ serverMt.isWildcardType())
@@ -71,10 +71,12 @@ private static int m2i(MediaType mt) {
     }
 
     private MediaType combinedMediaType;
-    private int q, qs, d;
-    private static final CombinedClientServerMediaType NO_MATCH = new CombinedClientServerMediaType();
+    private int q;
+    private int qs;
+    private int d;
+    private static final CombinedMediaType NO_MATCH = new CombinedMediaType();
 
-    private CombinedClientServerMediaType() {
+    private CombinedMediaType() {
     }
 
     /**
@@ -84,12 +86,12 @@ private CombinedClientServerMediaType() {
      * @param serverMt server-side media type.
      * @return combined client/server media type.
      */
-    public static CombinedClientServerMediaType create(MediaType clientMt, EffectiveMediaType serverMt) {
+    public static CombinedMediaType create(MediaType clientMt, EffectiveMediaType serverMt) {
         if (!clientMt.isCompatible(serverMt.getMediaType())) {
             return NO_MATCH;
         }
 
-        CombinedClientServerMediaType result = new CombinedClientServerMediaType();
+        CombinedMediaType result = new CombinedMediaType();
 
         result.combinedMediaType = MediaTypes.stripQualityParams(MediaTypes.mostSpecific(clientMt, serverMt.getMediaType()));
         result.d = wildcardsMatched(clientMt, serverMt);
@@ -108,13 +110,13 @@ public int compare(MediaType o1, MediaType o2) {
 
 
     /**
-     * Comparator used to compare {@link CombinedClientServerMediaType}. The comparator sorts the elements of list
+     * Comparator used to compare {@link CombinedMediaType}. The comparator sorts the elements of list
      * in the ascending order from the least appropriate to the most appropriate {@link MediaType media type}.
      */
-    final static Comparator<CombinedClientServerMediaType> COMPARATOR = new Comparator<CombinedClientServerMediaType>() {
+    final static Comparator<CombinedMediaType> COMPARATOR = new Comparator<CombinedMediaType>() {
 
         @Override
-        public int compare(CombinedClientServerMediaType c1, CombinedClientServerMediaType c2) {
+        public int compare(CombinedMediaType c1, CombinedMediaType c2) {
             int partialComparison = partialOrderComparator.compare(c1.combinedMediaType, c2.combinedMediaType);
 
             if (partialComparison > 0) {
@@ -257,10 +259,7 @@ public boolean equals(Object o) {
 
             EffectiveMediaType that = (EffectiveMediaType) o;
 
-            if (derived != that.derived) return false;
-            if (!mediaType.equals(that.mediaType)) return false;
-
-            return true;
+            return derived == that.derived && mediaType.equals(that.mediaType);
         }
 
         @Override

core-server/src/main/java/org/glassfish/jersey/server/internal/routing/CombinedClientServerMediaType.java renamed to core-server/src/main/java/org/glassfish/jersey/server/internal/routing/CombinedMediaType.java

@@ -42,16 +42,16 @@
 import org.glassfish.jersey.server.model.ResourceModel;
 
 /**
- * A pair of resource model (for sub-resource locators) and a corresponding model router.
+ * A pair of sub-resource locator model and a corresponding model router.
  *
  * @author Michal Gajdos (michal.gajdos at oracle.com)
  */
-final class LocatorAcceptorPair {
+final class LocatorRouting {
 
     /**
      * Sub-resource locator model.
      */
-    final ResourceModel model;
+    final ResourceModel locator;
 
     /**
      * Sub-resource locator router.
@@ -61,11 +61,11 @@ final class LocatorAcceptorPair {
     /**
      * Create a new instance.
      *
-     * @param model  sub-resource locator model.
+     * @param locator  sub-resource locator model.
      * @param router router that is needed to execute the {@code model}.
      */
-    LocatorAcceptorPair(final ResourceModel model, final Router router) {
-        this.model = model;
+    LocatorRouting(final ResourceModel locator, final Router router) {
+        this.locator = locator;
         this.router = router;
     }
 }