From b007ea211780908f75742b08ded318f827309d00 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Fri, 18 Apr 2025 07:03:49 -0400
Subject: [PATCH 1/4] Remove redundant code

---
 .../dependency/analyzer/ProjectDependencyAnalysis.java      | 6 +++---
 .../shared/dependency/analyzer/asm/ConstantPoolParser.java  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
index 71e2496b..3465637c 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
@@ -65,11 +65,11 @@ public ProjectDependencyAnalysis(
             Set<Artifact> usedDeclaredArtifacts,
             Set<Artifact> usedUndeclaredArtifacts,
             Set<Artifact> unusedDeclaredArtifacts) {
-        this(usedDeclaredArtifacts, usedUndeclaredArtifacts, unusedDeclaredArtifacts, Collections.<Artifact>emptySet());
+        this(usedDeclaredArtifacts, usedUndeclaredArtifacts, unusedDeclaredArtifacts, Collections.emptySet());
     }
 
     /**
-     * <p>Constructor for ProjectDependencyAnalysis.</p>
+     * Constructor for ProjectDependencyAnalysis.
      *
      * @param usedDeclaredArtifacts artifacts both used and declared
      * @param usedUndeclaredArtifacts artifacts used but not declared
@@ -343,7 +343,7 @@ private static Map<Artifact, Set<DependencyUsage>> mapWithKeys(Set<Artifact> key
         Map<Artifact, Set<DependencyUsage>> map = new LinkedHashMap<>();
 
         for (Artifact k : keys) {
-            map.put(k, Collections.<DependencyUsage>emptySet());
+            map.put(k, CollectionsemptySet());
         }
 
         return map;
diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
index 76da741b..eafd7e5d 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
@@ -208,7 +208,7 @@ private static String decodeString(ByteBuffer buf) {
         // Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
         @SuppressWarnings("RedundantCast")
         int oldLimit = ((Buffer) buf).limit();
-        ((Buffer) buf).limit(buf.position() + size);
+        buf.limit(buf.position() + size);
         StringBuilder sb = new StringBuilder(size + (size >> 1) + 16);
         while (buf.hasRemaining()) {
             byte b = buf.get();
@@ -224,7 +224,7 @@ private static String decodeString(ByteBuffer buf) {
                 }
             }
         }
-        ((Buffer) buf).limit(oldLimit);
+        buf.limit(oldLimit);
         return sb.toString();
     }
 

From 65a2d6bd45047050cec262576c0c2fe2e45e85a6 Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Fri, 18 Apr 2025 07:09:21 -0400
Subject: [PATCH 2/4] fix

---
 .../shared/dependency/analyzer/ProjectDependencyAnalysis.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
index 3465637c..5d0141ac 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
@@ -343,7 +343,7 @@ private static Map<Artifact, Set<DependencyUsage>> mapWithKeys(Set<Artifact> key
         Map<Artifact, Set<DependencyUsage>> map = new LinkedHashMap<>();
 
         for (Artifact k : keys) {
-            map.put(k, CollectionsemptySet());
+            map.put(k, Collections.emptySet());
         }
 
         return map;

From 316b8dd483067904c6cb7c4a6b889e32b8c2fe0b Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Fri, 18 Apr 2025 10:47:14 -0400
Subject: [PATCH 3/4] link

---
 .../dependency/analyzer/asm/ConstantPoolParser.java  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
index eafd7e5d..535187fc 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
@@ -33,7 +33,7 @@
  * A small parser to read the constant pool directly, in case it contains references
  * ASM does not support.
  *
- * Adapted from http://stackoverflow.com/a/32278587/23691
+ * Adapted from <a href="https://stackoverflow.com/questions/32255023/how-would-i-go-about-parsing-the-java-class-file-constant-pool/32278587#32278587">Stack Overflow</a>
  *
  * Constant pool types:
  *
@@ -108,7 +108,7 @@ static Set<String> getConstantPoolClassReferences(byte[] b) {
         return parseConstantPoolClassReferences(ByteBuffer.wrap(b));
     }
 
-    static Set<String> parseConstantPoolClassReferences(ByteBuffer buf) {
+    private static Set<String> parseConstantPoolClassReferences(ByteBuffer buf) {
         if (buf.order(ByteOrder.BIG_ENDIAN).getInt() != HEAD) {
             return Collections.emptySet();
         }
@@ -203,12 +203,12 @@ private static void addClassToResult(Set<String> result, String className) {
         }
     }
 
+    @SuppressWarnings("RedundantCast")
     private static String decodeString(ByteBuffer buf) {
         int size = buf.getChar();
+        int oldLimit = buf.limit();
         // Explicit cast for compatibility with covariant return type on JDK 9's ByteBuffer
-        @SuppressWarnings("RedundantCast")
-        int oldLimit = ((Buffer) buf).limit();
-        buf.limit(buf.position() + size);
+        ((Buffer) buf).limit(buf.position() + size);
         StringBuilder sb = new StringBuilder(size + (size >> 1) + 16);
         while (buf.hasRemaining()) {
             byte b = buf.get();
@@ -224,7 +224,7 @@ private static String decodeString(ByteBuffer buf) {
                 }
             }
         }
-        buf.limit(oldLimit);
+        ((Buffer) buf).limit(oldLimit);
         return sb.toString();
     }
 

From fc7824224f0cd52be42bb48abf84f70d33226a4f Mon Sep 17 00:00:00 2001
From: Elliotte Rusty Harold <elharo@ibiblio.org>
Date: Thu, 10 Jul 2025 10:52:01 -0400
Subject: [PATCH 4/4] move default to end

---
 .../shared/dependency/analyzer/asm/ConstantPoolParser.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
index 535187fc..1b9da80b 100644
--- a/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
+++ b/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ConstantPoolParser.java
@@ -120,8 +120,6 @@ private static Set<String> parseConstantPoolClassReferences(ByteBuffer buf) {
         for (int ix = 1, num = buf.getChar(); ix < num; ix++) {
             byte tag = buf.get();
             switch (tag) {
-                default:
-                    throw new RuntimeException("Unknown constant pool type '" + tag + "'");
                 case CONSTANT_UTF8:
                     stringConstants.put(ix, decodeString(buf));
                     break;
@@ -172,6 +170,8 @@ private static Set<String> parseConstantPoolClassReferences(ByteBuffer buf) {
                 case CONSTANT_PACKAGE:
                     consumePackage(buf);
                     break;
+                default:
+                    throw new RuntimeException("Unknown constant pool type '" + tag + "'");
             }
         }