Fixing failing of Serializer and tests

LMCROSSITXSADEPLOY-2301

Author: karrgov

multiapps-controller-process/src/main/java/org/cloudfoundry/multiapps/controller/process/security/SecretTokenSerializer.java

@@ -164,6 +164,10 @@ private Object getResultFromTransformedJson(String transformedJson, Object eleme
     }
 
     private String transformJson(String candidate, boolean censor) {
+        if (!isValid(candidate)) {
+            return null;
+        }
+
         try {
             JsonNode rootNode = OBJECT_MAPPER.readTree(candidate);
             AtomicBoolean changed = new AtomicBoolean();
@@ -179,6 +183,15 @@ private String transformJson(String candidate, boolean censor) {
         }
     }
 
+    public boolean isValid(String json) {
+        try {
+            OBJECT_MAPPER.readTree(json);
+        } catch (JacksonException e) {
+            return false;
+        }
+        return true;
+    }
+
     private JsonNode processJsonValue(JsonNode currentNode, Set<String> secretValueNames, boolean censor, AtomicBoolean changed) {
         if (currentNode.isObject()) {
             return processObjectNode(currentNode, secretValueNames, censor, changed);

multiapps-controller-process/src/test/java/org/cloudfoundry/multiapps/controller/process/security/resolver/SecretTokenKeyResolverImplTest.java

@@ -59,7 +59,7 @@ void setUp() {
 
     @Test
     void testResolveSuccessWithNamespace() {
-        String expectedUps = "__mta-secure-my-mtans";
+        String expectedUps = "__mta-secure-my-mta-ns";
 
         UUID upsGuid = UUID.randomUUID();
         when(cloudServiceInstance.getGuid()).thenReturn(upsGuid);
@@ -73,7 +73,7 @@ void testResolveSuccessWithNamespace() {
 
         assertEquals("abcdefghijklmnopqrstuvwxyz123456", encryptionKey);
         verify(cloudControllerClient, times(1)).getServiceInstance(expectedUps);
-        verify(cloudControllerClient, times(1)).getUserProvidedServiceInstanceParameters(upsGuid);
+        verify(cloudControllerClient, times(2)).getUserProvidedServiceInstanceParameters(upsGuid);
     }
 
     @Test
@@ -97,18 +97,18 @@ void testResolveSuccessWithoutNamespace() {
 
     @Test
     void testResolveWhenServiceInstanceMissing() {
-        when(cloudControllerClient.getServiceInstance("__mta-secure-my-mtans")).thenReturn(null);
+        when(cloudControllerClient.getServiceInstance("__mta-secure-my-mta-ns")).thenReturn(null);
 
         Exception exception = assertThrows(SLException.class, () -> secretTokenKeyResolver.resolve(execution));
         assertTrue(exception.getMessage()
                             .contains("Could not retrieve service instance"));
-        verify(cloudControllerClient, times(1)).getServiceInstance("__mta-secure-my-mtans");
+        verify(cloudControllerClient, times(1)).getServiceInstance("__mta-secure-my-mta-ns");
         verify(cloudControllerClient, never()).getUserProvidedServiceInstanceParameters(any(UUID.class));
     }
 
     @Test
     void testResolveWhenCredentialsMissing() {
-        String expectedUps = "__mta-secure-my-mtans";
+        String expectedUps = "__mta-secure-my-mta-ns";
 
         UUID upsGuid = UUID.randomUUID();
         when(cloudServiceInstance.getGuid()).thenReturn(upsGuid);