Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix formatting and ignore generated files #9

Merged
merged 2 commits into from
Mar 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand All @@ -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...
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
Loading