diff --git a/.github/README.md b/.github/README.md index 808e4fa..ba7286f 100644 --- a/.github/README.md +++ b/.github/README.md @@ -24,6 +24,7 @@ This repository contains a collection of sample projects for Javalin. The sample * [Docker Example](/javalin5/javalin-docker-example) * [Email Example](/javalin5/javalin-email-example) * [GraalVM Example](/javalin5/javalin-graalvm-example) + * [Gradle Shadow Jar Example](/javalin5/javalin-gradle-shadowjar-example) * [Heroku Example](/javalin5/javalin-heroku-example) * [HTML Forms Example](/javalin5/javalin-html-forms-example) * [HTTP2 Example](/javalin5/javalin-http2-example) diff --git a/javalin4/javalin-testing-example/pom.xml b/javalin4/javalin-testing-example/pom.xml index 334dd6c..93dc5a3 100644 --- a/javalin4/javalin-testing-example/pom.xml +++ b/javalin4/javalin-testing-example/pom.xml @@ -93,6 +93,12 @@ 4.5.0 test + + org.seleniumhq.selenium + selenium-http-jdk-client + 4.5.0 + test + io.github.bonigarcia webdrivermanager diff --git a/javalin4/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java b/javalin4/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java index 0581895..5d4bbc2 100644 --- a/javalin4/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java +++ b/javalin4/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java @@ -16,6 +16,7 @@ public class EndToEndTest { @Test public void UI_contains_correct_heading() { + System.setProperty("webdriver.http.factory", "jdk-http-client"); TestUtil.test(app, (server, client) -> { WebDriverManager.chromedriver().setup(); ChromeOptions options = new ChromeOptions(); diff --git a/javalin4/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt b/javalin4/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt index 233d023..08ced7f 100644 --- a/javalin4/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt +++ b/javalin4/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt @@ -14,6 +14,7 @@ class EndToEndTest { @Test fun `UI contains correct heading`() = JavalinTest.test(app) { server, client -> + System.setProperty("webdriver.http.factory", "jdk-http-client") WebDriverManager.chromedriver().setup() val driver: WebDriver = ChromeDriver(ChromeOptions().apply { addArguments("--headless") diff --git a/javalin4/pom.xml b/javalin4/pom.xml index da44410..7c951ce 100644 --- a/javalin4/pom.xml +++ b/javalin4/pom.xml @@ -21,7 +21,6 @@ javalin-openapi-example javalin-prometheus-example javalin-realtime-collaboration-example - javalin-testing-example javalin-vuejs-example javalin-website-example javalin-websocket-example @@ -29,4 +28,18 @@ javalinvue-example/javalinvue2-example javalinvue-example/javalinvue3-example + + + + at-least-java-11 + + [11,) + + + + + javalin-testing-example + + + diff --git a/javalin5/javalin-gradle-shadowjar-example/.gitattributes b/javalin5/javalin-gradle-shadowjar-example/.gitattributes new file mode 100644 index 0000000..097f9f9 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/.gitattributes @@ -0,0 +1,9 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# Linux start script should use lf +/gradlew text eol=lf + +# These are Windows script files and should use crlf +*.bat text eol=crlf + diff --git a/javalin5/javalin-gradle-shadowjar-example/.gitignore b/javalin5/javalin-gradle-shadowjar-example/.gitignore new file mode 100644 index 0000000..67c4583 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/.gitignore @@ -0,0 +1,7 @@ +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build + +.idea/ diff --git a/javalin5/javalin-gradle-shadowjar-example/LICENSE b/javalin5/javalin-gradle-shadowjar-example/LICENSE new file mode 100644 index 0000000..6f75635 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-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/javalin5/javalin-gradle-shadowjar-example/README.md b/javalin5/javalin-gradle-shadowjar-example/README.md new file mode 100644 index 0000000..4003a70 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/README.md @@ -0,0 +1,21 @@ +# Javalin Gradle ShadowJar Example + +This project demonstrates how to create a shadow jar, also known as fat jar or uber jar with the Javalin library as an +example. + +## Requirements + +- Java 17 +- Gradle 8 (provided by the Gradle Wrapper ./gradlew) +- Gradle Shadow Plugin + +## Creating a shadow jar + +Run `./gradlew shadowJar`. The resulting jar file `app/build/libs/app-all.jar` can now be run with +`java -jar app/build/libs/app-all.jar` when inside the default working directory. + +```shell +./gradlew shadowJar +cd app/build/libs +java -jar app-all.jar +``` diff --git a/javalin5/javalin-gradle-shadowjar-example/app/build.gradle.kts b/javalin5/javalin-gradle-shadowjar-example/app/build.gradle.kts new file mode 100644 index 0000000..f8e7970 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/app/build.gradle.kts @@ -0,0 +1,44 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This generated file contains a sample Java application project to get you started. + * For more details take a look at the 'Building Java & JVM projects' chapter in the Gradle + * User Manual available at https://docs.gradle.org/8.0.2/userguide/building_java_projects.html + */ + +plugins { + // Apply the application plugin to add support for building a CLI application in Java. + application + id("com.github.johnrengelman.shadow") version "8.1.0" +} + +repositories { + // Use Maven Central for resolving dependencies. + mavenCentral() +} + +dependencies { + // Use JUnit Jupiter for testing. + testImplementation("org.junit.jupiter:junit-jupiter:5.9.2") + testImplementation("io.javalin:javalin-testtools:5.4.2") + + // This dependency is used by the application. + implementation("io.javalin:javalin:5.4.2") + implementation("org.slf4j:slf4j-simple:2.0.6") +} + +application { + // Define the main class for the application. + mainClass.set("io.javalin.samples.javalin5.gradleshadow.App") +} + +java { + toolchain { + languageVersion.set(JavaLanguageVersion.of(17)) + } +} + +tasks.named("test") { + // Use JUnit Platform for unit tests. + useJUnitPlatform() +} diff --git a/javalin5/javalin-gradle-shadowjar-example/app/src/main/java/io/javalin/samples/javalin5/gradleshadow/App.java b/javalin5/javalin-gradle-shadowjar-example/app/src/main/java/io/javalin/samples/javalin5/gradleshadow/App.java new file mode 100644 index 0000000..bb489c5 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/app/src/main/java/io/javalin/samples/javalin5/gradleshadow/App.java @@ -0,0 +1,15 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +package io.javalin.samples.javalin5.gradleshadow; + +import io.javalin.Javalin; + +public class App { + Javalin javalin = Javalin.create() + .get("/", ctx -> ctx.result("Root")); + + public static void main(String[] args) { + new App().javalin.start(8080); + } +} diff --git a/javalin5/javalin-gradle-shadowjar-example/app/src/test/java/io/javalin/samples/javalin5/gradleshadow/AppTest.java b/javalin5/javalin-gradle-shadowjar-example/app/src/test/java/io/javalin/samples/javalin5/gradleshadow/AppTest.java new file mode 100644 index 0000000..0a38cec --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/app/src/test/java/io/javalin/samples/javalin5/gradleshadow/AppTest.java @@ -0,0 +1,23 @@ +/* + * This Java source file was generated by the Gradle 'init' task. + */ +package io.javalin.samples.javalin5.gradleshadow; + +import io.javalin.testtools.JavalinTest; +import okhttp3.ResponseBody; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.*; + +class AppTest { + @Test + void appHasAGreeting() { + App classUnderTest = new App(); + JavalinTest.test(classUnderTest.javalin, (a, http) -> { + try (ResponseBody body = http.get("/").body()) { + assertNotNull(body); + assertEquals("Root", body.string()); + } + }); + } +} diff --git a/javalin5/javalin-gradle-shadowjar-example/gradle/wrapper/gradle-wrapper.jar b/javalin5/javalin-gradle-shadowjar-example/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..ccebba7 Binary files /dev/null and b/javalin5/javalin-gradle-shadowjar-example/gradle/wrapper/gradle-wrapper.jar differ diff --git a/javalin5/javalin-gradle-shadowjar-example/gradle/wrapper/gradle-wrapper.properties b/javalin5/javalin-gradle-shadowjar-example/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..bdc9a83 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/javalin5/javalin-gradle-shadowjar-example/gradlew b/javalin5/javalin-gradle-shadowjar-example/gradlew new file mode 100644 index 0000000..79a61d4 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/gradlew @@ -0,0 +1,244 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/javalin5/javalin-gradle-shadowjar-example/gradlew.bat b/javalin5/javalin-gradle-shadowjar-example/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/javalin5/javalin-gradle-shadowjar-example/settings.gradle.kts b/javalin5/javalin-gradle-shadowjar-example/settings.gradle.kts new file mode 100644 index 0000000..68d5797 --- /dev/null +++ b/javalin5/javalin-gradle-shadowjar-example/settings.gradle.kts @@ -0,0 +1,11 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * The settings file is used to specify which projects to include in your build. + * + * Detailed information about configuring a multi-project build in Gradle can be found + * in the user manual at https://docs.gradle.org/8.0.2/userguide/multi_project_builds.html + */ + +rootProject.name = "javalin-gradle-shadowjar-example" +include("app") diff --git a/javalin5/javalin-testing-example/pom.xml b/javalin5/javalin-testing-example/pom.xml index fc4b535..12d88fb 100644 --- a/javalin5/javalin-testing-example/pom.xml +++ b/javalin5/javalin-testing-example/pom.xml @@ -67,6 +67,12 @@ 4.5.0 test + + org.seleniumhq.selenium + selenium-http-jdk-client + 4.5.0 + test + io.github.bonigarcia webdrivermanager diff --git a/javalin5/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java b/javalin5/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java index e2d009f..5ebe0fd 100644 --- a/javalin5/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java +++ b/javalin5/javalin-testing-example/src/test/java/io/javalin/example/java/EndToEndTest.java @@ -16,6 +16,7 @@ public class EndToEndTest { @Test public void UI_contains_correct_heading() { + System.setProperty("webdriver.http.factory", "jdk-http-client"); JavalinTest.test(app, (server, client) -> { WebDriverManager.chromedriver().setup(); ChromeOptions options = new ChromeOptions(); diff --git a/javalin5/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt b/javalin5/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt index f3e8951..9262118 100644 --- a/javalin5/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt +++ b/javalin5/javalin-testing-example/src/test/kotlin/io/javalin/example/kotlin/EndToEndTest.kt @@ -14,6 +14,7 @@ class EndToEndTest { @Test fun `UI contains correct heading`() = JavalinTest.test(app) { server, client -> + System.setProperty("webdriver.http.factory", "jdk-http-client") WebDriverManager.chromedriver().setup() val driver: WebDriver = ChromeDriver(ChromeOptions().apply { addArguments("--headless") diff --git a/javalin5/pom.xml b/javalin5/pom.xml index 2fc9470..dc5431f 100644 --- a/javalin5/pom.xml +++ b/javalin5/pom.xml @@ -22,7 +22,6 @@ javalin-openapi-example javalin-prometheus-example javalin-realtime-collaboration-example - javalin-testing-example javalin-vuejs-example javalin-websocket-example javalinstagram @@ -32,6 +31,17 @@ + + at-least-java-11 + + [11,) + + + + + javalin-testing-example + + modern-java