Fixed #3

Author: jaaufauvre

src/main/java/com/mastercard/developer/encryption/FieldLevelEncryption.java

@@ -223,9 +223,9 @@ private static void decryptPayloadPath(DocumentContext payloadContext, String js
         checkOrCreateOutObject(payloadContext, jsonPathOut);
         addDecryptedDataToPayload(payloadContext, decryptedValue, jsonPathOut);
 
-        // Remove the input object if now empty
-        inJsonObject = readJsonObject(payloadContext, jsonPathIn);
-        if (inJsonObject != null && 0 == jsonProvider.length(inJsonObject) && !"$".equals(jsonPathIn)) {
+        // Remove the input if now empty
+        Object inJsonElement  = readJsonElement(payloadContext, jsonPathIn);
+        if (inJsonElement != null && 0 == jsonProvider.length(inJsonElement) && !"$".equals(jsonPathIn)) {
             payloadContext.delete(jsonPathIn);
         }
     }

src/main/java/com/mastercard/developer/json/JsonEngine.java

@@ -75,7 +75,7 @@ protected static Object asPrimitiveValue(String string) {
 
     public String toJsonString(Object object) {
         if (null == object) {
-            throw new IllegalStateException("Can get a JSON string from a null object!");
+            throw new IllegalStateException("Can't get a JSON string from a null object!");
         }
         if (isJsonPrimitive(object)) {
             return object.toString();

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

@@ -14,6 +14,7 @@
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.InvalidKeyException;
+import java.security.PrivateKey;
 
 import static com.mastercard.developer.encryption.FieldLevelEncryptionConfig.FieldValueEncoding;
 import static com.mastercard.developer.encryption.FieldLevelEncryptionParams.SYMMETRIC_KEY_TYPE;
@@ -1035,7 +1036,7 @@ public void testDecryptPayload_ShouldKeepInputObject_WhenContainsAdditionalField
     }
 
     @Test
-    public void testDecryptPayload_ShouldOverwriteInputObject_WhenOutPathSameAsInPath() throws Exception {
+    public void testDecryptPayload_ShouldOverwriteInputObject_WhenOutPathSameAsInPath_ObjectData() throws Exception {
 
         // GIVEN
         String encryptedPayload = "{" +
@@ -1060,6 +1061,40 @@ public void testDecryptPayload_ShouldOverwriteInputObject_WhenOutPathSameAsInPat
         assertEquals("\"field2Value\"", payloadObject.get("encryptedData").getAsJsonObject().get("field2").toString());
     }
 
+    /**
+     * https://github.com/Mastercard/client-encryption-java/issues/3
+     */
+    @Test
+    public void testDecryptPayload_ShouldOverwriteInputObject_WhenOutPathSameAsInPath_PrimitiveTypeData() throws Exception {
+
+        // GIVEN
+        String encryptedPayload = "{" +
+                "    \"data\": {" +
+                "        \"encryptedData\": {" +
+                "            \"encryptedValue\": \"Qiw1g87OCwa5/IXPC5nIJw==\"," +
+                "            \"iv\": \"OZt7FRV644fEFbb75VNdjA==\"," +
+                "            \"encryptedKey\": \"AyI8R1/ziGTZ6Uhy2JGsy+PYf+KXcrzn5v56tP3WnuFM2Qt24T9t4WXE+B1cqiDjo1LQIEgXJWZ5XX/fbYh/Y1qmycit/QmPVEjGqoKLNSB1Js00Cghyt7lChuSUIWRnYbNAa0q6EgPS5vyDrXDVZH0vkTM6egc7d76O9Sw+rXGzv9d9wiQlhxFXkb+GH/BCiswb064w53LcXdoBcup1sEEn6UIuORtiCGeQcNqS6yvkR3HWc0lrAJpCikJoTCMQli7MJYAVj+w4LZCUZMcwWMuiMhLQQdjTAhCCK9+fKItwA5xSDaXictspUALTi/drdcj2zXbxX3E2t+q1PgWPUg==\"," +
+                "            \"publicKeyFingerprint\": \"29f8a7cea970886829226864c79195088ee464a89d8bc835d392c1f6666326c6\"," +
+                "            \"oaepPaddingDigestAlgorithm\": \"SHA256\"" +
+                "        }" +
+                "    }" +
+                "}";
+
+        PrivateKey decryptionKey = EncryptionUtils.loadDecryptionKey("./src/test/resources/keys/pkcs8/github-issue#3.pem");
+        FieldLevelEncryptionConfig config = getTestFieldLevelEncryptionConfigBuilder()
+                .withDecryptionKey(decryptionKey)
+                .withDecryptionPath("$.data.encryptedData", "$.data.encryptedData")
+                .withFieldValueEncoding(FieldValueEncoding.BASE64)
+                .build();
+
+        // WHEN
+        String payload = FieldLevelEncryption.decryptPayload(encryptedPayload, config);
+
+        // THEN
+        JsonObject payloadObject = new Gson().fromJson(payload, JsonObject.class);
+        assertEquals("India", payloadObject.get("data").getAsJsonObject().get("encryptedData").getAsString());
+    }
+
     @Test
     public void testDecryptPayload_ShouldSupportRootAsInputPath() throws Exception {
 

src/test/resources/keys/pkcs8/github-issue#3.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQClPNgGKUEUSZ5C
+UGQ5tEw9ZeYLPv6+vMZ6YH7QfzhCQwas1nL+eTsXAooggd0HglICSsIYcHMvnUuD
+458G3j8NGBTcuzO0FKsc+9WjWKXyqfvi9SnM/1q8ZvyIRbw2a1bSpND63d2GVERo
+K/31cyesb7BS4Jr/EQCEK+kN87l9MMkPmgAFBCAXrQ+ZdiZ43j0Czs6c7a+ueRRA
+fChKjS5nrUpFc/MWWPCUKUmqMnJMRaCTvQ+9ZIbnBccs2grbP9F+V25EpVagcbbE
+/c5RXzqbUNIUK/BpeJ9IPE7ZvUu8cEQU1pJIlk8TLnoIFyJwdRF9FDT/iNsHxuBN
+jpwT5EExAgMBAAECggEBAJWjciayOYN739xCHWG8i8aWfyv0EpL9NekhdfavH22y
+cVsYoe8eLor5+8jQki/4rvfwZ7HmNAoMspRwEFYR8puTEWGMDpiolwWacrCI2U/W
+7ItuZjqFjdBMm6l1LatCrc/4/mARiEncCk8kd8pOTMF2LAIB8ZvH8+W+NkIyU+qw
+TMyHFzpG1XE1/QQgr3sEHsOnBkyWZteS42AYa11lPA2Agt5OpABi6cgTVsfUdmlr
+paAuP00fmWXdFBzZRKHBTJHamFrp2Bm/i3+YQMdwMtbOKGo4R2VuTVcMaYb7jocG
+Q/goEHonOeV5SoeIdb3DfC0qlazhAM9Za2MsL2aD15kCgYEA1JYwb5l0WDFI0kHI
+4js/TQOc5p45jseQjYblouc0UccUZDjq26v5gDM+/xbo3Wv25p6Wkxn0HuCWzw+1
+hoOGKsX9U8846H+b/G9F2ihMj2a9oYFedNY0f2MYEbpKRehMNTARIOriQ/lXh/RT
+yr6jDD4wxH90KuuYhRVNnfcPnK8CgYEAxvtMO+6enIzW3OCRaY+9sWSqBp8orc2v
+SsO3ekt5ZVU4+crK+RIXRnCB8lOtPu2RD9jAYeXpyqqJ8f03slGtmSUshLv2xg3k
+WEuKP1XrXSnArqKWMf1v9DhvLV1Do07nwKw2wMQc+rufD65IJ7Yg5T7/TxmFyVeI
+S8rga/9mOB8CgYBBGjV/F7l/gKhSa37/eTFrfl3AalgqF4d3MAaHGtL08EiYYK3b
+1BC2Z/s012k81eFowsxOBDa0dgb5JlBq/0BJPRTVY7KD0QCOD+2OX6UCjW4pVZr9
+oNO25zvpwekY+4jLCQtVz1i3hFZ/9hzrC/KWvzzkEDwdIMU2jE2WwKBxVQKBgFKT
+69lbeBvEH09fKznB25mJCz7gQoOOvtaqTrTEKccyDQktbfrb1Sj4fBVTQKzC7tbC
+v2RhhBsFl2YEDl9EomTSFp2nXAxpq4AxKViLkbgCIeLXurlYUmPqH8mV0QIvNuKx
+Fa/+M4Ci6KobS/qfDRvWfyIWl30thHTf5y8quQNFAoGBALYIgy7b9JjGp2BwITMK
+1AFhH40Kl2C6Myk2ikITxNtKAYucDE27+OHmXSUvmi2itC0SpthTNt0nd5KAm749
+0WQdwU8xD+t3vb879gRJx4LZT/FjI+u3U8+Q4kKyUHpLDQuPhTYA6B2LA1LBlQlN
+myHZ4rfXarq79sN+UG4h2lCv
+-----END PRIVATE KEY-----