Skip to content

Commit 0a9a923

Browse files
bbottemabbottema
committed
#198: Added empty Batch module
1 parent 37bbbad commit 0a9a923

File tree

13 files changed

+311
-3
lines changed

13 files changed

+311
-3
lines changed

‎angular-app

‎modules/authenticated-socks-module/src/main/java/org/simplejavamail/internal/authenticatedsockssupport/socks5client/SocksCommandSender.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public static void send(final Socket socket, final SocketAddress socketAddress)
8585
}
8686

8787
public static void send(final Socket socket, final String host, final int port)
88-
throws IOException {
88+
throws IOException, SocksException {
8989
final InputStream inputStream = socket.getInputStream();
9090
final OutputStream outputStream = socket.getOutputStream();
9191
final int lengthOfHost = host.getBytes(UTF_8).length;
@@ -109,7 +109,7 @@ public static void send(final Socket socket, final String host, final int port)
109109
}
110110

111111
private static void checkServerReply(final InputStream inputStream)
112-
throws IOException {
112+
throws IOException, SocksException {
113113
final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
114114
int temp = 0;
115115
for (int i = 0; i < 4; i++) {

‎modules/batch-module/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.iml
2+
target

‎modules/batch-module/LICENSE-2.0.txt

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
2+
Apache License
3+
Version 2.0, January 2004
4+
http://www.apache.org/licenses/
5+
6+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
7+
8+
1. Definitions.
9+
10+
"License" shall mean the terms and conditions for use, reproduction,
11+
and distribution as defined by Sections 1 through 9 of this document.
12+
13+
"Licensor" shall mean the copyright owner or entity authorized by
14+
the copyright owner that is granting the License.
15+
16+
"Legal Entity" shall mean the union of the acting entity and all
17+
other entities that control, are controlled by, or are under common
18+
control with that entity. For the purposes of this definition,
19+
"control" means (i) the power, direct or indirect, to cause the
20+
direction or management of such entity, whether by contract or
21+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
22+
outstanding shares, or (iii) beneficial ownership of such entity.
23+
24+
"You" (or "Your") shall mean an individual or Legal Entity
25+
exercising permissions granted by this License.
26+
27+
"Source" form shall mean the preferred form for making modifications,
28+
including but not limited to software source code, documentation
29+
source, and configuration files.
30+
31+
"Object" form shall mean any form resulting from mechanical
32+
transformation or translation of a Source form, including but
33+
not limited to compiled object code, generated documentation,
34+
and conversions to other media types.
35+
36+
"Work" shall mean the work of authorship, whether in Source or
37+
Object form, made available under the License, as indicated by a
38+
copyright notice that is included in or attached to the work
39+
(an example is provided in the Appendix below).
40+
41+
"Derivative Works" shall mean any work, whether in Source or Object
42+
form, that is based on (or derived from) the Work and for which the
43+
editorial revisions, annotations, elaborations, or other modifications
44+
represent, as a whole, an original work of authorship. For the purposes
45+
of this License, Derivative Works shall not include works that remain
46+
separable from, or merely link (or bind by name) to the interfaces of,
47+
the Work and Derivative Works thereof.
48+
49+
"Contribution" shall mean any work of authorship, including
50+
the original version of the Work and any modifications or additions
51+
to that Work or Derivative Works thereof, that is intentionally
52+
submitted to Licensor for inclusion in the Work by the copyright owner
53+
or by an individual or Legal Entity authorized to submit on behalf of
54+
the copyright owner. For the purposes of this definition, "submitted"
55+
means any form of electronic, verbal, or written communication sent
56+
to the Licensor or its representatives, including but not limited to
57+
communication on electronic mailing lists, source code control systems,
58+
and issue tracking systems that are managed by, or on behalf of, the
59+
Licensor for the purpose of discussing and improving the Work, but
60+
excluding communication that is conspicuously marked or otherwise
61+
designated in writing by the copyright owner as "Not a Contribution."
62+
63+
"Contributor" shall mean Licensor and any individual or Legal Entity
64+
on behalf of whom a Contribution has been received by Licensor and
65+
subsequently incorporated within the Work.
66+
67+
2. Grant of Copyright License. Subject to the terms and conditions of
68+
this License, each Contributor hereby grants to You a perpetual,
69+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
70+
copyright license to reproduce, prepare Derivative Works of,
71+
publicly display, publicly perform, sublicense, and distribute the
72+
Work and such Derivative Works in Source or Object form.
73+
74+
3. Grant of Patent License. Subject to the terms and conditions of
75+
this License, each Contributor hereby grants to You a perpetual,
76+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
77+
(except as stated in this section) patent license to make, have made,
78+
use, offer to sell, sell, import, and otherwise transfer the Work,
79+
where such license applies only to those patent claims licensable
80+
by such Contributor that are necessarily infringed by their
81+
Contribution(s) alone or by combination of their Contribution(s)
82+
with the Work to which such Contribution(s) was submitted. If You
83+
institute patent litigation against any entity (including a
84+
cross-claim or counterclaim in a lawsuit) alleging that the Work
85+
or a Contribution incorporated within the Work constitutes direct
86+
or contributory patent infringement, then any patent licenses
87+
granted to You under this License for that Work shall terminate
88+
as of the date such litigation is filed.
89+
90+
4. Redistribution. You may reproduce and distribute copies of the
91+
Work or Derivative Works thereof in any medium, with or without
92+
modifications, and in Source or Object form, provided that You
93+
meet the following conditions:
94+
95+
(a) You must give any other recipients of the Work or
96+
Derivative Works a copy of this License; and
97+
98+
(b) You must cause any modified files to carry prominent notices
99+
stating that You changed the files; and
100+
101+
(c) You must retain, in the Source form of any Derivative Works
102+
that You distribute, all copyright, patent, trademark, and
103+
attribution notices from the Source form of the Work,
104+
excluding those notices that do not pertain to any part of
105+
the Derivative Works; and
106+
107+
(d) If the Work includes a "NOTICE" text file as part of its
108+
distribution, then any Derivative Works that You distribute must
109+
include a readable copy of the attribution notices contained
110+
within such NOTICE file, excluding those notices that do not
111+
pertain to any part of the Derivative Works, in at least one
112+
of the following places: within a NOTICE text file distributed
113+
as part of the Derivative Works; within the Source form or
114+
documentation, if provided along with the Derivative Works; or,
115+
within a display generated by the Derivative Works, if and
116+
wherever such third-party notices normally appear. The contents
117+
of the NOTICE file are for informational purposes only and
118+
do not modify the License. You may add Your own attribution
119+
notices within Derivative Works that You distribute, alongside
120+
or as an addendum to the NOTICE text from the Work, provided
121+
that such additional attribution notices cannot be construed
122+
as modifying the License.
123+
124+
You may add Your own copyright statement to Your modifications and
125+
may provide additional or different license terms and conditions
126+
for use, reproduction, or distribution of Your modifications, or
127+
for any such Derivative Works as a whole, provided Your use,
128+
reproduction, and distribution of the Work otherwise complies with
129+
the conditions stated in this License.
130+
131+
5. Submission of Contributions. Unless You explicitly state otherwise,
132+
any Contribution intentionally submitted for inclusion in the Work
133+
by You to the Licensor shall be under the terms and conditions of
134+
this License, without any additional terms or conditions.
135+
Notwithstanding the above, nothing herein shall supersede or modify
136+
the terms of any separate license agreement you may have executed
137+
with Licensor regarding such Contributions.
138+
139+
6. Trademarks. This License does not grant permission to use the trade
140+
names, trademarks, service marks, or product names of the Licensor,
141+
except as required for reasonable and customary use in describing the
142+
origin of the Work and reproducing the content of the NOTICE file.
143+
144+
7. Disclaimer of Warranty. Unless required by applicable law or
145+
agreed to in writing, Licensor provides the Work (and each
146+
Contributor provides its Contributions) on an "AS IS" BASIS,
147+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
148+
implied, including, without limitation, any warranties or conditions
149+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
150+
PARTICULAR PURPOSE. You are solely responsible for determining the
151+
appropriateness of using or redistributing the Work and assume any
152+
risks associated with Your exercise of permissions under this License.
153+
154+
8. Limitation of Liability. In no event and under no legal theory,
155+
whether in tort (including negligence), contract, or otherwise,
156+
unless required by applicable law (such as deliberate and grossly
157+
negligent acts) or agreed to in writing, shall any Contributor be
158+
liable to You for damages, including any direct, indirect, special,
159+
incidental, or consequential damages of any character arising as a
160+
result of this License or out of the use or inability to use the
161+
Work (including but not limited to damages for loss of goodwill,
162+
work stoppage, computer failure or malfunction, or any and all
163+
other commercial damages or losses), even if such Contributor
164+
has been advised of the possibility of such damages.
165+
166+
9. Accepting Warranty or Additional Liability. While redistributing
167+
the Work or Derivative Works thereof, You may choose to offer,
168+
and charge a fee for, acceptance of support, warranty, indemnity,
169+
or other liability obligations and/or rights consistent with this
170+
License. However, in accepting such obligations, You may act only
171+
on Your own behalf and on Your sole responsibility, not on behalf
172+
of any other Contributor, and only if You agree to indemnify,
173+
defend, and hold each Contributor harmless for any liability
174+
incurred by, or claims asserted against, such Contributor by reason
175+
of your accepting any such warranty or additional liability.
176+
177+
END OF TERMS AND CONDITIONS
178+
179+
APPENDIX: How to apply the Apache License to your work.
180+
181+
To apply the Apache License to your work, attach the following
182+
boilerplate notice, with the fields enclosed by brackets "[]"
183+
replaced with your own identifying information. (Don't include
184+
the brackets!) The text should be enclosed in the appropriate
185+
comment syntax for the file format. We also recommend that a
186+
file or class name and description of purpose be included on the
187+
same "printed page" as the copyright notice for easier
188+
identification within third-party archives.
189+
190+
Copyright 2016 Benny Bottema
191+
192+
Licensed under the Apache License, Version 2.0 (the "License");
193+
you may not use this file except in compliance with the License.
194+
You may obtain a copy of the License at
195+
196+
http://www.apache.org/licenses/LICENSE-2.0
197+
198+
Unless required by applicable law or agreed to in writing, software
199+
distributed under the License is distributed on an "AS IS" BASIS,
200+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
201+
See the License for the specific language governing permissions and
202+
limitations under the License.

‎modules/batch-module/NOTICE.txt

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
=========================================================================
2+
== NOTICE file for use with the Apache License, Version 2.0 ==
3+
=========================================================================
4+
5+
Simple Java Mail - Batch module
6+
Copyright 2009-2019 Benny Bottema
7+
http://www.simplejavamail.org
8+
9+
This product uses no commercial products.
10+
11+
This product uses the following external (Open Source) libraries:
12+
13+
- Stormpot for generic object pooling https://github.com/chrisvest/stormpot/

‎modules/batch-module/pom.xml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<parent>
8+
<groupId>org.simplejavamail</groupId>
9+
<artifactId>maven-master-project</artifactId>
10+
<!--suppress MavenPropertyInParent -->
11+
<version>6.0.0.beta-SNAPSHOT.2</version>
12+
<relativePath>../../</relativePath>
13+
</parent>
14+
15+
<artifactId>batch-module</artifactId>
16+
<packaging>jar</packaging>
17+
<name>Simple Java Mail - Batch module</name>
18+
<description>Simple API, Complex Emails. High performance.</description>
19+
20+
<dependencies>
21+
22+
<!-- core dependencies -->
23+
<dependency>
24+
<groupId>org.simplejavamail</groupId>
25+
<artifactId>core-module</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
29+
<!-- needed for pooling SMTP (JavaMail Transport) connections -->
30+
<dependency>
31+
<groupId>com.github.chrisvest</groupId>
32+
<artifactId>stormpot</artifactId>
33+
<version>2.4.1</version>
34+
</dependency>
35+
</dependencies>
36+
37+
</project>

‎modules/batch-module/src/main/java/org/simplejavamail/internal/batchsupport/BatchSupport.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package org.simplejavamail.internal.batchsupport;
2+
3+
import org.simplejavamail.internal.modules.BatchModule;
4+
import org.slf4j.Logger;
5+
import org.slf4j.LoggerFactory;
6+
7+
/**
8+
* This class only serves to hide the Batch implementation behind an easy-to-load-with-reflection class.
9+
*/
10+
@SuppressWarnings("unused") // it is used through reflection
11+
public class BatchSupport implements BatchModule {
12+
13+
private static final Logger LOGGER = LoggerFactory.getLogger(BatchSupport.class);
14+
15+
}

‎modules/cli-module/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@
6363
<scope>runtime</scope>
6464
<optional>true</optional>
6565
</dependency>
66+
<dependency>
67+
<groupId>org.simplejavamail</groupId>
68+
<artifactId>batch-module</artifactId>
69+
<version>${project.version}</version>
70+
<scope>runtime</scope>
71+
<optional>true</optional>
72+
</dependency>
6673
<dependency>
6774
<groupId>org.simplejavamail</groupId>
6875
<artifactId>outlook-module</artifactId>

‎modules/core-module/src/main/java/org/simplejavamail/internal/modules/BatchModule.java

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package org.simplejavamail.internal.modules;
2+
3+
/**
4+
* This interface only serves to hide the Batch implementation behind an easy-to-load-with-reflection class.
5+
*/
6+
public interface BatchModule {
7+
8+
}

‎modules/jacoco-aggregator-module/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,12 @@
4646
<version>${project.version}</version>
4747
<scope>compile</scope>
4848
</dependency>
49+
<dependency>
50+
<groupId>org.simplejavamail</groupId>
51+
<artifactId>batch-module</artifactId>
52+
<version>${project.version}</version>
53+
<scope>compile</scope>
54+
</dependency>
4955
<dependency>
5056
<groupId>org.simplejavamail</groupId>
5157
<artifactId>cli-module</artifactId>

‎modules/simple-java-mail/pom.xml

+6
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@
5050
<version>${project.version}</version>
5151
<optional>true</optional>
5252
</dependency>
53+
<dependency>
54+
<groupId>org.simplejavamail</groupId>
55+
<artifactId>batch-module</artifactId>
56+
<version>${project.version}</version>
57+
<optional>true</optional>
58+
</dependency>
5359
<dependency>
5460
<groupId>org.simplejavamail</groupId>
5561
<artifactId>outlook-module</artifactId>

‎modules/simple-java-mail/src/main/java/org/simplejavamail/internal/modules/ModuleLoader.java

+11
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@ public static SMIMEModule loadSmimeModule() {
5757
return (SMIMEModule) LOADED_MODULES.get(SMIMEModule.class);
5858
}
5959

60+
public static BatchModule loadBatchModule() {
61+
if (!LOADED_MODULES.containsKey(BatchModule.class)) {
62+
LOADED_MODULES.put(BatchModule.class, loadModule(
63+
"Batch",
64+
"org.simplejavamail.internal.batchsupport.BatchSupport",
65+
"https://github.com/bbottema/simple-java-mail/tree/develop/modules/batch-module"
66+
));
67+
}
68+
return (BatchModule) LOADED_MODULES.get(BatchModule.class);
69+
}
70+
6071
public static boolean smimeModuleAvailable() {
6172
return MiscUtil.classAvailable("org.simplejavamail.internal.smimesupport.SMIMESupport");
6273
}

‎pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<modules>
6161
<module>modules/core-module</module>
6262
<module>modules/core-test-module</module>
63+
<module>modules/batch-module</module>
6364
<module>modules/authenticated-socks-module</module>
6465
<module>modules/outlook-module</module>
6566
<module>modules/dkim-module</module>

0 commit comments

Comments
 (0)