Fix format

itesla · Jul 3, 2017 · 9a05526 · 9a05526
1 parent fe5066c
commit 9a05526
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 24 deletions.
diff --git a/...ty-analysis-ws/src/main/java/eu/itesla_project/security/rest/api/SecurityAnalysisApi.java b/...ty-analysis-ws/src/main/java/eu/itesla_project/security/rest/api/SecurityAnalysisApi.java
@@ -26,13 +26,12 @@
 @Path("/")
 public class SecurityAnalysisApi {
     private final SecurityAnalysisService delegate = SecurityAnalysisServiceFactory.getSecurityServiceApi();
-    
+
     @POST
     @Path("/security-analysis")
     @Consumes(MediaType.MULTIPART_FORM_DATA)
     public Response process(MultipartFormDataInput form, @PathParam("format") String format, @Context SecurityContext securityContext) {      
         return delegate.analyze(form);
     }
-
-
+
 }
diff --git a/...nalysis-ws/src/main/java/eu/itesla_project/security/rest/api/SecurityAnalysisService.java b/...nalysis-ws/src/main/java/eu/itesla_project/security/rest/api/SecurityAnalysisService.java
@@ -15,7 +15,7 @@
  * @author Giovanni Ferrari <giovanni.ferrari@techrain.it>
  */
 public interface SecurityAnalysisService {
-    
+
     public Response analyze(MultipartFormDataInput dataInput);
 
 }
diff --git a/...in/java/eu/itesla_project/security/rest/api/factories/SecurityAnalysisServiceFactory.java b/...in/java/eu/itesla_project/security/rest/api/factories/SecurityAnalysisServiceFactory.java
@@ -11,7 +11,6 @@
 import eu.itesla_project.security.rest.api.SecurityAnalysisService;
 import eu.itesla_project.security.rest.api.impl.SecurityAnalysisServiceImpl;
 
-
 /**
  *
  * @author Giovanni Ferrari <giovanni.ferrari@techrain.it>

diff --git a/...s/src/main/java/eu/itesla_project/security/rest/api/impl/SecurityAnalysisServiceImpl.java b/...s/src/main/java/eu/itesla_project/security/rest/api/impl/SecurityAnalysisServiceImpl.java
@@ -56,7 +56,7 @@ public class SecurityAnalysisServiceImpl implements SecurityAnalysisService {
     private enum Format {
         CSV, JSON
     }
-    
+
     private final SecurityAnalyzer analyzer;
 
     public SecurityAnalysisServiceImpl(SecurityAnalyzer securityAnalyzer) {
@@ -79,8 +79,6 @@ public Response analyze(MultipartFormDataInput form) {
                     String out_format = getParameter(formatParts);
                     if(out_format != null)
                         format = Format.valueOf(out_format);
-
-                    LOGGER.debug("format=" + format);
                 } catch (java.lang.IllegalArgumentException ie) {
                     return Response.status(Status.BAD_REQUEST).entity("Wrong format parameter").build();
                 }
@@ -92,7 +90,6 @@ public Response analyze(MultipartFormDataInput form) {
             List<InputPart> limitParts = formParts.get("limit-types");
             if (limitParts != null) {
                 limitTypes = getParameter(limitParts);
-                LOGGER.debug("limit-types=" + limitTypes);
             }
 
             Set<LimitViolationType> limitViolationTypes = null;
@@ -157,9 +154,8 @@ public void write(OutputStream out) throws IOException, WebApplicationException
                 }
             }
         };
-
     }
-    
+
     private String getParameter(List<InputPart> parts){
         Objects.requireNonNull(parts);
         try {

diff --git a/security-analysis-ws/src/main/webapp/analysis.html b/security-analysis-ws/src/main/webapp/analysis.html
@@ -1,3 +1,9 @@
+<!--
+    Copyright (c) 2016, RTE (http://www.rte-france.com) This Source Code 
+    Form is subject to the terms of the Mozilla Public License, v. 2.0. If a 
+    copy of the MPL was not distributed with this file, You can obtain one at 
+    http://mozilla.org/MPL/2.0/. 
+-->
 <!DOCTYPE html>
 <html>
 <head>
@@ -26,7 +32,6 @@ <h2>Security Analysis</h2>
                 <td><select name="format">
                         <option value="JSON">JSON</option>
                         <option value="CSV">CSV</option>
-                        <option value="ERROR">ERROR</option>
                 </select></td>
             </tr>
             <tr>

diff --git a/...ty-analysis-ws/src/test/java/eu/itesla_project/security/rest/api/test/SecurityWsTest.java b/...ty-analysis-ws/src/test/java/eu/itesla_project/security/rest/api/test/SecurityWsTest.java
@@ -30,27 +30,25 @@
 import eu.itesla_project.security.rest.api.impl.SecurityAnalysisServiceImpl;
 
 public class SecurityWsTest {
-    
+
     private SecurityAnalysisServiceImpl service;
-    
+
     @Before
     public void setUp(){
         SecurityAnalysisResult result = new SecurityAnalysisResult(
-                new LimitViolationsResult(true, Collections.emptyList()), Collections.emptyList());
-
+                new LimitViolationsResult(true, Collections.emptyList()), Collections.emptyList());  
         SecurityAnalyzer analyzer = Mockito.mock(SecurityAnalyzer.class);
         when(analyzer.analyze(any(Path.class), any(Path.class))).thenReturn(result);
-
         service = new SecurityAnalysisServiceImpl(analyzer);
     }
-    
+
     @Test
     public void testSecurityAnalysisJson() {
         MultipartFormDataInput dataInput = mock(MultipartFormDataInput.class);
         Map<String, List<InputPart>> formValues = new HashMap();
         formValues.put("format", Arrays.asList(new InputPartImpl("JSON", MediaType.TEXT_PLAIN_TYPE)));
         formValues.put("limit-types", Arrays.asList(new InputPartImpl("CURRENT", MediaType.TEXT_PLAIN_TYPE)));
-        
+
         MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
         headers.putSingle("Content-Disposition", "filename=" + "case-file.xiidm.gz");
 
@@ -71,7 +69,7 @@ public void testSecurityAnalysisJson() {
         Assert.assertEquals(200, res.getStatus());
 
     }
-  
+
     @Test
     public void testSecurityAnalysisCsv() {
         MultipartFormDataInput dataInput = mock(MultipartFormDataInput.class);
@@ -97,7 +95,7 @@ public void testSecurityAnalysisCsv() {
         Response res = service.analyze(dataInput);
         Assert.assertEquals(200, res.getStatus());
     }
-    
+
     @Test
     public void testWrongFormat() {
         MultipartFormDataInput dataInput = mock(MultipartFormDataInput.class);
@@ -156,7 +154,6 @@ public void testMissingCaseFile() {
         MultipartFormDataInput dataInput = mock(MultipartFormDataInput.class);
         Map<String, List<InputPart>> formValues = new HashMap();
         formValues.put("format", Arrays.asList(new InputPartImpl("JSON", MediaType.TEXT_PLAIN_TYPE)));
-
         formValues.put("limit-types", Arrays.asList(new InputPartImpl("CURRENT", MediaType.TEXT_PLAIN_TYPE)));
 
         MultivaluedMap<String, String> headers2 = new MultivaluedMapImpl();
@@ -177,7 +174,6 @@ public void testWrongLimits() {
         MultipartFormDataInput dataInput = mock(MultipartFormDataInput.class);
         Map<String, List<InputPart>> formValues = new HashMap();
         formValues.put("format", Arrays.asList(new InputPartImpl("JSON", MediaType.TEXT_PLAIN_TYPE)));
-
         formValues.put("limit-types", Arrays.asList(new InputPartImpl("ERRR", MediaType.TEXT_PLAIN_TYPE)));
 
         MultivaluedMap<String, String> headers = new MultivaluedMapImpl();
@@ -187,7 +183,7 @@ public void testWrongLimits() {
                 Arrays.asList(new InputPartImpl(
                         new ByteArrayInputStream("Network".getBytes()),
                         MediaType.APPLICATION_OCTET_STREAM_TYPE, headers)));
-        
+
         MultivaluedMap<String, String> headers2 = new MultivaluedMapImpl();
         headers2.putSingle("Content-Disposition", "filename=" + "contingencies-file.csv");
         formValues.put("contingencies-file",