diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTableTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTableTest.java index d39575b..9c3503f 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTableTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTableTest.java @@ -87,14 +87,14 @@ public abstract class AbstractQueryRestControllerTableTest extends AbstractDaqRe assertEquals(2, events.size()); DataEvent event = events.get(0); assertEquals(TEST_CHANNEL_01, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(100, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(100, event.getValue(Number.class).longValue()); event = events.get(1); assertEquals(TEST_CHANNEL_02, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(100, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); @@ -104,14 +104,14 @@ public abstract class AbstractQueryRestControllerTableTest extends AbstractDaqRe assertEquals(2, events.size()); event = events.get(0); assertEquals(TEST_CHANNEL_01, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(101, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(101, event.getValue(Number.class).longValue()); event = events.get(1); assertEquals(TEST_CHANNEL_02, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(101, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTest.java index 7672ba4..e505ee0 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTest.java @@ -83,19 +83,19 @@ public abstract class AbstractQueryRestControllerTest extends AbstractDaqRestTes assertEquals(2, eventsList.size()); ChannelEventsImpl chEvents = eventsList.get(0); assertEquals(TEST_CHANNEL_01, chEvents.getChannel().getName()); - assertEquals(Backend.SF_DATABUFFER, chEvents.getChannel().getBackend()); + assertEquals(backend, chEvents.getChannel().getBackend()); List events = chEvents.getEvents().collect(Collectors.toList()); assertEquals(2, events.size()); DataEvent event = events.get(0); assertEquals(TEST_CHANNEL_01, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(100, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(100, event.getValue(Number.class).longValue()); event = events.get(1); assertEquals(TEST_CHANNEL_01, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(101, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); @@ -103,19 +103,19 @@ public abstract class AbstractQueryRestControllerTest extends AbstractDaqRestTes chEvents = eventsList.get(1); assertEquals(TEST_CHANNEL_02, chEvents.getChannel().getName()); - assertEquals(Backend.SF_DATABUFFER, chEvents.getChannel().getBackend()); + assertEquals(backend, chEvents.getChannel().getBackend()); events = chEvents.getEvents().collect(Collectors.toList()); assertEquals(2, events.size()); event = events.get(0); assertEquals(TEST_CHANNEL_02, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(100, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(100, event.getValue(Number.class).longValue()); event = events.get(1); assertEquals(TEST_CHANNEL_02, event.getChannel()); - assertEquals(Backend.SF_DATABUFFER, event.getBackend()); + assertEquals(backend, event.getBackend()); assertEquals(101, event.getPulseId()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java index 188c6d5..1088073 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java @@ -99,7 +99,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -111,7 +111,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -123,7 +123,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -135,7 +135,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -183,7 +183,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -198,7 +198,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -242,7 +242,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -254,7 +254,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -266,7 +266,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -278,7 +278,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -319,7 +319,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -333,7 +333,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -374,28 +374,28 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].eventCount").value(50)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].eventCount").value(50)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(150)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].eventCount").value(50)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(150)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].eventCount").value(50)); } @@ -427,7 +427,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -444,7 +444,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -496,7 +496,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -504,7 +504,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -512,7 +512,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][0].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -520,7 +520,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][1].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$[0].data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -532,7 +532,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[0][0].channel").value(testChannel3)) - .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -540,7 +540,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[1][0].channel").value(testChannel3)) - .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[1][0].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$[1].data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))); @@ -570,7 +570,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(200)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(2, 0))) @@ -578,7 +578,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(200)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(2, 0))) @@ -586,7 +586,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(201)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(2, 10000000))) @@ -594,7 +594,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(201)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(2, 10000000))); @@ -629,7 +629,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -637,7 +637,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -645,7 +645,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))) @@ -653,7 +653,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(101)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 10000000))); @@ -735,7 +735,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -747,7 +747,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -759,7 +759,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -771,7 +771,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -817,7 +817,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -839,7 +839,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -861,7 +861,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -883,7 +883,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -935,7 +935,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(1000)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 0))) @@ -947,7 +947,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(1000)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 0))) @@ -961,7 +961,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(1010)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 100000000))) @@ -973,7 +973,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(1010)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 100000000))) @@ -987,7 +987,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].pulseId").value(1020)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 200000000))) @@ -999,7 +999,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].pulseId").value(1020)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 200000000))) @@ -1013,7 +1013,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].pulseId").value(1030)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 300000000))) @@ -1025,7 +1025,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].pulseId").value(1030)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 300000000))) @@ -1039,7 +1039,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].pulseId").value(1040)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 400000000))) @@ -1051,7 +1051,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].pulseId").value(1040)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 400000000))) @@ -1065,7 +1065,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].pulseId").value(1050)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 500000000))) @@ -1077,7 +1077,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].pulseId").value(1050)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 500000000))) @@ -1091,7 +1091,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].pulseId").value(1060)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 600000000))) @@ -1103,7 +1103,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].pulseId").value(1060)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 600000000))) @@ -1117,7 +1117,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][0].pulseId").value(1070)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 700000000))) @@ -1129,7 +1129,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][1].pulseId").value(1070)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[7][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 700000000))) @@ -1143,7 +1143,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][0].pulseId").value(1080)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 800000000))) @@ -1155,7 +1155,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][1].pulseId").value(1080)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[8][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 800000000))) @@ -1169,7 +1169,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][0].channel").value(TEST_CHANNEL_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][0].pulseId").value(1090)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][0].globalSeconds").value( TestTimeUtils.getTimeStr(10, 900000000))) @@ -1181,7 +1181,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][1].channel").value(TEST_CHANNEL_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][1].pulseId").value(1090)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[9][1].globalSeconds").value( TestTimeUtils.getTimeStr(10, 900000000))) @@ -1227,7 +1227,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_WAVEFORM_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -1242,7 +1242,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_WAVEFORM_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -1257,7 +1257,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_WAVEFORM_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -1272,7 +1272,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_WAVEFORM_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -1322,7 +1322,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(TEST_CHANNEL_WAVEFORM_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -1358,7 +1358,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(TEST_CHANNEL_WAVEFORM_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(100)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 0))) @@ -1394,7 +1394,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(TEST_CHANNEL_WAVEFORM_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -1430,7 +1430,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(TEST_CHANNEL_WAVEFORM_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(105)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].globalSeconds").value( TestTimeUtils.getTimeStr(1, 50000000))) @@ -1503,19 +1503,19 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][3]").doesNotExist()) @@ -1562,13 +1562,13 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2]").doesNotExist()) @@ -1577,13 +1577,13 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2]").doesNotExist()) @@ -1592,13 +1592,13 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2]").doesNotExist()) @@ -1607,13 +1607,13 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2]").doesNotExist()) @@ -1622,13 +1622,13 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2]").doesNotExist()) @@ -1637,19 +1637,19 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][3]").doesNotExist()) @@ -1658,7 +1658,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].pulseId").value(6)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1]").doesNotExist()) @@ -1705,7 +1705,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").doesNotExist()) @@ -1713,7 +1713,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][3]").doesNotExist()) @@ -1724,13 +1724,13 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][3]").doesNotExist()) @@ -1739,7 +1739,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").doesNotExist()) @@ -1747,7 +1747,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][3]").doesNotExist()) @@ -1758,13 +1758,13 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][3]").doesNotExist()) @@ -1773,7 +1773,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").doesNotExist()) @@ -1781,7 +1781,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][3]").doesNotExist()) @@ -1790,19 +1790,19 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][3]").doesNotExist()) @@ -1813,7 +1813,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][1].pulseId").value(6)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][2]").doesNotExist()) @@ -1868,7 +1868,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].eventCount").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].value").isMap()) @@ -1879,7 +1879,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].value").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][2]").doesNotExist()) @@ -1889,14 +1889,14 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].value").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].value").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][2]").doesNotExist()) @@ -1906,14 +1906,14 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].value").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].value").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][2]").doesNotExist()) @@ -1923,14 +1923,14 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].value").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].value").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][2]").doesNotExist()) @@ -1940,14 +1940,14 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].value").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].value").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][2]").doesNotExist()) @@ -1957,14 +1957,14 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].value").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].eventCount").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].value").isMap()) @@ -1975,7 +1975,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].value").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][3]").doesNotExist()) @@ -1985,7 +1985,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].pulseId").value(6)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].eventCount").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].value").isMap()) @@ -2043,7 +2043,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].eventCount").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][0].value").isArray()) @@ -2059,7 +2059,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].pulseId").value(0)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[0][1].value[0]").value(0)) @@ -2071,7 +2071,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][0].value[0]").value(1)) @@ -2080,7 +2080,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].pulseId").value(1)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[1][1].value[0]").value(1)) @@ -2092,7 +2092,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][0].value[0]").value(2)) @@ -2101,7 +2101,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].pulseId").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[2][1].value[0]").value(2)) @@ -2113,7 +2113,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][0].value[0]").value(3)) @@ -2122,7 +2122,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].pulseId").value(3)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[3][1].value[0]").value(3)) @@ -2134,7 +2134,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][0].value[0]").value(4)) @@ -2143,7 +2143,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].pulseId").value(4)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[4][1].value[0]").value(4)) @@ -2155,7 +2155,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].channel").value(channel_01)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][0].value[0]").value(5)) @@ -2164,7 +2164,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].eventCount").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][1].value").isArray()) @@ -2180,7 +2180,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].channel").value(channel_03)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].pulseId").value(5)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].value").isArray()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[5][2].value[0]").value(5)) @@ -2192,7 +2192,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest { .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").exists()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0]").isMap()) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].channel").value(channel_02)) - .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(Backend.SF_DATABUFFER.getKey())) + .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].backend").value(backend.getKey())) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].pulseId").value(6)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].eventCount").value(2)) .andExpect(MockMvcResultMatchers.jsonPath("$.data[6][0].value").isArray())