Merge pull request #12 from devgateway/main-OCNANDI-11

OCNANDI-11 Collision between spring Jackson2ObjectMapperBuilder beans…

docker-compose-dev.yml

@@ -0,0 +1,64 @@
+version: '3.8'
+
+services:
+
+  app:
+    image: ocportal-nandi/admin/prod:${TAG-local}
+    restart: always
+    extra_hosts:
+      - "host.docker.internal:host-gateway" #required so docker connects to host interface (this is for sending emails)
+    build:
+        target: prod
+    depends_on:
+      - db
+      - mongo
+    ports:
+      - "8090:8090"
+      - "8000:8000"
+    env_file:
+      - .env
+
+  db:
+    image: postgis/postgis:11-3.3
+    restart: 'no'
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+    env_file:
+      - .env
+
+  mongo:
+    image: mongo:4.2
+    restart: 'no'
+    command: [--auth]
+    volumes:
+        - mongodata:/data/db
+    ports:
+      - "27017:27017"
+    env_file:
+      - .env
+
+  pgbackups:
+    image: prodrigestivill/postgres-backup-local
+    restart: 'no'
+    volumes:
+      - /opt/pgbackups:/backups
+    env_file:
+      - .env
+    depends_on:
+      - db
+    environment:
+      - POSTGRES_HOST=db
+      - POSTGRES_DB=ocportal
+      - POSTGRES_USER=$POSTGRES_USER
+      - POSTGRES_PASSWORD=$POSTGRES_PASSWORD
+      - SCHEDULE=@daily
+      - BACKUP_KEEP_DAYS=30
+      - BACKUP_KEEP_WEEKS=12
+      - BACKUP_KEEP_MONTHS=24
+      - HEALTHCHECK_PORT=5432
+
+volumes:
+    pgdata:
+    mongodata:

docker-compose.yml

@@ -4,7 +4,7 @@ services:
 
   app:
     image: ocportal-nandi/admin/prod:${TAG-local}
-    restart: 'no'
+    restart: always
     extra_hosts:
       - "host.docker.internal:host-gateway" #required so docker connects to host interface (this is for sending emails)
     build:
@@ -13,35 +13,30 @@ services:
       - db
       - mongo
     ports:
-      - "8090:8090"
-      - "8000:8000"
+      - "127.0.0.1:8090:8090"
     env_file:
       - .env
 
   db:
     image: postgis/postgis:11-3.3
-    restart: 'no'
+    restart: always
     volumes:
       - pgdata:/var/lib/postgresql/data
-    ports:
-      - "5432:5432"
     env_file:
       - .env
 
   mongo:
     image: mongo:4.2
-    restart: 'no'
+    restart: always
     command: [--auth]
     volumes:
         - mongodata:/data/db
-    ports:
-      - "27017:27017"
     env_file:
       - .env
 
   pgbackups:
     image: prodrigestivill/postgres-backup-local
-    restart: 'no'
+    restart: always
     volumes:
       - /opt/pgbackups:/backups
     env_file:

persistence-mongodb/src/main/java/org/devgateway/toolkit/persistence/mongo/spring/MongoPersistenceApplication.java

@@ -17,6 +17,7 @@
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.ReadingConverter;
@@ -44,7 +45,8 @@
  * @author mpostelnicu
  */
 @SpringBootApplication
-@ComponentScan("org.devgateway")
+@ComponentScan(value = "org.devgateway", excludeFilters = @ComponentScan.Filter(
+        type = FilterType.ASPECTJ, pattern = "org.devgateway.jocds.ValidatorConfiguration" ))
 @PropertySource("classpath:/org/devgateway/toolkit/persistence/mongo/application.properties")
 @EnableCaching
 public class MongoPersistenceApplication {

persistence/src/main/java/org/devgateway/toolkit/persistence/spring/PersistenceApplication.java

@@ -29,6 +29,7 @@
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.Profile;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.ReloadableResourceBundleMessageSource;
@@ -46,7 +47,8 @@
 @EnableTransactionManagement
 @EntityScan(basePackageClasses = {GenericPersistable.class})
 @PropertySource("classpath:/org/devgateway/toolkit/persistence/application.properties")
-@ComponentScan("org.devgateway.toolkit")
+@ComponentScan(value = "org.devgateway.toolkit", excludeFilters = @ComponentScan.Filter(
+        type = FilterType.ASPECTJ, pattern = "org.devgateway.jocds.ValidatorConfiguration" ))
 @EnableConfigurationProperties({OnfonMediaProperties.class, DgFmProperties.class})
 public class PersistenceApplication {
     private static final Logger logger = LoggerFactory.getLogger(PersistenceApplication.class);

web/src/main/java/org/devgateway/toolkit/web/spring/WebApplication.java

@@ -17,6 +17,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration;
 import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.PropertySource;
 
 /**
@@ -25,7 +26,9 @@
 
 @SpringBootApplication(exclude = {EmbeddedMongoAutoConfiguration.class})
 @PropertySource("classpath:/org/devgateway/toolkit/web/application.properties")
-@ComponentScan("org.devgateway.toolkit")
+@ComponentScan(value = "org.devgateway.toolkit", excludeFilters = @ComponentScan.Filter(
+        type = FilterType.ASSIGNABLE_TYPE,
+        value = org.devgateway.jocds.ValidatorConfiguration.class))
 public class WebApplication {
 
     private static final Logger logger = LoggerFactory.getLogger(WebApplication.class);