-
Notifications
You must be signed in to change notification settings - Fork 2.8k
introduce MailClientProvider for dynamic mail client generation #4187
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+626
−88
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6f26cc8
introduce MailClientProvider for dynamic mail client generation
vzickner c6776e8
fix review findings
vzickner aba3b83
fix mail provider set/reset structure
vzickner 15f6e21
improve CMMN static tenant test
vzickner 558b14e
polish
filiphr File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
...les/flowable-cmmn-engine/src/test/java/org/flowable/cmmn/test/task/CmmnEmailTestCase.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.flowable.cmmn.test.task; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
|
|
||
| import org.flowable.cmmn.test.FlowableCmmnTestCase; | ||
| import org.flowable.common.engine.impl.cfg.mail.MailServerInfo; | ||
| import org.flowable.mail.common.api.client.MailClientProvider; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Tag; | ||
| import org.subethamail.wiser.Wiser; | ||
|
|
||
| /** | ||
| * @author Valentin Zickner | ||
| */ | ||
| @Tag("email") | ||
| public abstract class CmmnEmailTestCase extends FlowableCmmnTestCase { | ||
|
|
||
| protected static Wiser wiser; | ||
| private MailClientProvider initialMailClientProvider; | ||
| private Map<String, MailServerInfo> initialMailServers; | ||
|
|
||
| @BeforeAll | ||
| public static void setupWiser() throws Exception { | ||
| int counter = 0; | ||
| boolean serverUpAndRunning = false; | ||
| while (!serverUpAndRunning && counter++ < 11) { | ||
| wiser = Wiser.port(5025); | ||
| try { | ||
| wiser.start(); | ||
| serverUpAndRunning = true; | ||
| } catch (RuntimeException e) { // Fix for slow port-closing Jenkins | ||
| if (e.getMessage().toLowerCase().contains("bindexception")) { | ||
| Thread.sleep(250L); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @BeforeEach | ||
| public void setUp() { | ||
| wiser.getMessages().clear(); | ||
| initialMailClientProvider = cmmnEngineConfiguration.getMailClientProvider(); | ||
| reinitializeMailClients(); | ||
| Map<String, MailServerInfo> mailServers = cmmnEngineConfiguration.getMailServers(); | ||
| initialMailServers = mailServers == null ? null : new HashMap<>(mailServers); | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void tearDown() { | ||
| if (initialMailServers != null) { | ||
| cmmnEngineConfiguration.getMailServers().clear(); | ||
| cmmnEngineConfiguration.getMailServers().putAll(initialMailServers); | ||
| } | ||
| cmmnEngineConfiguration.setMailClientProvider(initialMailClientProvider); | ||
| } | ||
|
|
||
| @AfterAll | ||
| public static void stopWiser() { | ||
| wiser.stop(); | ||
| } | ||
|
|
||
| protected void reinitializeMailClients() { | ||
| cmmnEngineConfiguration.setMailClientProvider(null); | ||
| cmmnEngineConfiguration.initMailClients(); | ||
| } | ||
|
|
||
| protected void addMailServer(String tenantId, String defaultFrom, String forceTo) { | ||
| MailServerInfo mailServerInfo = new MailServerInfo(); | ||
| mailServerInfo.setMailServerHost("localhost"); | ||
| mailServerInfo.setMailServerPort(5025); | ||
| mailServerInfo.setMailServerUseSSL(false); | ||
| mailServerInfo.setMailServerUseTLS(false); | ||
| mailServerInfo.setMailServerDefaultFrom(defaultFrom); | ||
| mailServerInfo.setMailServerForceTo(forceTo); | ||
| mailServerInfo.setMailServerUsername(defaultFrom); | ||
| mailServerInfo.setMailServerPassword("password"); | ||
|
|
||
| cmmnEngineConfiguration.getMailServers().put(tenantId, mailServerInfo); | ||
| } | ||
|
|
||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.