diff --git a/kontor-javalin/.gitignore b/kontor-javalin/.gitignore new file mode 100644 index 0000000..9896012 --- /dev/null +++ b/kontor-javalin/.gitignore @@ -0,0 +1,33 @@ +.gradle/ +.settings/ +build/ +bin/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +.project +.classpath +.vscode/ +.idea/ +*.lock +logs/ +frontend/generated +frontend/index.html +package*.json +tsconfig.json +types.d.ts +node_modules/ +vite.* +kontor*Db +tags* +kontorHSQLDB* +.vs/ +.winget +src/main/resources/application-local.properties +src/main/resources/application-prod.properties +src/main/resources/application-*.yml +/uploaded-files/ diff --git a/kontor-javalin/Dockerfile b/kontor-javalin/Dockerfile new file mode 100644 index 0000000..1cfd701 --- /dev/null +++ b/kontor-javalin/Dockerfile @@ -0,0 +1,5 @@ +FROM alpine/java:21-jdk +WORKDIR / +ADD build/libs/kontor-spring-0.2.0-SNAPSHOT.jar app.jar +EXPOSE 8000 +CMD ["java", "-jar", "-Dspring.profiles.active=prod", "-Dvaadin.productionMode=true", "app.jar"] diff --git a/kontor-javalin/Makefile b/kontor-javalin/Makefile new file mode 100644 index 0000000..55728ed --- /dev/null +++ b/kontor-javalin/Makefile @@ -0,0 +1,8 @@ +.PYHONY: all + +all: + ./gradlew build + +docker: + ./gradlew dockerImage + diff --git a/kontor-javalin/README.md b/kontor-javalin/README.md new file mode 100644 index 0000000..f24bbcd --- /dev/null +++ b/kontor-javalin/README.md @@ -0,0 +1,3 @@ +# kontor-spring + +Kontor Anwendung mit Spring Boot und Vaadin \ No newline at end of file diff --git a/kontor-javalin/api/build.gradle b/kontor-javalin/api/build.gradle new file mode 100644 index 0000000..e2cb6db --- /dev/null +++ b/kontor-javalin/api/build.gradle @@ -0,0 +1,17 @@ +plugins { + id 'application' +} + +dependencies { + implementation project(":models") // We need this dependency for serializing persons to JSON + implementation project(":services") // We'll make use of the InMemoryPersonReader soon + + implementation libs.javalin // Pulling in Javalin + implementation libs.jackson // For JSON serialization of persons + implementation libs.slf4j // To see some Javalin logging +} + +application { + mainClass = "de.thpeetz.kontor.api.Main" + mainModule = "de.thpeetz.kontor.api" +} diff --git a/kontor-javalin/api/src/main/java/de/thpeetz/kontor/api/Main.java b/kontor-javalin/api/src/main/java/de/thpeetz/kontor/api/Main.java new file mode 100644 index 0000000..32ee536 --- /dev/null +++ b/kontor-javalin/api/src/main/java/de/thpeetz/kontor/api/Main.java @@ -0,0 +1,30 @@ +package de.thpeetz.kontor.api; + +import com.fasterxml.jackson.databind.ObjectMapper; +import io.javalin.Javalin; +import de.thpeetz.kontor.services.api.PersonReader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.ServiceLoader; + +public class Main { + private static Logger logger = LoggerFactory.getLogger(Main.class); + private static short port = 7312; + + public static void main(String[] args) { + var personReader = ServiceLoader.load(PersonReader.class).findFirst().get(); // <-- Getting an implementation + // for the PersonReader interface + // from the ServiceLoader + var objMapper = new ObjectMapper(); + var result = objMapper.valueToTree(personReader.getAll()); + + logger.info("API: found {} people.", personReader.getAll().size()); + + var app = Javalin.create().start(port); + app.get("/ping", ctx -> ctx.result("pong")); + app.get("/persons", ctx -> ctx.json(result)); + + logger.info("API's alive for real :-)))"); + } +} diff --git a/kontor-javalin/api/src/main/java/module-info.java b/kontor-javalin/api/src/main/java/module-info.java new file mode 100644 index 0000000..de9b448 --- /dev/null +++ b/kontor-javalin/api/src/main/java/module-info.java @@ -0,0 +1,10 @@ +module de.thpeetz.kontor.api { + requires io.javalin; + requires com.fasterxml.jackson.databind; + requires org.slf4j; + requires kotlin.stdlib; + + requires de.thpeetz.kontor.services; + + uses de.thpeetz.kontor.services.api.PersonReader; +} diff --git a/kontor-javalin/build.gradle b/kontor-javalin/build.gradle new file mode 100644 index 0000000..d25e5a5 --- /dev/null +++ b/kontor-javalin/build.gradle @@ -0,0 +1,14 @@ +plugins { + id 'org.javamodularity.moduleplugin' version '2.0.0' apply false +} + +subprojects { + repositories { + mavenCentral() + } + apply plugin: "org.javamodularity.moduleplugin" +} + +wrapper { + gradleVersion = "9.2.1" +} diff --git a/kontor-javalin/gradle.properties b/kontor-javalin/gradle.properties new file mode 100644 index 0000000..ba98070 --- /dev/null +++ b/kontor-javalin/gradle.properties @@ -0,0 +1,3 @@ +description='Kontor with Spring Boot' +version=0.2.0-SNAPSHOT +group=de.thpeetz diff --git a/kontor-javalin/gradle/libs.versions.toml b/kontor-javalin/gradle/libs.versions.toml new file mode 100644 index 0000000..4488442 --- /dev/null +++ b/kontor-javalin/gradle/libs.versions.toml @@ -0,0 +1,18 @@ +[versions] +gradle = "8.6" +junit = "5.8.2" +#slf4j = "1.7.36" +slf4j = "2.0.16" +hsqldb = "2.7.1" +sqlite = "3.25.2" +jackson = "2.16.1" +#javalin = "4.6.4" +javalin = "6.7.0" + +[libraries] +junit = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit" } +slf4j = { module = "org.slf4j:slf4j-simple", version.ref = "slf4j" } +hsqldb = { module = "org.hsqldb:hsqldb", version.ref = "hsqldb" } +jackson = { module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson" } +sqlite-jdbc = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" } +javalin = { module = "io.javalin:javalin", version.ref = "javalin" } diff --git a/kontor-javalin/gradle/wrapper/gradle-wrapper.jar b/kontor-javalin/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f8e1ee3 Binary files /dev/null and b/kontor-javalin/gradle/wrapper/gradle-wrapper.jar differ diff --git a/kontor-javalin/gradle/wrapper/gradle-wrapper.properties b/kontor-javalin/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..23449a2 --- /dev/null +++ b/kontor-javalin/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/kontor-javalin/gradlew b/kontor-javalin/gradlew new file mode 100755 index 0000000..adff685 --- /dev/null +++ b/kontor-javalin/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# 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/platforms/jvm/plugins-application/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##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# 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 + + + +# 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 + if ! command -v java >/dev/null 2>&1 + then + 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 +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=SC2039,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=SC2039,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" ) + + 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 + + +# 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"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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/kontor-javalin/gradlew.bat b/kontor-javalin/gradlew.bat new file mode 100644 index 0000000..e509b2d --- /dev/null +++ b/kontor-javalin/gradlew.bat @@ -0,0 +1,93 @@ +@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 +@rem SPDX-License-Identifier: Apache-2.0 +@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. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/kontor-javalin/models/build.gradle b/kontor-javalin/models/build.gradle new file mode 100644 index 0000000..483b849 --- /dev/null +++ b/kontor-javalin/models/build.gradle @@ -0,0 +1,4 @@ +plugins { + id 'java-library' +} + diff --git a/kontor-javalin/models/src/main/java/de/thpeetz/kontor/models/Person.java b/kontor-javalin/models/src/main/java/de/thpeetz/kontor/models/Person.java new file mode 100644 index 0000000..af00658 --- /dev/null +++ b/kontor-javalin/models/src/main/java/de/thpeetz/kontor/models/Person.java @@ -0,0 +1,27 @@ +package de.thpeetz.kontor.models; + +public class Person { + private String name; + private int age; + + public Person(String name, int age) { + this.name = name; + this.age = age; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public int getAge() { + return age; + } + + public void setAge(int age) { + this.age = age; + } +} diff --git a/kontor-javalin/models/src/main/java/module-info.java b/kontor-javalin/models/src/main/java/module-info.java new file mode 100644 index 0000000..5cb3b7a --- /dev/null +++ b/kontor-javalin/models/src/main/java/module-info.java @@ -0,0 +1,4 @@ +module de.thpeetz.kontor.models { + // We're exporting the only package we have in this subproject + exports de.thpeetz.kontor.models; +} diff --git a/kontor-javalin/services/build.gradle b/kontor-javalin/services/build.gradle new file mode 100644 index 0000000..7d12b82 --- /dev/null +++ b/kontor-javalin/services/build.gradle @@ -0,0 +1,7 @@ +plugins { + id 'java-library' +} + +dependencies { + implementation project(":models") // <-- add dependency to models subproject +} diff --git a/kontor-javalin/services/src/main/java/de/thpeetz/kontor/services/api/PersonReader.java b/kontor-javalin/services/src/main/java/de/thpeetz/kontor/services/api/PersonReader.java new file mode 100644 index 0000000..032567a --- /dev/null +++ b/kontor-javalin/services/src/main/java/de/thpeetz/kontor/services/api/PersonReader.java @@ -0,0 +1,9 @@ +package de.thpeetz.kontor.services.api; + +import de.thpeetz.kontor.models.Person; + +import java.util.List; + +public interface PersonReader { + List getAll(); +} diff --git a/kontor-javalin/services/src/main/java/de/thpeetz/kontor/services/inmemory/InMemoryPersonReader.java b/kontor-javalin/services/src/main/java/de/thpeetz/kontor/services/inmemory/InMemoryPersonReader.java new file mode 100644 index 0000000..4600d74 --- /dev/null +++ b/kontor-javalin/services/src/main/java/de/thpeetz/kontor/services/inmemory/InMemoryPersonReader.java @@ -0,0 +1,15 @@ +package de.thpeetz.kontor.services.inmemory; + +import de.thpeetz.kontor.models.Person; +import java.util.List; + +import de.thpeetz.kontor.services.api.PersonReader; + +public class InMemoryPersonReader implements PersonReader { + @Override + public List getAll() { + return List.of( + new Person("Vincent Vega", 73), + new Person("Jules Winnfield", 12)); + } +} diff --git a/kontor-javalin/services/src/main/java/module-info.java b/kontor-javalin/services/src/main/java/module-info.java new file mode 100644 index 0000000..9112de2 --- /dev/null +++ b/kontor-javalin/services/src/main/java/module-info.java @@ -0,0 +1,11 @@ +import de.thpeetz.kontor.services.api.PersonReader; +import de.thpeetz.kontor.services.inmemory.InMemoryPersonReader; + +module de.thpeetz.kontor.services { + exports de.thpeetz.kontor.services.api; + + requires de.thpeetz.kontor.models; + + // We're telling the ServiceLoader that the InMemoryPersonReader provides the implementation for the PersonReader interface + provides PersonReader with InMemoryPersonReader; +} diff --git a/kontor-javalin/settings.gradle b/kontor-javalin/settings.gradle new file mode 100644 index 0000000..d245e05 --- /dev/null +++ b/kontor-javalin/settings.gradle @@ -0,0 +1,6 @@ +rootProject.name = 'kontor-javalin' + +include ':models' +include ':services' +include ':api' +