updates from review

jetty · May 19, 2024 · 99c6de8 · 99c6de8
1 parent 5a21f5e
commit 99c6de8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ClassMatcher.java b/jetty-core/jetty-util/src/main/java/org/eclipse/jetty/util/ClassMatcher.java
@@ -525,6 +525,7 @@ public ClassMatcher(String pattern)
         add(pattern);
     }
 
+    @Deprecated
     protected interface Constructor<T extends ClassMatcher>
     {
          T construct(Map<String, Entry> entries, IncludeExcludeSet<Entry, String> patterns, IncludeExcludeSet<Entry, URI> locations);
@@ -537,7 +538,9 @@ protected interface Constructor<T extends ClassMatcher>
      * @param constructor The constructor to build the API specific wrapper
      * @param <T> The type of the API specific wrapper
      * @return A wrapper of the {@code matcher}, sharing internal state.
+     * @deprecated use {@link ClassMatcher} directly.
      */
+    @Deprecated
     protected static <T extends ClassMatcher> T wrap(ClassMatcher matcher, Constructor<T> constructor)
     {
         return constructor.construct(matcher._entries, matcher._patterns, matcher._locations);

diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/ClassMatcher.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/ClassMatcher.java
@@ -68,7 +68,7 @@ public ClassMatcher asImmutable()
      * @param matcher The util {@link org.eclipse.jetty.util.ClassMatcher} to wrap
      * @return A {@link ClassMatcher webapp ClassMatcher}
      */
-    public static ClassMatcher wrap(org.eclipse.jetty.util.ClassMatcher matcher)
+    static ClassMatcher wrap(org.eclipse.jetty.util.ClassMatcher matcher)
     {
         Constructor<ClassMatcher> constructor = ClassMatcher::new;
         return wrap(matcher, constructor);