Use ObjectMapper Supplier for EventRegistry json converters

With this if custom configurations were adding additional model classes before the engine was build would keep working

Author: filiphr

modules/flowable-event-registry-json-converter/src/main/java/org/flowable/eventregistry/json/converter/ChannelJsonConverter.java

@@ -17,6 +17,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import org.flowable.eventregistry.model.CamelInboundChannelModel;
 import org.flowable.eventregistry.model.CamelOutboundChannelModel;
@@ -40,29 +41,36 @@
  */
 public class ChannelJsonConverter {
 
-    protected ObjectMapper objectMapper;
+    protected Supplier<ObjectMapper> objectMapperSupplier;
 
     protected List<ChannelValidator> validators = new ArrayList<>();
     protected Map<String, Class<? extends ChannelModel>> channelModelClasses = new HashMap<>();
 
     public ChannelJsonConverter() {
-        this(new ObjectMapper());
+        ObjectMapper objectMapper = new ObjectMapper();
+        this.objectMapperSupplier = () -> objectMapper;
+        addValidator(new OutboundChannelModelValidator());
+        addValidator(new InboundChannelModelValidator());
+        addDefaultChannelModelClasses();
     }
 
-    public ChannelJsonConverter(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
+    public ChannelJsonConverter(Supplier<ObjectMapper> objectMapperSupplier) {
+        this.objectMapperSupplier = objectMapperSupplier;
         addValidator(new OutboundChannelModelValidator());
         addValidator(new InboundChannelModelValidator());
         addDefaultChannelModelClasses();
     }
 
     public ChannelJsonConverter(Collection<ChannelValidator> validators) {
-        this(validators, new ObjectMapper());
+        this.validators = new ArrayList<>(validators);
+        ObjectMapper objectMapper = new ObjectMapper();
+        this.objectMapperSupplier = () -> objectMapper;
+        addDefaultChannelModelClasses();
     }
 
-    public ChannelJsonConverter(Collection<ChannelValidator> validators, ObjectMapper objectMapper) {
-        this(objectMapper);
+    public ChannelJsonConverter(Collection<ChannelValidator> validators, Supplier<ObjectMapper> objectMapperSupplier) {
         this.validators = new ArrayList<>(validators);
+        this.objectMapperSupplier = objectMapperSupplier;
         addDefaultChannelModelClasses();
     }
 
@@ -82,6 +90,7 @@ protected void addDefaultChannelModelClasses() {
 
     public ChannelModel convertToChannelModel(String modelJson) {
         try {
+            ObjectMapper objectMapper = objectMapperSupplier.get();
             JsonNode channelNode = objectMapper.readTree(modelJson);
             Class<? extends ChannelModel> channelClass = determineChannelModelClass(channelNode);
 
@@ -117,7 +126,7 @@ protected void validateChannel(ChannelModel channelModel) {
 
     public String convertToJson(ChannelModel definition) {
         try {
-            return objectMapper.writeValueAsString(definition);
+            return objectMapperSupplier.get().writeValueAsString(definition);
         } catch (Exception e) {
             throw new FlowableEventJsonException("Error writing channel json", e);
         }

modules/flowable-event-registry-json-converter/src/main/java/org/flowable/eventregistry/json/converter/EventJsonConverter.java

@@ -13,6 +13,7 @@
 package org.flowable.eventregistry.json.converter;
 
 import java.util.Collection;
+import java.util.function.Supplier;
 
 import org.flowable.eventregistry.model.EventModel;
 import org.flowable.eventregistry.model.EventPayload;
@@ -28,19 +29,20 @@
  */
 public class EventJsonConverter {
 
-    protected ObjectMapper objectMapper;
+    protected Supplier<ObjectMapper> objectMapperSupplier;
 
     public EventJsonConverter() {
-        this(new ObjectMapper());
+        ObjectMapper objectMapper = new ObjectMapper();
+        this.objectMapperSupplier = () -> objectMapper;
     }
 
-    public EventJsonConverter(ObjectMapper objectMapper) {
-        this.objectMapper = objectMapper;
+    public EventJsonConverter(Supplier<ObjectMapper> objectMapperSupplier) {
+        this.objectMapperSupplier = objectMapperSupplier;
     }
 
     public EventModel convertToEventModel(String modelJson) {
         try {
-            JsonNode modelNode = objectMapper.readTree(modelJson);
+            JsonNode modelNode = objectMapperSupplier.get().readTree(modelJson);
             EventModel eventModel = new EventModel();
 
             eventModel.setKey(modelNode.path("key").asText(null));
@@ -83,6 +85,7 @@ public EventModel convertToEventModel(String modelJson) {
     }
 
     public String convertToJson(EventModel definition) {
+        ObjectMapper objectMapper = objectMapperSupplier.get();
         ObjectNode modelNode = objectMapper.createObjectNode();
 
         if (definition.getKey() != null) {

modules/flowable-event-registry/src/main/java/org/flowable/eventregistry/impl/EventRegistryEngineConfiguration.java

@@ -124,8 +124,8 @@ public class EventRegistryEngineConfiguration extends AbstractBuildableEngineCon
     protected Collection<ELResolver> preBeanELResolvers;
     protected Collection<ELResolver> postDefaultELResolvers;
 
-    protected EventJsonConverter eventJsonConverter;
-    protected ChannelJsonConverter channelJsonConverter;
+    protected EventJsonConverter eventJsonConverter = new EventJsonConverter(this::getObjectMapper);
+    protected ChannelJsonConverter channelJsonConverter = new ChannelJsonConverter(this::getObjectMapper);
 
     // DEPLOYERS
     // ////////////////////////////////////////////////////////////////
@@ -251,7 +251,6 @@ protected void init() {
         configuratorsAfterInit();
         initDataManagers();
         initEntityManagers();
-        initJsonConverters();
         initEventRegistry();
         initInboundEventProcessor();
         initOutboundEventProcessor();
@@ -503,15 +502,6 @@ public void initInboundChannelModelCacheManager() {
         }
     }
 
-    protected void initJsonConverters() {
-        if (eventJsonConverter == null) {
-            eventJsonConverter = new EventJsonConverter(objectMapper);
-        }
-        if (channelJsonConverter == null) {
-            channelJsonConverter = new ChannelJsonConverter(objectMapper);
-        }
-    }
-    
     public void initEventRegistry() {
         if (this.eventRegistry == null) {
             this.eventRegistry = new DefaultEventRegistry(this);