From f56a275f9d2f68d8a36f8b96e6d276aee2df8caa Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Mon, 1 Jul 2024 13:02:38 -0700 Subject: [PATCH] Deprecate `WebApp#mimeTypes` --- core/src/main/java/org/kohsuke/stapler/Stapler.java | 6 +----- core/src/main/java/org/kohsuke/stapler/WebApp.java | 3 +++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/org/kohsuke/stapler/Stapler.java b/core/src/main/java/org/kohsuke/stapler/Stapler.java index a63bd9862..5cd869a1c 100644 --- a/core/src/main/java/org/kohsuke/stapler/Stapler.java +++ b/core/src/main/java/org/kohsuke/stapler/Stapler.java @@ -675,11 +675,7 @@ private String getMimeType(String fileName) { idx = fileName.lastIndexOf('\\'); fileName = fileName.substring(idx + 1); - String extension = fileName.substring(fileName.lastIndexOf('.') + 1); - String mimeType = webApp.mimeTypes.get(extension); - if (mimeType == null) { - mimeType = getServletContext().getMimeType(fileName); - } + String mimeType = getServletContext().getMimeType(fileName); if (mimeType == null) { mimeType = "application/octet-stream"; } diff --git a/core/src/main/java/org/kohsuke/stapler/WebApp.java b/core/src/main/java/org/kohsuke/stapler/WebApp.java index 3525bada8..75a48d29e 100644 --- a/core/src/main/java/org/kohsuke/stapler/WebApp.java +++ b/core/src/main/java/org/kohsuke/stapler/WebApp.java @@ -111,7 +111,10 @@ public static WebApp get(ServletContext context) { * * This overrides whatever mappings given in the servlet as far as stapler is concerned. * This is case insensitive, and should be normalized to lower case. + * + * @deprecated removed without replacement */ + @Deprecated public final Map mimeTypes = new Hashtable<>(); private volatile ClassLoader classLoader;