Cleanup of TypeUtil and ContextHandler stop/start

jetty-core/jetty-server/src/test/java/org/eclipse/jetty/server/handler/ContextHandlerTest.java

@@ -141,6 +141,44 @@ public void testSimpleGET() throws Exception
         assertThat(BufferUtil.toString(stream.getResponseContent()), equalTo(helloHandler.getMessage()));
     }
 
+    @Test
+    public void testNullPath() throws Exception
+    {
+        HelloHandler helloHandler = new HelloHandler();
+        _contextHandler.setHandler(helloHandler);
+        _server.start();
+
+        ConnectionMetaData connectionMetaData = new MockConnectionMetaData(new MockConnector(_server));
+        HttpChannel channel = new HttpChannelState(connectionMetaData);
+        MockHttpStream stream = new MockHttpStream(channel);
+        HttpFields fields = HttpFields.build().add(HttpHeader.HOST, "localhost").asImmutable();
+        MetaData.Request request = new MetaData.Request("GET", HttpURI.from("http://localhost/ctx"), HttpVersion.HTTP_1_1, fields, 0);
+        Runnable task = channel.onRequest(request);
+        task.run();
+
+        assertThat(stream.isComplete(), is(true));
+        assertThat(stream.getFailure(), nullValue());
+        assertThat(stream.getResponse(), notNullValue());
+        assertThat(stream.getResponse().getStatus(), equalTo(301));
+        assertThat(stream.getResponseHeaders().get(HttpHeader.LOCATION), equalTo("/ctx/"));
+
+        _contextHandler.stop();
+        _contextHandler.setAllowNullPathInContext(true);
+        _contextHandler.start();
+
+        stream = new MockHttpStream(channel);
+        fields = HttpFields.build().add(HttpHeader.HOST, "localhost").asImmutable();
+        request = new MetaData.Request("GET", HttpURI.from("http://localhost/ctx"), HttpVersion.HTTP_1_1, fields, 0);
+        task = channel.onRequest(request);
+        task.run();
+
+        assertThat(stream.getResponse().getStatus(), equalTo(200));
+        assertThat(stream.getResponseHeaders().get(HttpHeader.CONTENT_TYPE), equalTo(MimeTypes.Type.TEXT_PLAIN_UTF_8.asString()));
+        // The original fields have been recycled.
+        assertThat(stream.getResponse().getFields().size(), equalTo(0));
+        assertThat(BufferUtil.toString(stream.getResponseContent()), equalTo(helloHandler.getMessage()));
+    }
+
     @Test
     public void testSetAvailable() throws Exception
     {

jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java

@@ -40,6 +40,8 @@
 import java.util.ServiceConfigurationError;
 import java.util.ServiceLoader;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
@@ -61,6 +63,7 @@ public class TypeUtil
     public static final Class<?>[] NO_ARGS = new Class[]{};
     public static final int CR = '\r';
     public static final int LF = '\n';
+    private static final  Pattern TRAILING_DIGITS = Pattern.compile("^\\D*(\\d+)$");
 
     private static final HashMap<String, Class<?>> name2Class = new HashMap<>();
 
@@ -253,7 +256,12 @@ public static String toShortName(Class<?> type)
             {
                 String[] ss = p.split("\\.");
                 for (String s : ss)
+                {
                     b.append(s.charAt(0));
+                    Matcher matcher = TRAILING_DIGITS.matcher(s);
+                    if (matcher.matches())
+                        b.append(matcher.group(1));
+                }
             }
             b.append('.');
         }

jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/TypeUtilTest.java

@@ -19,6 +19,7 @@
 
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
+import org.eclipse.jetty.util.test10.TestClass;
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -27,6 +28,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
+import static org.hamcrest.Matchers.is;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -236,4 +238,20 @@ public void testGetLocationJavaLangThreadDeathJPMS()
         String expectedJavaBase = "/java.base";
         assertThat(TypeUtil.getLocationOfClass(java.lang.ThreadDeath.class).toASCIIString(), containsString(expectedJavaBase));
     }
+
+    public static Stream<Arguments> shortNames()
+    {
+        return Stream.of(
+            Arguments.of(TypeUtilTest.class, "oeju.TypeUtilTest"),
+            Arguments.of(TestClass.class, "oejut10.TestClass")
+        );
+    }
+
+    @ParameterizedTest
+    @MethodSource("shortNames")
+    public void testToShortName(Class<?> clazz, String shortName)
+    {
+        assertThat(TypeUtil.toShortName(clazz), is(shortName));
+    }
+
 }

jetty-core/jetty-util/src/test/java/org/eclipse/jetty/util/test10/TestClass.java

@@ -0,0 +1,18 @@
+//
+// ========================================================================
+// Copyright (c) 1995-2022 Mort Bay Consulting Pty Ltd and others.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+// which is available at https://www.apache.org/licenses/LICENSE-2.0.
+//
+// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+// ========================================================================
+//
+
+package org.eclipse.jetty.util.test10;
+
+public class TestClass
+{
+}

jetty-ee9/jetty-ee9-nested/src/main/java/org/eclipse/jetty/ee9/nested/ContextHandler.java

@@ -198,7 +198,6 @@ public enum ContextStatus
     private String[] _welcomeFiles;
     private ErrorHandler _errorHandler;
     private Logger _logger;
-    private boolean _allowNullPathInfo;
     private int _maxFormKeys = Integer.getInteger(MAX_FORM_KEYS_KEY, DEFAULT_MAX_FORM_KEYS);
     private int _maxFormContentSize = Integer.getInteger(MAX_FORM_CONTENT_SIZE_KEY, DEFAULT_MAX_FORM_CONTENT_SIZE);
     private boolean _compactPath = false;
@@ -238,6 +237,7 @@ protected ContextHandler(APIContext context,
                              String contextPath)
     {
         _coreContextHandler = new CoreContextHandler();
+        addBean(_coreContextHandler, false);
         _apiContext = context == null ? new APIContext() : context;
         _initParams = new HashMap<>();
         if (contextPath != null)
@@ -274,7 +274,7 @@ public APIContext getServletContext()
     @ManagedAttribute("Checks if the /context is not redirected to /context/")
     public boolean getAllowNullPathInfo()
     {
-        return _allowNullPathInfo;
+        return _coreContextHandler.getAllowNullPathInContext();
     }
 
     // TODO this is a thought bubble
@@ -294,7 +294,7 @@ public boolean isCanonicalEncodingURIs()
      */
     public void setAllowNullPathInfo(boolean allowNullPathInfo)
     {
-        _allowNullPathInfo = allowNullPathInfo;
+        _coreContextHandler.setAllowNullPathInContext(allowNullPathInfo);
     }
 
     @Override
@@ -612,10 +612,16 @@ protected void doStart() throws Exception
         // we need to run ourselves in the core context
         if (org.eclipse.jetty.server.handler.ContextHandler.getCurrentContext() != _coreContextHandler.getContext())
         {
-            _coreContextHandler.getContext().call(this::doStart, null);
-            return;
+            _coreContextHandler.unmanage(this);
+            _coreContextHandler.start();
+            _coreContextHandler.manage(this);
         }
 
+        _coreContextHandler.getContext().call(this::doStartInContext, null);
+    }
+
+    protected void doStartInContext() throws Exception
+    {
         if (_logger == null)
             _logger = LoggerFactory.getLogger(ContextHandler.class.getName() + getLogNameSuffix());
 
@@ -631,6 +637,57 @@ protected void doStart() throws Exception
         contextInitialized();
     }
 
+    @Override
+    protected void doStop() throws Exception
+    {
+        // If we are being stopped directly (rather than via a start of the CoreContextHandler), then
+        // we need to stop ourselves in the core context
+        if (org.eclipse.jetty.server.handler.ContextHandler.getCurrentContext() != _coreContextHandler.getContext())
+        {
+            _coreContextHandler.unmanage(this);
+            _coreContextHandler.stop();
+            _coreContextHandler.manage(this);
+        }
+        _coreContextHandler.getContext().call(this::doStopInContext, null);
+    }
+
+    protected void doStopInContext() throws Exception
+    {
+        try
+        {
+            stopContext();
+            contextDestroyed();
+
+            // retain only durable listeners
+            setEventListeners(_durableListeners);
+            _durableListeners.clear();
+
+            if (_errorHandler != null)
+                _errorHandler.stop();
+
+            for (EventListener l : _programmaticListeners)
+            {
+                removeEventListener(l);
+                if (l instanceof ContextScopeListener)
+                {
+                    try
+                    {
+                        ((ContextScopeListener)l).exitScope(_apiContext, null);
+                    }
+                    catch (Throwable e)
+                    {
+                        LOG.warn("Unable to exit scope", e);
+                    }
+                }
+            }
+            _programmaticListeners.clear();
+        }
+        finally
+        {
+            _contextStatus = ContextStatus.NOTSET;
+        }
+    }
+
     private String getLogNameSuffix()
     {
         // Use display name first
@@ -770,44 +827,6 @@ protected void callContextDestroyed(ServletContextListener l, ServletContextEven
         l.contextDestroyed(e);
     }
 
-    @Override
-    protected void doStop() throws Exception
-    {
-        try
-        {
-            stopContext();
-            contextDestroyed();
-
-            // retain only durable listeners
-            setEventListeners(_durableListeners);
-            _durableListeners.clear();
-
-            if (_errorHandler != null)
-                _errorHandler.stop();
-
-            for (EventListener l : _programmaticListeners)
-            {
-                removeEventListener(l);
-                if (l instanceof ContextScopeListener)
-                {
-                    try
-                    {
-                        ((ContextScopeListener)l).exitScope(_apiContext, null);
-                    }
-                    catch (Throwable e)
-                    {
-                        LOG.warn("Unable to exit scope", e);
-                    }
-                }
-            }
-            _programmaticListeners.clear();
-        }
-        finally
-        {
-            _contextStatus = ContextStatus.NOTSET;
-        }
-    }
-
     @Override
     public void doScope(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
     {
@@ -1279,20 +1298,7 @@ public String toString()
 
         StringBuilder b = new StringBuilder();
 
-        Package pkg = getClass().getPackage();
-        if (pkg != null)
-        {
-            String p = pkg.getName();
-            if (p.length() > 0)
-            {
-                String[] ss = p.split("\\.");
-                for (String s : ss)
-                {
-                    b.append(s.charAt(0)).append('.');
-                }
-            }
-        }
-        b.append(getClass().getSimpleName()).append('@').append(Integer.toString(hashCode(), 16));
+        b.append(TypeUtil.toShortName(getClass())).append('@').append(Integer.toString(hashCode(), 16));
         b.append('{');
         if (getDisplayName() != null)
             b.append(getDisplayName()).append(',');