Java 5 to Java 8 updates.

Author: dghgit

core/src/test/java/org/bouncycastle/pqc/crypto/test/MLDSATest.java

@@ -641,7 +641,7 @@ public boolean processVerify(MLDSAPublicKeyParameters pubParams, byte[] msg, byt
     private static List<TestVector> parseTestVectors(InputStream src)
         throws IOException
     {
-        List<TestVector> vectors = new ArrayList<>();
+        List<TestVector> vectors = new ArrayList<TestVector>();
         BufferedReader bin = new BufferedReader(new InputStreamReader(src));
 
         TestVector currentVector = null;
@@ -678,7 +678,7 @@ private static List<TestVector> parseTestVectors(InputStream src)
             if (fieldMatcher.find())
             {
                 currentField = fieldMatcher.group(1);
-                currentBytes = new ArrayList<>();
+                currentBytes = new ArrayList<Byte>();
                 line = line.substring(fieldMatcher.end()).trim();
             }
 
@@ -721,24 +721,27 @@ private static void setField(TestVector vector, String field, List<Byte> bytes)
             byteArray[i] = bytes.get(i);
         }
 
-        switch (field)
+        if ("seed".equals(field))
         {
-        case "seed":
             vector.seed = byteArray;
-            break;
-        case "pk":
+        }
+        else if ("pk".equals(field))
+        {
             vector.pk = byteArray;
-            break;
-        case "sk":
+        }
+        else if ("sk".equals(field))
+        {
             vector.sk = byteArray;
-            break;
-        case "msg":
+        }
+        else if ("msg".equals(field))
+        {
             vector.msg = byteArray;
-            break;
-        case "sig":
+        }
+        else if ("sig".equals(field))
+        {
             vector.sig = byteArray;
-            break;
         }
+        // else ignore
     }
 
     static class TestVector

pg/src/main/java/org/bouncycastle/bcpg/ArmoredInputStream.java

@@ -663,7 +663,7 @@ public void setDetectMissingCRC(boolean detectMissing)
 
     private static List<String> defaultAllowedHeaders()
     {
-        List<String> allowedHeaders = new ArrayList<>();
+        List<String> allowedHeaders = new ArrayList<String>();
         allowedHeaders.add(ArmoredOutputStream.COMMENT_HDR);
         allowedHeaders.add(ArmoredOutputStream.VERSION_HDR);
         allowedHeaders.add(ArmoredOutputStream.CHARSET_HDR);

pg/src/test/java/org/bouncycastle/openpgp/api/test/DoubleBufferedInputStreamTest.java

@@ -1,15 +1,15 @@
 package org.bouncycastle.openpgp.api.test;
 
-import org.bouncycastle.bcpg.test.AbstractPacketTest;
-import org.bouncycastle.openpgp.api.DoubleBufferedInputStream;
-import org.bouncycastle.util.io.Streams;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import org.bouncycastle.bcpg.test.AbstractPacketTest;
+import org.bouncycastle.openpgp.api.DoubleBufferedInputStream;
+import org.bouncycastle.util.io.Streams;
+
 public class DoubleBufferedInputStreamTest
     extends AbstractPacketTest
 {
@@ -37,7 +37,7 @@ private void successfullyReadSmallerThanBuffer()
     {
         byte[] bytes = getSequentialBytes(400);
         ByteArrayInputStream bIn = new ByteArrayInputStream(bytes);
-        DoubleBufferedInputStream<ByteArrayInputStream> retIn = new DoubleBufferedInputStream<>(bIn, 512);
+        DoubleBufferedInputStream<ByteArrayInputStream> retIn = new DoubleBufferedInputStream<ByteArrayInputStream>(bIn, 512);
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         Streams.pipeAll(retIn, bOut);
         isEncodingEqual(bytes, bOut.toByteArray());
@@ -48,7 +48,7 @@ private void successfullyReadGreaterThanBuffer()
     {
         byte[] bytes = getSequentialBytes(2000);
         ByteArrayInputStream bIn = new ByteArrayInputStream(bytes);
-        DoubleBufferedInputStream<ByteArrayInputStream> retIn = new DoubleBufferedInputStream<>(bIn, 512);
+        DoubleBufferedInputStream<ByteArrayInputStream> retIn = new DoubleBufferedInputStream<ByteArrayInputStream>(bIn, 512);
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         Streams.pipeAll(retIn, bOut);
         isEncodingEqual(bytes, bOut.toByteArray());
@@ -74,7 +74,7 @@ public int read()
                 return i;
             }
         };
-        DoubleBufferedInputStream<InputStream> retIn = new DoubleBufferedInputStream<>(throwAfterNBytes, 512);
+        DoubleBufferedInputStream<InputStream> retIn = new DoubleBufferedInputStream<InputStream>(throwAfterNBytes, 512);
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         try
         {
@@ -107,7 +107,7 @@ public int read()
                 return i;
             }
         };
-        DoubleBufferedInputStream<InputStream> retIn = new DoubleBufferedInputStream<>(throwAfterNBytes, 4);
+        DoubleBufferedInputStream<InputStream> retIn = new DoubleBufferedInputStream<InputStream>(throwAfterNBytes, 4);
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         try
         {
@@ -134,7 +134,7 @@ public void close()
                 throw new IOException("Oopsie");
             }
         };
-        DoubleBufferedInputStream<FilterInputStream> retIn = new DoubleBufferedInputStream<>(throwOnClose, 512);
+        DoubleBufferedInputStream<FilterInputStream> retIn = new DoubleBufferedInputStream<FilterInputStream>(throwOnClose, 512);
         ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         try
         {

pg/src/test/java/org/bouncycastle/openpgp/test/ArmoredInputStreamTest.java

@@ -159,7 +159,7 @@ private void unknownClearsignedMessageHeadersTest()
 
         // Test validation enabled
         bIn = new ByteArrayInputStream(armor.getBytes(StandardCharsets.UTF_8));
-        ByteArrayInputStream finalBIn = bIn;
+        final ByteArrayInputStream finalBIn = bIn;
         isTrue(null != testException(
             "Illegal ASCII armor header line in clearsigned message encountered: Hello: this is totally part of the signed text",
             "ArmoredInputException",