Resolving some quality issues

SonarQubeCommunity · Apr 1, 2014 · a9b7e7e · a9b7e7e
1 parent fcd886f
commit a9b7e7e
Show file tree

Hide file tree

Showing 23 changed files with 186 additions and 201 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+.classpath
+.project
+.settings
+target
+!/sonar-jmeter-plugin/src/test/resources/test-project/target
+
diff --git a/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/JMeterReportClient.java b/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/JMeterReportClient.java
@@ -39,8 +39,8 @@
 
 public class JMeterReportClient {
 
-  private static final Logger log = LoggerFactory.getLogger(JMeterReportClient.class);
-  private static final boolean LOG_DEBUG = log.isDebugEnabled();
+  private static final Logger LOG = LoggerFactory.getLogger(JMeterReportClient.class);
+  private static final boolean LOG_DEBUG = LOG.isDebugEnabled();
 
   private String serverHost = JMeterReportConst.DEFAULT_HOST;
   private int serverPort = JMeterReportConst.DEFAULT_PORT;
@@ -70,8 +70,8 @@ protected Socket openSocket() throws IOException {
    */
   public GlobalSummary getGlobalSummary(String config) {
     if (LOG_DEBUG) {
-      log.debug("getGlobalSummary");
-      log.debug("config: " + config);
+      LOG.debug("getGlobalSummary");
+      LOG.debug("config: " + config);
     }
 
     Socket socket = null;
@@ -130,10 +130,10 @@ public GlobalSummary getGlobalSummary(String config) {
    */
   public StreamReader<GlobalSummary> getRunningGlobalSummary(String config, boolean startNewIfNone, int sleepTime) {
     if (LOG_DEBUG) {
-      log.debug("getRunningGlobalSummary");
-      log.debug("config: " + config);
-      log.debug("startNewIfNone: " + startNewIfNone);
-      log.debug("sleepTime: " + sleepTime);
+      LOG.debug("getRunningGlobalSummary");
+      LOG.debug("config: " + config);
+      LOG.debug("startNewIfNone: " + startNewIfNone);
+      LOG.debug("sleepTime: " + sleepTime);
     }
 
     Socket socket = null;
@@ -169,10 +169,10 @@ public StreamReader<GlobalSummary> getRunningGlobalSummary(String config, boolea
   public StreamReader<Measure> getBuckedMeasures(String config, String metric,
       int millisBucket) {
     if (LOG_DEBUG) {
-      log.debug("getBuckedMeasures");
-      log.debug("config: " + config);
-      log.debug("metric: " + metric);
-      log.debug("millisBucket: " + millisBucket);
+      LOG.debug("getBuckedMeasures");
+      LOG.debug("config: " + config);
+      LOG.debug("metric: " + metric);
+      LOG.debug("millisBucket: " + millisBucket);
     }
 
     Socket socket = null;

diff --git a/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/JMeterReportConst.java b/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/JMeterReportConst.java
@@ -21,6 +21,8 @@
 package es.excentia.jmeter.report.client;
 
 public class JMeterReportConst {
+
+	private JMeterReportConst() {}
 
   public static final String REPORT_SERVER_PROPERTIES = "jmeter-report-server.properties";
 

diff --git a/...port-client/src/main/java/es/excentia/jmeter/report/client/serialization/BasicWriter.java b/...port-client/src/main/java/es/excentia/jmeter/report/client/serialization/BasicWriter.java
@@ -32,7 +32,7 @@
 
 public abstract class BasicWriter<T> extends StreamWriter<T> {
 
-  DataOutputStream dos;
+  protected DataOutputStream dos;
 
   public BasicWriter(OutputStream os) {
     super(os);

diff --git a/...ort-client/src/main/java/es/excentia/jmeter/report/client/serialization/StreamWriter.java b/...ort-client/src/main/java/es/excentia/jmeter/report/client/serialization/StreamWriter.java
@@ -23,7 +23,7 @@
 import java.io.OutputStream;
 
 public abstract class StreamWriter<T> {
-  OutputStream os;
+  protected OutputStream os;
 
   public StreamWriter(OutputStream os) {
     this.os = os;

diff --git a/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/util/JavaUtil.java b/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/util/JavaUtil.java
@@ -24,10 +24,12 @@
 import java.util.regex.Pattern;
 
 /**
- * Util class for working with strings
+ * Utility class for checking java version
  */
 public class JavaUtil {
 
+	private JavaUtil() {}
+
 	private static Pattern JAVA_VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\w+)");
 
 	public static String getVersion() {
@@ -39,20 +41,20 @@ private static String getGroup(int groupidx) {
     if (m.matches()) {
     	return m.group(groupidx);
     } 
-    return null;
+    return "0";
 	}
 
   /**
-   * Return jre major version
+   * Return jre major version or 0 if couldn't parse java.version
    */
-	public static int getJREMajorVersion() {
+	public static Integer getJREMajorVersion() {
 		return Integer.parseInt(getGroup(1));
 	}
 
 	/**
-   * Return jre minor version
+   * Return jre minor version or 0 if couldn't parse java.version
    */
-	public static int getJREMinorVersion() {
+	public static Integer getJREMinorVersion() {
 		return Integer.parseInt(getGroup(2));
 	}
 

diff --git a/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/util/StringUtil.java b/jmeter-report-client/src/main/java/es/excentia/jmeter/report/client/util/StringUtil.java
@@ -21,9 +21,11 @@
 package es.excentia.jmeter.report.client.util;
 
 /**
- * Util class for working with strings
+ * Utility class for working with strings
  */
 public class StringUtil {
+
+	private StringUtil() {}
 
   /**
    * Return true if the string is null, empty or only have white spaces

diff --git a/jmeter-report-server/src/main/java/es/excentia/jmeter/report/server/JMeterReportServer.java b/jmeter-report-server/src/main/java/es/excentia/jmeter/report/server/JMeterReportServer.java
@@ -42,9 +42,9 @@
  */
 public class JMeterReportServer {
 
-  private static final Logger log = LoggerFactory.getLogger(JMeterReportServer.class);
-  private static final boolean LOG_DEBUG = log.isDebugEnabled();
-  private static final boolean LOG_TRACE = log.isTraceEnabled();
+  private static final Logger LOG = LoggerFactory.getLogger(JMeterReportServer.class);
+  private static final boolean LOG_DEBUG = LOG.isDebugEnabled();
+  private static final boolean LOG_TRACE = LOG.isTraceEnabled();
 
   private ServerSocket listener;
   private Thread serverThread;
@@ -75,7 +75,7 @@ public void run() {
 
         int op = in.readInt();
         if (LOG_DEBUG) {
-          log.debug("Attending client request operation: " + op);
+          LOG.debug("Attending client request operation: " + op);
         }
 
         try {
@@ -109,24 +109,24 @@ public void run() {
           }
 
         } catch (IOException ioe) {
-          log.error("IOException on socket when serving request", ioe);
+          LOG.error("IOException on socket when serving request", ioe);
         } catch (Exception e) {
-          log.error("Report request exception", e);
+          LOG.error("Report request exception", e);
 
           // Send error to client
           out.writeInt(JMeterReportConst.RETURN_CODE_ERROR);
           out.writeUTF(e.toString());
         }
 
       } catch (IOException ioe) {
-        log.error("Could not get socket streams", ioe);
+        LOG.error("Could not get socket streams", ioe);
       } finally {
         try {
           connections--;
           socket.close();
-          log.debug("Request finished");
+          LOG.debug("Request finished");
         } catch (Exception e) {
-          log.error("Could not close server socket", e);
+          LOG.error("Could not close server socket", e);
         }
       }
     }
@@ -139,12 +139,12 @@ public void run() {
    */
   private void connectionLimitExceeded(Socket socket) {
     if (LOG_DEBUG) {
-      log.debug("Connection limit exceeded ("+maxConnections+"). Closing socket ...");
+      LOG.debug("Connection limit exceeded ("+maxConnections+"). Closing socket ...");
     }
     try {
       socket.close();
     } catch (Exception e) {
-      log.error("Could not close server socket", e);
+      LOG.error("Could not close server socket", e);
     }
   }
 
@@ -157,7 +157,7 @@ private void startListening() {
     try {
 
       int port = configService.getPort();
-      log.info("Starting server on port " + port);
+      LOG.info("Starting server on port " + port);
 
       maxConnections = configService.getMaxConnections();
 
@@ -181,13 +181,13 @@ private void startListening() {
 
     } catch (IOException ioe) {
       if (LOG_TRACE) {
-        log.trace("IOException on socket listen", ioe);
+        LOG.trace("IOException on socket listen", ioe);
       } else if (!stopWhenPossible) {
-        log.error("IOException on socket listen", ioe);
+        LOG.error("IOException on socket listen", ioe);
       }
     }
 
-    log.info("Server stopped");
+    LOG.info("Server stopped");
   }
 
   /**
@@ -208,14 +208,14 @@ public void run() {
 
   public void stop() {
     if (listener != null) {
-      log.info("Stopping server ...");
+      LOG.info("Stopping server ...");
 
       stopWhenPossible = true;
 
       try {
         listener.close();
       } catch (IOException e) {
-        log.error("Error stoping server", e);
+        LOG.error("Error stoping server", e);
       } finally {
         listener = null;
       }

diff --git a/jmeter-report-server/src/main/java/es/excentia/jmeter/report/server/report/Report.java b/jmeter-report-server/src/main/java/es/excentia/jmeter/report/server/report/Report.java
@@ -203,7 +203,7 @@ protected ReportData createSummaryData(Class<?> summaryDataClass) {
 
   @Override
   public String toString() {
-    StringBuffer buff = new StringBuffer();
+  	StringBuilder buff = new StringBuilder();
 
     buff.append("\n** Request Global Scope **");
     for (int phase = 0; phase < 2; phase++) {

diff --git a/jmeter-report-server/src/main/java/es/excentia/jmeter/report/server/report/ReportThread.java b/jmeter-report-server/src/main/java/es/excentia/jmeter/report/server/report/ReportThread.java
@@ -27,20 +27,20 @@
 
 public abstract class ReportThread extends Thread  {
 
-  private static final Logger log = LoggerFactory.getLogger(ReportThread.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ReportThread.class);
 
 
   private RuntimeException resultException;
   private Report report;
   private StreamReader<SampleMix> reader;
+  private boolean ok = false;
 
-
-  public ReportThread(Report report, StreamReader<SampleMix> reader) {
+	public ReportThread(Report report, StreamReader<SampleMix> reader) {
     this.report = report;
     this.reader = reader;
   }
 
-  
+	public boolean isOk() { return ok; }
   public Report getReport() {  return report; }
   public RuntimeException getResultException() { return resultException; }
 
@@ -49,12 +49,13 @@ public void run() {
 
     try {
       report.extract(reader);
+      ok = true;
     } catch(RuntimeException ex) {
-      log.debug("ReportThread running finished with exception", ex);
+      LOG.debug("ReportThread finished with exception", ex);
       resultException = ex;
+    } finally {
+    	onFinished();
     }
-
-    onFinished();
   }
 
   public abstract void onFinished();

diff --git a/...-report-server/src/main/java/es/excentia/jmeter/report/server/service/ServiceFactory.java b/...-report-server/src/main/java/es/excentia/jmeter/report/server/service/ServiceFactory.java
@@ -25,6 +25,8 @@
 
 public class ServiceFactory {
 
+	private ServiceFactory() {}
+
   private static final String IMPL_PACKAGE = "es.excentia.jmeter.report.server.service.impl";
 
   private static Map<Class<? extends Service>, Service> map = new HashMap<Class<? extends Service>, Service>();

diff --git a/...server/src/main/java/es/excentia/jmeter/report/server/service/impl/ConfigServiceImpl.java b/...server/src/main/java/es/excentia/jmeter/report/server/service/impl/ConfigServiceImpl.java
@@ -40,7 +40,7 @@
  */
 public class ConfigServiceImpl implements ConfigService {
 
-  private static final Logger log = LoggerFactory.getLogger(ConfigServiceImpl.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ConfigServiceImpl.class);
 
   private static final String PORT_KEY = "port";
   private static final String MAX_CONNECTIONS_KEY = "maxConnections";
@@ -90,20 +90,20 @@ public int getNaturalProperty(String key, int defaultValue) {
 
     String strValue = getProperty(key);
     if (strValue == null) {
-      log.debug(
+      LOG.debug(
           "No " + key + " configured. "+
           "Using default value " + defaultValue + "."
        );
     } else {
       try {
         value = Integer.parseInt(getProperty(key));
       } catch (NumberFormatException e) {
-        log.warn("Could not parse " + key + ": " + e.getMessage());
+        LOG.warn("Could not parse " + key + ": " + e.getMessage());
       }
     }
 
     if (value < 0) {
-      log.warn(
+      LOG.warn(
           "The value of " + key + " cannot be negative: " + value+ ". "+
           "Using default value " + defaultValue + "."
       );