Merge pull request #42 from frengor/gradle-checksum

Improve `checksum` methods

Author: AlessioDP

core/src/main/java/com/alessiodp/libby/Library.java

@@ -528,25 +528,25 @@ public Builder checksum(byte @Nullable [] checksum) {
         }
 
         /**
-         * Sets the Base64 hexadecimal bytes encoded SHA-256 checksum for this library.
+         * Sets the SHA-256 checksum for this library.
          *
-         * @param checksum Base64 binary encoded SHA-256 checksum
+         * @param checksum SHA-256 checksum
          * @return this builder
          */
         @NotNull
         public Builder checksum(@Nullable String checksum) {
-            return checksum != null ? checksum(Base64.getDecoder().decode(checksum)) : this;
+            return checksum != null ? checksum(hexStringToByteArray(checksum)) : this;
         }
 
         /**
-         * Sets the SHA-256 checksum for this library.
+         * Sets the Base64 hexadecimal bytes encoded SHA-256 checksum for this library.
          *
-         * @param checksum SHA-256 checksum
+         * @param checksum Base64 binary encoded SHA-256 checksum
          * @return this builder
          */
         @NotNull
-        public Builder checksumFromSha256(@Nullable String checksum) {
-            return checksum != null ? checksum(hexStringToByteArray(checksum)) : this;
+        public Builder checksumFromBase64(@Nullable String checksum) {
+            return checksum != null ? checksum(Base64.getDecoder().decode(checksum)) : this;
         }
 
         /**

core/src/main/java/com/alessiodp/libby/classloader/ClassLoaderHelper.java

@@ -303,7 +303,7 @@ protected Instrumentation initInstrumentation(LibraryManager libraryManager) thr
                             .groupId("net{}bytebuddy")
                             .artifactId("byte-buddy-agent")
                             .version("1.12.1")
-                            .checksum("mcCtBT9cljUEniB5ESpPDYZMfVxEs1JRPllOiWTP+bM=")
+                            .checksumFromBase64("mcCtBT9cljUEniB5ESpPDYZMfVxEs1JRPllOiWTP+bM=")
                             .repository(Repositories.MAVEN_CENTRAL)
                             .build()
             ));

core/src/main/java/com/alessiodp/libby/configuration/ConfigurationFetcher.java

@@ -104,7 +104,7 @@ public ConfigurationFetcher(@NotNull LibraryManager libraryManager) {
                         .groupId("com{}grack")
                         .artifactId("nanojson")
                         .version("1.8")
-                        .checksum("qyhAVZM8LYvqhGQrbmW2aHV4hRzn+2flPCV98wAimJo=")
+                        .checksumFromBase64("qyhAVZM8LYvqhGQrbmW2aHV4hRzn+2flPCV98wAimJo=")
                         .repository(Repositories.MAVEN_CENTRAL)
                         .build()
         ));
@@ -343,7 +343,8 @@ private Set<ExcludedDependency> fetchExcludedTransitiveDependencies(@NotNull Map
      * </ul>
      * Optional properties:
      * <ul>
-     *     <li>checksum: The SHA-256 checksum of the library, must be a base64 encoded string and may only be included if the library is a JAR</li>
+     *     <li>checksum: The SHA-256 checksum of the library, may only be included if the library is a JAR</li>
+     *     <li>checksumFromBase64: The SHA-256 checksum of the library, must be a base64 encoded string and may only be included if the library is a JAR</li>
      *     <li>classifier: The artifact classifier of the library</li>
      *     <li>isolatedLoad: Whether to load this library in an IsolatedClassLoader</li>
      *     <li>loaderId: The loader ID of this library</li>
@@ -399,8 +400,14 @@ private List<Library> fetchLibraries(@NotNull Map<String, Object> configuration,
                 String checksum = getString(library, "checksum");
 
                 if (checksum != null) {
+                    libraryBuilder.checksum(checksum);
+                }
+
+                String checksumFromBase64 = getString(library, "checksumFromBase64");
+
+                if (checksumFromBase64 != null) {
                     try {
-                        libraryBuilder.checksum(checksum);
+                        libraryBuilder.checksumFromBase64(checksumFromBase64);
                     } catch (IllegalArgumentException ignored) {
                         throw new ConfigurationException("The checksum property must be a valid base64 encoded SHA-256 checksum");
                     }

core/src/main/java/com/alessiodp/libby/relocation/RelocationHelper.java

@@ -66,7 +66,7 @@ public RelocationHelper(@NotNull LibraryManager libraryManager) {
                    .groupId("org{}ow2{}asm")
                    .artifactId("asm-commons")
                    .version("9.2")
-                   .checksum("vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=")
+                   .checksumFromBase64("vkzlMTiiOLtSLNeBz5Hzulzi9sqT7GLUahYqEnIl4KY=")
                    .repository(Repositories.MAVEN_CENTRAL)
                    .build()
         ));
@@ -77,7 +77,7 @@ public RelocationHelper(@NotNull LibraryManager libraryManager) {
                    .groupId("org{}ow2{}asm")
                    .artifactId("asm")
                    .version("9.2")
-                   .checksum("udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=")
+                   .checksumFromBase64("udT+TXGTjfOIOfDspCqqpkz4sxPWeNoDbwyzyhmbR/U=")
                    .repository(Repositories.MAVEN_CENTRAL)
                    .build()
         ));
@@ -88,7 +88,7 @@ public RelocationHelper(@NotNull LibraryManager libraryManager) {
                    .groupId("me{}lucko")
                    .artifactId("jar-relocator")
                    .version("1.7")
-                   .checksum("b30RhOF6kHiHl+O5suNLh/+eAr1iOFEFLXhwkHHDu4I=")
+                   .checksumFromBase64("b30RhOF6kHiHl+O5suNLh/+eAr1iOFEFLXhwkHHDu4I=")
                    .repository(Repositories.MAVEN_CENTRAL)
                    .build()
         ));

core/src/main/java/com/alessiodp/libby/transitive/TransitiveLibraryResolutionDependency.java

@@ -51,7 +51,7 @@ public Library toLibrary() {
                 .groupId(groupId)
                 .artifactId(artifactId)
                 .version(version)
-                .checksum(checksum)
+                .checksumFromBase64(checksum)
                 .repository(Repositories.MAVEN_CENTRAL)
                 // Relocate all packages used in Libby to avoid conflicts
                 .relocate("org{}eclipse{}aether{}util", "org.eclipse.aether.util") // maven-resolver-util

core/src/test/java/com/alessiodp/libby/ConfigurationFetcherTest.java

@@ -26,7 +26,6 @@ public class ConfigurationFetcherTest {
     private LibraryManagerMock libraryManager;
     private ConfigurationFetcher configurationFetcher;
 
-
     @BeforeEach
     public void setUp() throws Exception {
         libraryManager = new LibraryManagerMock();
@@ -123,7 +122,7 @@ public void testFails() {
         assertTrue(ex.getMessage().contains("version property"));
 
         // Invalid checksum
-        ex = assertThrows(ConfigurationException.class, () -> parseAndRead("{\"libraries\":[{\"groupId\":\"\",\"artifactId\":\"\",\"version\":\"\",\"checksum\":\"invalid-checksum\"}]}"));
+        ex = assertThrows(ConfigurationException.class, () -> parseAndRead("{\"libraries\":[{\"groupId\":\"\",\"artifactId\":\"\",\"version\":\"\",\"checksumFromBase64\":\"invalid-checksum\"}]}"));
         assertTrue(ex.getMessage().contains("valid base64"));
     }
 

core/src/test/java/com/alessiodp/libby/TestUtils.java

@@ -22,7 +22,7 @@ public class TestUtils {
             .groupId("org{}apache{}commons")
             .artifactId("commons-lang3")
             .version("3.13.0")
-            .checksum("gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=")
+            .checksumFromBase64("gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=")
             .build();
     public static final Library APACHE_COMMONS_LANG3_ISOLATED = Library.builder()
             .groupId(APACHE_COMMONS_LANG3.getGroupId())

standalone/src/test/java/com/alessiodp/libby/TestUtils.java

@@ -8,6 +8,6 @@ public class TestUtils {
             .groupId("org{}apache{}commons")
             .artifactId("commons-lang3")
             .version("3.13.0")
-            .checksum("gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=")
+            .checksumFromBase64("gvUoz3GMejwvMPxbx4TjxqChCxdgXa254WyC7eEeYGQ=")
             .build();
 }