diff --git a/javalin4/javalin-testing-example/pom.xml b/javalin4/javalin-testing-example/pom.xml index 93dc5a3..e546184 100644 --- a/javalin4/javalin-testing-example/pom.xml +++ b/javalin4/javalin-testing-example/pom.xml @@ -90,19 +90,19 @@ org.seleniumhq.selenium selenium-chrome-driver - 4.5.0 + 4.16.1 test org.seleniumhq.selenium selenium-http-jdk-client - 4.5.0 + 4.13.0 test io.github.bonigarcia webdrivermanager - 5.3.0 + 5.6.3 test diff --git a/javalin6/javalin-async-example/.gitignore b/javalin6/javalin-async-example/.gitignore new file mode 100644 index 0000000..f5ff132 --- /dev/null +++ b/javalin6/javalin-async-example/.gitignore @@ -0,0 +1,15 @@ +.idea +*.iml + +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties + +# Avoid ignoring Maven wrapper jar file (.jar files are usually ignored) +!/.mvn/wrapper/maven-wrapper.jar diff --git a/javalin6/javalin-async-example/LICENSE b/javalin6/javalin-async-example/LICENSE new file mode 100644 index 0000000..261eeb9 --- /dev/null +++ b/javalin6/javalin-async-example/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + 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. diff --git a/javalin6/javalin-async-example/README.md b/javalin6/javalin-async-example/README.md new file mode 100644 index 0000000..093a5e9 --- /dev/null +++ b/javalin6/javalin-async-example/README.md @@ -0,0 +1,10 @@ +# javalin-async-example + +This repo contains a benchmarking tool created for playing around with futures in [Javalin](https://javalin.io). + +The plugin [javalin-ssl](https://github.com/javalin/javalin-ssl) is used to enable HTTP/2. + +It's only intended as an illustration of the concepts of running requests asynchronously. Since your browser is being used +as a benchmarking tool results will become wildly inaccurate if you try to send too many requests. + +![bench](https://user-images.githubusercontent.com/1521451/38759263-55f68e5e-3f75-11e8-93df-1185afd0120c.png) diff --git a/javalin6/javalin-async-example/pom.xml b/javalin6/javalin-async-example/pom.xml new file mode 100644 index 0000000..bb09fe2 --- /dev/null +++ b/javalin6/javalin-async-example/pom.xml @@ -0,0 +1,115 @@ + + + + 4.0.0 + + io.javalin.samples.javalin5 + javalin-async-example + 1.0-SNAPSHOT + jar + + Javalin 6 ${project.artifactId} + + + + + reposilite-repository-snapshots + Reposilite Repository + https://repo.reposilite.com/snapshots + + + + + UTF-8 + 1.9.10 + official + 11 + + + + + io.javalin + javalin-bundle + 6.0.0-beta.4 + + + io.javalin.community.ssl + ssl-plugin + 6.0.0-SNAPSHOT + + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + compile + + compile + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/java + + + + + test-compile + test-compile + + test-compile + + + + ${project.basedir}/src/test/kotlin + ${project.basedir}/src/test/java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 11 + 11 + + + + + default-compile + none + + + + default-testCompile + none + + + java-compile + compile + + compile + + + + java-test-compile + test-compile + + testCompile + + + + + + + + diff --git a/javalin6/javalin-async-example/src/main/java/app/JavalinAsyncExampleApp.java b/javalin6/javalin-async-example/src/main/java/app/JavalinAsyncExampleApp.java new file mode 100644 index 0000000..ebf0201 --- /dev/null +++ b/javalin6/javalin-async-example/src/main/java/app/JavalinAsyncExampleApp.java @@ -0,0 +1,49 @@ +package app; + +import io.javalin.Javalin; +import io.javalin.http.staticfiles.Location; +import io.javalin.community.ssl.SSLPlugin; + +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; + +import org.eclipse.jetty.util.thread.QueuedThreadPool; + +public class JavalinAsyncExampleApp { + + private static ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor(); + + public static void main(String[] args) { + + Javalin app = Javalin.create(config -> { + config.jetty.threadPool = new QueuedThreadPool(10, 2, 60_000); + // Set up the SSL plugin (Enables HTTP/2 by default) + config.registerPlugin(new SSLPlugin(ssl -> ssl.keystoreFromClasspath("keystore.jks", "password"))); + config.staticFiles.add("/public", Location.CLASSPATH); + }).start(); + + + app.get("/async", ctx -> { + long taskTime = ctx.queryParamAsClass("task-time", Long.class).get(); + ctx.future(() -> getFuture(taskTime)); + }); + + app.get("/blocking", ctx -> { + long taskTime = ctx.queryParamAsClass("task-time", Long.class).get(); + Thread.sleep(taskTime); + ctx.result("done"); + }); + + app.exception(Exception.class, (exception, ctx) -> System.out.println(exception.getMessage())); + + } + + private static CompletableFuture getFuture(long taskTime) { + CompletableFuture future = new CompletableFuture<>(); + executorService.schedule(() -> future.complete("done"), taskTime, TimeUnit.MILLISECONDS); + return future; + } + +} diff --git a/javalin6/javalin-async-example/src/main/resources/keystore.jks b/javalin6/javalin-async-example/src/main/resources/keystore.jks new file mode 100644 index 0000000..7026a0a Binary files /dev/null and b/javalin6/javalin-async-example/src/main/resources/keystore.jks differ diff --git a/javalin6/javalin-async-example/src/main/resources/public/index.html b/javalin6/javalin-async-example/src/main/resources/public/index.html new file mode 100644 index 0000000..a2ef244 --- /dev/null +++ b/javalin6/javalin-async-example/src/main/resources/public/index.html @@ -0,0 +1,93 @@ + + + + + Javalin Async Example + + + + +
+

Async vs Blocking

+

+ The server is configured with a ThreadPool of 10 threads. + Play around with the number of requests and task time to see the effect of async vs blocking. +
+ + + Note: A browser isn't a benchmarking tool, too many requests will yield inaccurate results.
+ In chrome, keeping the console tab open will increase performance for some reason... +
+
+

+
+ + +
+
+ + +
+ + + + +
+ + + diff --git a/javalin6/javalin-auth-example/pom.xml b/javalin6/javalin-auth-example/pom.xml index a885838..0fa175a 100644 --- a/javalin6/javalin-auth-example/pom.xml +++ b/javalin6/javalin-auth-example/pom.xml @@ -21,7 +21,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-cors-example/pom.xml b/javalin6/javalin-cors-example/pom.xml index 6727e76..f70e12e 100644 --- a/javalin6/javalin-cors-example/pom.xml +++ b/javalin6/javalin-cors-example/pom.xml @@ -19,7 +19,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-email-example/pom.xml b/javalin6/javalin-email-example/pom.xml index 2a645a9..8ac1f8d 100644 --- a/javalin6/javalin-email-example/pom.xml +++ b/javalin6/javalin-email-example/pom.xml @@ -14,7 +14,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 com.j2html diff --git a/javalin6/javalin-heroku-example/pom.xml b/javalin6/javalin-heroku-example/pom.xml index 9996b4b..98285db 100644 --- a/javalin6/javalin-heroku-example/pom.xml +++ b/javalin6/javalin-heroku-example/pom.xml @@ -14,7 +14,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-html-forms-example/pom.xml b/javalin6/javalin-html-forms-example/pom.xml index 965add1..42369bc 100644 --- a/javalin6/javalin-html-forms-example/pom.xml +++ b/javalin6/javalin-html-forms-example/pom.xml @@ -8,13 +8,13 @@ javalin-html-forms-example 1.0-SNAPSHOT - Javalin 5 ${project.artifactId} + Javalin 6 ${project.artifactId} io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-http2-example/pom.xml b/javalin6/javalin-http2-example/pom.xml new file mode 100644 index 0000000..29bd3f5 --- /dev/null +++ b/javalin6/javalin-http2-example/pom.xml @@ -0,0 +1,137 @@ + + + + 4.0.0 + + io.javalin.samples.javalin5 + javalin-http2-example + 1.0-SNAPSHOT + jar + + Javalin 6 ${project.artifactId} + + + + + reposilite-repository-snapshots + Reposilite Repository + https://repo.reposilite.com/snapshots + + + + + UTF-8 + 1.9.10 + official + 4.13.1 + + + + + io.javalin + javalin-bundle + 6.0.0-beta.4 + + + io.javalin.community.ssl + ssl-plugin + 6.0.0-SNAPSHOT + + + org.jetbrains.kotlin + kotlin-stdlib + ${kotlin.version} + + + org.jetbrains.kotlin + kotlin-test-junit + ${kotlin.version} + test + + + junit + junit + ${junit.version} + test + + + com.squareup.okhttp3 + okhttp + 4.10.0 + test + + + + + + + + org.jetbrains.kotlin + kotlin-maven-plugin + ${kotlin.version} + + + compile + + compile + + + + ${project.basedir}/src/main/kotlin + ${project.basedir}/src/main/java + + + + + test-compile + + test-compile + + + + ${project.basedir}/src/test/kotlin + ${project.basedir}/src/test/java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 11 + 11 + + + + + default-compile + none + + + + default-testCompile + none + + + java-compile + compile + + compile + + + + java-test-compile + test-compile + + testCompile + + + + + + + + diff --git a/javalin6/javalin-http2-example/src/main/java/app/JavalinHttp2ExampleApp.java b/javalin6/javalin-http2-example/src/main/java/app/JavalinHttp2ExampleApp.java new file mode 100644 index 0000000..4d5955a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/java/app/JavalinHttp2ExampleApp.java @@ -0,0 +1,27 @@ +package app; + +import io.javalin.Javalin; +import io.javalin.community.ssl.SSLPlugin; +import io.javalin.http.staticfiles.Location; + +public class JavalinHttp2ExampleApp { + + public static void main(String[] args) { + + Javalin app = Javalin.create(config -> { + + // Set up the SSL plugin (Enables HTTP2 by default) + config.registerPlugin(new SSLPlugin(ssl -> { + ssl.keystoreFromClasspath("keystore.jks", "password"); // The ssl plugin will enable HTTP/2 by default + ssl.insecurePort = 8080; + ssl.securePort = 8443; + })); + + config.staticFiles.add("/public", Location.CLASSPATH); + }).start(); + + app.get("/", ctx -> ctx.result("Hello World")); + + } + +} diff --git a/javalin6/javalin-http2-example/src/main/kotlin/app/JavalinHttp2ExampleApp.kt b/javalin6/javalin-http2-example/src/main/kotlin/app/JavalinHttp2ExampleApp.kt new file mode 100644 index 0000000..6cf1621 --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/kotlin/app/JavalinHttp2ExampleApp.kt @@ -0,0 +1,22 @@ +package app + +import io.javalin.Javalin +import io.javalin.community.ssl.SSLPlugin +import io.javalin.http.staticfiles.Location + +fun main() { + + val app = Javalin.create { javalinConfig -> + // Set up the SSL plugin (Enables HTTP2 by default) + javalinConfig.registerPlugin(SSLPlugin { ssl -> + ssl.keystoreFromClasspath("keystore.jks", "password") + ssl.insecurePort = 8080 + ssl.securePort = 8443 + }) + javalinConfig.staticFiles.add("/public", Location.CLASSPATH) + }.start() + + app.get("/") { it.result("Hello World") } + +} + diff --git a/javalin6/javalin-http2-example/src/main/resources/keystore.jks b/javalin6/javalin-http2-example/src/main/resources/keystore.jks new file mode 100644 index 0000000..7026a0a Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/keystore.jks differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css1.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css1.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css1.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css2.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css2.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css2.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css3.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css3.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css3.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css4.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css4.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css4.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css5.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css5.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css5.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css6.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css6.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css6.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css7.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css7.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css7.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css8.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css8.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css8.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/css/css9.css b/javalin6/javalin-http2-example/src/main/resources/public/css/css9.css new file mode 100644 index 0000000..c8b00eb --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/css/css9.css @@ -0,0 +1,7 @@ +body { + background: #f5f5f5; +} + +img { + max-height: 100px; +} diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama1.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama1.jpg new file mode 100644 index 0000000..fa3579f Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama1.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama2.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama2.jpg new file mode 100644 index 0000000..0e59212 Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama2.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama3.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama3.jpg new file mode 100644 index 0000000..ffac9b0 Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama3.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama4.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama4.jpg new file mode 100644 index 0000000..8b94917 Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama4.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama5.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama5.jpg new file mode 100644 index 0000000..ad8ab8f Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama5.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama6.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama6.jpg new file mode 100644 index 0000000..5960476 Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama6.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama7.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama7.jpg new file mode 100644 index 0000000..0cde104 Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama7.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama8.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama8.jpg new file mode 100644 index 0000000..b4d31c6 Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama8.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/img/lama9.jpg b/javalin6/javalin-http2-example/src/main/resources/public/img/lama9.jpg new file mode 100644 index 0000000..a4b9a9a Binary files /dev/null and b/javalin6/javalin-http2-example/src/main/resources/public/img/lama9.jpg differ diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js1.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js1.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js1.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js2.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js2.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js2.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js3.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js3.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js3.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js4.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js4.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js4.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js5.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js5.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js5.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js6.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js6.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js6.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js7.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js7.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js7.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js8.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js8.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js8.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/js/js9.js b/javalin6/javalin-http2-example/src/main/resources/public/js/js9.js new file mode 100644 index 0000000..913e95a --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/js/js9.js @@ -0,0 +1 @@ +console.log("Loaded some js"); diff --git a/javalin6/javalin-http2-example/src/main/resources/public/static-files-test.html b/javalin6/javalin-http2-example/src/main/resources/public/static-files-test.html new file mode 100644 index 0000000..8edbdac --- /dev/null +++ b/javalin6/javalin-http2-example/src/main/resources/public/static-files-test.html @@ -0,0 +1,31 @@ +

This file gets a bunch of other files

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/javalin6/javalin-http2-example/src/test/kotlin/org/example/HelloTest.kt b/javalin6/javalin-http2-example/src/test/kotlin/org/example/HelloTest.kt new file mode 100644 index 0000000..ebd5aa3 --- /dev/null +++ b/javalin6/javalin-http2-example/src/test/kotlin/org/example/HelloTest.kt @@ -0,0 +1,51 @@ +package org.example + +import app.main +import okhttp3.OkHttpClient +import okhttp3.Protocol +import okhttp3.Request +import org.junit.Assert.assertEquals +import org.junit.Test +import java.security.SecureRandom +import java.security.cert.X509Certificate +import javax.net.ssl.* + + +class HelloTest { + + private val client : OkHttpClient + /** + * Creates a trust manager that does not validate certificate chains. + */ + init { + + val trustAllCerts = arrayOf( + object : X509TrustManager { + override fun checkClientTrusted(chain: Array, authType: String) {} + override fun checkServerTrusted(chain: Array, authType: String) {} + override fun getAcceptedIssuers(): Array { + return arrayOf() + } + } + ) + + val sslContext = SSLContext.getInstance("SSL") + sslContext.init(null, trustAllCerts, SecureRandom()) + + val newBuilder = OkHttpClient.Builder() + newBuilder.sslSocketFactory(sslContext.socketFactory, trustAllCerts[0] as X509TrustManager) + newBuilder.hostnameVerifier { _: String?, _: SSLSession? -> true } + + client = newBuilder.build() + } + + @Test + fun `test if server supports http2`() { + main() + + val response = client.newCall(Request.Builder().url("https://localhost:8443/").build()).execute() + assertEquals(200, response.code) + assertEquals(Protocol.HTTP_2, response.protocol) + } + +} diff --git a/javalin6/javalin-jetty-sessions-example/pom.xml b/javalin6/javalin-jetty-sessions-example/pom.xml index 5263d70..ccab498 100644 --- a/javalin6/javalin-jetty-sessions-example/pom.xml +++ b/javalin6/javalin-jetty-sessions-example/pom.xml @@ -19,7 +19,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 org.eclipse.jetty diff --git a/javalin6/javalin-kotlin-example/pom.xml b/javalin6/javalin-kotlin-example/pom.xml index 1963454..dbd2dc6 100644 --- a/javalin6/javalin-kotlin-example/pom.xml +++ b/javalin6/javalin-kotlin-example/pom.xml @@ -19,7 +19,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-modern-java-example/pom.xml b/javalin6/javalin-modern-java-example/pom.xml index bd8db67..26e27a6 100644 --- a/javalin6/javalin-modern-java-example/pom.xml +++ b/javalin6/javalin-modern-java-example/pom.xml @@ -17,7 +17,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-prometheus-example/pom.xml b/javalin6/javalin-prometheus-example/pom.xml index 4e09251..ddcacb3 100644 --- a/javalin6/javalin-prometheus-example/pom.xml +++ b/javalin6/javalin-prometheus-example/pom.xml @@ -18,7 +18,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 io.prometheus diff --git a/javalin6/javalin-prometheus-example/src/main/kotlin/JavalinPrometheusExampleApp.kt b/javalin6/javalin-prometheus-example/src/main/kotlin/JavalinPrometheusExampleApp.kt index cf15e8c..af2a0cc 100644 --- a/javalin6/javalin-prometheus-example/src/main/kotlin/JavalinPrometheusExampleApp.kt +++ b/javalin6/javalin-prometheus-example/src/main/kotlin/JavalinPrometheusExampleApp.kt @@ -12,11 +12,10 @@ fun main() { val statisticsHandler = StatisticsHandler() val queuedThreadPool = QueuedThreadPool(200, 8, 60_000) - val app = Javalin.create { - it.pvt.server = Server(queuedThreadPool).apply { - handler = statisticsHandler - } - it.router.apiBuilder { + val app = Javalin.create { config -> + config.jetty.threadPool = queuedThreadPool + config.jetty.modifyServer{ server -> server.handler = statisticsHandler} + config.router.apiBuilder { get("/1") { ctx -> ctx.result("Hello World") } get("/2") { ctx -> Thread.sleep((Math.random() * 2000).toLong()) diff --git a/javalin6/javalin-realtime-collaboration-example/pom.xml b/javalin6/javalin-realtime-collaboration-example/pom.xml index e29bd81..ad5ba3b 100644 --- a/javalin6/javalin-realtime-collaboration-example/pom.xml +++ b/javalin6/javalin-realtime-collaboration-example/pom.xml @@ -19,7 +19,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-testing-example/pom.xml b/javalin6/javalin-testing-example/pom.xml index 549efb7..28bb6b9 100644 --- a/javalin6/javalin-testing-example/pom.xml +++ b/javalin6/javalin-testing-example/pom.xml @@ -21,7 +21,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 junit diff --git a/javalin6/javalin-vuejs-example/pom.xml b/javalin6/javalin-vuejs-example/pom.xml index 804864b..df29b32 100644 --- a/javalin6/javalin-vuejs-example/pom.xml +++ b/javalin6/javalin-vuejs-example/pom.xml @@ -20,7 +20,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 diff --git a/javalin6/javalin-websocket-example/pom.xml b/javalin6/javalin-websocket-example/pom.xml index a24230c..c8aa896 100644 --- a/javalin6/javalin-websocket-example/pom.xml +++ b/javalin6/javalin-websocket-example/pom.xml @@ -20,7 +20,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 com.j2html diff --git a/javalin6/javalinstagram/pom.xml b/javalin6/javalinstagram/pom.xml index b7e7b6c..86b3e2c 100644 --- a/javalin6/javalinstagram/pom.xml +++ b/javalin6/javalinstagram/pom.xml @@ -21,7 +21,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 ch.qos.logback diff --git a/javalin6/javalinvue-example/javalinvue2-example/pom.xml b/javalin6/javalinvue-example/javalinvue2-example/pom.xml index 82b8752..485318c 100644 --- a/javalin6/javalinvue-example/javalinvue2-example/pom.xml +++ b/javalin6/javalinvue-example/javalinvue2-example/pom.xml @@ -20,7 +20,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 org.webjars.npm diff --git a/javalin6/javalinvue-example/javalinvue3-example/pom.xml b/javalin6/javalinvue-example/javalinvue3-example/pom.xml index 76d464f..a904b8a 100644 --- a/javalin6/javalinvue-example/javalinvue3-example/pom.xml +++ b/javalin6/javalinvue-example/javalinvue3-example/pom.xml @@ -20,7 +20,7 @@ io.javalin javalin-bundle - 6.0.0-beta.2 + 6.0.0-beta.4 org.webjars.npm diff --git a/javalin6/pom.xml b/javalin6/pom.xml index d105de8..47a2ce1 100644 --- a/javalin6/pom.xml +++ b/javalin6/pom.xml @@ -10,13 +10,13 @@ Javalin 6 samples - + javalin-async-example javalin-auth-example javalin-cors-example javalin-email-example javalin-heroku-example javalin-html-forms-example - + javalin-http2-example javalin-jetty-sessions-example javalin-kotlin-example