Merge pull request #9 from jembishop/fix-formatting

Fix formatting and ignore generated files
archiver-appliance · Mar 6, 2024 · 7d78e6f · 7d78e6f
2 parents 83f738a + 4cbb52a
commit 7d78e6f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -85,6 +85,10 @@ java {
 
 spotless {
     java {
+        target project.fileTree(project.rootDir) {
+                include '**/*.java'
+                exclude 'build/**/*.*'
+            }
         // don't need to set target, it is inferred from java
         // apply a specific flavor of google-java-format
         palantirJavaFormat()

diff --git a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/DataRetrieval.java b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/DataRetrieval.java
@@ -26,7 +26,8 @@ public abstract class DataRetrieval {
      */
     public final GenMsgIterator getDataForPV(String pvName, Timestamp startTime, Timestamp endTime) {
         return getDataForPV(pvName, startTime, endTime, false);
-    };
+    }
+    ;
     /**
      * Get data for PV pvName from starttime to endtime using the system defined sparsification operator.
      * @param pvName The name of the pv
@@ -37,8 +38,8 @@ public final GenMsgIterator getDataForPV(String pvName, Timestamp startTime, Tim
      */
     public final GenMsgIterator getDataForPV(
             String pvName, Timestamp startTime, Timestamp endTime, boolean useReducedDataSet) {
-                return getDataForPV(pvName, startTime, endTime, useReducedDataSet, null);
-            }
+        return getDataForPV(pvName, startTime, endTime, useReducedDataSet, null);
+    }
 
     /**
      * Get data for PV pvName from starttime to endtime using the system defined sparsification operator; pass additional params in the HTTP call.
@@ -55,14 +56,14 @@ public final GenMsgIterator getDataForPV(
             Timestamp endTime,
             boolean useReducedDataSet,
             Map<String, String> otherParams) {
-                return getDataForPVs(Collections.singletonList(pvName), startTime, endTime, useReducedDataSet, otherParams);
-            }
+        return getDataForPVs(Collections.singletonList(pvName), startTime, endTime, useReducedDataSet, otherParams);
+    }
 
     /**
      * Get data for PVs in pvNames from starttime to endtime using the system defined sparsification operator; pass additional params in the HTTP call.
-     * NOTE: The data for all the PVs will be concatenated together. To identify which PV is currently being read, you must register your own 
+     * NOTE: The data for all the PVs will be concatenated together. To identify which PV is currently being read, you must register your own
      * {@code InfoChangeHandler} to the returned {@code GenMsgIterator} using {@code onInfoChange}.
-     * @param pvName The name of the pv
+     * @param pvNames The names of the pvs
      * @param startTime Start time of request
      * @param endTime End time of request
      * @param useReducedDataSet - If true, use the server defined sparsification operator...

diff --git a/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java b/lib/src/main/java/org/epics/archiverappliance/retrieval/client/RawDataRetrieval.java
@@ -53,7 +53,7 @@ public final GenMsgIterator getDataForPVs(
         } else {
             buf.append("?pv=").append(first_encoded);
         }
-        for (var pvName: pvNames) {
+        for (var pvName : pvNames) {
             buf.append("&pv=").append(URLEncoder.encode(pvName, StandardCharsets.UTF_8));
         }
         buf.append("&from=").append(convertToUTC(startTime)).append("&to=").append(convertToUTC(endTime));