ATEST-242

src/main/java/ch/psi/daq/queryrest/config/QueryRestConfig.java

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.function.Function;
 
+import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 
 import org.slf4j.Logger;
@@ -70,6 +71,39 @@ public class QueryRestConfig extends WebMvcConfigurerAdapter {
 
    @Resource
    private Environment env;
+   
+   @Resource
+   private ObjectMapper objectMapper;
+
+   @PostConstruct
+   public void afterPropertiesSet() {
+      // add deserializers to ObjectMapper
+      String packageName = AbstractQuery.class.getPackage().getName();
+      Class<AbstractQuery> abstractQueryClass = AbstractQuery.class;
+      AttributeBasedDeserializer<AbstractQuery> abstractQueryDeserializer =
+            new AttributeBasedDeserializer<AbstractQuery>(abstractQueryClass).register(packageName);
+      SimpleModule module = new SimpleModule("PolymorphicAbstractQuery", Version.unknownVersion());
+      module.addDeserializer(abstractQueryClass, abstractQueryDeserializer);
+      objectMapper.registerModule(module);
+
+      // only include non-null values
+      objectMapper.setSerializationInclusion(Include.NON_NULL);
+      // Mixin which is used dynamically to filter out which properties get serialised and which
+      // won't. This way, the user can specify which columns are to be received.
+      objectMapper.addMixIn(DataEvent.class, PropertyFilterMixin.class);
+      objectMapper.addMixIn(StorelessStatistics.class, PropertyFilterMixin.class);
+      objectMapper.addMixIn(EnumMap.class, PropertyFilterMixin.class);
+
+      // defines how to writer inner Streams (i.e. Stream<Entry<String, Stream<?>>> toSerialize)
+      module = new SimpleModule("Streams API", Version.unknownVersion());
+      module.addSerializer(new JsonStreamSerializer());
+      objectMapper.registerModule(module);
+
+      // by default, byte[] are written as String
+      module = new SimpleModule("byte[]", Version.unknownVersion());
+      module.addSerializer(new JsonByteArraySerializer());
+      objectMapper.registerModule(module);
+   }
 
    /**
     * {@inheritDoc}
@@ -81,44 +115,11 @@ public class QueryRestConfig extends WebMvcConfigurerAdapter {
        * This is necessary so that the message conversion uses the configured object mapper.
        * Otherwise, a separate object mapper is instantiated for Springs message conversion.
        */
-      converter.setObjectMapper(objectMapper());
+      converter.setObjectMapper(objectMapper);
       converters.add(converter);
       super.configureMessageConverters(converters);
    }
 
-   @Bean
-   public ObjectMapper objectMapper() {
-      ObjectMapper mapper = new ObjectMapper();
-
-      String packageName = AbstractQuery.class.getPackage().getName();
-      Class<AbstractQuery> abstractQueryClass = AbstractQuery.class;
-      AttributeBasedDeserializer<AbstractQuery> abstractQueryDeserializer =
-            new AttributeBasedDeserializer<AbstractQuery>(abstractQueryClass).register(packageName);
-      SimpleModule module = new SimpleModule("PolymorphicAbstractQuery", Version.unknownVersion());
-      module.addDeserializer(abstractQueryClass, abstractQueryDeserializer);
-      mapper.registerModule(module);
-
-      // only include non-null values
-      mapper.setSerializationInclusion(Include.NON_NULL);
-      // Mixin which is used dynamically to filter out which properties get serialised and which
-      // won't. This way, the user can specify which columns are to be received.
-      mapper.addMixIn(DataEvent.class, PropertyFilterMixin.class);
-      mapper.addMixIn(StorelessStatistics.class, PropertyFilterMixin.class);
-      mapper.addMixIn(EnumMap.class, PropertyFilterMixin.class);
-
-      // defines how to writer inner Streams (i.e. Stream<Entry<String, Stream<?>>> toSerialize)
-      module = new SimpleModule("Streams API", Version.unknownVersion());
-      module.addSerializer(new JsonStreamSerializer());
-      mapper.registerModule(module);
-
-      // by default, byte[] are written as String
-      module = new SimpleModule("byte[]", Version.unknownVersion());
-      module.addSerializer(new JsonByteArraySerializer());
-      mapper.registerModule(module);
-
-      return mapper;
-   }
-
    @Bean
    public JsonFactory jsonFactory() {
       return new JsonFactory();

src/main/java/ch/psi/daq/queryrest/controller/QueryRestController.java

@@ -107,6 +107,15 @@ public class QueryRestController {
       try {
          LOGGER.debug("Executing query '{}'", query.getClass().getSimpleName());
 
+         // write the response back to the client using java 8 streams
+         responseStreamWriter.respond(executeQuery(query), query, res);
+      } catch (Throwable t) {
+         LOGGER.error("Failed execute query '{}'.", query, t);
+         throw t;
+      }
+   }
+   
+   public Stream<Entry<String, ?>> executeQuery(AbstractQuery query) {
          QueryAnalyzer queryAnalizer = queryAnalizerFactory.apply(query);
 
          // all the magic happens here
@@ -115,13 +124,8 @@ public class QueryRestController {
 
          // do post-process
          Stream<Entry<String, ?>> channelToData = queryAnalizer.postProcess(channelToDataEvents);
-
-         // write the response back to the client using java 8 streams
-         responseStreamWriter.respond(channelToData, query, res);
-      } catch (Throwable t) {
-         LOGGER.error("Failed execute query '{}'.", query, t);
-         throw t;
-      }
+         
+         return channelToData;
    }
 
    private QueryProcessor getQueryProcessor(DBMode dbMode) {