Fiqare perseo-core improvements

.gitignore

@@ -10,6 +10,10 @@
 
 .idea
 .swp
+.classpath
+.project
+.scannerwork
+.settings
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
@@ -18,3 +22,4 @@ target
 nb-configuration.xml
 nbactions.xml
 
+"" 

.travis.yml

@@ -30,8 +30,7 @@ jdk:
   - openjdk11
 branches:
   only:
-  - /.*/
-
+    - fiqare-perseo-core-improvements
 install:
   - mvn test -B
 

pom.xml

@@ -75,6 +75,11 @@
           <version>1.1.1</version>
           <scope>compile</scope>
         </dependency>
+        <dependency>
+		    <groupId>org.owasp.encoder</groupId>
+		    <artifactId>encoder</artifactId>
+		    <version>1.2.2</version>
+		</dependency>
     </dependencies>
 
     <build>
@@ -122,31 +127,6 @@
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.1</version>
-                <executions>
-                    <execution>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${endorsed.dir}</outputDirectory>
-                            <silent>true</silent>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>javax</groupId>
-                                    <artifactId>javaee-endorsed-api</artifactId>
-                                    <version>6.0</version>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -194,4 +174,4 @@
             </plugin>
         </plugins>
     </reporting>
-</project>
+</project>

sonar-project.properties

@@ -0,0 +1,9 @@
+sonar.projectKey=fiware-perseo-core-dev-jafernandez
+sonar.projectName=Fiware Perseo Core Dev JaFernandez
+sonar.projectVersion=1.0
+sonar.sources=.
+sonar.java.binaries=.
+sonar.exclusions=target/**
+sonar.junit.reportPaths=target/surefire-reports
+sonar.jacoco.reportPaths=target/jacoco.exec
+sonar.coverage.jacoco.xmlReportPaths=target/site/jacoco/jacoco.xml

src/main/java/com/telefonica/iot/perseo/Configuration.java

@@ -24,6 +24,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import java.util.ResourceBundle;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,15 +47,15 @@ private Configuration() {
     private static final String PERSEO_MAX_AGE_ENV = "MAX_AGE";
 
     private static final Properties PROPERTIES = new Properties();
-    private static final String PATH = "/etc/perseo-core.properties";
+    private static final String PATH = ResourceBundle.getBundle("perseo-core").getString("properties.path");
     private static final String ACTION_URL_PROP = "action.url";
     private static final String MAX_AGE_PROP = "rule.max_age";
 
     private static String actionRule;
     private static long maxAge;
 
     static {
-        LOGGER.debug("Configuration init: " + reload());
+        LOGGER.debug(String.format("Configuration init: %s",reload()));
     }
 
     /**
@@ -67,7 +69,7 @@ public static synchronized boolean reload() {
         InputStream stream;
         String defaultMaxAge;
         String defaultURL;
-        String actionPath = "/actions/do";
+        String actionPath = ResourceBundle.getBundle("perseo-core").getString("action.path");
 
         // Check configuration file. If exist, set as default configuration for perseo-core
         try {
@@ -95,21 +97,21 @@ public static synchronized boolean reload() {
             // Add actions/do path if perseoFeURLEnv not contains it yet
             actionRule = perseoFeURLEnv.contains(actionPath) ? perseoFeURLEnv : perseoFeURLEnv + actionPath;
         } else {
-            LOGGER.error("Invalid value for " + PERSEO_FE_URL_ENV + ": " + perseoFeURLEnv);
+            LOGGER.error(String.format("Invalid value for %s: %s",PERSEO_FE_URL_ENV, perseoFeURLEnv));
             return false;
         }
-        LOGGER.info("actionRule configuration is: " + actionRule);
+        LOGGER.info(String.format("actionRule configuration is: %s",actionRule));
 
         // Get MAX_AGE from env var if exist, else default
         String maxAgeEnv = System.getenv(PERSEO_MAX_AGE_ENV);
         // Check maxAge numerical value
         try {
             maxAge = maxAgeEnv != null ? Long.parseLong(maxAgeEnv) : Long.parseLong(defaultMaxAge);
         } catch (NumberFormatException nfe) {
-            LOGGER.error("Invalid value for " + PERSEO_MAX_AGE_ENV + ": " + nfe);
+            LOGGER.error(String.format("Invalid value for %s: %s",PERSEO_MAX_AGE_ENV,nfe));
             return false;
         }
-        LOGGER.info("maxAge configuration is: " + maxAge);
+        LOGGER.info(String.format("maxAge configuration is: %s",maxAge));
 
         return true;
     }

src/main/java/com/telefonica/iot/perseo/Constants.java

@@ -24,7 +24,7 @@
  * @author brox
  */
 public final class Constants {
-    private Constants() { };
+    private Constants() {}
     public static final String SERVICE_FIELD = "service";
     public static final String SUBSERVICE_FIELD = "subservice";
     public static final String CORRELATOR_HEADER = "fiware-correlator";

src/main/java/com/telefonica/iot/perseo/EventsServlet.java

@@ -33,6 +33,7 @@
 import org.apache.log4j.MDC;
 import org.json.JSONException;
 import org.json.JSONObject;
+import org.owasp.encoder.Encode;
 
 /**
  *
@@ -42,7 +43,7 @@
 public class EventsServlet extends HttpServlet {
 
     private static final Logger logger = LoggerFactory.getLogger(EventsServlet.class);
-    EPServiceProvider epService;
+    private static EPServiceProvider epService;
 
     @Override
     public void init() {
@@ -76,25 +77,27 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
         Utils.putCorrelatorAndTrans(request);
         logger.debug("events doPost");
         response.setCharacterEncoding("UTF-8");
-        response.setContentType("application/json;charset=UTF-8");
-        PrintWriter out = response.getWriter();
-        try {
-            StringBuilder sb = new StringBuilder();
+        response.setContentType("application/json;charset=UTF-8");        
+        try {        	
             String eventText = Utils.getBodyAsString(request);
-            logger.info("incoming event:" + eventText);
+            logger.info(String.format("incoming event: %s", eventText));
             org.json.JSONObject jo = new JSONObject(eventText);
-            logger.debug("event as JSONObject: " + jo);
+            logger.debug(String.format("event as JSONObject: %s", jo));
             Map<String, Object> eventMap = Utils.JSONObject2Map(jo);
-            logger.debug("event as map: " + eventMap);
+            logger.debug(String.format("event as map: %s" , eventMap));
             epService.getEPRuntime().sendEvent(eventMap, Constants.IOT_EVENT);
-            logger.debug("event was sent: " + eventMap);
-        } catch (JSONException je) {
-            logger.error("error: " + je);
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-            out.printf("{\"error\":\"%s\"}\n", je.getMessage());
 
-        } finally {
-            out.close();
+            logger.debug(String.format("event was sent: %s", eventMap));
+        } catch (Exception je) {
+        	try {        		
+        		logger.error(String.format("error: %s" ,je));
+        		response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        		response.getOutputStream().print(String.format("{\"error\":\"%s\"}%n", Encode.forHtmlContent(je.getMessage())));        		
+        	}catch(IOException exception) {
+        		response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        	}           
+
+
         }
     }
 

src/main/java/com/telefonica/iot/perseo/GenericListener.java

@@ -49,8 +49,7 @@ public class GenericListener implements UpdateListener {
      */
     @Override
     public void update(EventBean[] newEvents, EventBean[] oldEvents) {
-        try {
-            HashMap<String, JSONObject> rules = TimeRulesStore.getInstance().getAllRulesInfo();
+        try {          
             for (EventBean event : newEvents) {
 
                 JSONObject jo = Utils.Event2JSONObject(event);
@@ -64,23 +63,23 @@ public void update(EventBean[] newEvents, EventBean[] oldEvents) {
 
                     // Is a timed Rule. Set special headers using rule saved information
                     Utils.setTimerRuleHeaders(rule);
-                    LOGGER.info("Firing temporal rule: " + event);
+                    LOGGER.info(String.format("Firing temporal rule: %s",event));
 
                 } else {
 
-                    LOGGER.info("Firing Rule: " + event);
+                    LOGGER.info(String.format("Firing Rule: %s",event));
                 }
 
-                LOGGER.debug("result errors: " + jo.optJSONObject("errors"));
-                LOGGER.debug("result json: " + jo);
+                LOGGER.debug(String.format("result errors: %s",jo.optJSONObject("errors")));
+                LOGGER.debug(String.format("result json: %s", jo));
 
                 boolean ok = Utils.DoHTTPPost(Configuration.getActionURL(), jo.toString());
                 if (!ok) {
                     LOGGER.error("action post failed");
                 }
             }
         } catch (PropertyAccessException pae) {
-            LOGGER.error("doing action " + pae);
+            LOGGER.error(String.format("doing action %s",pae));
         }
     }
 }

src/main/java/com/telefonica/iot/perseo/LogLevelServlet.java

@@ -30,6 +30,7 @@
 import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Level;
 import org.apache.log4j.LogManager;
+import org.owasp.encoder.Encode;
 
 
 /**
@@ -65,21 +66,28 @@ public class LogLevelServlet extends HttpServlet {
     @Override
     protected void doPut(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
-        String levelName = request.getParameter("level");
-        logger.info("changing log level to " + levelName);
-        Level level = levels.get(levelName);
-        if (level == null) {
-            logger.error("invalid log level: " + levelName);
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application/json");
-            response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
-            response.getOutputStream().print("{\"errorMessage\":\"invalid log level\"}");
-            return;
+        try {
+        	String levelName = request.getParameter("level");
+            logger.info(String.format("changing log level to %s",levelName));
+            Level level = levels.get(levelName);
+            if (level == null) {
+                logger.error(String.format("invalid log level: %s",levelName));
+                response.setCharacterEncoding("UTF-8");
+                response.setContentType("application/json");
+                response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+                response.getOutputStream().print("{\"errorMessage\":\"invalid log level\"}");
+                return;
+            }
+            synchronized (mutex) {
+                LogManager.getRootLogger().setLevel(level);
+            }
+            response.setStatus(HttpServletResponse.SC_OK);      
+        }catch(IOException e) {
+        	logger.error("IOException in log level");
+        	response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        	return;
         }
-        synchronized (mutex) {
-            LogManager.getRootLogger().setLevel(level);
-        }
-        response.setStatus(HttpServletResponse.SC_OK);      
+
     }
 
     /**
@@ -95,11 +103,18 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
             throws ServletException, IOException {
         logger.debug("getting log level");
         synchronized (mutex) {
-            String currentLevel = LogManager.getRootLogger().getLevel().toString();
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application/json");
-            response.setStatus(HttpServletResponse.SC_OK);
-            response.getOutputStream().print("{\"level\":\""+ currentLevel +"\"}");
+        	 try {
+	            String currentLevel = LogManager.getRootLogger().getLevel().toString();
+	            response.setCharacterEncoding("UTF-8");
+	            response.setContentType("application/json");
+	            response.setStatus(HttpServletResponse.SC_OK);
+	            response.getOutputStream().print(String.format("{\"level\":\"%s\"}",Encode.forHtmlContent(currentLevel)));
+        	}catch(IOException e) {
+	         	logger.error("IOException in log level");
+	         	response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+	         	return;
+            }
+
         }
     }
     /**