Merge pull request #37 from DevFactory/release/boolean-expressions-not-to-be-wrapped-fix-1

Fixing squid:S1126--Fixing squid:S1488

Author: janithb

src/main/java/org/audit4j/core/Configurations.java

@@ -80,8 +80,7 @@ static Configuration loadConfig(String configFilePath) throws ConfigurationExcep
      */
     static Configuration loadConfig(ConfigurationStream stream) throws ConfigurationException {
         ConfigProvider<Configuration> provider = getProviderByFileExtention(stream.getExtention());
-        Configuration configuration = provider.readConfig(stream.getInputStream());
-        return configuration;
+        return provider.readConfig(stream.getInputStream());
     }
 
     /**

src/main/java/org/audit4j/core/handler/file/FileHandlerUtil.java

@@ -183,11 +183,7 @@ public static String separatorsToSystem(String path) {
 	 */
 	public static boolean isFileAlreadyExists(String path) {
 		File file = new File(path);
-		if (file.exists()) {
-			return true;
-		} else {
-			return false;
-		}
+		return file.exists();
 	}
 
 	/**

src/main/java/org/audit4j/core/web/ServletContexConfigSupport.java

@@ -95,10 +95,6 @@ boolean canSearchConfigFile(ServletContext servletContext) {
      */
     boolean hasHandlers(ServletContext servletContext) {
         String handlers = servletContext.getInitParameter("handlers");
-        if (handlers == null || handlers.equals("")) {
-            return false;
-        } else {
-            return true;
-        }
+        return !(handlers == null || handlers.equals(""));
     }
 }

src/test/java/org/audit4j/core/Audit4jTestBase.java

@@ -24,8 +24,7 @@ protected AuditEvent getSampleAuditEvent() {
         EventBuilder builder = new EventBuilder();
         builder.addTimestamp(new Date()).addActor(actor).addAction("myMethod").addOrigin("Origin").addField("myParam1Name", "param1")
                 .addField("myParam2Name", new Integer(2));
-        AuditEvent event = builder.build();
-        return event;
+        return builder.build();
     }
 
     protected Configuration getDefaultConfiguration() {