JUnit/SONAR/Checkstyle in ONAP-REST
[policy/engine.git] / ONAP-PAP-REST / src / test / java / org / onap / policy / pap / xacml / rest / controller / MicroServiceDictionaryControllerTest.java
index 2e9df25..115e302 100644 (file)
@@ -2,14 +2,16 @@
  * ============LICENSE_START=======================================================
  * ONAP-PAP-REST
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright (C) 2019 Samsung
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -18,7 +20,6 @@
  * ============LICENSE_END=========================================================
  */
 
-
 package org.onap.policy.pap.xacml.rest.controller;
 
 import static org.junit.Assert.assertTrue;
@@ -42,19 +43,18 @@ import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.pap.xacml.rest.util.DictionaryUtils;
 import org.onap.policy.rest.dao.CommonClassDao;
-import org.onap.policy.rest.jpa.DCAEuuid;
+import org.onap.policy.rest.jpa.DcaeUuid;
 import org.onap.policy.rest.jpa.MicroServiceLocation;
 import org.onap.policy.rest.jpa.MicroServiceModels;
 import org.onap.policy.rest.jpa.UserInfo;
 import org.springframework.mock.web.MockHttpServletResponse;
 
 /**
- * The class <code>MicroServiceDictionaryControllerTest</code> contains tests
- * for the class {@link <code>MicroServiceDictionaryController</code>}*
+ * The class <code>MicroServiceDictionaryControllerTest</code> contains tests for the class
+ * {@link <code>MicroServiceDictionaryController</code>}*
  *
- * All JUnits are designed to run in the local development environment
- * where they have write privileges and can execute time-sensitive
- * tasks.
+ * All JUnits are designed to run in the local development environment where they have write privileges and can execute
+ * time-sensitive tasks.
  */
 
 public class MicroServiceDictionaryControllerTest {
@@ -64,7 +64,7 @@ public class MicroServiceDictionaryControllerTest {
     private String jsonString = null;
     private HttpServletRequest request = null;
     private MicroServiceDictionaryController controller = null;
-     BufferedReader br = null;
+    BufferedReader br = null;
 
     @Before
     public void setUp() throws Exception {
@@ -74,63 +74,67 @@ public class MicroServiceDictionaryControllerTest {
         userInfo.setUserLoginId("testUserId");
         userInfo.setUserName("John");
         when(commonClassDao.getEntityItem(UserInfo.class, "userLoginId", "testing")).thenReturn(userInfo);
-        
-        List<String>  listIds = new ArrayList<String>();
+
+        List<String> listIds = new ArrayList<String>();
         listIds.add("Jack");
-        when(commonClassDao.getDataByColumn(DCAEuuid.class, "name")).thenReturn(listIds);
-        
-        List<String>  microList = new ArrayList<String>();
+        when(commonClassDao.getDataByColumn(DcaeUuid.class, "name")).thenReturn(listIds);
+
+        List<String> microList = new ArrayList<String>();
         microList.add("MC-Model");
         when(commonClassDao.getDataByColumn(MicroServiceLocation.class, "name")).thenReturn(microList);
-        
-        List<Object>  listId = new ArrayList<Object>();
+
+        List<Object> listId = new ArrayList<Object>();
         listId.add("smith");
-        when(commonClassDao.getData(DCAEuuid.class)).thenReturn(listId);
+        when(commonClassDao.getData(DcaeUuid.class)).thenReturn(listId);
         MicroServiceModels microServiceModels = new MicroServiceModels();
-        
+
         doNothing().when(commonClassDao).delete(microServiceModels);
 
         MicroServiceDictionaryController.setCommonClassDao(commonClassDao);
 
         controller = new MicroServiceDictionaryController();
-       
+
         HttpServletRequest request = Mockito.mock(HttpServletRequest.class);
-        
-        jsonString = "{\"microServiceModelsDictionaryData\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                + " \"version\": \"\",\"createdBy\": \"someone\",      \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"   },"
-                + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                + "    \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                + "    \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                + "    \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
-    
+
+        jsonString = "{\"microServiceModelsDictionaryData\": {\"modelName\": \"test\",\"inprocess\": false,"
+                + "\"model\": {\"name\": \"testingdata\",\"subScopename\": \"\",\"path\": [],"
+                + "\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\","
+                + "\"createdBy\": \"someone\",\"modifiedBy\": \"someone\",\"content\": \"\","
+                + "\"recursive\": false},\"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                + "\"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
+
         br = new BufferedReader(new StringReader(jsonString));
-        //--- mock the getReader() call
-        when(request.getReader()).thenReturn(br);   
+        // --- mock the getReader() call
+        when(request.getReader()).thenReturn(br);
         new DictionaryUtils(commonClassDao);
         DictionaryUtils.setDictionaryUtils(new DictionaryUtils());
-        mock(DictionaryUtils.class);        
+        mock(DictionaryUtils.class);
         logger.info("setUp: exit");
     }
 
-
     @Test
     public void testSaveMicroServiceHeaderDefaultValues() {
         logger.info("testSaveMicroServiceHeaderDefaultValues: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"modelAttributeDictionaryData\": {\"onapName\": \"test\",  \"guard\": false,\"priority\": \"3\","
-                    + " \"riskType\": \"test\", \"riskLevel\": \"7\", \"modelName\": \"testname\"}}";
+            jsonString =
+                    "{\"modelAttributeDictionaryData\": {\"onapName\": \"test\",\"guard\": false,\"priority\": \"3\","
+                            + " \"riskType\": \"test\", \"riskLevel\": \"7\", \"modelName\": \"testname\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.saveMicroServiceHeaderDefaultValues(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -139,17 +143,17 @@ public class MicroServiceDictionaryControllerTest {
         logger.info("testSaveMicroServiceHeaderDefaultValues: exit");
     }
 
-
     @Test
     public void testGetMicroServiceHeaderDefaultsEntityDataByName() {
         logger.info("testGetMicroServiceHeaderDefaultsEntityDataByName: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceHeaderDefaultsEntityDataByName(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -162,12 +166,13 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceHeaderDefaultsEntityData() {
         logger.info("testGetMicroServiceHeaderDefaultsEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceHeaderDefaultsEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -180,24 +185,29 @@ public class MicroServiceDictionaryControllerTest {
     public void testRemoveMicroServiceHeaderDefaults() {
         logger.info("testRemoveMicroServiceHeaderDefaults: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"data\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString =
+                    "{\"data\": {\"modelName\": \"test\",\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
+                            + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,"
+                            + "\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\",\"createdBy\": \"someone\","
+                            + "\"modifiedBy\": \"someone\",\"content\": \"\",\"recursive\": false},"
+                            + "\"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                            + "\"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                            + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                            + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                            + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                            + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                            + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.removeMicroServiceHeaderDefaults(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceHeaderDefaultDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -206,18 +216,18 @@ public class MicroServiceDictionaryControllerTest {
         logger.info("testRemoveMicroServiceHeaderDefaults: exit");
     }
 
-
     @Test
     public void testGetDCAEUUIDDictionaryByNameEntityData() {
 
         logger.info("testGetDCAEUUIDDictionaryByNameEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getDCAEUUIDDictionaryByNameEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -231,12 +241,13 @@ public class MicroServiceDictionaryControllerTest {
 
         logger.info("testGetDCAEUUIDDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getDCAEUUIDDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -249,29 +260,32 @@ public class MicroServiceDictionaryControllerTest {
     public void testSaveDCAEUUIDDictionary() {
         logger.info("testSaveDCAEUUIDDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"dcaeUUIDDictionaryData\": {\"modelName\": \"test\",       \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString = "{\"dcaeUUIDDictionaryData\": {\"modelName\": \"test\",\"inprocess\": false,"
+                    + "\"model\": {\"name\": \"testingdata\",\"subScopename\": \"\",\"path\": [],"
+                    + "\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
+                    + " \"version\": \"\",\"createdBy\": \"someone\",\"modifiedBy\": \"someone\","
+                    + "\"content\": \"\",\"recursive\": false},\"tempModel\": "
+                    + "{\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                    + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                    + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                    + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                    + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                    + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.saveDCAEUUIDDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
-
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("dcaeUUIDDictionaryDatas"));
         } catch (Exception e) {
             fail("Exception: " + e);
         }
-
         logger.info("testSaveDCAEUUIDDictionary: exit");
     }
 
@@ -279,29 +293,32 @@ public class MicroServiceDictionaryControllerTest {
     public void testRemoveDCAEUUIDDictionary() {
         logger.info("testRemoveDCAEUUIDDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"data\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString =
+                    "{\"data\": {\"modelName\": \"test\",\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
+                            + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,"
+                            + "\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\",\"createdBy\": \"someone\","
+                            + "\"modifiedBy\": \"someone\",\"content\": \"\",\"recursive\": false},"
+                            + "\"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                            + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                            + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                            + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                            + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                            + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                            + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.removeMicroServiceConfigNameDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
-
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
         } catch (Exception e) {
             fail("Exception: " + e);
         }
-
         logger.info("testRemoveDCAEUUIDDictionary: exit");
     }
 
@@ -309,12 +326,13 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceConfigNameByNameDictionaryEntityData() {
         logger.info("testGetMicroServiceConfigNameByNameDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceConfigNameByNameDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -327,12 +345,13 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceConfigNameDictionaryEntityData() {
         logger.info("testGetMicroServiceConfigNameByNameDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceConfigNameDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -345,29 +364,32 @@ public class MicroServiceDictionaryControllerTest {
     public void testSaveMicroServiceConfigNameDictionary() {
         logger.info("testSaveMicroServiceConfigNameDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"microServiceConfigNameDictionaryData\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString = "{\"microServiceConfigNameDictionaryData\": {\"modelName\": \"test\",\"inprocess\": false,"
+                    + "\"model\": {\"name\": \"testingdata\",\"subScopename\": \"\",\"path\": [],"
+                    + "\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\","
+                    + "\"createdBy\": \"someone\",\"modifiedBy\": \"someone\",\"content\": \"\","
+                    + "\"recursive\": false},\"tempModel\": {\"name\": \"testingdata\","
+                    + "\"subScopename\": \"\"},\"policy\": "
+                    + "{\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                    + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                    + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                    + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                    + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                    + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.saveMicroServiceConfigNameDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
-
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
         } catch (Exception e) {
             fail("Exception: " + e);
         }
-
         logger.info("testSaveMicroServiceConfigNameDictionary: exit");
     }
 
@@ -375,29 +397,32 @@ public class MicroServiceDictionaryControllerTest {
     public void testRemoveMicroServiceConfigNameDictionary() {
         logger.info("testRemoveMicroServiceConfigNameDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"data\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString =
+                    "{\"data\": {\"modelName\": \"test\",\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
+                            + "\"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,"
+                            + "\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\",\"createdBy\": \"someone\","
+                            + "\"modifiedBy\": \"someone\",\"content\": \"\",\"recursive\": false},"
+                            + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                            + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                            + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                            + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                            + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                            + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                            + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.removeMicroServiceConfigNameDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
-
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceConfigNameDictionaryDatas"));
         } catch (Exception e) {
             fail("Exception: " + e);
         }
-
         logger.info("testRemoveMicroServiceConfigNameDictionary: exit");
     }
 
@@ -406,12 +431,13 @@ public class MicroServiceDictionaryControllerTest {
 
         logger.info("testGetMicroServiceLocationByNameDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceLocationByNameDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -424,12 +450,13 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceLocationDictionaryEntityData() {
         logger.info("testGetMicroServiceLocationDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceLocationDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -442,24 +469,29 @@ public class MicroServiceDictionaryControllerTest {
     public void testSaveMicroServiceLocationDictionary() {
         logger.info("testSaveMicroServiceLocationDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"microServiceLocationDictionaryData\": {\"modelName\": \"test\",   \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString = "{\"microServiceLocationDictionaryData\": {\"modelName\": \"test\",\"inprocess\": false,"
+                    + "\"model\": {\"name\": \"testingdata\",\"subScopename\": \"\",\"path\": [],"
+                    + "\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\","
+                    + "\"version\": \"\",\"createdBy\": \"someone\",\"modifiedBy\": \"someone\","
+                    + "\"content\": \"\",\"recursive\": false},\"tempModel\": "
+                    + "{\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                    + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                    + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                    + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                    + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                    + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.saveMicroServiceLocationDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -472,30 +504,32 @@ public class MicroServiceDictionaryControllerTest {
     public void testRemoveMicroServiceLocationDictionary() {
         logger.info("testRemoveMicroServiceLocationDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"data\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString =
+                    "{\"data\": {\"modelName\": \"test\",\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
+                            + "\"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,"
+                            + "\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\",\"createdBy\": \"someone\","
+                            + "\"modifiedBy\": \"someone\",\"content\": \"\",\"recursive\": false},\"policy\": "
+                            + "{\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                            + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                            + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                            + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                            + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                            + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
 
             when(request.getReader()).thenReturn(br);
             controller.removeMicroServiceLocationDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
-
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceLocationDictionaryDatas"));
         } catch (Exception e) {
             fail("Exception: " + e);
         }
-
         logger.info("testRemoveMicroServiceLocationDictionary: exit");
     }
 
@@ -503,12 +537,13 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceAttributeByNameDictionaryEntityData() {
         logger.info("testGetMicroServiceAttributeByNameDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceAttributeByNameDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -521,12 +556,13 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceAttributeDictionaryEntityData() {
         logger.info("testGetMicroServiceAttributeDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceAttributeDictionaryEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -539,29 +575,31 @@ public class MicroServiceDictionaryControllerTest {
     public void testSaveMicroServiceAttributeDictionary() {
         logger.info("testSaveMicroServiceAttributeDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"modelAttributeDictionaryData\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString = "{\"modelAttributeDictionaryData\": {\"modelName\": \"test\",\"inprocess\": false,"
+                    + "\"model\": {\"name\": \"testingdata\",\"subScopename\": \"\",\"path\": [],"
+                    + "\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\","
+                    + "\"createdBy\": \"someone\",\"modifiedBy\": \"someone\",\"content\": \"\","
+                    + "\"recursive\": false},\"tempModel\": " + "{\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                    + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                    + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                    + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                    + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                    + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.saveMicroServiceAttributeDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
-
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
         } catch (Exception e) {
             fail("Exception: " + e);
         }
-
         logger.info("testSaveMicroServiceAttributeDictionary: exit");
     }
 
@@ -569,24 +607,29 @@ public class MicroServiceDictionaryControllerTest {
     public void testRemoveMicroServiceAttributeDictionary() {
         logger.info("testRemoveMicroServiceAttributeDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"data\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString =
+                    "{\"data\": {\"modelName\": \"test\",\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
+                            + "\"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,"
+                            + "\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\",\"createdBy\": \"someone\","
+                            + "\"modifiedBy\": \"someone\",\"content\": \"\",\"recursive\": false},\"tempModel\": "
+                            + "{\"name\": \"testingdata\",\"subScopename\": \"\"},\"policy\": "
+                            + "{\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                            + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                            + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                            + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                            + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                            + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.removeMicroServiceAttributeDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceAttributeDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -599,12 +642,13 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceModelsDictionaryByNameEntityData() {
         logger.info("testGetMicroServiceModelsDictionaryByNameEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
 
         controller.getMicroServiceModelsDictionaryByNameEntityData(response);
 
         try {
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
             logger.info("response.getContentAsString(): " + response.getContentAsString());
         } catch (UnsupportedEncodingException e) {
             fail("Exception: " + e);
@@ -617,7 +661,7 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceModelsDictionaryByVersionEntityData() {
         logger.info("testGetMicroServiceModelsDictionaryByVersionEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
 
         BufferedReader br = new BufferedReader(new StringReader(msModelJson));
@@ -628,7 +672,8 @@ public class MicroServiceDictionaryControllerTest {
             when(request.getReader()).thenReturn(br);
             controller.getMicroServiceModelsDictionaryByVersionEntityData(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("No model name given"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("No model name given"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -641,7 +686,7 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceModelsDictionaryEntityData() {
         logger.info("testGetMicroServiceModelsDictionaryEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
 
         BufferedReader br = new BufferedReader(new StringReader(msModelJson));
@@ -652,7 +697,8 @@ public class MicroServiceDictionaryControllerTest {
             when(request.getReader()).thenReturn(br);
             controller.getMicroServiceModelsDictionaryEntityData(response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -665,7 +711,7 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceModelsDictionaryEntityDataServiceVersion() {
         logger.info("testGetMicroServiceModelsDictionaryEntityDataServiceVersion: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
 
         BufferedReader br = new BufferedReader(new StringReader(msModelJson));
@@ -676,7 +722,8 @@ public class MicroServiceDictionaryControllerTest {
             when(request.getReader()).thenReturn(br);
             controller.getMicroServiceModelsDictionaryEntityDataServiceVersion(response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -689,7 +736,7 @@ public class MicroServiceDictionaryControllerTest {
     public void testGetMicroServiceModelsDictionaryClassEntityData() {
         logger.info("testGetMicroServiceModelsDictionaryClassEntityData: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         String msModelJson = "{\"microServiceModelsDictionaryData\":[\"modelName\"]}";
 
         BufferedReader br = new BufferedReader(new StringReader(msModelJson));
@@ -700,7 +747,8 @@ public class MicroServiceDictionaryControllerTest {
             when(request.getReader()).thenReturn(br);
             controller.getMicroServiceModelsDictionaryClassEntityData(response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryClassDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceModelsDictionaryClassDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -713,7 +761,7 @@ public class MicroServiceDictionaryControllerTest {
     public void testSaveMicroServiceModelsDictionary() {
         logger.info("testSaveMicroServiceModelsDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
@@ -721,7 +769,8 @@ public class MicroServiceDictionaryControllerTest {
             when(request.getReader()).thenReturn(br);
             controller.saveMicroServiceModelsDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
 
         } catch (Exception e) {
             fail("Exception: " + e);
@@ -734,31 +783,112 @@ public class MicroServiceDictionaryControllerTest {
     public void testRemoveMicroServiceModelsDictionary() {
         logger.info("testRemoveMicroServiceModelsDictionary: Entering");
 
-        MockHttpServletResponse response =  new MockHttpServletResponse();
+        MockHttpServletResponse response = new MockHttpServletResponse();
         request = mock(HttpServletRequest.class);
 
         try {
             // mock the getReader() call
-            jsonString = "{\"data\": {\"modelName\": \"test\", \"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
-                    + " \"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,\"date\": \"2017-04-12T21:26:57.000Z\", "
-                    + " \"version\": \"\",\"createdBy\": \"someone\",  \"modifiedBy\": \"someone\",    \"content\": \"\",\"recursive\": false},"
-                    + " \"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"       },"
-                    + " \"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\",\"policyName\": \"may1501\", "
-                    + "        \"policyDescription\": \"testing input\", \"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\",\"riskLevel\": \"2\","
-                    + "        \"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\",\"version\": \"1707.41.02\",\"ruleGridData\": [ [\"fileId\"]],\"ttlDate\": null}}, "
-                    + "        \"policyJSON\": {\"pmTableName\": \"test\",     \"dmdTopic\": \"1\",\"fileId\": \"56\"} }";
+            jsonString =
+                    "{\"data\": {\"modelName\": \"test\",\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
+                            + "\"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,"
+                            + "\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\",\"createdBy\": \"someone\","
+                            + "\"modifiedBy\": \"someone\",\"content\": \"\",\"recursive\": false},"
+                            + "\"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                            + "\"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                            + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                            + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                            + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                            + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                            + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
 
             BufferedReader br = new BufferedReader(new StringReader(jsonString));
             when(request.getReader()).thenReturn(br);
             controller.removeMicroServiceModelsDictionary(request, response);
             logger.info("response.getContentAsString(): " + response.getContentAsString());
-            assertTrue( response.getContentAsString() != null && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
-
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceModelsDictionaryDatas"));
         } catch (Exception e) {
             fail("Exception: " + e);
         }
+        logger.info("testRemoveMicroServiceModelsDictionary: exit");
+    }
+
+    @Test
+    public void testRemoveMicroServiceDictionaryData() {
+        logger.info("testRemoveMicroServiceModelsDictionary: Entering");
+
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        request = mock(HttpServletRequest.class);
+
+        try {
+            jsonString =
+                    "{\"data\": {\"modelName\": \"test\",\"inprocess\": false,\"model\": {\"name\": \"testingdata\", "
+                            + "\"subScopename\": \"\",\"path\": [],\"type\": \"dir\",\"size\": 0,"
+                            + "\"date\": \"2017-04-12T21:26:57.000Z\",\"version\": \"\",\"createdBy\": \"someone\","
+                            + "\"modifiedBy\": \"someone\",\"content\": \"\",\"recursive\": false},"
+                            + "\"tempModel\": {\"name\": \"testingdata\",\"subScopename\": \"\"},"
+                            + "\"policy\": {\"policyType\": \"Config\",\"configPolicyType\": \"Micro Service\","
+                            + "\"policyName\": \"may1501\",\"policyDescription\": \"testing input\","
+                            + "\"onapName\": \"RaviTest\",\"guard\": \"False\",\"riskType\": \"Risk12345\","
+                            + "\"riskLevel\": \"2\",\"priority\": \"6\",\"serviceType\": \"DkatPolicyBody\","
+                            + "\"version\": \"1707.41.02\",\"ruleGridData\": [[\"fileId\"]],\"ttlDate\": null}},"
+                            + "\"policyJSON\": {\"pmTableName\": \"test\",\"dmdTopic\": \"1\",\"fileId\": \"56\"}}";
 
+            BufferedReader br = new BufferedReader(new StringReader(jsonString));
+            when(request.getReader()).thenReturn(br);
+            controller.removeMicroServiceDictionaryData(request, response);
+            logger.info("response.getContentAsString(): " + response.getContentAsString());
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceDictionaryData"));
+        } catch (Exception e) {
+            fail("Exception: " + e);
+        }
         logger.info("testRemoveMicroServiceModelsDictionary: exit");
     }
 
+    @Test
+    public void getMicroServiceDictNameDictionaryEntityData() {
+        logger.info("getMicroServiceDictNameDictionaryEntityData: Entering");
+
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        String msModelJson = "{\"microServiceDictionaryData\":[\"modelName\"]}";
+
+        BufferedReader br = new BufferedReader(new StringReader(msModelJson));
+        request = mock(HttpServletRequest.class);
+
+        try {
+            when(request.getReader()).thenReturn(br);
+            controller.getMicroServiceDictNameDictionaryEntityData(response);
+            logger.info("response.getContentAsString(): " + response.getContentAsString());
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceDictionaryData"));
+
+        } catch (Exception e) {
+            fail("Exception: " + e);
+        }
+
+        logger.info("getMicroServiceDictNameDictionaryEntityData: exit");
+    }
+
+    @Test
+    public void testSaveDictionaryData() {
+        logger.info("testSaveDictionaryData: Entering");
+
+        MockHttpServletResponse response = new MockHttpServletResponse();
+        request = mock(HttpServletRequest.class);
+
+        try {
+            jsonString = "{\"microServiceDictionaryDatas\": {\"id\": 1,\"dictionaryName\": \"tes1t\","
+                    + "\"dictionaryUrl\": \"tes1t\",\"dictionaryDataByName\": \"test\"}}";
+            BufferedReader br = new BufferedReader(new StringReader(jsonString));
+            when(request.getReader()).thenReturn(br);
+            controller.saveDictionaryData(request, response);
+            logger.info("response.getContentAsString(): " + response.getContentAsString());
+            assertTrue(response.getContentAsString() != null
+                    && response.getContentAsString().contains("microServiceDictionaryDatas"));
+        } catch (Exception e) {
+            fail("Exception: " + e);
+        }
+        logger.info("testSaveDictionaryData: exit");
+    }
 }