Blazebit · Mobe91 · Jan 9, 2023 · Dec 16, 2022 · Dec 16, 2022 · Dec 16, 2022
diff --git a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannel.java b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannelFactory.java b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/package-info.java b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannel.java b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannelFactory.java b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/package-info.java b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannel.java b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannelFactory.java b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/package-info.java b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannel.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFactory.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFilter.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...mtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelRecipientPatternFilter.java b/...mtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelRecipientPatternFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/package-info.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...tp/src/test/java/com/blazebit/notify/channel/smtp/AbstractSmtpChannelIntegrationTest.java b/...tp/src/test/java/com/blazebit/notify/channel/smtp/AbstractSmtpChannelIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...mtp/src/test/java/com/blazebit/notify/channel/smtp/DefaultEmailNotificationRecipient.java b/...mtp/src/test/java/com/blazebit/notify/channel/smtp/DefaultEmailNotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 import java.util.Locale;
 import java.util.Objects;
+import java.util.TimeZone;
 
 public class DefaultEmailNotificationRecipient<ID> implements EmailNotificationRecipient<ID> {
 
@@ -50,6 +51,11 @@ public Locale getLocale() {
         return Locale.getDefault();
     }
 
+    @Override
+    public TimeZone getTimeZone() {
+        return TimeZone.getDefault();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

diff --git a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/SmtpChannelIntegrationTest.java b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/SmtpChannelIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...src/test/java/com/blazebit/notify/channel/smtp/james/module/MessageSearchIndexModule.java b/...src/test/java/com/blazebit/notify/channel/smtp/james/module/MessageSearchIndexModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/util/ImapMailClient.java b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/util/ImapMailClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-config.xml b/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-suppressions.xml b/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-suppressions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/Channel.java b/core/api/src/main/java/com/blazebit/notify/Channel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@
  */
 public interface Channel<R extends NotificationRecipient<?>, M extends NotificationMessage> extends AutoCloseable {
 
+    String SERVICE_PROVIDER_PROPERTY = "serviceProvider";
+
     /**
      * Returns the notification message type class.
      *

diff --git a/core/api/src/main/java/com/blazebit/notify/ChannelFactory.java b/core/api/src/main/java/com/blazebit/notify/ChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/ChannelKey.java b/core/api/src/main/java/com/blazebit/notify/ChannelKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/ConfigurationSourceProvider.java b/core/api/src/main/java/com/blazebit/notify/ConfigurationSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/Notification.java b/core/api/src/main/java/com/blazebit/notify/Notification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationException.java b/core/api/src/main/java/com/blazebit/notify/NotificationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJob.java b/core/api/src/main/java/com/blazebit/notify/NotificationJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobContext.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -625,7 +625,12 @@ public <T extends NotificationMessage> NotificationMessageResolver<T> getNotific
                         if (channelFactory == null) {
                             throw new NotificationException("No channel factory for channel key available: " + channelKey);
                         }
-                        return channelFactory.createChannel(this, configurationSource);
+                        return channelFactory.createChannel(this, (key) -> {
+                            if (Channel.SERVICE_PROVIDER_PROPERTY.equals(key)) {
+                                return this;
+                            }
+                            return configurationSource.getProperty(key);
+                        });
                     }
                 );
             }

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstance.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessor.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessorFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessor.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessorFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobTrigger.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessage.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessagePart.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessagePart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolver.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverModelCustomizer.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverModelCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationProcessor.java b/core/api/src/main/java/com/blazebit/notify/NotificationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationProcessorFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationRecipient.java b/core/api/src/main/java/com/blazebit/notify/NotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.blazebit.notify;
 
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * A base type for a notification recipient.
@@ -40,15 +41,23 @@ public interface NotificationRecipient<ID> {
      */
     Locale getLocale();
 
+    /**
+     * Returns the time zone for this notification recipient.
+     *
+     * @return the time zone for this notification recipient
+     */
+    TimeZone getTimeZone();
+
     /**
      * Returns a simple notification recipient with the given identifier and locale.
      *
      * @param id The notification recipient identifier
      * @param locale The notification recipient locale
+     * @param timeZone The notification recipient time zone
      * @param <X> The notification recipient identifier type
      * @return a simple notification recipient
      */
-    static <X> NotificationRecipient<X> of(X id, Locale locale) {
+    static <X> NotificationRecipient<X> of(X id, Locale locale, TimeZone timeZone) {
         return new NotificationRecipient<X>() {
             @Override
             public X getId() {
@@ -59,6 +68,11 @@ public X getId() {
             public Locale getLocale() {
                 return locale;
             }
+
+            @Override
+            public TimeZone getTimeZone() {
+                return timeZone;
+            }
         };
     }
 }
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationRecipientResolver.java b/core/api/src/main/java/com/blazebit/notify/NotificationRecipientResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.