remove obsolete subprojects

java-quarkus/.gitignore

@@ -1,9 +0,0 @@
-build/
-.settings/
-.gradle/
-.classpath
-.project
-.vscode/
-bin/
-.idea/
-/.eclipse-pmd

java-quarkus/.gitlab-ci.yml

@@ -1,38 +0,0 @@
-variables:
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false"
-
-before_script:
-  - source "/home/gitlab-runner/.sdkman/bin/sdkman-init.sh"
-  - sdk u java 11.0.12-open
-  - chmod +x ./gradlew
-
-stages:
-  - build
-  - test
-  - analysis
-  - publish
-
-Build Application:
-  stage: build
-  script: ./gradlew --build-cache compileJava
-
-Create Documentation:
-  stage: build
-  script: ./gradlew asciidoctorPdf
-
-Test Application:
-  stage: test
-  script: ./gradlew check
-
-sonarqube-check:
-  stage: analysis
-  variables:
-    SONAR_USER_HOME: "${CI_PROJECT_DIR}/.sonar"  # Defines the location of the analysis task cache
-    GIT_DEPTH: "0"  # Tells git to fetch all the branches of the project, required by the analysis task
-  script: ./gradlew sonarqube
-  allow_failure: true
-
-Publish Artifacts:
-  stage: publish
-  script: ./gradlew publish
-

java-quarkus/build.gradle

@@ -1,158 +0,0 @@
-plugins {
-    id 'java'
-    id 'maven-publish'
-    id 'jacoco'
-    id 'jacoco-report-aggregation'
-    id 'pmd'
-	id 'checkstyle'
-	id 'jvm-test-suite'
-    id 'io.quarkus'
-    id "org.sonarqube" version "3.3"
-    alias(versionsLibs.plugins.asciidoctorConvert)
-    alias(versionsLibs.plugins.asciidoctorPdf)
-    alias(versionsLibs.plugins.asciidoctorGems)
-}
-
-repositories {
-    ruby.gems()
-    maven {
-        url "https://nexus.thpeetz.de/nexus/content/groups/public/"
-    }
-    mavenCentral()
-    mavenLocal()
-}
-
-dependencies {
-    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
-    implementation 'io.quarkus:quarkus-resteasy-reactive'
-    implementation 'io.quarkus:quarkus-resteasy-reactive-jackson'
-    implementation 'io.quarkus:quarkus-arc'
-    testImplementation 'io.quarkus:quarkus-junit5'
-    testImplementation 'io.rest-assured:rest-assured'
-    testImplementation("io.quarkus:quarkus-jacoco")
-}
-
-final BUILD_DATE = new Date().format('dd.MM.yyyy').toString()
-def pdfFile = layout.buildDirectory.file("docs/asciidocPdf/" + project.name + ".pdf")
-def pdfArtifact = artifacts.add('archives', pdfFile.get().asFile) {
-	type 'pdf'
-	builtBy asciidoctorPdf
-}
-
-tasks.withType(GenerateModuleMetadata).configureEach {
-	suppressedValidationErrors.add('enforced-platform')
-}
-
-publishing {
-    publications {
-        quarkusApp(MavenPublication){
-            from components.java
-        }
-        docs(MavenPublication) {
-            groupId = group + '.docs'
-            artifactId = project.name
-            artifact pdfArtifact
-        }
-    }
-    repositories {
-        maven {
-			name = 'nexusPeetz'
-            def releasesRepoUrl = "https://nexus.thpeetz.de/nexus/content/repositories/releases/"
-            def snapshotsRepoUrl = "https://nexus.thpeetz.de/nexus/content/repositories/snapshots/"
-            url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-            credentials(PasswordCredentials)
-        }
-    }
-}
-
-java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
-}
-
-tasks.withType(GenerateModuleMetadata).configureEach {
-    suppressedValidationErrors.add('enforced-platform')
-}
-
-compileJava {
-    options.encoding = 'UTF-8'
-    options.compilerArgs << '-parameters'
-}
-
-compileTestJava {
-    options.encoding = 'UTF-8'
-}
-
-jacocoTestReport {
-    reports {
-        xml.required = true
-    }
-}
-
-test.finalizedBy jacocoTestReport
-
-
-pmd {
-	//ruleSetFiles = files("custom-pmd-ruleset.xml")
-	ruleSets = ["category/java/errorprone.xml", "category/java/bestpractices.xml"]
-	ignoreFailures = true
-}
-
-tasks.withType(Checkstyle) {
-	reports {
-		xml.required = true
-		html.required = true
-	}
-}
-
-testing {
-	suites {
-		test {
-			useJUnitJupiter()
-		}
-	}
-}
-
-pmdTest.dependsOn("compileQuarkusTestGeneratedSourcesJava")
-checkstyleTest.dependsOn("compileQuarkusTestGeneratedSourcesJava")
-jacocoTestReport.dependsOn("compileQuarkusGeneratedSourcesJava")
-pmdMain.dependsOn("compileQuarkusGeneratedSourcesJava")
-
-sonarqube {
-    properties {
-        property "sonar.host.url", "https://sonar.thpeetz.de"
-        property "sonar.qualitygate.wait", true
-        property "sonar.sourceEncoding", "UTF-8"
-		property "sonar.projectKey", "kontor_kontor-quarkus_AYQek8Mxz0hBjLSV8I8O"
-		property "sonar.login", "5ecd90dee57806857e07443a9b0efd3cd7774a81"
-    }
-}
-
-tasks.named('sonarqube').configure {
-    dependsOn 'test', 'pmdMain', 'checkstyleMain', 'jacocoTestReport'
-}
-
-asciidoctorPdf {
-	baseDirFollowsSourceFile()
-
-	asciidoctorj {
-		attributes 'build-gradle':       file('build.gradle'),
-				   'endpoint-url':       'https://www.thpeetz.de',
-				   'source-highlighter': 'rouge',
-				   'imagesdir':          './images',
-				   'toc':                'left',
-				   'toc-title':          'Inhaltsverzeichnis',
-				   'revdate':            BUILD_DATE,
-				   'revnumber':          { project.version.toString() },
-				   'revremark':          'Entwurf',
-				   'chapter-label':      '',
-				   'icons':              'font',
-				   'idprefix':           'id_',
-				   'idseparator':        '-',
-				   'docinfo1':           ''
-	}
-}
-
-wrapper {
-    gradleVersion = "7.5"
-}

java-quarkus/config/checkstyle/checkstyle.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE module PUBLIC "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN" "https://checkstyle.org/dtds/configuration_1_3.dtd">
-<module name="Checker">
-    <module name="TreeWalker">
-        <module name="UnusedImports" />
-        <module name="AvoidStarImport" />
-        <module name="ConstantName" />
-        <module name="NeedBraces" />
-        <module name="RightCurly" />
-        <module name="ModifierOrder">
-            <property name="severity" value="warning"/>
-        </module>
-    </module>
-</module>

java-quarkus/gradle.properties

@@ -1,9 +0,0 @@
-#Gradle properties
-group=de.thpeetz.kontor
-version=1.0.0-SNAPSHOT
-
-quarkusPluginId=io.quarkus
-quarkusPluginVersion=2.13.2.Final
-quarkusPlatformGroupId=io.quarkus.platform
-quarkusPlatformArtifactId=quarkus-bom
-quarkusPlatformVersion=2.13.2.Final

java-quarkus/gradlew

@@ -1,185 +0,0 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or 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 UN*X
-##
-##############################################################################
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# 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 "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# 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
-    ;;
-  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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"

java-quarkus/gradlew.bat

@@ -1,104 +0,0 @@
-@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=.
-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%" == "0" goto init
-
-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 init
-
-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
-
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
-: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 %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega

java-quarkus/src/docs/asciidoc/kontor-quarkus.adoc

@@ -1,84 +0,0 @@
-= Projektbeschreibung kontor-quarkus: Pflichtenheft und Projekthandbuch
-:author: Thomas Peetz
-:email: <thomas.peetz@thpeetz.de>
-:doctype: article
-:sectnums:
-:sectnumlevels: 4
-:toc:
-:toclevels: 4
-:table-caption!:
-:counter: table-number: 0
-
-//[title="Dokumenthistorie", caption="Tabelle {counter:table-number} ", id="Tabelle-{counter:table-number}", options="header"]
-//[title="Dokumenthistorie", id="Table-{counter:table-number}", options="header", cols="4"]
-[title="Dokumenthistorie", id="Table-{counter:table-number}", options="header"]
-|===
-| Version | Datum      | Autor        | Änderungsgrund / Bemerkungen
-| 0.0.1   | 16.05.2022 | Thomas Peetz | Ersterstellung
-|===
-
-== Einführung
-
-=== Zweck
-
-=== Stakeholder des Systems
-
-=== Systemumfang
-
-==== Zielsetzung des Systems
-
-=== Systemübersicht
-
-==== Systemkontext
-
-==== Systemarchitektur
-
-==== Systemschnittstellen
-
-===== Realisierte Schnittstellen
-
-===== Verwendete Schnittstellen
-
-==== Logisches Datenmodell
-
-==== Einschränkungen
-
-== Anforderungen der Domäne
-
-=== Systemfunktionen
-
-==== Anwendungsfälle
-
-==== Akteure
-
-==== Zielgruppen
-
-=== Anforderungen
-
-==== Anforderungen an externe Schnittstellen
-
-==== Funktionale Anforderungen
-
-==== Qualitätsanforderungen
-
-==== Randbedingungen
-
-==== Weitere Anforderungen
-
-==== Wartungs- und Supportinformationen
-
-=== Verifikation
-
-[bibliography]
-== Referenzen
-
-[glossary]
-== Glossar
-
-== Verzeichnisse
-
-=== Abbildungsverzeichnis
-
-=== Tabellenverzeichnis
-
-<<Table-1, Tabelle 1>> <<Table-1>>

java-quarkus/src/main/java/de/thpeetz/kontor/comics/ComicsResource.java

@@ -1,95 +0,0 @@
-package de.thpeetz.kontor.comics;
-
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-
-import de.thpeetz.kontor.comics.service.ArtistService;
-import de.thpeetz.kontor.comics.service.ComicsService;
-import de.thpeetz.kontor.comics.service.PublisherService;
-
-@Path("/kontor/comics")
-public class ComicsResource {
-
-    @Inject
-    transient ComicsService comicsService;
-    
-    @Inject
-    transient ArtistService artistService;
-    
-    @Inject
-    transient PublisherService publisherService;
-
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/")
-    public String showComicList() {
-        return comicsService.showComicList();
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/artist")
-    public String showArtistList() {
-        return artistService.showArtistList();
-    }
-
-    @GET
-    @Produces(MediaType.APPLICATION_JSON)
-    @Path("/artist")
-    public String showArtistListJson() {
-        return artistService.showArtistList();
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/artist/view/{artist_id}")
-    public String showArtist(String artist_id) {
-        return artistService.showArtist(artist_id);
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/artist/create")
-    public String showArtistCreation() {
-        return artistService.showArtistCreation();
-    }
-
-    @POST
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/artist/create")
-    public String validateArtistDetails() {
-        return artistService.validateArtistDetails();
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/publisher")
-    public String showPublisherList() {
-        return publisherService.showPublisherList();
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/publisher/view/{publisher_id}")
-    public String showPublisher(String publisher_id) {
-        return publisherService.showPublisher(publisher_id);
-    }
-
-    @GET
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/publisher/create")
-    public String showPublisherCreation() {
-        return publisherService.showPublisherCreation();
-    }
-
-    @POST
-    @Produces(MediaType.TEXT_HTML)
-    @Path("/publisher/create")
-    public String validatePublisherDetails() {
-        return publisherService.validatePublisherDetails();
-    }
-}

java-quarkus/src/main/java/de/thpeetz/kontor/comics/service/ArtistService.java

@@ -1,28 +0,0 @@
-package de.thpeetz.kontor.comics.service;
-
-import javax.enterprise.context.ApplicationScoped;
-
-@ApplicationScoped
-public class ArtistService {
-
-	public String showArtistList() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String showArtist(String artist_id) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String showArtistCreation() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String validateArtistDetails() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}

java-quarkus/src/main/java/de/thpeetz/kontor/comics/service/ComicsService.java

@@ -1,12 +0,0 @@
-package de.thpeetz.kontor.comics.service;
-
-import javax.enterprise.context.ApplicationScoped;
-
-@ApplicationScoped
-public class ComicsService {
-
-	public String showComicList() {
-		return "comics";
-	}
-
-}

java-quarkus/src/main/java/de/thpeetz/kontor/comics/service/PublisherService.java

@@ -1,28 +0,0 @@
-package de.thpeetz.kontor.comics.service;
-
-import javax.enterprise.context.ApplicationScoped;
-
-@ApplicationScoped
-public class PublisherService {
-
-	public String showPublisherList() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String showPublisher(String publisher_id) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String showPublisherCreation() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String validatePublisherDetails() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-}

java-quarkus/src/main/resources/application.properties

@@ -1,3 +0,0 @@
-# Your configuration properties
-quarkus.http.test-port=8083
-quarkus.http.test-ssl-port=8446

java-quarkus/src/native-test/java/de/thpeetz/kontor/comics/ComicsResourceIT.java

@@ -1,8 +0,0 @@
-package de.thpeetz.kontor.comics;
-
-import io.quarkus.test.junit.QuarkusIntegrationTest;
-
-@QuarkusIntegrationTest
-public class ComicsResourceIT extends ComicsResourceTest {
-
-}

java-quarkus/src/test/java/de/thpeetz/kontor/comics/ComicsResourceTest.java

@@ -1,19 +0,0 @@
-package de.thpeetz.kontor.comics;
-
-import org.junit.jupiter.api.Test;
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.CoreMatchers.is;
-
-import io.quarkus.test.junit.QuarkusTest;
-
-@QuarkusTest
-class ComicsResourceTest {
-	
-	@Test
-	void testComicsEndpoint() {
-		given().when().get("/kontor/comics")
-		.then()
-			.statusCode(200)
-			.body(is("comics"));
-	}
-}

kontor-quarkus/.dockerignore

@@ -0,0 +1,5 @@
+*
+!build/*-runner
+!build/*-runner.jar
+!build/lib/*
+!build/quarkus-app/*

kontor-quarkus/.gitignore

@@ -0,0 +1,41 @@
+# Gradle
+.gradle/
+build/
+
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Local environment
+.env
+
+# Plugin directory
+/.quarkus/cli/plugins/
+# TLS Certificates
+.certs/

kontor-quarkus/README.md

@@ -1,60 +1,68 @@
-# kontor-quarkus Project
+# kontor-quarkus
 
 This project uses Quarkus, the Supersonic Subatomic Java Framework.
 
-If you want to learn more about Quarkus, please visit its website: https://quarkus.io/ .
+If you want to learn more about Quarkus, please visit its website: <https://quarkus.io/>.
 
 ## Running the application in dev mode
 
 You can run your application in dev mode that enables live coding using:
+
 ```shell script
 ./gradlew quarkusDev
 ```
 
-> **_NOTE:_**  Quarkus now ships with a Dev UI, which is available in dev mode only at http://localhost:8080/q/dev/.
+> **_NOTE:_**  Quarkus now ships with a Dev UI, which is available in dev mode only at <http://localhost:8080/q/dev/>.
 
 ## Packaging and running the application
 
 The application can be packaged using:
+
 ```shell script
 ./gradlew build
 ```
+
 It produces the `quarkus-run.jar` file in the `build/quarkus-app/` directory.
 Be aware that it’s not an _über-jar_ as the dependencies are copied into the `build/quarkus-app/lib/` directory.
 
 The application is now runnable using `java -jar build/quarkus-app/quarkus-run.jar`.
 
 If you want to build an _über-jar_, execute the following command:
+
 ```shell script
-./gradlew build -Dquarkus.package.type=uber-jar
+./gradlew build -Dquarkus.package.jar.type=uber-jar
 ```
 
 The application, packaged as an _über-jar_, is now runnable using `java -jar build/*-runner.jar`.
 
 ## Creating a native executable
 
-You can create a native executable using: 
+You can create a native executable using:
+
 ```shell script
-./gradlew build -Dquarkus.package.type=native
+./gradlew build -Dquarkus.native.enabled=true
 ```
 
-Or, if you don't have GraalVM installed, you can run the native executable build in a container using: 
+Or, if you don't have GraalVM installed, you can run the native executable build in a container using:
+
 ```shell script
-./gradlew build -Dquarkus.package.type=native -Dquarkus.native.container-build=true
+./gradlew build -Dquarkus.native.enabled=true -Dquarkus.native.container-build=true
 ```
 
 You can then execute your native executable with: `./build/kontor-quarkus-1.0.0-SNAPSHOT-runner`
 
-If you want to learn more about building native executables, please consult https://quarkus.io/guides/gradle-tooling.
+If you want to learn more about building native executables, please consult <https://quarkus.io/guides/gradle-tooling>.
 
 ## Related Guides
 
-- RESTEasy Reactive ([guide](https://quarkus.io/guides/resteasy-reactive)): A JAX-RS implementation utilizing build time processing and Vert.x. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it.
+- REST ([guide](https://quarkus.io/guides/rest)): A Jakarta REST implementation utilizing build time processing and Vert.x. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it.
+- REST Jackson ([guide](https://quarkus.io/guides/rest#json-serialisation)): Jackson serialization support for Quarkus REST. This extension is not compatible with the quarkus-resteasy extension, or any of the extensions that depend on it
+- JDBC Driver - PostgreSQL ([guide](https://quarkus.io/guides/datasource)): Connect to the PostgreSQL database via JDBC
 
 ## Provided Code
 
-### RESTEasy Reactive
+### REST
 
-Easily start your Reactive RESTful Web Services
+Easily start your REST Web Services
 
 [Related guide section...](https://quarkus.io/guides/getting-started-reactive#reactive-jax-rs-resources)

kontor-quarkus/build.gradle

@@ -0,0 +1,46 @@
+plugins {
+    id 'java'
+    id 'io.quarkus'
+}
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+
+dependencies {
+    implementation 'io.quarkus:quarkus-micrometer-registry-prometheus'
+    implementation 'io.quarkus:quarkus-smallrye-health'
+    implementation 'io.quarkus:quarkus-info'
+    implementation 'io.quarkus:quarkus-config-yaml'
+    implementation enforcedPlatform("${quarkusPlatformGroupId}:${quarkusPlatformArtifactId}:${quarkusPlatformVersion}")
+    implementation 'io.quarkus:quarkus-rest'
+    implementation 'io.quarkus:quarkus-rest-jackson'
+    implementation("io.quarkus:quarkus-hibernate-orm-panache")
+    implementation 'io.quarkus:quarkus-hibernate-validator'
+    implementation 'io.quarkus:quarkus-jdbc-postgresql'
+    implementation 'io.quarkus:quarkus-arc'
+    testImplementation 'io.quarkus:quarkus-junit5'
+    testImplementation 'io.rest-assured:rest-assured'
+}
+
+group 'de.thpeetz'
+version '0.2.0-SNAPSHOT'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
+}
+
+test {
+    systemProperty "java.util.logging.manager", "org.jboss.logmanager.LogManager"
+}
+
+compileJava {
+    options.encoding = 'UTF-8'
+    options.compilerArgs << '-parameters'
+}
+
+compileTestJava {
+    options.encoding = 'UTF-8'
+}

kontor-quarkus/gradle.properties

@@ -0,0 +1,12 @@
+# Gradle properties
+
+# Gradle properties
+description='Kontor with Quarkus'
+version=0.2.0-SNAPSHOT
+group=de.thpeetz
+
+quarkusPluginId=io.quarkus
+quarkusPluginVersion=3.24.1
+quarkusPlatformGroupId=io.quarkus.platform
+quarkusPlatformArtifactId=quarkus-bom
+quarkusPlatformVersion=3.24.1

kontor-quarkus/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

kontor-quarkus/gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       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/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# 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"'
+# 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
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +133,29 @@ 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.
+    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
@@ -193,16 +200,20 @@ if "$cygwin" || "$msys" ; then
     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.
+
+# 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" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

kontor-quarkus/gradlew.bat

@@ -13,6 +13,8 @@
 @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 ##########################################################################
@@ -26,6 +28,7 @@ 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%
 
@@ -42,11 +45,11 @@ 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.
+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
 
@@ -56,22 +59,22 @@ 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.
+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
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

kontor-quarkus/src/main/docker/Dockerfile.jvm

@@ -14,7 +14,9 @@
 # docker run -i --rm -p 8080:8080 quarkus/kontor-quarkus-jvm
 #
 # If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5005
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
 #
 # Then run the container using :
 #
@@ -24,7 +26,8 @@
 # This scripts computes the command line to execute your Java application, and
 # includes memory/GC tuning.
 # You can configure the behavior using the following environment properties:
-# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
+# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override
+# the default JVM options, use `JAVA_OPTS_APPEND` to append options
 # - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
 #   in JAVA_OPTS (example: "-Dsome.property=foo")
 # - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
@@ -75,7 +78,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.14
+FROM registry.access.redhat.com/ubi9/openjdk-21:1.21
 
 ENV LANGUAGE='en_US:en'
 
@@ -88,7 +91,8 @@ COPY --chown=185 build/quarkus-app/quarkus/ /deployments/quarkus/
 
 EXPOSE 8080
 USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
 
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]
+

kontor-quarkus/src/main/docker/Dockerfile.legacy-jar

@@ -3,7 +3,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=legacy-jar
+# ./gradlew build -Dquarkus.package.jar.type=legacy-jar
 #
 # Then, build the image with:
 #
@@ -14,7 +14,9 @@
 # docker run -i --rm -p 8080:8080 quarkus/kontor-quarkus-legacy-jar
 #
 # If you want to include the debug port into your docker image
-# you will have to expose the debug port (default 5005) like this :  EXPOSE 8080 5005
+# you will have to expose the debug port (default 5005 being the default) like this :  EXPOSE 8080 5005.
+# Additionally you will have to set -e JAVA_DEBUG=true and -e JAVA_DEBUG_PORT=*:5005
+# when running the container
 #
 # Then run the container using :
 #
@@ -24,7 +26,8 @@
 # This scripts computes the command line to execute your Java application, and
 # includes memory/GC tuning.
 # You can configure the behavior using the following environment properties:
-# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class")
+# - JAVA_OPTS: JVM options passed to the `java` command (example: "-verbose:class") - Be aware that this will override
+# the default JVM options, use `JAVA_OPTS_APPEND` to append options
 # - JAVA_OPTS_APPEND: User specified Java options to be appended to generated options
 #   in JAVA_OPTS (example: "-Dsome.property=foo")
 # - JAVA_MAX_MEM_RATIO: Is used when no `-Xmx` option is given in JAVA_OPTS. This is
@@ -75,7 +78,7 @@
 #   accessed directly. (example: "foo.example.com,bar.example.com")
 #
 ###
-FROM registry.access.redhat.com/ubi8/openjdk-11:1.14
+FROM registry.access.redhat.com/ubi9/openjdk-21:1.21
 
 ENV LANGUAGE='en_US:en'
 
@@ -85,6 +88,7 @@ COPY build/*-runner.jar /deployments/quarkus-run.jar
 
 EXPOSE 8080
 USER 185
-ENV AB_JOLOKIA_OFF=""
-ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
+ENV JAVA_OPTS_APPEND="-Dquarkus.http.host=0.0.0.0 -Djava.util.logging.manager=org.jboss.logmanager.LogManager"
 ENV JAVA_APP_JAR="/deployments/quarkus-run.jar"
+
+ENTRYPOINT [ "/opt/jboss/container/java/run/run-java.sh" ]

kontor-quarkus/src/main/docker/Dockerfile.native

@@ -3,7 +3,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=native
+# ./gradlew build -Dquarkus.native.enabled=true
 #
 # Then, build the image with:
 #
@@ -13,15 +13,17 @@
 #
 # docker run -i --rm -p 8080:8080 quarkus/kontor-quarkus
 #
+# The ` registry.access.redhat.com/ubi9/ubi-minimal:9.5` base image is based on UBI 9.
+# To use UBI 8, switch to `quay.io/ubi8/ubi-minimal:8.10`.
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.6
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.5
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work
-COPY --chown=1001:root build/*-runner /work/application
+COPY --chown=1001:root --chmod=0755 build/*-runner /work/application
 
 EXPOSE 8080
 USER 1001
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

kontor-quarkus/src/main/docker/Dockerfile.native-micro

@@ -6,7 +6,7 @@
 #
 # Before building the container image run:
 #
-# ./gradlew build -Dquarkus.package.type=native
+# ./gradlew build -Dquarkus.native.enabled=true
 #
 # Then, build the image with:
 #
@@ -16,15 +16,17 @@
 #
 # docker run -i --rm -p 8080:8080 quarkus/kontor-quarkus
 #
+# The `quay.io/quarkus/ubi9-quarkus-micro-image:2.0` base image is based on UBI 9.
+# To use UBI 8, switch to `quay.io/quarkus/quarkus-micro-image:2.0`.
 ###
-FROM quay.io/quarkus/quarkus-micro-image:1.0
+FROM quay.io/quarkus/ubi9-quarkus-micro-image:2.0
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \
     && chown 1001:root /work
-COPY --chown=1001:root build/*-runner /work/application
+COPY --chown=1001:root --chmod=0755 build/*-runner /work/application
 
 EXPOSE 8080
 USER 1001
 
-CMD ["./application", "-Dquarkus.http.host=0.0.0.0"]
+ENTRYPOINT ["./application", "-Dquarkus.http.host=0.0.0.0"]

kontor-quarkus/src/main/java/de/thpeetz/kontor/comics/data/Publisher.java

@@ -0,0 +1,96 @@
+package de.thpeetz.kontor.comics.data;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
+
+import java.util.Date;
+
+@Entity
+@Table(name= "publisher")
+public class Publisher {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private String id;
+
+    @Version
+    private int version;
+
+    private Date created_date;
+
+    private Date last_modified_date;
+
+    @NotEmpty
+    @Column(unique = true)
+    private String name;
+
+    private String weblink;
+
+    public Publisher() {}
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public int getVersion() {
+        return version;
+    }
+
+    public void setVersion(int version) {
+        this.version = version;
+    }
+
+    public Date getCreated_date() {
+        return created_date;
+    }
+
+    public void setCreated_date(Date created_date) {
+        this.created_date = created_date;
+    }
+
+    public Date getLast_modified_date() {
+        return last_modified_date;
+    }
+
+    public void setLast_modified_date(Date last_modified_date) {
+        this.last_modified_date = last_modified_date;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getWeblink() {
+        return weblink;
+    }
+
+    public void setWeblink(String weblink) {
+        this.weblink = weblink;
+    }
+
+    @Override
+    public String toString() {
+        return "Publisher{" +
+                "id='" + id + '\'' +
+                ", version=" + version +
+                ", created_date=" + created_date +
+                ", last_modified_date=" + last_modified_date +
+                ", name='" + name + '\'' +
+                ", weblink='" + weblink + '\'' +
+                '}';
+    }
+}

kontor-quarkus/src/main/java/de/thpeetz/kontor/comics/repository/PublisherRepository.java

@@ -0,0 +1,16 @@
+package de.thpeetz.kontor.comics.repository;
+
+import de.thpeetz.kontor.comics.data.Publisher;
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+
+import jakarta.enterprise.context.ApplicationScoped;
+import java.util.List;
+
+@ApplicationScoped
+public class PublisherRepository implements PanacheRepository<Publisher> {
+
+    Publisher findByName(String name) {
+        return find("name", name).firstResult();
+    }
+
+}

kontor-quarkus/src/main/java/de/thpeetz/kontor/comics/resource/PublisherResource.java

@@ -0,0 +1,30 @@
+package de.thpeetz.kontor.comics.resource;
+
+import de.thpeetz.kontor.comics.data.Publisher;
+import de.thpeetz.kontor.comics.repository.PublisherRepository;
+import jakarta.inject.Inject;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import io.quarkus.logging.Log;
+import java.util.List;
+
+@Path("/comics/publishers")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+public class PublisherResource {
+    @Inject
+    PublisherRepository publisherRepository;
+
+    @GET
+    public List<Publisher> list() {
+        List<Publisher> results = publisherRepository.listAll();
+        Log.infof("found %d entries", results.size());
+        for (Publisher publisher: results) {
+            Log.infof("Publisher: %s", publisher.toString());
+        }
+        return results;
+    }
+}

kontor-quarkus/src/main/java/de/thpeetz/kontor/media/data/MediaFile.java

@@ -0,0 +1,46 @@
+package de.thpeetz.kontor.media.data;
+
+import jakarta.annotation.Nullable;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Version;
+
+import java.util.Date;
+
+@Entity
+public class MediaFile {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.UUID)
+    private String id;
+
+    @Version
+    private int version;
+
+    private Date created_date;
+
+    private Date last_modified_date;
+
+    @Nullable
+    private String url;
+
+    private boolean review;
+
+    private boolean shouldDownload;
+
+    @Nullable
+    private String title;
+
+    @Nullable
+    private String cloudLink;
+
+    @Nullable
+    private String fileName;
+
+    @Nullable
+    private String path;
+
+    public MediaFile() {}
+}

kontor-quarkus/src/main/java/de/thpeetz/kontor/media/repository/MediaFileRepository.java

@@ -0,0 +1,7 @@
+package de.thpeetz.kontor.media.repository;
+
+import de.thpeetz.kontor.media.data.MediaFile;
+import io.quarkus.hibernate.orm.panache.PanacheRepository;
+
+public interface MediaFileRepository extends PanacheRepository<MediaFile> {
+}

kontor-quarkus/src/main/resources/application.yml

@@ -0,0 +1,10 @@
+# YAML supports comments
+quarkus:
+  datasource:
+    db-kind: postgresql
+    username: kontor
+    password: kontor
+    jdbc:
+      url: jdbc:postgresql://127.0.0.1:5432/kontor
+  http:
+    port: 8088

kontor-quarkus/src/native-test/java/de/thpeetz/comics/PublisherResourceIT.java

@@ -0,0 +1,8 @@
+package de.thpeetz.comics;
+
+import de.thpeetz.comics.resource.PublisherResourceTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
+
+@QuarkusIntegrationTest
+public class PublisherResourceIT extends PublisherResourceTest {
+}

kontor-quarkus/src/test/java/de/thpeetz/comics/resource/PublisherResourceTest.java

@@ -0,0 +1,19 @@
+package de.thpeetz.comics.resource;
+
+import io.quarkus.test.junit.QuarkusTest;
+import org.junit.jupiter.api.Test;
+
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.CoreMatchers.is;
+
+@QuarkusTest
+public class PublisherResourceTest {
+
+    @Test
+    void testPublishersEndpoint() {
+        given()
+                .when().get("/comics/publishers")
+                .then()
+                    .statusCode(200);
+    }
+}

kontor-spring/src/main/java/de/thpeetz/kontor/comics/data/Publisher.java

@@ -14,7 +14,7 @@ import jakarta.persistence.JoinColumn;
 import jakarta.persistence.Column;
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.ManyToOne;
-import jakarta.validation.constraints.*;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

kontor-spring/src/main/java/de/thpeetz/kontor/common/data/AbstractEntity.java

@@ -1,6 +1,11 @@
 package de.thpeetz.kontor.common.data;
 
-import jakarta.persistence.*;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
+import jakarta.persistence.Version;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Setter;

kotlin-spring/.gitignore

@@ -1,37 +0,0 @@
-HELP.md
-.gradle
-build/
-!gradle/wrapper/gradle-wrapper.jar
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### STS ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-bin/
-!**/src/main/**/bin/
-!**/src/test/**/bin/
-
-### IntelliJ IDEA ###
-.idea
-*.iws
-*.iml
-*.ipr
-out/
-!**/src/main/**/out/
-!**/src/test/**/out/
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-
-### VS Code ###
-.vscode/

kotlin-spring/README.md

@@ -1,92 +0,0 @@
-# Kontor Kotlin
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://gitlab.thpeetz.de/kontor/kontor-kotlin.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://gitlab.thpeetz.de/kontor/kontor-kotlin/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.

kotlin-spring/build.gradle

@@ -1,58 +0,0 @@
-import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-
-plugins {
-	id 'org.springframework.boot' version '2.7.7'
-	id 'io.spring.dependency-management' version '1.0.15.RELEASE'
-	id 'org.jetbrains.kotlin.jvm' version '1.7.21'
-	id 'org.jetbrains.kotlin.plugin.spring' version '1.7.21'
-	id 'org.jetbrains.kotlin.plugin.jpa' version '1.7.21'
-	id 'org.jetbrains.kotlin.plugin.allopen' version '1.7.21'
-	id 'org.jetbrains.kotlin.kapt' version '1.7.21'
-}
-
-group = 'de.thpeetz.kontor'
-version = '0.0.1-SNAPSHOT'
-sourceCompatibility = '11'
-
-repositories {
-	mavenCentral()
-}
-
-dependencies {
-	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-	implementation 'org.springframework.boot:spring-boot-starter-mustache'
-	implementation 'org.springframework.boot:spring-boot-starter-web'
-	implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
-	implementation 'org.jetbrains.kotlin:kotlin-reflect'
-	implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
-	developmentOnly 'org.springframework.boot:spring-boot-devtools'
-	kapt 'org.springframework.boot:spring-boot-configuration-processor'
-	runtimeOnly 'com.h2database:h2'
-	runtimeOnly 'org.springframework.boot:spring-boot-devtools'
-	testImplementation("org.springframework.boot:spring-boot-starter-test") {
-		exclude group: 'org.junit.vintage', module: 'junit-vintage-engine'
-		exclude module: 'mockito-core'
-	}
-	testImplementation 'org.junit.jupiter:junit-jupiter-api'
-	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
-	testImplementation 'com.ninja-squad:springmockk:3.1.1'
-
-
-}
-
-tasks.withType(KotlinCompile) {
-	kotlinOptions {
-		freeCompilerArgs = ['-Xjsr305=strict']
-		jvmTarget = '11'
-	}
-}
-
-tasks.named('test') {
-	useJUnitPlatform()
-}
-
-allOpen {
-	annotation("javax.persistence.Entity")
-	annotation("javax.persistence.Embeddable")
-	annotation("javax.persistence.MappedSuperclass")
-}

kotlin-spring/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +0,0 @@
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists

kotlin-spring/settings.gradle

@@ -1 +0,0 @@
-rootProject.name = 'kontor'

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/KontorApplication.kt

@@ -1,16 +0,0 @@
-package de.thpeetz.kontor
-
-import org.springframework.boot.Banner
-import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.context.properties.EnableConfigurationProperties
-import org.springframework.boot.runApplication
-
-@SpringBootApplication
-@EnableConfigurationProperties(KontorProperties::class)
-class KontorApplication
-
-fun main(args: Array<String>) {
-	runApplication<KontorApplication>(*args) {
-		setBannerMode(Banner.Mode.OFF)
-	}
-}

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/KontorConfiguration.kt

@@ -1,79 +0,0 @@
-package de.thpeetz.kontor
-
-import de.thpeetz.kontor.comics.*
-import org.springframework.boot.ApplicationRunner
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-
-@Configuration
-class KontorConfiguration {
-    @Bean
-    fun databaseInitializer(artistRepository: ArtistRepository,
-                            publisherRepository: PublisherRepository,
-                            comicRepository: ComicRepository,
-                            issueRepository: IssueRepository
-    ) = ApplicationRunner {
-
-        artistRepository.save(Artist("Turner, Michael"))
-        artistRepository.save(Artist("Bendis, Brian Michael"))
-        artistRepository.save(Artist("Land, Greg"))
-        artistRepository.save(Artist("Whedon, Joss"))
-        val marvel = publisherRepository.save(Publisher("Marvel"))
-        val aspen = publisherRepository.save(Publisher("Aspen"))
-        publisherRepository.save(Publisher("DC"))
-        val de = publisherRepository.save(Publisher("Dynamite Entertainment"))
-        val wildstorm = publisherRepository.save(Publisher("WildStorm"))
-        val bongo = publisherRepository.save(Publisher("Bongo"))
-        val image = publisherRepository.save(Publisher("Image"))
-        val darkHorse = publisherRepository.save(Publisher("Dark Horse Comics"))
-        val cliffhanger = publisherRepository.save(Publisher("Cliffhanger"))
-        comicRepository.save(Comic(title = "X-Men", publisher = marvel, currentOrder = false, completed = false))
-        val redSonja = comicRepository.save(Comic(title = "Red Sonja", publisher = de, currentOrder = false, completed = false))
-        val x23 = comicRepository.save(Comic(title = "X-23", publisher = marvel, currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Simpsons Comics", publisher = bongo, currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Futurama Comics", publisher = bongo, currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Bomb Queen III: The Good, The Bad and The Lovely", publisher = image, currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Bomb Queen IV: Suicide Bomber", publisher = image, currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Gen13", publisher = wildstorm, currentOrder = false, completed = false))
-        val bombqueen = comicRepository.save(Comic(title = "Bomb Queen II: Queen of Hearts", publisher = image, currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Iron & The Maiden",publisher = aspen,currentOrder = false,completed = false))
-        comicRepository.save(Comic(title = "Fathom",publisher = aspen,currentOrder = false,completed = false))
-        comicRepository.save(Comic(title = "Soulfire",publisher = aspen,currentOrder = false,completed = false))
-        comicRepository.save(Comic(title = "Star Wars: Rebellion",publisher = darkHorse,currentOrder = false,completed = false))
-        comicRepository.save(Comic(title = "Star Wars: Rebellion",publisher = darkHorse,currentOrder = false,completed = false))
-        comicRepository.save(Comic(title = "Star Wars: Knights of the Old Republic",publisher = darkHorse,currentOrder = false,completed = false))
-        comicRepository.save(Comic(title = "Star Wars: Legacy",publisher = darkHorse,currentOrder = false,completed = false))
-        comicRepository.save(Comic(title = "Star Wars: Dark Times", publisher = darkHorse, currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Samurai: Heaven and Earth", publisher = darkHorse, currentOrder = false, completed = false))
-        val battlpope = comicRepository.save(Comic(title = "Battle Pope", publisher = image,currentOrder = false, completed = false))
-        comicRepository.save(Comic(title = "Danger Girl", publisher = cliffhanger, currentOrder = false, completed = false))
-        val marville = comicRepository.save(Comic(title = "Marville", publisher = marvel, currentOrder = false, completed = false))
-        issueRepository.save(Issue(number = "0", comic = redSonja, gelesen = true))
-        issueRepository.save(Issue(number = "1", comic = redSonja, gelesen = true))
-        issueRepository.save(Issue(number = "2", comic = redSonja, gelesen = true))
-        issueRepository.save(Issue(number = "1", comic = x23, gelesen = false))
-        issueRepository.save(Issue(number = "1", comic = bombqueen, gelesen = false))
-        issueRepository.save(Issue(number = "2", comic = bombqueen, gelesen = false))
-        issueRepository.save(Issue(number = "3", comic = bombqueen, gelesen = false))
-        issueRepository.save(Issue(number = "4", comic = bombqueen, gelesen = false))
-        issueRepository.save(Issue(number = "1", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "2", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "3", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "4", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "5", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "6", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "7", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "8", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "9", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "10", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "11", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "12", comic = battlpope, gelesen = false))
-        issueRepository.save(Issue(number = "1", comic = marville, gelesen = false))
-        issueRepository.save(Issue(number = "2", comic = marville, gelesen = false))
-        issueRepository.save(Issue(number = "3", comic = marville, gelesen = false))
-        issueRepository.save(Issue(number = "4", comic = marville, gelesen = false))
-        issueRepository.save(Issue(number = "5", comic = marville, gelesen = false))
-        issueRepository.save(Issue(number = "6", comic = marville, gelesen = false))
-        issueRepository.save(Issue(number = "7", comic = marville, gelesen = false))
-    }
-}

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/KontorController.kt

@@ -1,24 +0,0 @@
-package de.thpeetz.kontor
-
-import de.thpeetz.kontor.KontorProperties
-import de.thpeetz.kontor.Navigation
-import org.springframework.stereotype.Controller
-import org.springframework.ui.Model
-import org.springframework.ui.set
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-
-@Controller
-@RequestMapping("/")
-class KontorController(val properties: KontorProperties, val navigation: Navigation) {
-    @GetMapping("/")
-    fun blog(model: Model): String {
-        model["title"] = properties.title
-        model["title"] = "Kontor"
-        model["banner"] = properties.banner
-        model["version"] = properties.version
-        model["navigation"] = navigation.links()
-        model["login"] = navigation.login()
-        return "kontor"
-    }
-}

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/KontorProperties.kt

@@ -1,10 +0,0 @@
-package de.thpeetz.kontor
-
-import org.springframework.boot.context.properties.ConfigurationProperties
-import org.springframework.boot.context.properties.ConstructorBinding
-
-@ConstructorBinding
-@ConfigurationProperties("kontor")
-data class KontorProperties(var title: String, var version: String = "unknown", val banner: Banner) {
-    data class Banner(val title: String? = null, val content: String)
-}

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/Navigation.kt

@@ -1,24 +0,0 @@
-package de.thpeetz.kontor
-
-import org.springframework.context.annotation.Bean
-import org.springframework.context.annotation.Configuration
-
-@Configuration
-class Navigation {
-
-    @Bean
-    fun links(): Iterable<Link> = listOf(
-        Link("/comics", "Comics"),
-        Link("/library","Library"),
-        Link("/office", "HomeOffice"),
-        Link("/tradingcards", "Trading Cards"),
-        Link("/tysc","TradeYourSportsCards"),
-        Link("/user/login", "<span class=\"glyphicon glyphicon-off\" aria-hidden=\"true\"></span>"),
-        Link("/admin/","Admin")
-    )
-
-    @Bean
-    fun login(): Iterable<Link> = listOf(Link("/user/login", "Login"))
-}
-
-data class Link(val link: String, val title: String)

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/RequestLoggingFilter.kt

@@ -1,25 +0,0 @@
-package de.thpeetz.kontor
-
-import org.slf4j.LoggerFactory
-import javax.servlet.Filter
-import org.springframework.stereotype.Component
-import javax.servlet.FilterChain
-import javax.servlet.ServletRequest
-import javax.servlet.ServletResponse
-
-@Component
-class RequestLoggingFilter: Filter {
-    val loggerFactory = LoggerFactory.getLogger("Kontor Logger")
-
-    override fun doFilter(
-        request: ServletRequest,
-        response: ServletResponse,
-        filterChain: FilterChain
-    ) {
-        val requestString = request.servletContext.contextPath.toString()
-        //val attributeNames = request.attributeNames
-        //attributeNames.toList().forEach { loggerFactory.info("Attribute: ${it.toString()}") }
-        loggerFactory.info("Logging request: $requestString")
-        filterChain.doFilter(request, response)
-    }
-}

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/comics/ComicsApiController.kt

@@ -1,25 +0,0 @@
-package de.thpeetz.kontor.comics
-
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
-
-@RestController
-@RequestMapping("api/")
-class ComicsApiController(val artistRepository: ArtistRepository,
-                          val publisherRepository: PublisherRepository,
-                          val comicRepository: ComicRepository,
-                          val issueRepository: IssueRepository) {
-
-    @GetMapping("/artist")
-    fun artistList()  = artistRepository.findAll()
-
-    @GetMapping("/publisher")
-    fun publisherList() = publisherRepository.findAll()
-
-    @GetMapping("/comics")
-    fun comicsList() = comicRepository.findAll()
-
-    @GetMapping("/issues")
-    fun issuesList() = issueRepository.findAll()
-}

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/comics/ComicsController.kt

@@ -1,29 +0,0 @@
-package de.thpeetz.kontor.comics
-
-import de.thpeetz.kontor.KontorProperties
-import de.thpeetz.kontor.Navigation
-import org.springframework.stereotype.Controller
-import org.springframework.ui.Model
-import org.springframework.ui.set
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.RequestMapping
-
-@Controller
-@RequestMapping("/comics")
-class ComicsController(private val properties: KontorProperties,
-                       val navigation: Navigation,
-                       val comicRepository: ComicRepository
-) {
-
-    @GetMapping("/")
-    fun blog(model: Model): String {
-        model["title"] = properties.title
-        model["title"] = "Comics"
-        model["banner"] = properties.banner
-        model["navigation"] = navigation.links()
-        model["comics"] = comicRepository.findAll().map { it }
-        return "comics"
-    }
-
-
-}

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/comics/Entities.kt

@@ -1,36 +0,0 @@
-package de.thpeetz.kontor.comics
-
-import javax.persistence.Entity
-import javax.persistence.GeneratedValue
-import javax.persistence.Id
-import javax.persistence.ManyToOne
-
-
-@Entity
-class Artist(
-    val name: String,
-    @Id @GeneratedValue val id: Long? = null
-)
-
-@Entity
-class Publisher(
-    val name: String,
-    @Id @GeneratedValue val id: Long? = null
-)
-
-@Entity
-class Comic(
-    val title: String,
-    @ManyToOne val publisher: Publisher,
-    val currentOrder: Boolean,
-    val completed: Boolean,
-    @Id @GeneratedValue val id: Long? = null
-)
-
-@Entity
-class Issue(
-    val number: String,
-    @ManyToOne val comic: Comic,
-    val gelesen: Boolean,
-    @Id @GeneratedValue val id: Long? = null
-)

kotlin-spring/src/main/kotlin/de/thpeetz/kontor/comics/Repositories.kt

@@ -1,22 +0,0 @@
-package de.thpeetz.kontor.comics
-
-import org.springframework.data.repository.CrudRepository
-
-interface ArtistRepository: CrudRepository<Artist, String> {
-
-    override fun findAll(): Iterable<Artist>
-}
-
-interface PublisherRepository: CrudRepository<Publisher, String> {
-    override fun findAll(): Iterable<Publisher>
-}
-
-interface ComicRepository: CrudRepository<Comic, String> {
-
-    override fun findAll(): Iterable<Comic>
-}
-
-interface IssueRepository: CrudRepository<Issue, String> {
-
-    override fun findAll(): Iterable<Issue>
-}

kotlin-spring/src/main/resources/application.properties

@@ -1,6 +0,0 @@
-spring.jpa.properties.hibernate.globally_quoted_identifiers=true
-spring.jpa.properties.hibernate.globally_quoted_identifiers_skip_column_definitions = true
-kontor.title=Kontor
-kontor.version=1.0.0-SNAPSHOT
-kontor.banner.title=Warning
-kontor.banner.content=The blog will be down tomorrow.

kotlin-spring/src/main/resources/templates/comics.mustache

@@ -1,23 +0,0 @@
-{{> header}}
-
-{{> menu}}
-<ul class="nav nav-tabs">
-    <li role="presentation" class="active"><a href="/comics/comic">Comics</a></li>
-    <li role="presentation"><a href="/comics/publisher">Publishers</a></li>
-    <li role="presentation"><a href="/comics/artist">Artists</a></li>
-</ul>
-
-<div class="panel panel-default">
-    <table class="table">
-        <caption>List of Comics</caption>
-        <tr><th scope="col">Name</th></tr>
-        {{#comics}}
-            <tr><td><a href="/comics/comic/view/{{id}}">{{title}}</a></td></tr>
-        {{/comics}}
-    </table>
-    <div class="panel-body">
-        <a href="/comics/comic/create">Add entry</a>
-    </div>
-</div>
-
-{{> footer}}

kotlin-spring/src/main/resources/templates/footer.mustache

@@ -1,22 +0,0 @@
-<nav class="navbar navbar-default navbar-fixed-bottom">
-    <div class="container">
-        <div class="row">
-            <p class="col-lg-12">
-            <ul class="list-inline">
-                <li><a href="/">Kontor</a></li>
-                <li class="footer-menu-divider">⋅</li>
-            {{#login}}
-                <li><a href="{{link}}">{{title}}</a></li>
-            {{/login}}
-            {{^login}}
-                <li><a href="/user/logout">Logout</a></li>
-            {{/login}}
-            </ul>
-            <p class="copyright text-muted small">Version {{version}} Copyright © 2018. All Rights Reserved</p>
-        </div>
-    </div>
-    </div>
-</nav>
-</body>
-
-</html>

kotlin-spring/src/main/resources/templates/header.mustache

@@ -1,15 +0,0 @@
-<!doctype html>
-<html lang="de">
-<head>
-    <!--Use the `title` variable to set the title of the page-->
-    <title>{{title}}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta charset="UTF-8">
-
-    <!--Use bootstrap to make the application look decent-->
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" integrity="sha384-1q8mTJOASx8j1Au+a5WDVnPi2lkFfwwEAa8hDDdjZlpLegxhjVME1fgjWPGmkzs7" crossorigin="anonymous">
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-    <script async src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js" integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS" crossorigin="anonymous"></script>
-</head>
-
-<body class="container">

kotlin-spring/src/main/resources/templates/kontor.mustache

@@ -1,18 +0,0 @@
-{{> header}}
-
-{{> menu}}
-
-<div>
-    {{#banner.title}}
-        <section>
-            <header class="banner">
-                <h2 class="banner-title">{{banner.title}}</h2>
-            </header>
-            <div class="banner-content">
-                {{banner.content}}
-            </div>
-        </section>
-    {{/banner.title}}
-</div>
-
-{{> footer}}

kotlin-spring/src/main/resources/templates/menu.mustache

@@ -1,23 +0,0 @@
-<nav class="navbar navbar-default">
-    <div class="container-fluid">
-        <!-- Brand and toggle get grouped for better mobile display -->
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
-                <span class="sr-only">Toggle navigation</span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            <a class="navbar-brand" href="/">Kontor</a>
-        </div>
-
-        <!-- Collect the nav links, forms, and other content for toggling -->
-        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
-            <ul class="nav navbar-nav navbar-right">
-                {{#navigation}}
-                    <li><a href="{{link}}">{{title}}</a></li>
-                {{/navigation}}
-            </ul>
-        </div><!-- /.navbar-collapse -->
-    </div><!-- /.container-fluid -->
-</nav>

kotlin-spring/src/test/resources/junit-platform.properties

@@ -1 +0,0 @@
-junit.jupiter.testinstance.lifecycle.default = per_class