Clean-up

Author: jaaufauvre

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

@@ -201,8 +201,8 @@ private static void decryptPayloadPath(DocumentContext payloadContext, String js
             return;
         }
 
-        if ((config.encryptedKeyFieldName == null || config.ivFieldName == null) && params == null) {
-            throw new IllegalStateException("Encryption params have to be passed in argument or field names have to be set in config!");
+        if (!config.useHttpPayloads() && params == null) {
+            throw new IllegalStateException("Encryption params have to be set when not stored in HTTP payloads!");
         }
 
         if (params == null) {

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

@@ -149,6 +149,13 @@ public boolean useHttpHeaders() {
         return encryptedKeyHeaderName != null && ivHeaderName != null;
     }
 
+    /**
+     * If the encryption parameters must be written to/read from HTTP payloads.
+     */
+    public boolean useHttpPayloads() {
+        return encryptedKeyFieldName != null && ivFieldName != null;
+    }
+
     public String getOaepPaddingDigestAlgorithmHeaderName() {
         return oaepPaddingDigestAlgorithmHeaderName;
     }

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

@@ -100,10 +100,6 @@ public boolean isNullOrEmptyJson(Object jsonElement) {
 
     /**
      * Get JSON path to the parent of the object at the given JSON path.
-     * Examples:
-     * - "$['obj1']['obj2']" will return "$['obj1']"
-     * - "$.obj1.obj2" will return "$['obj1']"
-     * - "obj1.obj2" will return "$['obj1']"
      */
     public static String getParentJsonPath(String jsonPathString) {
         JsonPath jsonPath = JsonPath.compile(jsonPathString);
@@ -117,10 +113,6 @@ public static String getParentJsonPath(String jsonPathString) {
 
     /**
      * Get object key at the given JSON path.
-     * Examples:
-     * - "$['obj1']['obj2']" will return "obj2"
-     * - "$.obj1.obj2" will return "obj2"
-     * - "obj1.obj2" will return "obj2"
      */
     public static String getJsonElementKey(String jsonPathString) {
         JsonPath jsonPath = JsonPath.compile(jsonPathString);

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

@@ -1200,7 +1200,7 @@ public void testDecryptPayload_ShouldThrowIllegalStateException_WhenEncryptionPa
 
         // THEN
         expectedException.expect(IllegalStateException.class);
-        expectedException.expectMessage("Encryption params have to be passed in argument or field names have to be set in config!");
+        expectedException.expectMessage("Encryption params have to be set when not stored in HTTP payloads!");
 
         // WHEN
         FieldLevelEncryption.decryptPayload(encryptedPayload, config, null);

src/test/java/com/mastercard/developer/json/JsonEngineTest.java

@@ -0,0 +1,106 @@
+package com.mastercard.developer.json;
+
+import org.junit.Assert;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+public class JsonEngineTest {
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Test
+    public void testGetParentJsonPath_Nominal() {
+
+        // GIVEN
+        String jsonPath1 = "$['obj1']['obj2']";
+        String jsonPath2 = "obj1.obj2";
+        String jsonPath3 = "$.obj1.obj2";
+
+        // WHEN
+        String parentJsonPath1 = JsonEngine.getParentJsonPath(jsonPath1);
+        String parentJsonPath2 = JsonEngine.getParentJsonPath(jsonPath2);
+        String parentJsonPath3 = JsonEngine.getParentJsonPath(jsonPath3);
+
+        // THEN
+        Assert.assertEquals("$['obj1']", parentJsonPath1);
+        Assert.assertEquals("$['obj1']", parentJsonPath2);
+        Assert.assertEquals("$['obj1']", parentJsonPath3);
+    }
+
+    @Test
+    public void testGetJsonElementKey_Nominal() {
+
+        // GIVEN
+        String jsonPath1 = "$['obj1']['obj2']";
+        String jsonPath2 = "obj1.obj2";
+        String jsonPath3 = "$.obj1.obj2";
+
+        // WHEN
+        String jsonElementKey1 = JsonEngine.getJsonElementKey(jsonPath1);
+        String jsonElementKey2 = JsonEngine.getJsonElementKey(jsonPath2);
+        String jsonElementKey3 = JsonEngine.getJsonElementKey(jsonPath3);
+
+        // THEN
+        Assert.assertEquals("obj2", jsonElementKey1);
+        Assert.assertEquals("obj2", jsonElementKey2);
+        Assert.assertEquals("obj2", jsonElementKey3);
+    }
+
+    @Test
+    public void testGetParentJsonPath_ShouldThrowIllegalArgumentException_WhenJsonPathNullOrEmpty() {
+
+        // GIVEN
+        String jsonPath = "";
+
+        // THEN
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("json can not be null or empty");
+
+        // WHEN
+        JsonEngine.getParentJsonPath(jsonPath);
+    }
+
+    @Test
+    public void testGetJsonElementKey_ShouldThrowIllegalArgumentException_WhenJsonPathNullOrEmpty() {
+
+        // GIVEN
+        String jsonPath = "";
+
+        // THEN
+        expectedException.expect(IllegalArgumentException.class);
+        expectedException.expectMessage("json can not be null or empty");
+
+        // WHEN
+        JsonEngine.getJsonElementKey(jsonPath);
+    }
+
+    @Test
+    public void testGetParentJsonPath_ShouldThrowIllegalStateException_WhenNoParent() {
+
+        // GIVEN
+        String jsonPath = "$";
+
+        // THEN
+        expectedException.expect(IllegalStateException.class);
+        expectedException.expectMessage("Unable to find parent for '$'");
+
+        // WHEN
+        JsonEngine.getParentJsonPath(jsonPath);
+    }
+
+    @Test
+    public void testGetJsonElementKey_ShouldThrowIllegalStateException_WhenNoKey() {
+
+        // GIVEN
+        String jsonPath = "$";
+
+        // THEN
+        expectedException.expect(IllegalStateException.class);
+        expectedException.expectMessage("Unable to find object key for '$'");
+
+        // WHEN
+        JsonEngine.getJsonElementKey(jsonPath);
+    }
+}