Unit/SONAR/Checkstyle in ONAP-REST
[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / controller / DictionaryImportController.java
index 7093cd5..0295822 100644 (file)
@@ -2,14 +2,14 @@
  * ============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.
  * ================================================================================
  * 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.
 
 package org.onap.policy.pap.xacml.rest.controller;
 
+import au.com.bytecode.opencsv.CSVReader;
+
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.FileReader;
@@ -39,9 +44,9 @@ import org.onap.policy.rest.jpa.ActionList;
 import org.onap.policy.rest.jpa.ActionPolicyDict;
 import org.onap.policy.rest.jpa.AddressGroup;
 import org.onap.policy.rest.jpa.Attribute;
-import org.onap.policy.rest.jpa.BRMSController;
-import org.onap.policy.rest.jpa.BRMSDependency;
-import org.onap.policy.rest.jpa.BRMSParamTemplate;
+import org.onap.policy.rest.jpa.BrmsController;
+import org.onap.policy.rest.jpa.BrmsDependency;
+import org.onap.policy.rest.jpa.BrmsParamTemplate;
 import org.onap.policy.rest.jpa.Category;
 import org.onap.policy.rest.jpa.ClosedLoopD2Services;
 import org.onap.policy.rest.jpa.ClosedLoopSite;
@@ -51,15 +56,15 @@ import org.onap.policy.rest.jpa.DescriptiveScope;
 import org.onap.policy.rest.jpa.GroupServiceList;
 import org.onap.policy.rest.jpa.MicroServiceModels;
 import org.onap.policy.rest.jpa.OnapName;
-import org.onap.policy.rest.jpa.PEPOptions;
+import org.onap.policy.rest.jpa.PepOptions;
 import org.onap.policy.rest.jpa.PrefixList;
 import org.onap.policy.rest.jpa.ProtocolList;
 import org.onap.policy.rest.jpa.SecurityZone;
 import org.onap.policy.rest.jpa.ServiceList;
 import org.onap.policy.rest.jpa.TermList;
 import org.onap.policy.rest.jpa.UserInfo;
-import org.onap.policy.rest.jpa.VNFType;
-import org.onap.policy.rest.jpa.VSCLAction;
+import org.onap.policy.rest.jpa.VnfType;
+import org.onap.policy.rest.jpa.VsclAction;
 import org.onap.policy.rest.jpa.VarbindDictionary;
 import org.onap.policy.rest.jpa.Zone;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -67,23 +72,17 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import au.com.bytecode.opencsv.CSVReader;
-
-
 @Controller
 public class DictionaryImportController {
-    private static final Logger LOGGER  = FlexLogger.getLogger(DictionaryImportController.class);
+    private static final Logger LOGGER = FlexLogger.getLogger(DictionaryImportController.class);
 
     private static CommonClassDao commonClassDao;
-    private static final String DESCRIPTION= "description";
-    private static final String ERROR= "Error";
-    private static final String DEPENDENCY= "dependency";
+    private static final String DESCRIPTION = "description";
+    private static final String ERROR = "Error";
+    private static final String DEPENDENCY = "dependency";
 
     @Autowired
-    public DictionaryImportController(CommonClassDao commonClassDao){
+    public DictionaryImportController(CommonClassDao commonClassDao) {
         setCommonClassDao(commonClassDao);
     }
 
@@ -91,18 +90,18 @@ public class DictionaryImportController {
         DictionaryImportController.commonClassDao = commonClassDao;
     }
 
-    public DictionaryImportController(){
+    public DictionaryImportController() {
         super();
     }
 
-    @RequestMapping(value={"/dictionary/import_dictionary"}, method={RequestMethod.POST})
-    public void importDictionaryData(HttpServletRequest request, HttpServletResponse response) throws IOException{
+    @RequestMapping(value = {"/dictionary/import_dictionary"}, method = {RequestMethod.POST})
+    public void importDictionaryData(HttpServletRequest request, HttpServletResponse response) throws IOException {
         ObjectMapper mapper = new ObjectMapper();
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         String userId = request.getParameter("userId");
         String dictionaryName = request.getParameter("dictionaryName");
 
-        if(dictionaryName == null || dictionaryName.isEmpty()){
+        if (dictionaryName == null || dictionaryName.isEmpty()) {
             LOGGER.error("dictionaryName is null/empty");
             response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
             response.getWriter().write(ERROR);
@@ -110,46 +109,49 @@ public class DictionaryImportController {
         }
 
         // fix Fortify Path Manipulation issue
-        if(!isValidDictionaryName(dictionaryName)){
+        if (!isValidDictionaryName(dictionaryName)) {
             LOGGER.error("dictionaryName is invalid");
             response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
             response.getWriter().write(ERROR);
             return;
         }
         File file = new File(dictionaryName);
-        try(OutputStream outputStream = new FileOutputStream(file); FileReader fileReader = new FileReader(file.toString())){
+        try (OutputStream outputStream = new FileOutputStream(file);
+                FileReader fileReader = new FileReader(file.toString())) {
             IOUtils.copy(request.getInputStream(), outputStream);
             CSVReader csvReader = new CSVReader(fileReader);
             List<String[]> dictSheet = csvReader.readAll();
-            if(dictionaryName.startsWith("Attribute")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("Attribute")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     Attribute attribute = new Attribute("");
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("xacml_id".equalsIgnoreCase(dictSheet.get(0)[j]) || "Attribute ID".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("xacml_id".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Attribute ID".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setXacmlId(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("priority".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("priority".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setPriority(rows[j]);
                         }
-                        if("datatype".equalsIgnoreCase(dictSheet.get(0)[j]) || "Data Type".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("datatype".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Data Type".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             Datatype dataType = new Datatype();
-                            if("string".equalsIgnoreCase(rows[j])){
+                            if ("string".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(26);
-                            }else if("integer".equalsIgnoreCase(rows[j])){
+                            } else if ("integer".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(12);
-                            }else if("double".equalsIgnoreCase(rows[j])){
+                            } else if ("double".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(25);
-                            }else if("boolean".equalsIgnoreCase(rows[j])){
+                            } else if ("boolean".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(18);
-                            }else if("user".equalsIgnoreCase(rows[j])){
+                            } else if ("user".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(29);
                             }
                             attribute.setDatatypeBean(dataType);
@@ -157,60 +159,63 @@ public class DictionaryImportController {
                             category.setId(5);
                             attribute.setCategoryBean(category);
                         }
-                        if("attribute_value".equalsIgnoreCase(dictSheet.get(0)[j]) || "Attribute Value".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("attribute_value".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Attribute Value".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setAttributeValue(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("ActionPolicyDictionary")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("ActionPolicyDictionary")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     ActionPolicyDict attribute = new ActionPolicyDict();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("attribute_name".equalsIgnoreCase(dictSheet.get(0)[j]) || "Attribute Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("attribute_name".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Attribute Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setAttributeName(rows[j]);
                         }
-                        if("body".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("body".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setBody(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("headers".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("headers".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setHeader(rows[j]);
                         }
-                        if("method".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("method".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setMethod(rows[j]);
                         }
-                        if("type".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("type".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setType(rows[j]);
                         }
-                        if("url".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("url".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setUrl(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("OnapName")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("OnapName")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     OnapName attribute = new OnapName();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("onap_name".equalsIgnoreCase(dictSheet.get(0)[j]) || "Onap Name".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setOnapName(rows[j]);
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("onap_name".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Onap Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
@@ -218,39 +223,41 @@ public class DictionaryImportController {
                 }
             }
 
-            if(dictionaryName.startsWith("MSPolicyDictionary")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("MSPolicyDictionary")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     MicroServiceModels attribute = new MicroServiceModels();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("modelName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Micro Service Model".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("modelName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Micro Service Model".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setModelName(rows[j]);
                         }
-                        if("version".equalsIgnoreCase(dictSheet.get(0)[j]) || "Model Version".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("version".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Model Version".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setVersion(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if(DEPENDENCY.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DEPENDENCY.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDependency(rows[j]);
                         }
-                        if("attributes".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setAttributes(rows[j]);
                         }
-                        if("enumValues".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("enumValues".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setEnumValues(rows[j]);
                         }
-                        if("Ref Attributes".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setRef_attributes(rows[j]);
+                        if ("Ref Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setRefAttributes(rows[j]);
                         }
-                        if("Sub Attributes".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setSub_attributes(rows[j]);
+                        if ("Sub Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setSubAttributes(rows[j]);
                         }
-                        if("annotations".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                        if ("annotations".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setAnnotation(rows[j]);
                         }
                     }
@@ -259,39 +266,41 @@ public class DictionaryImportController {
                 }
             }
 
-            if(dictionaryName.startsWith("OptimizationPolicyDictionary")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("OptimizationPolicyDictionary")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     MicroServiceModels attribute = new MicroServiceModels();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("modelName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Optimization Service Model".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("modelName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Optimization Service Model".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setModelName(rows[j]);
                         }
-                        if("version".equalsIgnoreCase(dictSheet.get(0)[j]) || "Model Version".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("version".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Model Version".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setVersion(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if(DEPENDENCY.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DEPENDENCY.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDependency(rows[j]);
                         }
-                        if("attributes".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setAttributes(rows[j]);
                         }
-                        if("enumValues".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("enumValues".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setEnumValues(rows[j]);
                         }
-                        if("Ref Attributes".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setRef_attributes(rows[j]);
+                        if ("Ref Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setRefAttributes(rows[j]);
                         }
-                        if("Sub Attributes".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setSub_attributes(rows[j]);
+                        if ("Sub Attributes".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setSubAttributes(rows[j]);
                         }
-                        if("annotations".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                        if ("annotations".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setAnnotation(rows[j]);
                         }
                     }
@@ -300,218 +309,231 @@ public class DictionaryImportController {
                 }
             }
 
-            if(dictionaryName.startsWith("VNFType")){
-                for(int i = 1; i< dictSheet.size(); i++){
-                    VNFType attribute = new VNFType();
+            if (dictionaryName.startsWith("VNFType")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
+                    VnfType attribute = new VnfType();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("vnf_type".equalsIgnoreCase(dictSheet.get(0)[j]) || "VNF Type".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setVnftype(rows[j]);
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("vnf_type".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "VNF Type".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setType(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("VSCLAction")){
-                for(int i = 1; i< dictSheet.size(); i++){
-                    VSCLAction attribute = new VSCLAction();
+            if (dictionaryName.startsWith("VSCLAction")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
+                    VsclAction attribute = new VsclAction();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("vscl_action".equalsIgnoreCase(dictSheet.get(0)[j]) || "VSCL Action".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setVsclaction(rows[j]);
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("vscl_action".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "VSCL Action".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setAction(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("ClosedLoopService")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("ClosedLoopService")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     ClosedLoopD2Services attribute = new ClosedLoopD2Services();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("serviceName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Service Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("serviceName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Service Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServiceName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("ClosedLoopSite")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("ClosedLoopSite")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     ClosedLoopSite attribute = new ClosedLoopSite();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("siteName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Site Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("siteName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Site Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setSiteName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("PEPOptions")){
-                for(int i = 1; i< dictSheet.size(); i++){
-                    PEPOptions attribute = new PEPOptions();
+            if (dictionaryName.startsWith("PepOptions")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
+                    PepOptions attribute = new PepOptions();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("PEP_NAME".equalsIgnoreCase(dictSheet.get(0)[j]) || "PEP Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("PEP_NAME".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "PEP Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setPepName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("Actions".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("Actions".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setActions(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("VarbindDictionary")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("VarbindDictionary")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     VarbindDictionary attribute = new VarbindDictionary();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("varbind_Name".equalsIgnoreCase(dictSheet.get(0)[j]) || "Varbind Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("varbind_Name".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Varbind Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setVarbindName(rows[j]);
                         }
-                        if("varbind_Description".equalsIgnoreCase(dictSheet.get(0)[j]) || "Varbind Description".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("varbind_Description".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Varbind Description".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setVarbindDescription(rows[j]);
                         }
-                        if("varbind_oid".equalsIgnoreCase(dictSheet.get(0)[j]) || "Varbind OID".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setVarbindOID(rows[j]);
+                        if ("varbind_oid".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Varbind OID".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setVarbindOid(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("BRMSParamDictionary")){
-                for(int i = 1; i< dictSheet.size(); i++){
-                    BRMSParamTemplate attribute = new BRMSParamTemplate();
+            if (dictionaryName.startsWith("BRMSParamDictionary")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
+                    BrmsParamTemplate attribute = new BrmsParamTemplate();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("param_template_name".equalsIgnoreCase(dictSheet.get(0)[j]) || "Rule Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("param_template_name".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Rule Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setRuleName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("rule".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("rule".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setRule(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("BRMSControllerDictionary")){
-                for(int i = 1; i< dictSheet.size(); i++){
-                    BRMSController attribute = new BRMSController();
+            if (dictionaryName.startsWith("BRMSControllerDictionary")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
+                    BrmsController attribute = new BrmsController();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("controllerName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Controller Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("controllerName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Controller Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setControllerName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("controller".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("controller".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setController(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("BRMSDependencyDictionary")){
-                for(int i = 1; i< dictSheet.size(); i++){
-                    BRMSDependency attribute = new BRMSDependency();
+            if (dictionaryName.startsWith("BRMSDependencyDictionary")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
+                    BrmsDependency attribute = new BrmsDependency();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("dependencyName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Dependency Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("dependencyName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Dependency Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDependencyName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if(DEPENDENCY.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DEPENDENCY.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDependency(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("Settings")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("Settings")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     DecisionSettings attribute = new DecisionSettings();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("xacml_id".equalsIgnoreCase(dictSheet.get(0)[j]) || "Settings ID".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("xacml_id".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Settings ID".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setXacmlId(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("priority".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("priority".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setPriority(rows[j]);
                         }
-                        if("datatype".equalsIgnoreCase(dictSheet.get(0)[j]) || "Data Type".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("datatype".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Data Type".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             Datatype dataType = new Datatype();
-                            if("string".equalsIgnoreCase(rows[j])){
+                            if ("string".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(26);
-                            }else if("integer".equalsIgnoreCase(rows[j])){
+                            } else if ("integer".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(12);
-                            }else if("double".equalsIgnoreCase(rows[j])){
+                            } else if ("double".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(25);
-                            }else if("boolean".equalsIgnoreCase(rows[j])){
+                            } else if ("boolean".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(18);
-                            }else if("user".equalsIgnoreCase(rows[j])){
+                            } else if ("user".equalsIgnoreCase(rows[j])) {
                                 dataType.setId(29);
                             }
                             attribute.setDatatypeBean(dataType);
@@ -520,200 +542,229 @@ public class DictionaryImportController {
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("PrefixList")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("PrefixList")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     PrefixList attribute = new PrefixList();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("prefixListName".equalsIgnoreCase(dictSheet.get(0)[j]) || "PrefixList Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("prefixListName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "PrefixList Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setPrefixListName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setPrefixListValue(rows[j]);
                         }
-                        if("prefixListValue".equalsIgnoreCase(dictSheet.get(0)[j]) || "PrefixList Value".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("prefixListValue".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "PrefixList Value".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("SecurityZone")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("SecurityZone")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     SecurityZone attribute = new SecurityZone();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("zoneName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Zone Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("zoneName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Zone Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setZoneName(rows[j]);
                         }
-                        if("zoneValue".equalsIgnoreCase(dictSheet.get(0)[j])  || "Zone Value".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("zoneValue".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Zone Value".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setZoneValue(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("Zone")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("Zone")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     Zone attribute = new Zone();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("zoneName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Zone Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("zoneName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Zone Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setZoneName(rows[j]);
                         }
-                        if("zoneValue".equalsIgnoreCase(dictSheet.get(0)[j])  || "Zone Value".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("zoneValue".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Zone Value".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setZoneValue(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("ServiceList")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("ServiceList")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     ServiceList attribute = new ServiceList();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("serviceName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Service Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("serviceName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Service Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServiceName(rows[j]);
                         }
-                        if("serviceDesc".equalsIgnoreCase(dictSheet.get(0)[j])  || DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("serviceDesc".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServiceDescription(rows[j]);
                         }
-                        if("serviceType".equalsIgnoreCase(dictSheet.get(0)[j])  || "Service Type".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("serviceType".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Service Type".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServiceType(rows[j]);
                         }
-                        if("serviceTrasProtocol".equalsIgnoreCase(dictSheet.get(0)[j])  || "Transport Protocol".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setServiceTransProtocol(rows[j]);
+                        if ("serviceTrasProtocol".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Transport Protocol".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setServiceTransportProtocol(rows[j]);
                         }
-                        if("serviceAppProtocol".equalsIgnoreCase(dictSheet.get(0)[j])  || "APP Protocol".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("serviceAppProtocol".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "APP Protocol".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServiceAppProtocol(rows[j]);
                         }
-                        if("servicePorts".equalsIgnoreCase(dictSheet.get(0)[j])  || "Ports".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("servicePorts".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Ports".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServicePorts(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("ServiceGroup")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("ServiceGroup")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     GroupServiceList attribute = new GroupServiceList();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("name".equalsIgnoreCase(dictSheet.get(0)[j]) || "Group Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("name".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Group Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setGroupName(rows[j]);
                         }
-                        if("serviceList".equalsIgnoreCase(dictSheet.get(0)[j])  || "Service List".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("serviceList".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Service List".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServiceList(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("AddressGroup")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("AddressGroup")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     AddressGroup attribute = new AddressGroup();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("name".equalsIgnoreCase(dictSheet.get(0)[j]) || "Group Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("name".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Group Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setGroupName(rows[j]);
                         }
-                        if("serviceList".equalsIgnoreCase(dictSheet.get(0)[j])  || "Prefix List".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("serviceList".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Prefix List".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setServiceList(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("ProtocolList")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("ProtocolList")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     ProtocolList attribute = new ProtocolList();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("protocolName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Protocol Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("protocolName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Protocol Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setProtocolName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("ActionList")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("ActionList")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     ActionList attribute = new ActionList();
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("actionName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Action Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("actionName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Action Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setActionName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("TermList")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("TermList")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     TermList attribute = new TermList();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("termName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Term-Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("termName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Term-Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setTermName(rows[j]);
                         }
-                        if("Term-Description".equalsIgnoreCase(dictSheet.get(0)[j]) || "termDescription".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("Term-Description".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "termDescription".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("fromZone".equalsIgnoreCase(dictSheet.get(0)[j])  || "From Zone".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setFromZones(rows[j]);
+                        if ("fromZone".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "From Zone".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setFromZone(rows[j]);
                         }
-                        if("toZone".equalsIgnoreCase(dictSheet.get(0)[j]) || "To Zone".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setToZones(rows[j]);
+                        if ("toZone".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "To Zone".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setToZone(rows[j]);
                         }
-                        if("srcIPList".equalsIgnoreCase(dictSheet.get(0)[j]) || "Source-IP-List".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setSrcIPList(rows[j]);
+                        if ("srcIPList".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Source-IP-List".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setSrcIpList(rows[j]);
                         }
-                        if("destIPList".equalsIgnoreCase(dictSheet.get(0)[j]) || "Destination-IP-List".equalsIgnoreCase(dictSheet.get(0)[j])){
-                            attribute.setDestIPList(rows[j]);
+                        if ("destIPList".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Destination-IP-List".equalsIgnoreCase(dictSheet.get(0)[j])) {
+                            attribute.setDestIpList(rows[j]);
                         }
-                        if("srcPortList".equalsIgnoreCase(dictSheet.get(0)[j]) || "Source-Port-List".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("srcPortList".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Source-Port-List".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setSrcPortList(rows[j]);
                         }
-                        if("destPortList".equalsIgnoreCase(dictSheet.get(0)[j]) || "Destination-Port-List".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("destPortList".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Destination-Port-List".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDestPortList(rows[j]);
                         }
-                        if("action".equalsIgnoreCase(dictSheet.get(0)[j]) || "Action List".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("action".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Action List".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setAction(rows[j]);
                         }
                     }
                     commonClassDao.save(attribute);
                 }
             }
-            if(dictionaryName.startsWith("SearchCriteria")){
-                for(int i = 1; i< dictSheet.size(); i++){
+            if (dictionaryName.startsWith("SearchCriteria")) {
+                for (int i = 1; i < dictSheet.size(); i++) {
                     DescriptiveScope attribute = new DescriptiveScope();
                     UserInfo userinfo = new UserInfo();
                     userinfo.setUserLoginId(userId);
                     attribute.setUserCreatedBy(userinfo);
                     attribute.setUserModifiedBy(userinfo);
                     String[] rows = dictSheet.get(i);
-                    for (int j=0 ; j<rows.length; j++ ){
-                        if("descriptiveScopeName".equalsIgnoreCase(dictSheet.get(0)[j]) || "Descriptive Scope Name".equalsIgnoreCase(dictSheet.get(0)[j])){
+                    for (int j = 0; j < rows.length; j++) {
+                        if ("descriptiveScopeName".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Descriptive Scope Name".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setScopeName(rows[j]);
                         }
-                        if(DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if (DESCRIPTION.equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setDescription(rows[j]);
                         }
-                        if("search".equalsIgnoreCase(dictSheet.get(0)[j]) || "Search Criteria".equalsIgnoreCase(dictSheet.get(0)[j])){
+                        if ("search".equalsIgnoreCase(dictSheet.get(0)[j])
+                                || "Search Criteria".equalsIgnoreCase(dictSheet.get(0)[j])) {
                             attribute.setSearch(rows[j]);
                         }
                     }
@@ -723,24 +774,24 @@ public class DictionaryImportController {
             csvReader.close();
             response.setStatus(HttpServletResponse.SC_OK);
             response.getWriter().write("Success");
-        }catch(Exception e){
-            LOGGER.error("Exception Occured while importing dictionary"+e);
+        } catch (Exception e) {
+            LOGGER.error("Exception Occured while importing dictionary" + e);
             response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
             response.getWriter().write(ERROR);
-        }finally{
-            if(file != null && file.exists()){
+        } finally {
+            if (file != null && file.exists()) {
                 boolean deleted = file.delete();
-                LOGGER.error("Imported File has been deleted: "+deleted);
+                LOGGER.error("Imported File has been deleted: " + deleted);
             }
         }
     }
 
-    public boolean isValidDictionaryName(String dictionaryName){
+    public boolean isValidDictionaryName(String dictionaryName) {
 
         String nameCheck = dictionaryName.replace(".csv", "");
-        try{
+        try {
             DictionaryNames mode = DictionaryNames.valueOf(nameCheck);
-            switch (mode){
+            switch (mode) {
                 case Attribute:
                 case ActionPolicyDictionary:
                 case OnapName:
@@ -750,7 +801,7 @@ public class DictionaryImportController {
                 case VSCLAction:
                 case ClosedLoopService:
                 case ClosedLoopSite:
-                case PEPOptions:
+                case PepOptions:
                 case VarbindDictionary:
                 case BRMSParamDictionary:
                 case BRMSControllerDictionary:
@@ -770,9 +821,9 @@ public class DictionaryImportController {
                 default:
                     return false;
             }
-        }catch(Exception e){
-            LOGGER.error("Dictionary not exits: " +dictionaryName +e);
+        } catch (Exception e) {
+            LOGGER.error("Dictionary not exits: " + dictionaryName + e);
             return false;
         }
     }
-}
\ No newline at end of file
+}