From 0626b7956df93cff12386ec86282b0b9791d8064 Mon Sep 17 00:00:00 2001 From: Dave Brosius Date: Sat, 18 Jan 2025 14:30:36 -0500 Subject: [PATCH] chore: support jakarta web methods --- build.properties | 2 +- pom.xml | 10 ++++---- .../mebigfatguy/deadmethods/DeadMethods.java | 23 +++++++++++++++---- 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/build.properties b/build.properties index d2b0928..eb372a7 100755 --- a/build.properties +++ b/build.properties @@ -3,4 +3,4 @@ # Dave Brosius -deadmethods.version = 0.9.2 +deadmethods.version = 0.9.3 diff --git a/pom.xml b/pom.xml index 7d1b5fa..0d21aae 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.mebigfatguy.deadmethods deadmethods - 0.9.2 + 0.9.3 org.sonatype.oss @@ -48,7 +48,7 @@ org.ow2.asm asm - 9.7 + 9.7.1 jakarta.servlet @@ -59,17 +59,17 @@ org.springframework spring-beans - 5.3.34 + 5.3.39 org.springframework spring-context - 5.3.34 + 5.3.39 org.apache.ant ant - 1.10.14 + 1.10.15 compile diff --git a/src/main/java/com/mebigfatguy/deadmethods/DeadMethods.java b/src/main/java/com/mebigfatguy/deadmethods/DeadMethods.java index 5b45fa8..b9734d8 100644 --- a/src/main/java/com/mebigfatguy/deadmethods/DeadMethods.java +++ b/src/main/java/com/mebigfatguy/deadmethods/DeadMethods.java @@ -470,12 +470,25 @@ private void removeSPIClasses(ClassRepository repo, Set methods) throws } private void removeWebMethods(ClassRepository repo, Set methods) throws IOException { - ClassInfo info = repo.getClassInfo("javax/servlet/http/HttpServlet"); - - for (MethodInfo methodInfo : info.getMethodInfo()) { - clearDerivedMethods(methods, info, methodInfo.toString()); + try { + ClassInfo info = repo.getClassInfo("javax/servlet/http/HttpServlet"); + + for (MethodInfo methodInfo : info.getMethodInfo()) { + clearDerivedMethods(methods, info, methodInfo.toString()); + } + logger.verbose("Standard javax Web methods removed"); + } catch (IOException e) { + } + + try { + ClassInfo info = repo.getClassInfo("jakarta/servlet/http/HttpServlet"); + + for (MethodInfo methodInfo : info.getMethodInfo()) { + clearDerivedMethods(methods, info, methodInfo.toString()); + } + logger.verbose("Standard jakarta Web methods removed"); + } catch (IOException e) { } - logger.verbose("Standard Web methods removed"); } private void clearDerivedMethods(Set methods, ClassInfo info, String methodInfo) {