Add all-in-one Docker image for TM Forum APIs (#129)

* move clock bean to ClockFactory in common module

* move ObjectMapperBeanEventListener to its own class instead of defining it as a static class in the Application.java file

* refactor controllers to support all-in-one api configuration

* unify EventMapper using a ModuleEventMapper interface

* move logback.xml to common module to avoid duplication across modules

* remove logback internal logs

* feat(module): add all-in-one Docker image to deploy all tm forum APIs in a single container

---------

Co-authored-by: Stefan Wiedemann <wistefan@googlemail.com>

Author: Mortega5

account/src/main/java/org/fiware/tmforum/account/AccountEventMapper.java

@@ -6,7 +6,7 @@
 import org.fiware.tmforum.common.exception.TmForumException;
 import org.fiware.tmforum.common.exception.TmForumExceptionReason;
 import org.fiware.tmforum.common.mapping.EventMapping;
-import org.fiware.tmforum.common.notification.EventMapper;
+import org.fiware.tmforum.common.notification.ModuleEventMapper;
 
 import javax.inject.Singleton;
 import java.util.Map;
@@ -15,7 +15,7 @@
 
 @RequiredArgsConstructor
 @Singleton
-public class AccountEventMapper implements EventMapper {
+public class AccountEventMapper implements ModuleEventMapper {
 
 	private final TMForumMapper tmForumMapper;
 

account/src/main/java/org/fiware/tmforum/account/Application.java

@@ -1,18 +1,7 @@
-package org.fiware.tmforum.account;
+ package org.fiware.tmforum.account;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import io.micronaut.context.annotation.Bean;
-import io.micronaut.context.annotation.Factory;
-import io.micronaut.context.event.BeanCreatedEvent;
-import io.micronaut.context.event.BeanCreatedEventListener;
-import io.micronaut.runtime.Micronaut;
-import lombok.RequiredArgsConstructor;
-import org.fiware.account.model.*;
-import org.fiware.tmforum.common.mapping.FieldCleaningSerializer;
-
-import javax.inject.Singleton;
-import java.time.Clock;
+ import io.micronaut.context.annotation.Factory;
+ import io.micronaut.runtime.Micronaut;
 
 /**
  * Base application as starting point
@@ -24,33 +13,4 @@ public static void main(String[] args) {
         Micronaut.run(Application.class, args);
     }
 
-    @Bean
-    public Clock clock() {
-        return Clock.systemUTC();
-    }
-
-    @Singleton
-    @RequiredArgsConstructor
-    static class ObjectMapperBeanEventListener implements BeanCreatedEventListener<ObjectMapper> {
-
-        @Override
-        public ObjectMapper onCreated(BeanCreatedEvent<ObjectMapper> event) {
-
-            final ObjectMapper objectMapper = event.getBean();
-            SimpleModule fieldParamModule = new SimpleModule();
-            // we need to register per class, in order to use the generic serializer
-            fieldParamModule.addSerializer(BillFormatVO.class, new FieldCleaningSerializer<>());
-            fieldParamModule.addSerializer(BillingAccountVO.class, new FieldCleaningSerializer<>());
-            fieldParamModule.addSerializer(BillingCycleSpecificationVO.class, new FieldCleaningSerializer<>());
-            fieldParamModule.addSerializer(BillPresentationMediaVO.class, new FieldCleaningSerializer<>());
-            fieldParamModule.addSerializer(FinancialAccountVO.class, new FieldCleaningSerializer<>());
-            fieldParamModule.addSerializer(PartyAccountVO.class, new FieldCleaningSerializer<>());
-            fieldParamModule.addSerializer(SettlementAccountVO.class, new FieldCleaningSerializer<>());
-            fieldParamModule.addSerializer(BillStructureVO.class, new FieldCleaningSerializer<>());
-            //fieldParamModule.addSerializer(BillingCycleSpecificationRefOrValueVO.class, new FieldCleaningSerializer<>());
-            objectMapper.registerModule(fieldParamModule);
-            return objectMapper;
-
-        }
-    }
 }

account/src/main/java/org/fiware/tmforum/account/bean/ObjectMapperBeanEventListener.java

@@ -0,0 +1,44 @@
+package org.fiware.tmforum.account.bean;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import io.micronaut.context.event.BeanCreatedEvent;
+import io.micronaut.context.event.BeanCreatedEventListener;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.fiware.account.model.BillFormatVO;
+import org.fiware.account.model.BillPresentationMediaVO;
+import org.fiware.account.model.BillStructureVO;
+import org.fiware.account.model.BillingAccountVO;
+import org.fiware.account.model.BillingCycleSpecificationVO;
+import org.fiware.account.model.FinancialAccountVO;
+import org.fiware.account.model.PartyAccountVO;
+import org.fiware.account.model.SettlementAccountVO;
+import org.fiware.tmforum.common.mapping.FieldCleaningSerializer;
+
+import javax.inject.Singleton;
+
+@Singleton
+@RequiredArgsConstructor
+@Slf4j
+public class ObjectMapperBeanEventListener implements BeanCreatedEventListener<ObjectMapper> {
+
+    @Override
+    public ObjectMapper onCreated(BeanCreatedEvent<ObjectMapper> event) {
+        log.debug("Add FieldCleaningSerializer to Account VOs");
+        final ObjectMapper objectMapper = event.getBean();
+        SimpleModule fieldParamModule = new SimpleModule();
+        // we need to register per class, in order to use the generic serializer
+        fieldParamModule.addSerializer(BillFormatVO.class, new FieldCleaningSerializer<>());
+        fieldParamModule.addSerializer(BillingAccountVO.class, new FieldCleaningSerializer<>());
+        fieldParamModule.addSerializer(BillingCycleSpecificationVO.class, new FieldCleaningSerializer<>());
+        fieldParamModule.addSerializer(BillPresentationMediaVO.class, new FieldCleaningSerializer<>());
+        fieldParamModule.addSerializer(FinancialAccountVO.class, new FieldCleaningSerializer<>());
+        fieldParamModule.addSerializer(PartyAccountVO.class, new FieldCleaningSerializer<>());
+        fieldParamModule.addSerializer(SettlementAccountVO.class, new FieldCleaningSerializer<>());
+        fieldParamModule.addSerializer(BillStructureVO.class, new FieldCleaningSerializer<>());
+        //fieldParamModule.addSerializer(BillingCycleSpecificationRefOrValueVO.class, new FieldCleaningSerializer<>());
+        objectMapper.registerModule(fieldParamModule);
+        return objectMapper;
+    }
+}

account/src/main/java/org/fiware/tmforum/account/rest/BillFormatApiController.java

@@ -26,7 +26,7 @@
 import java.util.UUID;
 
 @Slf4j
-@Controller("${general.basepath:/}")
+@Controller("${api.account.basepath:/}")
 public class BillFormatApiController extends AbstractApiController<BillFormat> implements BillFormatApi {
 
     private final TMForumMapper tmForumMapper;

account/src/main/java/org/fiware/tmforum/account/rest/BillPresentationMediaApiController.java

@@ -26,7 +26,7 @@
 import java.util.UUID;
 
 @Slf4j
-@Controller("${general.basepath:/}")
+@Controller("${api.account.basepath:/}")
 public class BillPresentationMediaApiController extends AbstractApiController<BillPresentationMedia> implements BillPresentationMediaApi {
 
     private final TMForumMapper tmForumMapper;

account/src/main/java/org/fiware/tmforum/account/rest/BillingAccountApiController.java

@@ -27,7 +27,7 @@
 import java.util.UUID;
 
 @Slf4j
-@Controller("${general.basepath:/}")
+@Controller("${api.account.basepath:/}")
 public class BillingAccountApiController extends AbstractApiController<BillingAccount> implements BillingAccountApi {
 
     private final TMForumMapper tmForumMapper;

account/src/main/java/org/fiware/tmforum/account/rest/BillingCycleSpecificationApiController.java

@@ -26,7 +26,7 @@
 import java.util.UUID;
 
 @Slf4j
-@Controller("${general.basepath:/}")
+@Controller("${api.account.basepath:/}")
 public class BillingCycleSpecificationApiController extends AbstractApiController<BillingCycleSpecification> implements BillingCycleSpecificationApi {
 
     private final TMForumMapper tmForumMapper;

account/src/main/java/org/fiware/tmforum/account/rest/EventSubscriptionApiController.java

@@ -30,7 +30,7 @@
 import static org.fiware.tmforum.common.notification.EventConstants.*;
 
 @Slf4j
-@Controller("${general.basepath:/}")
+@Controller("${api.account.basepath:/}")
 public class EventSubscriptionApiController extends AbstractSubscriptionApiController implements EventsSubscriptionApi {
 	private final TMForumMapper tmForumMapper;
 	private static final Map<String, String> EVENT_GROUP_TO_ENTITY_NAME_MAPPING = Map.ofEntries(

account/src/main/java/org/fiware/tmforum/account/rest/FinancialAccountApiController.java

@@ -26,7 +26,7 @@
 import java.util.UUID;
 
 @Slf4j
-@Controller("${general.basepath:/}")
+@Controller("${api.account.basepath:/}")
 public class FinancialAccountApiController extends AbstractApiController<FinancialAccount> implements FinancialAccountApi {
 
     private final TMForumMapper tmForumMapper;

account/src/main/java/org/fiware/tmforum/account/rest/PartyAccountApiController.java

@@ -27,7 +27,7 @@
 import java.util.UUID;
 
 @Slf4j
-@Controller("${general.basepath:/}")
+@Controller("${api.account.basepath:/}")
 public class PartyAccountApiController extends AbstractApiController<PartyAccount> implements PartyAccountApi {
 
     private final TMForumMapper tmForumMapper;