From: rb7147 Date: Fri, 10 Aug 2018 15:53:48 +0000 (-0400) Subject: Resolved the Sonar issues X-Git-Tag: 1.3.0~38^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=7abb244616d49b10d1c31b274488a8e9dbf12de3 Resolved the Sonar issues Issue-ID: POLICY-901 Change-Id: I30e1d075dd8eb4739bcb5aa1f2503a016900ff75 Signed-off-by: rb7147 --- diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java index 8a37e9ddc..5c2e96bb5 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntries.java @@ -21,6 +21,7 @@ package org.onap.policy.controller; import com.google.gson.Gson; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -66,7 +67,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; - /** * This class is used to import and export the black list entries which were used in the Decision Blacklist Guard YAML * Policy. @@ -102,8 +102,8 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr List blackLists = adapter.getYamlparams().getBlackList(); HSSFSheet sheet = workBook.createSheet("BlackList"); HSSFRow headingRow = sheet.createRow(0); - headingRow.createCell(0).setCellValue("Action"); - headingRow.createCell(1).setCellValue("BlackListEntry"); + headingRow.createCell(0).setCellValue(ACTION); + headingRow.createCell(1).setCellValue(BLACKLISTENTRY); short rowNo = 1; for (Object object : blackLists) { @@ -126,7 +126,7 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr String formatedDate = dateFormat.format(date); String fileName = "BlackList_Scope_" + adapter.getDomainDir() + "_Name_" + adapter.getPolicyName() - + "_Version_" + root.get("version").toString() + "_Date_" + formatedDate + ".xls"; + + "_Version_" + root.get("version").toString() + "_Date_" + formatedDate + ".xls"; String deleteCheckPath = tmpFile + File.separator + fileName; File deleteCheck = new File(deleteCheckPath); @@ -156,7 +156,7 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr out.write(jsonResposne.toString()); } catch (Exception e) { policyLogger.error( - XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Exception Occured while Exporting BlackList Entries" , e); + XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Exception Occured while Exporting BlackList Entries", e); } } @@ -166,25 +166,27 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr * * @param request the HTTP request contains file upload stream form GUI. * @param response the response is send to the GUI after reading the file input stream. - * @throws FileUploadException throws fileUpload Exception. - * @throws IOException throws IO Exceptions. */ @RequestMapping(value = {"/policycreation/importBlackListForDecisionPolicy"}, method = {RequestMethod.POST}) - public void importBlackListFile(HttpServletRequest request, HttpServletResponse response) throws Exception { - List items = new ServletFileUpload(new DiskFileItemFactory()).parseRequest(request); - List errorLogs = new ArrayList<>(); - Gson mapper = new Gson(); - errorLogs.add("error"); - Map model = new HashMap<>(); - if (items.isEmpty()) { - errorLogs.add("The File doesn't have any content and it is invalid."); - model.put(BLACKLISTENTRIESDATA, errorLogs); - } else { - readItems(items, errorLogs, model); + public void importBlackListFile(HttpServletRequest request, HttpServletResponse response) { + try { + List items = new ServletFileUpload(new DiskFileItemFactory()).parseRequest(request); + List errorLogs = new ArrayList<>(); + Gson mapper = new Gson(); + errorLogs.add("error"); + Map model = new HashMap<>(); + if (items.isEmpty()) { + errorLogs.add("The File doesn't have any content and it is invalid."); + model.put(BLACKLISTENTRIESDATA, errorLogs); + } else { + readItems(items, errorLogs, model); + } + JsonMessage msg = new JsonMessage(mapper.toJson(model)); + JSONObject jsonResposne = new JSONObject(msg); + response.getWriter().write(jsonResposne.toString()); + } catch (FileUploadException | IOException e) { + policyLogger.error("Exception Occured while importing the BlackListEntry", e); } - JsonMessage msg = new JsonMessage(mapper.toJson(model)); - JSONObject jsonResposne = new JSONObject(msg); - response.getWriter().write(jsonResposne.toString()); } /** @@ -195,7 +197,7 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr * @param model Map which stores key value (blacklist and append list data) * @throws Exception throws exception if it is not .xls format */ - private void readItems(List items, List errorLogs, Map model) throws Exception { + private void readItems(List items, List errorLogs, Map model) throws IOException { Map files = new HashMap<>(); FileItem item = items.get(0); @@ -238,7 +240,7 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr String error = "Error Occured While Reading File. Please check the format of the file."; errorLogs.add(error); model.put(BLACKLISTENTRIESDATA, errorLogs); - policyLogger.error(error , e); + policyLogger.error(error, e); } } @@ -288,7 +290,6 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr ReturnBlackList returnList = readBlackListCell(cell, lineNo, errorLogs); blEntry = returnList.getEntryValue(); blackListCheck = returnList.isEntryCheck(); - actionEntry = returnList.getActionValue(); } lineNo++; } @@ -326,7 +327,6 @@ public class ExportAndImportDecisionBlackListEntries extends RestrictedBaseContr } /** - * * This method is used to read the BlackList cell entry. * * @param cell reading the blacklist entry cell. diff --git a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntriesTest.java b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntriesTest.java index bf01ac1d9..0457f2b92 100644 --- a/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntriesTest.java +++ b/POLICY-SDK-APP/src/test/java/org/onap/policy/controller/ExportAndImportDecisionBlackListEntriesTest.java @@ -45,81 +45,81 @@ import org.springframework.mock.web.MockHttpServletResponse; public class ExportAndImportDecisionBlackListEntriesTest { - private HttpServletRequest request; - private MockHttpServletResponse response; - String jsonString; - - @Before - public void setUp() throws Exception { - request = mock(HttpServletRequest.class); - response = new MockHttpServletResponse(); - } - - @Test - public void testExportBlackList() throws IOException{ - ClassLoader classLoader = getClass().getClassLoader(); - jsonString = IOUtils.toString(classLoader.getResourceAsStream("DecisionPolicyData.txt")); - try(BufferedReader reader = new BufferedReader(new StringReader(jsonString))){ - Mockito.when(request.getReader()).thenReturn(reader); - ExportAndImportDecisionBlackListEntries controller = new ExportAndImportDecisionBlackListEntries(); - controller.exportBlackList(request, response); - assertTrue("".equals(response.getContentAsString())); - }catch(Exception e){ - fail("Not expecting Exception while Exporting BlackListEntries."); - } - } - - @Test - public void testImportBlackList() throws Exception{ - MockHttpServletRequest request = new MockHttpServletRequest(); - ExportAndImportDecisionBlackListEntries controller = new ExportAndImportDecisionBlackListEntries(); - File file = new File("src/test/resources/BlackList.xls"); - try(FileInputStream targetStream = new FileInputStream(file)){ - ExportAndImportDecisionBlackListEntriesTest testController = Mockito.mock(ExportAndImportDecisionBlackListEntriesTest.class); - ServletInputStream inputStream = testController.getInputStream(getBytes(targetStream)); - Mockito.when(request.getInputStream()).thenReturn(inputStream); - String boundary = "===" + System.currentTimeMillis() + "==="; - request.addHeader("Content-Type", "multipart/form-data; boundary=" + boundary); - request.addHeader("name", "BlackList.xls"); - controller.importBlackListFile(request, response); - assertTrue(response.getContentAsString().contains("data")); - }catch(Exception e){ - fail("Not expecting Exception while importing BlackListEntries."); - } - } - - public static byte[] getBytes(InputStream is) throws IOException { - int len; - int size = 1024; - byte[] buf; - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - buf = new byte[size]; - while ((len = is.read(buf, 0, size)) != -1) - bos.write(buf, 0, len); - buf = bos.toByteArray(); - return buf; - } - - public ServletInputStream getInputStream(byte[] body) throws IOException { + private HttpServletRequest request; + private MockHttpServletResponse response; + String jsonString; + + @Before + public void setUp() throws Exception { + request = mock(HttpServletRequest.class); + response = new MockHttpServletResponse(); + } + + @Test + public void testExportBlackList() throws IOException{ + ClassLoader classLoader = getClass().getClassLoader(); + jsonString = IOUtils.toString(classLoader.getResourceAsStream("DecisionPolicyData.txt")); + try(BufferedReader reader = new BufferedReader(new StringReader(jsonString))){ + Mockito.when(request.getReader()).thenReturn(reader); + ExportAndImportDecisionBlackListEntries controller = new ExportAndImportDecisionBlackListEntries(); + controller.exportBlackList(request, response); + assertTrue("".equals(response.getContentAsString())); + }catch(Exception e){ + fail("Not expecting Exception while Exporting BlackListEntries."); + } + } + + @Test + public void testImportBlackList() throws Exception{ + MockHttpServletRequest request = new MockHttpServletRequest(); + ExportAndImportDecisionBlackListEntries controller = new ExportAndImportDecisionBlackListEntries(); + File file = new File("src/test/resources/BlackList.xls"); + try(FileInputStream targetStream = new FileInputStream(file)){ + ExportAndImportDecisionBlackListEntriesTest testController = Mockito.mock(ExportAndImportDecisionBlackListEntriesTest.class); + ServletInputStream inputStream = testController.getInputStream(getBytes(targetStream)); + Mockito.when(request.getInputStream()).thenReturn(inputStream); + String boundary = "===" + System.currentTimeMillis() + "==="; + request.addHeader("Content-Type", "multipart/form-data; boundary=" + boundary); + request.addHeader("name", "BlackList.xls"); + controller.importBlackListFile(request, response); + assertTrue(response.getContentAsString().contains("data")); + }catch(Exception e){ + fail("Not expecting Exception while importing BlackListEntries."); + } + } + + public static byte[] getBytes(InputStream is) throws IOException { + int len; + int size = 1024; + byte[] buf; + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + buf = new byte[size]; + while ((len = is.read(buf, 0, size)) != -1) + bos.write(buf, 0, len); + buf = bos.toByteArray(); + return buf; + } + + public ServletInputStream getInputStream(byte[] body) throws IOException { final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body); ServletInputStream servletInputStream = new ServletInputStream() { public int read() throws IOException { return byteArrayInputStream.read(); } - @Override - public boolean isFinished() { - return false; - } + @Override + public boolean isFinished() { + return false; + } - @Override - public boolean isReady() { - return false; - } + @Override + public boolean isReady() { + return false; + } - @Override - public void setReadListener(ReadListener readListener) { - } + @Override + public void setReadListener(ReadListener readListener) { + } }; return servletInputStream; }