Fixed 'X509CertImpl is internal proprietary API and may be removed in a future release'

Author: jaaufauvre

src/test/java/com/mastercard/developer/encryption/FieldLevelEncryptionTest.java

@@ -4,11 +4,11 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import com.mastercard.developer.test.TestUtils;
 import org.apache.commons.codec.binary.Base64;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import sun.security.x509.X509CertImpl;
 
 import java.security.InvalidKeyException;
 
@@ -365,13 +365,13 @@ public void testEncryptPayload_ShouldNotAddOaepPaddingDigestAlgorithm_WhenOaepPa
     }
 
     @Test
-    public void testEncryptPayload_ShouldThrowEncryptionException_WhenInvalidCertificateObject() throws Exception {
+    public void testEncryptPayload_ShouldThrowEncryptionException_WhenEncryptionErrorOccurs() throws Exception {
 
         // GIVEN
         String payload = "{\"data\": {}, \"encryptedData\": {}}";
         FieldLevelEncryptionConfig config = getTestFieldLevelEncryptionConfigBuilder()
                 .withEncryptionPath("data", "encryptedData")
-                .withEncryptionCertificate(new X509CertImpl())
+                .withEncryptionCertificate(TestUtils.getTestInvalidEncryptionCertificate()) // Invalid certificate
                 .withOaepPaddingDigestAlgorithm("SHA-256")
                 .build();
 
@@ -715,7 +715,7 @@ public void testDecryptPayload_ShouldOverwriteInputObject_WhenOutPathSameAsInPat
     }
 
     @Test
-    public void testDecryptPayload_ShouldThrowEncryptionException_WhenWrongDecryptionKey() throws Exception {
+    public void testDecryptPayload_ShouldThrowEncryptionException_WhenDecryptionErrorOccurs() throws Exception {
 
         // GIVEN
         String encryptedPayload = "{" +
@@ -728,6 +728,7 @@ public void testDecryptPayload_ShouldThrowEncryptionException_WhenWrongDecryptio
         FieldLevelEncryptionConfig config = getTestFieldLevelEncryptionConfigBuilder()
                 .withDecryptionPath("encryptedData", "data")
                 .withOaepPaddingDigestAlgorithm("SHA-256")
+                // Not the right key
                 .withDecryptionKey(loadDecryptionKey("./src/test/resources/test_key_container.p12", "mykeyalias", "Password1"))
                 .build();
 

src/test/java/com/mastercard/developer/interceptor/HttpExecuteFieldLevelEncryptionInterceptorTest.java

@@ -4,6 +4,7 @@
 import com.mastercard.developer.encryption.EncryptionException;
 import com.mastercard.developer.encryption.FieldLevelEncryptionConfig;
 import com.mastercard.developer.interceptors.HttpExecuteFieldLevelEncryptionInterceptor;
+import com.mastercard.developer.test.TestUtils;
 import org.apache.commons.io.IOUtils;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -12,7 +13,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.junit.MockitoJUnitRunner;
-import sun.security.x509.X509CertImpl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -84,7 +84,7 @@ public void testIntercept_ShouldThrowIOException_WhenEncryptionFails() throws Ex
         // GIVEN
         FieldLevelEncryptionConfig config = getTestFieldLevelEncryptionConfigBuilder()
                 .withEncryptionPath("$.foo", "$.encryptedFoo")
-                .withEncryptionCertificate(new X509CertImpl()) // Certificate without key
+                .withEncryptionCertificate(TestUtils.getTestInvalidEncryptionCertificate()) // Invalid certificate
                 .build();
         HttpRequest request = mock(HttpRequest.class);
         when(request.getContent()).thenReturn(new ByteArrayContent(JSON_TYPE, "{\"foo\":\"bar\"}".getBytes()));

src/test/java/com/mastercard/developer/interceptor/OkHttp2FieldLevelEncryptionInterceptorTest.java

@@ -3,14 +3,14 @@
 import com.mastercard.developer.encryption.EncryptionException;
 import com.mastercard.developer.encryption.FieldLevelEncryptionConfig;
 import com.mastercard.developer.interceptors.OkHttp2FieldLevelEncryptionInterceptor;
+import com.mastercard.developer.test.TestUtils;
 import com.squareup.okhttp.*;
 import okio.Buffer;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
-import sun.security.x509.X509CertImpl;
 
 import java.io.IOException;
 
@@ -89,7 +89,7 @@ public void testIntercept_ShouldThrowIOException_WhenEncryptionFails() throws Ex
         // GIVEN
         FieldLevelEncryptionConfig config = getTestFieldLevelEncryptionConfigBuilder()
                 .withEncryptionPath("$.foo", "$.encryptedFoo")
-                .withEncryptionCertificate(new X509CertImpl()) // Certificate without key
+                .withEncryptionCertificate(TestUtils.getTestInvalidEncryptionCertificate()) // Invalid certificate
                 .build();
         Request request = new Request.Builder()
                 .url("https://sandbox.api.mastercard.com/service")

src/test/java/com/mastercard/developer/interceptor/OkHttpFieldLevelEncryptionInterceptorTest.java

@@ -3,14 +3,14 @@
 import com.mastercard.developer.encryption.EncryptionException;
 import com.mastercard.developer.encryption.FieldLevelEncryptionConfig;
 import com.mastercard.developer.interceptors.OkHttpFieldLevelEncryptionInterceptor;
+import com.mastercard.developer.test.TestUtils;
 import okhttp3.*;
 import okio.Buffer;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.mockito.ArgumentCaptor;
-import sun.security.x509.X509CertImpl;
 
 import java.io.IOException;
 
@@ -89,7 +89,7 @@ public void testIntercept_ShouldThrowIOException_WhenEncryptionFails() throws Ex
         // GIVEN
         FieldLevelEncryptionConfig config = getTestFieldLevelEncryptionConfigBuilder()
                 .withEncryptionPath("$.foo", "$.encryptedFoo")
-                .withEncryptionCertificate(new X509CertImpl()) // Certificate without key
+                .withEncryptionCertificate(TestUtils.getTestInvalidEncryptionCertificate()) // Invalid certificate
                 .build();
         Request request = new Request.Builder()
                 .url("https://sandbox.api.mastercard.com/service")

src/test/java/com/mastercard/developer/test/TestUtils.java

@@ -5,9 +5,11 @@
 
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
+import java.security.cert.X509Certificate;
 
 import static com.mastercard.developer.utils.EncryptionUtils.loadDecryptionKey;
 import static com.mastercard.developer.utils.EncryptionUtils.loadEncryptionCertificate;
+import static org.mockito.Mockito.mock;
 
 public class TestUtils {
 
@@ -18,6 +20,10 @@ public static Certificate getTestEncryptionCertificate() throws Exception {
         return loadEncryptionCertificate("./src/test/resources/test_certificate.cert");
     }
 
+    public static Certificate getTestInvalidEncryptionCertificate() {
+        return mock(X509Certificate.class); // Will throw "java.security.InvalidKeyException: Key must not be null"
+    }
+
     public static PrivateKey getTestDecryptionKey() throws Exception {
         return loadDecryptionKey("./src/test/resources/test_key.der");
     }