refactor: remove classes from jrt-fs jar (#171)

* refactor: remove indexing of jrt-fs jar because it is not used by JVM * Fix tests
chains-project · Mar 7, 2024 · 0b13ef3 · 0b13ef3
1 parent 5db584f
commit 0b13ef3
Show file tree

Hide file tree

Showing 5 changed files with 119 additions and 140 deletions.
diff --git a/classfile-fingerprint/src/main/java/io/github/algomaster99/terminator/index/JdkIndexer.java b/classfile-fingerprint/src/main/java/io/github/algomaster99/terminator/index/JdkIndexer.java
@@ -34,10 +34,6 @@ Map<String, Set<ClassFileAttributes>> createOrMergeProvenances(
                 referenceProvenance.computeIfAbsent(
                         resource.name(),
                         k -> new HashSet<>(Set.of(new ClassFileAttributes(classfileVersion, hash, algorithm))));
-                referenceProvenance.computeIfPresent(resource.name(), (k, v) -> {
-                    v.add(new ClassFileAttributes(classfileVersion, hash, algorithm));
-                    return v;
-                });
             } catch (NoSuchAlgorithmException e) {
                 LOGGER.error("Failed to compute hash with algorithm: " + algorithm, e);
                 throw new RuntimeException(e);

diff --git a/...ile-fingerprint/src/test/java/io/github/algomaster99/terminator/index/JdkIndexerTest.java b/...ile-fingerprint/src/test/java/io/github/algomaster99/terminator/index/JdkIndexerTest.java
@@ -49,6 +49,10 @@ void jdk21_0_2_indexShouldBeReproducible_temurin(@TempDir Path tempDir) throws I
         List<String> actual = Files.readAllLines(actualIndex);
         List<String> expected = Files.readAllLines(expectedIndex);
         assertThat(actual).isEqualTo(expected);
+
+        Map<String, Set<ClassFileAttributes>> referenceProvenance = ParsingHelper.deserializeFingerprints(actualIndex);
+        referenceProvenance.values().forEach(classFileAttributes -> assertThat(classFileAttributes.size())
+                .isEqualTo(1));
     }
 
     @EnabledOnJre(JRE.JAVA_17)
@@ -66,6 +70,10 @@ void jdk17_0_10_indexShouldBeReproducibleAcrossMultiple_implementations(@TempDir
         List<String> actual = Files.readAllLines(actualIndex);
         List<String> expected = Files.readAllLines(expectedIndex);
         assertThat(actual).isEqualTo(expected);
+
+        Map<String, Set<ClassFileAttributes>> referenceProvenance = ParsingHelper.deserializeFingerprints(actualIndex);
+        referenceProvenance.values().forEach(classFileAttributes -> assertThat(classFileAttributes.size())
+                .isEqualTo(1));
     }
 
     @Test