Add policy model id in tosca parser

Add the parameter policy model id when converting the tosca to a Json
schema for the UI so that it takes well what is provided in the
blueprint

Issue-ID: CLAMP-534
Change-Id: Ie5e9e0c495c3969f25cca36d8f3d74c82f1f63b6
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

diff --git a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java b/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
index f5c21c1..43dd5f4 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
+++ b/src/main/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertor.java
@@ -61,10 +61,12 @@ public class ToscaYamlToJsonConvertor {
     /**
      * Parses Tosca YAML string.
      *
-     * @param yamlString YAML string
+     * @param yamlString     YAML string
+     * @param modelTypeToUse The model type that must be used to obtain the Json
+     *                       Schema
      * @return JSON string
      */
-    public String parseToscaYaml(String yamlString) {
+    public String parseToscaYaml(String yamlString, String modelTypeToUse) {
 
         Yaml yaml = new Yaml();
         LinkedHashMap<String, Object> loadedYaml = yaml.load(yamlString);
@@ -76,7 +78,7 @@ public class ToscaYamlToJsonConvertor {
         JSONObject jsonParentObject = new JSONObject();
         JSONObject jsonTempObject = new JSONObject();
         parseNodeAndDataType(loadedYaml, nodeTypes, dataNodes);
-        populateJsonEditorObject(loadedYaml, nodeTypes, dataNodes, jsonParentObject, jsonTempObject);
+        populateJsonEditorObject(loadedYaml, nodeTypes, dataNodes, jsonParentObject, jsonTempObject, modelTypeToUse);
         if (jsonTempObject.length() > 0) {
             jsonParentObject = jsonTempObject;
         }
@@ -99,75 +101,68 @@ public class ToscaYamlToJsonConvertor {
             } else if (n.getKey().contains(ToscaSchemaConstants.POLICY_DATA)) {
                 dataNodes.put(n.getKey(), n.getValue());
             }
-
         });
     }
 
     @SuppressWarnings("unchecked")
     private void populateJsonEditorObject(LinkedHashMap<String, Object> map, LinkedHashMap<String, Object> nodeTypes,
-            LinkedHashMap<String, Object> dataNodes, JSONObject jsonParentObject, JSONObject jsonTempObject) {
+            LinkedHashMap<String, Object> dataNodes, JSONObject jsonParentObject, JSONObject jsonTempObject,
+            String modelTypeToUse) {
 
-        Map<String, JSONObject> jsonEntrySchema = new HashMap();
+        Map<String, JSONObject> jsonEntrySchema = new HashMap<>();
         jsonParentObject.put(JsonEditorSchemaConstants.TYPE, JsonEditorSchemaConstants.TYPE_OBJECT);
-        nodeTypes.entrySet().stream().forEach(nt -> {
-            if (nt.getValue() instanceof Map) {
-                ((LinkedHashMap<String, Object>) nt.getValue()).entrySet().forEach(ntElement -> {
-                    if (ntElement.getKey().equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
-                        JSONArray rootNodeArray = new JSONArray();
-                        if (ntElement.getValue() instanceof Map) {
-                            ((LinkedHashMap<String, Object>) ntElement.getValue()).entrySet()
-                                    .forEach((ntPropertiesElement) -> {
-                                        boolean isListNode = false;
+        if (nodeTypes.get(modelTypeToUse) instanceof Map) {
+            ((LinkedHashMap<String, Object>) nodeTypes.get(modelTypeToUse)).entrySet().forEach(ntElement -> {
+                if (ntElement.getKey().equalsIgnoreCase(ToscaSchemaConstants.PROPERTIES)) {
+                    JSONArray rootNodeArray = new JSONArray();
+                    if (ntElement.getValue() instanceof Map) {
+                        ((LinkedHashMap<String, Object>) ntElement.getValue()).entrySet()
+                                .forEach((ntPropertiesElement) -> {
+                                    boolean isListNode = false;
+                                    parseDescription((LinkedHashMap<String, Object>) ntPropertiesElement.getValue(),
+                                            jsonParentObject);
+                                    LinkedHashMap<String, Object> parentPropertiesMap = (LinkedHashMap<String, Object>) ntPropertiesElement
+                                            .getValue();
+                                    if (parentPropertiesMap.containsKey(ToscaSchemaConstants.TYPE)
+                                            && ((String) parentPropertiesMap.get(ToscaSchemaConstants.TYPE))
+                                                    .contains(ToscaSchemaConstants.TYPE_MAP)
+                                            && parentPropertiesMap.containsKey(ToscaSchemaConstants.ENTRY_SCHEMA)) {
+                                        parentPropertiesMap = (LinkedHashMap<String, Object>) parentPropertiesMap
+                                                .get(ToscaSchemaConstants.ENTRY_SCHEMA);
+                                        isListNode = true;
+                                    }
+                                    if (parentPropertiesMap.containsKey(ToscaSchemaConstants.TYPE)
+                                            && ((String) parentPropertiesMap.get(ToscaSchemaConstants.TYPE))
+                                                    .contains(ToscaSchemaConstants.POLICY_DATA)) {
+                                        ((LinkedHashMap<String, Object>) dataNodes
+                                                .get(parentPropertiesMap.get(ToscaSchemaConstants.TYPE))).entrySet()
+                                                        .stream().forEach(pmap -> {
+                                                            if (pmap.getKey().equalsIgnoreCase(
+                                                                    ToscaSchemaConstants.PROPERTIES)) {
+                                                                parseToscaProperties(ToscaSchemaConstants.POLICY_NODE,
+                                                                        (LinkedHashMap<String, Object>) pmap.getValue(),
+                                                                        jsonParentObject, rootNodeArray,
+                                                                        jsonEntrySchema, dataNodes,
+                                                                        incrementSimpleTypeOrder());
+                                                            }
+                                                        });
+                                    }
+                                    if (isListNode) {
+                                        jsonTempObject.put(JsonEditorSchemaConstants.TYPE,
+                                                JsonEditorSchemaConstants.TYPE_ARRAY);
                                         parseDescription((LinkedHashMap<String, Object>) ntPropertiesElement.getValue(),
-                                                jsonParentObject);
-                                        LinkedHashMap<String, Object> parentPropertiesMap = (LinkedHashMap<String, Object>) ntPropertiesElement
-                                                .getValue();
-                                        if (parentPropertiesMap.containsKey(ToscaSchemaConstants.TYPE)
-                                                && ((String) parentPropertiesMap.get(ToscaSchemaConstants.TYPE))
-                                                        .contains(ToscaSchemaConstants.TYPE_MAP)
-                                                && parentPropertiesMap.containsKey(ToscaSchemaConstants.ENTRY_SCHEMA)) {
-                                            parentPropertiesMap = (LinkedHashMap<String, Object>) parentPropertiesMap
-                                                    .get(ToscaSchemaConstants.ENTRY_SCHEMA);
-                                            isListNode = true;
-                                        }
-                                        if (parentPropertiesMap.containsKey(ToscaSchemaConstants.TYPE)
-                                                && ((String) parentPropertiesMap.get(ToscaSchemaConstants.TYPE))
-                                                        .contains(ToscaSchemaConstants.POLICY_DATA)) {
-                                            ((LinkedHashMap<String, Object>) dataNodes
-                                                    .get(parentPropertiesMap.get(ToscaSchemaConstants.TYPE))).entrySet()
-                                                            .stream().forEach(pmap -> {
-                                                                if (pmap.getKey().equalsIgnoreCase(
-                                                                        ToscaSchemaConstants.PROPERTIES)) {
-                                                                    parseToscaProperties(
-                                                                            ToscaSchemaConstants.POLICY_NODE,
-                                                                            (LinkedHashMap<String, Object>) pmap
-                                                                                    .getValue(),
-                                                                            jsonParentObject, rootNodeArray,
-                                                                            jsonEntrySchema, dataNodes,
-                                                                            incrementSimpleTypeOrder());
-                                                                }
-
-                                                            });
-
-                                        }
-                                        if (isListNode) {
-                                            jsonTempObject.put(JsonEditorSchemaConstants.TYPE,
-                                                    JsonEditorSchemaConstants.TYPE_ARRAY);
-                                            parseDescription(
-                                                    (LinkedHashMap<String, Object>) ntPropertiesElement.getValue(),
-                                                    jsonTempObject);
-                                            jsonTempObject.put(JsonEditorSchemaConstants.ITEMS, jsonParentObject);
-                                            jsonTempObject.put(JsonEditorSchemaConstants.FORMAT,
-                                                    JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT_TABS_TOP);
-                                            jsonTempObject.put(JsonEditorSchemaConstants.UNIQUE_ITEMS,
-                                                    JsonEditorSchemaConstants.TRUE);
-                                        }
-                                    });
-                        }
+                                                jsonTempObject);
+                                        jsonTempObject.put(JsonEditorSchemaConstants.ITEMS, jsonParentObject);
+                                        jsonTempObject.put(JsonEditorSchemaConstants.FORMAT,
+                                                JsonEditorSchemaConstants.CUSTOM_KEY_FORMAT_TABS_TOP);
+                                        jsonTempObject.put(JsonEditorSchemaConstants.UNIQUE_ITEMS,
+                                                JsonEditorSchemaConstants.TRUE);
+                                    }
+                                });
                     }
-                });
-            }
-        });
+                }
+            });
+        }
     }
 
     @SuppressWarnings("unchecked")

diff --git a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
index b1cea34..2943c39 100644 (file)
--- a/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
+++ b/src/main/java/org/onap/clamp/policy/microservice/MicroServicePolicy.java
@@ -117,7 +117,7 @@ public class MicroServicePolicy implements Serializable, Policy {
         this.policyTosca = policyTosca;
         this.shared = shared;
         this.jsonRepresentation = JsonUtils.GSON_JPA_MODEL
-                .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyTosca), JsonObject.class);
+                .fromJson(new ToscaYamlToJsonConvertor().parseToscaYaml(policyTosca, modelType), JsonObject.class);
         this.usedByLoops = usedByLoops;
     }
 

diff --git a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
index 00c9b7d..18f77cb 100644 (file)
--- a/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
+++ b/src/test/java/org/onap/clamp/clds/tosca/ToscaYamlToJsonConvertorTest.java
@@ -45,7 +45,8 @@ public class ToscaYamlToJsonConvertorTest {
         String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca_example.yaml");
         ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
 
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml);
+        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml,
+                "onap.policies.monitoring.cdap.tca.hi.lo.app");
         assertNotNull(parsedJsonSchema);
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json.json"),
                 parsedJsonSchema, true);
@@ -62,7 +63,7 @@ public class ToscaYamlToJsonConvertorTest {
         String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca-with-constraints.yaml");
         ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
 
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml);
+        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml,"onap.policies.monitoring.example.app");
         assertNotNull(parsedJsonSchema);
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-constraints" +
                                                                              ".json"),
@@ -80,7 +81,7 @@ public class ToscaYamlToJsonConvertorTest {
         String toscaModelYaml = ResourceFileUtil.getResourceAsString("tosca/tosca-with-datatypes.yaml");
         ToscaYamlToJsonConvertor convertor = new ToscaYamlToJsonConvertor();
 
-        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml);
+        String parsedJsonSchema = convertor.parseToscaYaml(toscaModelYaml,"onap.policies.monitoring.example.app");
         assertNotNull(parsedJsonSchema);
         JSONAssert.assertEquals(ResourceFileUtil.getResourceAsString("tosca/policy-yaml-to-json-with-datatypes.json"),
                                 parsedJsonSchema, true);

diff --git a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
index 73bd7f9..4be8d23 100644 (file)
--- a/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
+++ b/src/test/java/org/onap/clamp/loop/PolicyComponentTest.java
@@ -34,206 +34,194 @@ import org.mockito.Mockito;
 import org.onap.clamp.loop.components.external.ExternalComponentState;
 import org.onap.clamp.loop.components.external.PolicyComponent;
 
-
 public class PolicyComponentTest {
 
-     /**
-     * Test the computeState method. 
-     * oldState           newState        expectedFinalState
-     * NOT_SENT      SENT_AND_DEPLOYED          NOT_SENT
-     * NOT_SENT             SENT                NOT_SENT
-     * NOT_SENT           NOT_SENT              NOT_SENT
-     * NOT_SENT           IN_ERROR              IN_ERROR
+    /**
+     * Test the computeState method. oldState newState expectedFinalState NOT_SENT
+     * SENT_AND_DEPLOYED NOT_SENT NOT_SENT SENT NOT_SENT NOT_SENT NOT_SENT NOT_SENT
+     * NOT_SENT IN_ERROR IN_ERROR
      */
     @Test
     public void computeStateTestOriginalStateNotSent() {
-         Exchange exchange = Mockito.mock(Exchange.class);
-         Message message = Mockito.mock(Message.class);
-         Exchange exchange2 = Mockito.mock(Exchange.class);
-         Mockito.when(exchange.getIn()).thenReturn(message);
-         Mockito.when(message.getExchange()).thenReturn(exchange2);
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
 
-         // policy found + deployed 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        // policy found + deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
 
-         PolicyComponent policy = new PolicyComponent ();
-         ExternalComponentState state = policy.computeState(exchange);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState state = policy.computeState(exchange);
 
-         assertThat(state.getStateName()).isEqualTo("NOT_SENT");
+        assertThat(state.getStateName()).isEqualTo("NOT_SENT");
 
-         // policy found + not deployed 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state2 = policy.computeState(exchange);
+        // policy found + not deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state2 = policy.computeState(exchange);
 
-         assertThat(state2.getStateName()).isEqualTo("NOT_SENT");
+        assertThat(state2.getStateName()).isEqualTo("NOT_SENT");
 
-         // policy not found + not deployed
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state4 = policy.computeState(exchange);
+        // policy not found + not deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
 
-         assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
+        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
 
-         // policy not found + deployed
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-         ExternalComponentState state3 = policy.computeState(exchange);
+        // policy not found + deployed
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
 
-         assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
 
     }
 
     /**
-    * Test the computeState method. 
-    * oldState           newState        expectedFinalState
-    * SENT                 SENT                SENT
-    * SENT          SENT_AND_DEPLOYED          SENT
-    * SENT              IN_ERROR              IN_ERROR
-    * SENT              NOT_SENT              NOT_SENT
-    */
+     * Test the computeState method. oldState newState expectedFinalState SENT SENT
+     * SENT SENT SENT_AND_DEPLOYED SENT SENT IN_ERROR IN_ERROR SENT NOT_SENT
+     * NOT_SENT
+     */
     @Test
     public void computeStateTestOriginalStateSent() throws IOException {
-         Exchange exchange = Mockito.mock(Exchange.class);
-         Message message = Mockito.mock(Message.class);
-         Exchange exchange2 = Mockito.mock(Exchange.class);
-         Mockito.when(exchange.getIn()).thenReturn(message);
-         Mockito.when(message.getExchange()).thenReturn(exchange2);
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
 
-         PolicyComponent policy = new PolicyComponent ();
-         ExternalComponentState SENT = new ExternalComponentState("SENT",
-                 "The policies defined have been created but NOT deployed on the policy engine", 50);
-         policy.setState(SENT);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState SENT = new ExternalComponentState("SENT",
+                "The policies defined have been created but NOT deployed on the policy engine", 50);
+        policy.setState(SENT);
 
-         // new policy state SENT 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state = policy.computeState(exchange);
+        // new policy state SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state = policy.computeState(exchange);
 
-         assertThat(state.getStateName()).isEqualTo("SENT");
+        assertThat(state.getStateName()).isEqualTo("SENT");
 
-         // new policy state SENT_AND_DEPLOYED 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-         ExternalComponentState state2 = policy.computeState(exchange);
+        // new policy state SENT_AND_DEPLOYED
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state2 = policy.computeState(exchange);
 
-         assertThat(state2.getStateName()).isEqualTo("SENT");
+        assertThat(state2.getStateName()).isEqualTo("SENT");
 
-         // new policy state IN_ERROR 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-         ExternalComponentState state3 = policy.computeState(exchange);
+        // new policy state IN_ERROR
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
 
-         assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
 
-         // new policy state NOT_SENT
-         policy.setState(SENT);
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state4 = policy.computeState(exchange);
+        // new policy state NOT_SENT
+        policy.setState(SENT);
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
 
-         assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
+        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
     }
 
     /**
-    * Test the computeState method. 
-    * oldState                   newState        expectedFinalState
-    * SENT_AND_DEPLOYED     SENT_AND_DEPLOYED    SENT_AND_DEPLOYED
-    * SENT_AND_DEPLOYED            SENT                SENT
-    * SENT_AND_DEPLOYED          IN_ERROR            IN_ERROR
-    * SENT_AND_DEPLOYED          NOT_SENT            NOT_SENT
-    */
+     * Test the computeState method. oldState newState expectedFinalState
+     * SENT_AND_DEPLOYED SENT_AND_DEPLOYED SENT_AND_DEPLOYED SENT_AND_DEPLOYED SENT
+     * SENT SENT_AND_DEPLOYED IN_ERROR IN_ERROR SENT_AND_DEPLOYED NOT_SENT NOT_SENT
+     */
     @Test
     public void computeStateTestOriginalStateSentAndDeployed() throws IOException {
-         Exchange exchange = Mockito.mock(Exchange.class);
-         Message message = Mockito.mock(Message.class);
-         Exchange exchange2 = Mockito.mock(Exchange.class);
-         Mockito.when(exchange.getIn()).thenReturn(message);
-         Mockito.when(message.getExchange()).thenReturn(exchange2);
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
 
-         PolicyComponent policy = new PolicyComponent ();
-         ExternalComponentState SENT_AND_DEPLOYED = new ExternalComponentState("SENT_AND_DEPLOYED",
-                 "The policies defined have been created and deployed on the policy engine", 10);
-         policy.setState(SENT_AND_DEPLOYED);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState SENT_AND_DEPLOYED = new ExternalComponentState("SENT_AND_DEPLOYED",
+                "The policies defined have been created and deployed on the policy engine", 10);
+        policy.setState(SENT_AND_DEPLOYED);
 
-         // new policy state SENT_AND_DEPLOYED 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-         ExternalComponentState state = policy.computeState(exchange);
+        // new policy state SENT_AND_DEPLOYED
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state = policy.computeState(exchange);
 
-         assertThat(state.getStateName()).isEqualTo("SENT_AND_DEPLOYED");
+        assertThat(state.getStateName()).isEqualTo("SENT_AND_DEPLOYED");
 
-         // new policy state SENT 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state2 = policy.computeState(exchange);
+        // new policy state SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state2 = policy.computeState(exchange);
 
-         assertThat(state2.getStateName()).isEqualTo("SENT");
+        assertThat(state2.getStateName()).isEqualTo("SENT");
 
-         // new policy state IN_ERROR 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-         ExternalComponentState state3 = policy.computeState(exchange);
+        // new policy state IN_ERROR
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
 
-         assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
 
-         // new policy state NOT_SENT
-         policy.setState(SENT_AND_DEPLOYED);
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state4 = policy.computeState(exchange);
+        // new policy state NOT_SENT
+        policy.setState(SENT_AND_DEPLOYED);
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
 
-         assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
+        assertThat(state4.getStateName()).isEqualTo("NOT_SENT");
     }
 
     /**
-    * Test the computeState method. 
-    * oldState           newState        expectedFinalState
-    * IN_ERROR     SENT_AND_DEPLOYED         IN_ERROR
-    * IN_ERROR            SENT               IN_ERROR
-    * IN_ERROR          IN_ERROR             IN_ERROR
-    * IN_ERROR          NOT_SENT             IN_ERROR
-    */
+     * Test the computeState method. oldState newState expectedFinalState IN_ERROR
+     * SENT_AND_DEPLOYED IN_ERROR IN_ERROR SENT IN_ERROR IN_ERROR IN_ERROR IN_ERROR
+     * IN_ERROR NOT_SENT IN_ERROR
+     */
     @Test
     public void computeStateTestOriginalStateInError() throws IOException {
-         Exchange exchange = Mockito.mock(Exchange.class);
-         Message message = Mockito.mock(Message.class);
-         Exchange exchange2 = Mockito.mock(Exchange.class);
-         Mockito.when(exchange.getIn()).thenReturn(message);
-         Mockito.when(message.getExchange()).thenReturn(exchange2);
+        Exchange exchange = Mockito.mock(Exchange.class);
+        Message message = Mockito.mock(Message.class);
+        Exchange exchange2 = Mockito.mock(Exchange.class);
+        Mockito.when(exchange.getIn()).thenReturn(message);
+        Mockito.when(message.getExchange()).thenReturn(exchange2);
 
-         PolicyComponent policy = new PolicyComponent ();
-         ExternalComponentState IN_ERROR = new ExternalComponentState("IN_ERROR",
-                 "There was an error during the sending to policy, the policy engine may be corrupted or inconsistent", 100);
-         policy.setState(IN_ERROR);
+        PolicyComponent policy = new PolicyComponent();
+        ExternalComponentState IN_ERROR = new ExternalComponentState("IN_ERROR",
+                "There was an error during the sending to policy, the policy engine may be corrupted or inconsistent",
+                100);
+        policy.setState(IN_ERROR);
 
-         // new policy state SENT_AND_DEPLOYED 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-         ExternalComponentState state = policy.computeState(exchange);
+        // new policy state SENT_AND_DEPLOYED
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state = policy.computeState(exchange);
 
-         assertThat(state.getStateName()).isEqualTo("IN_ERROR");
+        assertThat(state.getStateName()).isEqualTo("IN_ERROR");
 
-         // new policy state SENT 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state2 = policy.computeState(exchange);
+        // new policy state SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(true);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state2 = policy.computeState(exchange);
 
-         assertThat(state2.getStateName()).isEqualTo("IN_ERROR");
+        assertThat(state2.getStateName()).isEqualTo("IN_ERROR");
 
-         // new policy state IN_ERROR 
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
-         ExternalComponentState state3 = policy.computeState(exchange);
+        // new policy state IN_ERROR
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(true);
+        ExternalComponentState state3 = policy.computeState(exchange);
 
-         assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
+        assertThat(state3.getStateName()).isEqualTo("IN_ERROR");
 
-         // new policy state NOT_SENT
-         Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
-         Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
-         ExternalComponentState state4 = policy.computeState(exchange);
+        // new policy state NOT_SENT
+        Mockito.when(exchange2.getProperty("policyFound")).thenReturn(false);
+        Mockito.when(exchange2.getProperty("policyDeployed")).thenReturn(false);
+        ExternalComponentState state4 = policy.computeState(exchange);
 
-         assertThat(state4.getStateName()).isEqualTo("IN_ERROR");
+        assertThat(state4.getStateName()).isEqualTo("IN_ERROR");
     }
 }