Merge branch 'develop' into feature/template-resolution-by-external-s…

…ervice

# Conflicts:
#	core/core-services-impl/src/test/java/com/sflpro/notifier/services/template/impl/TemplatingConfigurationImplTest.java

README.md

@@ -110,3 +110,5 @@ kafka.sasl.mechanism=PLAIN
 kafka.sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username="<API_KEY>" password="<API_SECRET>";
 kafka.security.protocol=SASL_SSL
 ```
+
+For detailed configuration of templating and i18n please see [Template resolution documentation](/docs/template-resolution.md)

docs/template-resolution.md

@@ -6,9 +6,13 @@ General intro
 
 Description of this approach
 
-Configuration
+Configuration example
 ```yaml
-path: sfdsfsdf
+notifier:
+  templates:
+    externalUrl: false
+    path: file:/templates
+    extension: .ftl
 ```
 
 ### File naming
@@ -25,16 +29,18 @@ Description of this approach
 
 Configuration example 
 ```yaml
-configuration:
-    example:
-        url: true
+notifier:
+  templates:
+    externalUrl: true
+    path: https://example.com
+    extension: .ftl
 ```
 
 ### External Service API Specification
 
-Implement the following API endpoints:
+Implement the following API endpoints, assuming .ftl template extension:
 
-    GET /templates/<template_name>
+    GET /<template_name>.ftl
         Returns the template content.
 
 Endpoints should return the following responses: