Add support for smtp/smtps and optional port (#130)

Signed-off-by: Sanjula Ganepola <[email protected]>
ThePrez · Jul 19, 2024 · 747df3a · 747df3a
1 parent ec84298
commit 747df3a
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 14 deletions.
diff --git a/camel/src/main/java/com/github/theprez/manzan/configuration/Config.java b/camel/src/main/java/com/github/theprez/manzan/configuration/Config.java
@@ -69,4 +69,12 @@ protected String getRequiredString(final String _name, final String _key) {
         }
         return ret;
     }
+
+    protected int getOptionalInt(final String _name, final String _key) {
+        final String ret = m_ini.get(_name, _key);
+        if (StringUtils.isEmpty(ret)) {
+            return -1;
+        }
+        return Integer.valueOf(ret);
+    }
 }
diff --git a/camel/src/main/java/com/github/theprez/manzan/configuration/DestinationConfig.java b/camel/src/main/java/com/github/theprez/manzan/configuration/DestinationConfig.java
@@ -78,15 +78,18 @@ public synchronized Map<String, ManzanRoute> getRoutes(CamelContext context) {
                     final String dsn = getRequiredString(name, "dsn");
                     ret.put(name, new SentryDestination(name, dsn));
                     break;
-                case "fluentd":
+                case "fluentd": {
                     final String tag = getRequiredString(name, "tag");
                     final String host = getRequiredString(name, "host");
                     final int port = getRequiredInt(name, "port");
                     ret.put(name, new FluentDDestination(name, tag, host, port));
+                }
                     break;
+                case "smtp":
                 case "smtps":
                     final String server = getRequiredString(name, "server");
-                    final EmailDestination d = new EmailDestination(name, server, format, getUriAndHeaderParameters(name, sectionObj, "server"), null);
+                    final int port = getOptionalInt(name, "port");
+                    final EmailDestination d = new EmailDestination(name, type, server, format, port, getUriAndHeaderParameters(name, sectionObj, "server", "port"), null);
                     ret.put(name, d);
                     break;
                 case "twilio":

diff --git a/camel/src/main/java/com/github/theprez/manzan/routes/dest/EmailDestination.java b/camel/src/main/java/com/github/theprez/manzan/routes/dest/EmailDestination.java
@@ -7,8 +7,8 @@
 
 public class EmailDestination extends ManzanGenericCamelRoute {
 
-    public EmailDestination(final String _name, final String _smtpServer, final String _format, final Map<String, String> _uriParams, final Map<String, Object> _headerParams) {
-        super(_name, "smtps", _smtpServer, _format, _uriParams, _headerParams);
+    public EmailDestination(final String _name, final String _type, final String _smtpServer, final String _format, final int _port, final Map<String, String> _uriParams, final Map<String, Object> _headerParams) {
+        super(_name, _type, (_port == -1) ? _smtpServer : _smtpServer + ":" + _port, _format, _uriParams, _headerParams);
     }
 
     @Override

diff --git a/docs/README.md b/docs/README.md
@@ -35,7 +35,7 @@ Many other destinations will be available. Examples include:
 - [AWS Simple Email Service (SES)](https://aws.amazon.com/ses/) ⏳
 - [AWS Simple Notification System (SNS)](https://aws.amazon.com/sns/) ⏳
 - [ElasticSearch](http://elastic.co) ⏳
-- Email (SMTPS) ✅
+- Email (SMTP/SMTPS) ✅
 - [FluentD](http://fluentd.org) ✅
 - [Google Drive](http://drive.google.com) ⏳
 - [Google Mail (gmail)](http://gmail.com) ⏳

diff --git a/docs/config/data.md b/docs/config/data.md
@@ -31,7 +31,7 @@ destinations=<destinations>
 
 Some types have additional properties that they required.
 
-| id      | Description                                 | Required properties            | Optional props                                                                                                        |
+| id      | Description                                 | Required properties            | Optional properties                                                                                                        |
 |---------|---------------------------------------------|--------------------------------|-----------------------------------------------------------------------------------------------------------------------|
 | `file`  | Triggered when a file changes               | `file` path of file to watch   | `filter` only listen for lines that include this value                                                                |
 | `watch` | Triggered when the Manzan handler is called | `id` of the watch (session ID) | `strwch` is part of the `STRWCH` CL command that can be used to describe how to start the watch when Manzan starts up |

diff --git a/docs/config/dests.md b/docs/config/dests.md
@@ -19,14 +19,14 @@ type=<type>
 
 Some types have additional properties that they required.
 
-| id       | Description                     | Required properties                                        |
-|----------|---------------------------------|------------------------------------------------------------|
-| `stdout`   | Write all data to standard out. | None.                                                      |
-| `slack`    | Send data to a Slack channel    | * `webhook` <br> * `channel` <br>                          |
-| `fluentd`  | Sent data to FluentD            | * `tag` <br> * `host` <br> * `port` <br>                   |
-| `smtps`     | Sent data via email             | * `server` <br> * `subject` <br> * `to` <br> * `from` <br> |
-| `sentry` | Send data into Sentry           | `dsn`                                                      |
-| `twilio` | Send via SMS | * `sid` <br> * `token` <br> * `to` <br> * `from` |
+| id               | Description                     | Required properties                                        | Optional properties   |
+|------------------|---------------------------------|------------------------------------------------------------|                       |
+| `stdout`         | Write all data to standard out. | None.                                                      |                       |
+| `slack`          | Send data to a Slack channel    | * `webhook` <br> * `channel` <br>                          |                       |
+| `fluentd`        | Sent data to FluentD            | * `tag` <br> * `host` <br> * `port` <br>                   |                       |
+| `smtp`/`smtps`   | Sent data via email             | * `server` <br> * `subject` <br> * `to` <br> * `from` <br> | * `port`              |
+| `sentry`         | Send data into Sentry           | * `dsn`                                                    |                       |
+| `twilio`         | Send via SMS                    | * `sid` <br> * `token` <br> * `to` <br> * `from`           |                       |
 
 ### Example