Merge branch 'release/0.3.0'

Fixed: #5

Author: io7m

net.adoptopenjdk.v3.api/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>net.adoptopenjdk</artifactId>
     <groupId>net.adoptopenjdk</groupId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>net.adoptopenjdk.v3.api</artifactId>

net.adoptopenjdk.v3.api/src/main/java/net/adoptopenjdk/v3/api/AOV3InstallerType.java

@@ -33,7 +33,7 @@ public interface AOV3InstallerType
    * @return The checksum of the data
    */
 
-  String checksum();
+  Optional<String> checksum();
 
   /**
    * @return A link to the checksum of the data

net.adoptopenjdk.v3.tests/pom.xml

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>net.adoptopenjdk</artifactId>
     <groupId>net.adoptopenjdk</groupId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>net.adoptopenjdk.v3.tests</artifactId>

net.adoptopenjdk.v3.tests/src/test/java/net/adoptopenjdk/v3/tests/AOV3ResponseParsersTest.java

@@ -16,6 +16,7 @@
 
 import net.adoptopenjdk.v3.api.AOV3Error;
 import net.adoptopenjdk.v3.api.AOV3ExceptionParseFailed;
+import net.adoptopenjdk.v3.api.AOV3Installer;
 import net.adoptopenjdk.v3.vanilla.AOV3ResponseParsers;
 import net.adoptopenjdk.v3.vanilla.AOV3ResponseParsersType;
 import org.apache.commons.io.input.BrokenInputStream;
@@ -274,6 +275,37 @@ public void testAssetsForLatest()
     Assertions.assertEquals(0, this.errors.size());
   }
 
+  @Test
+  public void testAssetsForReleases8()
+    throws Exception
+  {
+    final var stream = resource("releases8.json");
+    final var parser =
+      this.parsers.createParser(this::logError, URI.create("urn:test"), stream);
+    final var releases = parser.parseAssetsForRelease();
+
+    for (final var release : releases) {
+      LOG.debug("release {}", release.id());
+      for (final var binary : release.binaries()) {
+        LOG.debug("release {} binary {}", release.id(), binary.package_().name());
+        final var packChecksumOpt = binary.package_().checksum();
+        if (packChecksumOpt.isPresent()) {
+          final var checksum = packChecksumOpt.get();
+          Assertions.assertFalse(checksum.isBlank());
+        }
+
+        final var instChecksumOpt =
+          binary.installer().flatMap(AOV3Installer::checksum);
+        if (instChecksumOpt.isPresent()) {
+          final var checksum = instChecksumOpt.get();
+          Assertions.assertFalse(checksum.isBlank());
+        }
+      }
+    }
+
+    Assertions.assertEquals(0, this.errors.size());
+  }
+
   private void testAssetsForReleaseFuzzOnce(
     final Integer index)
     throws Exception

net.adoptopenjdk.v3.tests/src/test/resources/net/adoptopenjdk/v3/tests/releases8.json

@@ -9,7 +9,7 @@
   <parent>
     <artifactId>net.adoptopenjdk</artifactId>
     <groupId>net.adoptopenjdk</groupId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
   </parent>
 
   <artifactId>net.adoptopenjdk.v3.vanilla</artifactId>

net.adoptopenjdk.v3.vanilla/pom.xml

@@ -115,7 +115,7 @@ public static final class AOV3ReleaseVersionsJSON implements AOV3ASTMemberType
   public static final class AOV3InstallerJSON implements AOV3ASTMemberType
   {
     @JsonProperty(value = "checksum", required = true)
-    String checksum = "";
+    String checksum;
 
     @JsonProperty(value = "checksum_link", required = true)
     URI checksumLink;
@@ -140,7 +140,7 @@ public static final class AOV3InstallerJSON implements AOV3ASTMemberType
   public static final class AOV3PackageJSON implements AOV3ASTMemberType
   {
     @JsonProperty(value = "checksum", required = true)
-    String checksum = "";
+    String checksum;
 
     @JsonProperty(value = "checksum_link", required = true)
     URI checksumLink;

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3AST.java

@@ -137,7 +137,7 @@ private static AOV3Installer toInstaller(
     final AOV3AST.AOV3InstallerJSON installer)
   {
     final var checksum =
-      Objects.requireNonNull(installer.checksum, "installer.checksum");
+      Optional.ofNullable(installer.checksum);
     final var checksumLink =
       Optional.ofNullable(installer.checksumLink);
     final var downloadCount =
@@ -168,7 +168,7 @@ private static AOV3Package toPackage(
     final AOV3AST.AOV3PackageJSON package_)
   {
     final var checksum =
-      Objects.requireNonNull(package_.checksum, "package_.checksum");
+      Optional.ofNullable(package_.checksum);
     final var checksumLink =
       Optional.ofNullable(package_.checksumLink);
     final var downloadCount =

net.adoptopenjdk.v3.vanilla/src/main/java/net/adoptopenjdk/v3/vanilla/AOV3ResponseParser.java

@@ -14,7 +14,7 @@
 
   <groupId>net.adoptopenjdk</groupId>
   <artifactId>net.adoptopenjdk</artifactId>
-  <version>0.2.0</version>
+  <version>0.3.0</version>
   <packaging>pom</packaging>
 
   <name>net.adoptopenjdk</name>