Skip to content

Commit f63fa58

Browse files
committed
Change camelCase parameters in archivePV request to lowercase
Archiver seems to expect lowercase parameters in the archivePV request. As the AA processor used camelCase, Archiver ignored the specified archiving configuration.
1 parent 8232cd4 commit f63fa58

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/main/java/org/phoebus/channelfinder/processors/aa/ArchivePVOptions.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.annotation.JsonIgnore;
44
import com.fasterxml.jackson.annotation.JsonInclude;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
56

67
import java.util.List;
78
import java.util.logging.Level;
@@ -12,7 +13,9 @@ public class ArchivePVOptions {
1213
private static final Logger logger = Logger.getLogger(ArchivePVOptions.class.getName());
1314

1415
private String pv;
16+
@JsonProperty("samplingmethod")
1517
private String samplingMethod;
18+
@JsonProperty("samplingperiod")
1619
private String samplingPeriod;
1720
private String policy;
1821
@JsonIgnore

src/test/java/org/phoebus/channelfinder/processors/AAChannelProcessorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ void archivePVJson() throws JsonProcessingException {
114114
ObjectMapper objectMapper = new ObjectMapper();
115115
String str = objectMapper.writeValueAsString(List.of(ar1, ar2));
116116

117-
String expectedString = "[{\"pv\":\"sim://testing1\",\"samplingMethod\":\"MONITOR\",\"samplingPeriod\":\"1.0\"},{\"pv\":\"sim://testing2\",\"samplingMethod\":\"SCAN\",\"samplingPeriod\":\"0.2\"}]";
117+
String expectedString = "[{\"pv\":\"sim://testing1\",\"samplingmethod\":\"MONITOR\",\"samplingperiod\":\"1.0\"},{\"pv\":\"sim://testing2\",\"samplingmethod\":\"SCAN\",\"samplingperiod\":\"0.2\"}]";
118118
Assertions.assertEquals(str, expectedString);
119119

120120
// Only a pv name

0 commit comments

Comments
 (0)