perfsonar development work

Author: dante.delvaux
Date: 2013-10-02 21:57:44 +0100 (Wed, 02 Oct 2013)
New Revision: 6448

Modified:
   
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
   
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
   
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
   
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java
Log:
RRD MA 3.4.2: clearing most PMD warnings.

Modified: 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
    2013-10-02 20:25:24 UTC (rev 6447)
+++ 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/persistence/SetupDataKeyResponse.java
    2013-10-02 20:57:44 UTC (rev 6448)
@@ -59,7 +59,7 @@
         params.addParameter(getParameter("dataSourceHeartbeat", 
intf.getDataSourceHeartbeat()));
         params.addParameter(getParameter("dataSourceMinValue", 
intf.getDataSourceMinValue()));
         params.addParameter(getParameter("dataSourceMaxValue", 
intf.getDataSourceMaxValue()));
-        params.addParameter(getParameter(("eventType"), 
intf.getEventType()));
+        params.addParameter(getParameter("eventType", intf.getEventType()));
         k.setParameters(params);
         d.setKey(k);
         d.setId(String.valueOf(intf.getMetadataId()));

Modified: 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
   2013-10-02 20:25:24 UTC (rev 6447)
+++ 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RRDDataStorageDAOImpl.java
   2013-10-02 20:57:44 UTC (rev 6448)
@@ -238,7 +238,7 @@
 
         //which data source? (-1 = unknown)
         int ds = -1;
-        for (int i = 0; (i < cols) && (ds == -1); i++) {
+        for (int i = 0; i < cols && ds == -1; i++) {
             if (fetchData.getColName(i).equalsIgnoreCase(dataSource)) {
                 ds = i;
             }

Modified: 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
      2013-10-02 20:25:24 UTC (rev 6447)
+++ 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/rrd/RrdLibrary.java
      2013-10-02 20:57:44 UTC (rev 6448)
@@ -13,12 +13,11 @@
  */
 public interface RrdLibrary extends Library
 {
-    // CHECKSTYLE_OFF: ALL
-    public static final String JNA_LIBRARY_NAME = "rrd";
-    public static final NativeLibrary JNA_NATIVE_LIB = 
NativeLibrary.getInstance(RrdLibrary.JNA_LIBRARY_NAME);
-    public static final RrdLibrary INSTANCE = (RrdLibrary) 
Native.loadLibrary(RrdLibrary.JNA_LIBRARY_NAME,
-                                                                             
 RrdLibrary.class);
+    String JNA_LIBRARY_NAME = "rrd";
+    NativeLibrary JNA_NATIVE_LIB = 
NativeLibrary.getInstance(RrdLibrary.JNA_LIBRARY_NAME);
+    RrdLibrary INSTANCE = (RrdLibrary) 
Native.loadLibrary(RrdLibrary.JNA_LIBRARY_NAME, RrdLibrary.class);
 
+    // CHECKSTYLE_OFF: ALL
     int rrd_fetch(int argc, String[] argv, RrdLibrary.time_t start, 
RrdLibrary.time_t end,
                   NativeLongByReference step, NativeLongByReference ds_cnt, 
PointerByReference ds_namv,
                   PointerByReference data);
@@ -27,8 +26,9 @@
 
     void rrd_freemem(Pointer mem);
 
-    public static class time_t extends Structure {
+    class time_t extends Structure {
         public int value;
+        // CHECKSTYLE_ON: ALL
 
         public time_t() {
         }
@@ -37,5 +37,4 @@
             this.value = value;
         }
     }
-    // CHECKSTYLE_ON: ALL
 }

Modified: 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java
===================================================================
--- 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java
    2013-10-02 20:25:24 UTC (rev 6447)
+++ 
trunk/perfsonar-java-rrd-ma/src/main/java/org/perfsonar/service/measurementArchive/rrdType/storage/sql/query/QueryGenerator.java
    2013-10-02 20:57:44 UTC (rev 6448)
@@ -182,7 +182,7 @@
         if (parameters != null && parameters.getFirstParameter("keyword") != 
null) {
             String keyword = 
parameters.getFirstParameter("keyword").getText();
             logger.debug("Keyword is: {}", keyword);
-            return (keyword);
+            return keyword;
         }
 
         return null;