Restructuring Appserver to Use Radar Jersey

.dockerignore

@@ -1,3 +1,12 @@
-/src/test/
-/src/integrationTest
-/src/gatling
+/appserver-jersey/src/test/
+/appserver-jersey/src/integrationTest
+/appserver-jersey/build
+/appserver-legacy/build
+/buildSrc/build
+/out
+/.git
+/.gradle*
+/gradle/wrapper
+/gradlew*
+/.idea
+/.github

.editorconfig

@@ -0,0 +1,24 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[{*.yml, *.yaml}]
+indent_size = 2
+
+[*.gradle]
+indent_size = 4
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_allow_trailing_comma = true
+# To satisfy ktlint rules, see: https://stackoverflow.com/questions/59849619/intellij-does-not-sort-kotlin-imports-according-to-ktlints-expectations
+ij_kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^

.gitignore

@@ -1,5 +1,5 @@
-.gradle
-/build/
+**/.gradle
+**/build/
 !gradle/wrapper/gradle-wrapper.jar
 
 ### STS ###

Dockerfile.appserver-jersey

@@ -0,0 +1,44 @@
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+FROM --platform=$BUILDPLATFORM gradle:8.5-jdk17 AS builder
+
+RUN mkdir /code
+WORKDIR /code
+
+ENV GRADLE_USER_HOME=/code/.gradlecache \
+   GRADLE_OPTS="-Djdk.lang.Process.launchMechanism=vfork -Dorg.gradle.vfs.watch=false"
+
+COPY ./buildSrc /code/buildSrc
+COPY ./build.gradle.kts ./settings.gradle.kts /code/
+COPY appserver-jersey/build.gradle.kts /code/appserver-jersey/
+
+RUN gradle appserver-jersey:downloadDependencies appserver-jersey:copyDependencies appserver-jersey:startScripts
+
+COPY appserver-jersey/src/ /code/appserver-jersey/src
+
+RUN gradle jar
+
+FROM eclipse-temurin:17-jre
+
+COPY --from=builder /code/appserver-jersey/build/scripts/* /usr/bin/
+COPY --from=builder /code/appserver-jersey/build/third-party/* /usr/lib/
+COPY --from=builder /code/appserver-jersey/build/libs/*.jar /usr/lib/
+COPY --from=builder /code/appserver-jersey/src/main/resources/appserver.yml /etc/appserver-jersey/appserver.yml
+
+USER 101
+
+EXPOSE 8080
+
+CMD ["appserver-jersey"]
+
+

appserver-jersey/build.gradle.kts

@@ -0,0 +1,100 @@
+plugins {
+    application
+    kotlin("plugin.serialization") version Versions.kotlinVersion
+    id("org.radarbase.radar-kotlin")
+    kotlin("plugin.allopen")
+    kotlin("plugin.noarg")
+}
+
+application {
+    mainClass.set("org.radarbase.appserver.jersey.JerseyAppserverKt")
+
+    applicationDefaultJvmArgs = listOf(
+        "-Dcom.sun.management.jmxremote",
+        "-Dcom.sun.management.jmxremote.local.only=false",
+        "-Dcom.sun.management.jmxremote.port=9010",
+        "-Dcom.sun.management.jmxremote.authenticate=false",
+        "-Dcom.sun.management.jmxremote.ssl=false",
+    )
+}
+
+description = "RADAR Appserver for scheduling tasks and notifications."
+
+val integrationTestSourceSet = sourceSets.create("integrationTest") {
+    compileClasspath += sourceSets.main.get().output
+    runtimeClasspath += sourceSets.main.get().output
+}
+
+val integrationTestImplementation: Configuration by configurations.getting {
+    extendsFrom(configurations.testImplementation.get())
+}
+
+val integrationTest by tasks.registering(Test::class) {
+    description = "Runs integration tests."
+    group = "verification"
+    testClassesDirs = integrationTestSourceSet.output.classesDirs
+    classpath = integrationTestSourceSet.runtimeClasspath
+    testLogging.showStandardStreams = true
+    shouldRunAfter("test")
+    outputs.upToDateWhen { false }
+}
+
+configurations["integrationTestRuntimeOnly"].extendsFrom(configurations.testRuntimeOnly.get())
+
+allOpen {
+    annotation("jakarta.persistence.MappedSuperclass")
+    annotation("jakarta.persistence.Entity")
+    annotation("jakarta.persistence.Embeddable")
+}
+
+dependencies {
+    implementation(kotlin("reflect"))
+
+    implementation("org.radarbase:radar-commons-kotlin:${Versions.radarCommonsVersion}")
+    implementation("org.radarbase:radar-jersey:${Versions.radarJerseyVersion}")
+    implementation("org.radarbase:radar-jersey-hibernate:${Versions.radarJerseyVersion}") {
+        runtimeOnly("org.postgresql:postgresql:${Versions.postgresqlVersion}")
+    }
+    implementation("com.h2database:h2:${Versions.h2Version}")
+
+    implementation("io.ktor:ktor-client-core:${Versions.ktorVersion}")
+    implementation("io.ktor:ktor-client-cio:${Versions.ktorVersion}")
+    implementation("org.glassfish.jersey.ext:jersey-bean-validation:3.1.10")
+
+    implementation("com.google.firebase:firebase-admin:9.3.0") {
+        constraints {
+            implementation("com.google.protobuf:protobuf-java:3.25.5") {
+                because("Provided version of protobuf has security vulnerabilities")
+            }
+            implementation("com.google.protobuf:protobuf-java-util:3.25.5") {
+                because("Provided version of protobuf has security vulnerabilities")
+            }
+        }
+    }
+    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3")
+
+    implementation("com.google.guava:guava:32.1.3-jre")
+    implementation("org.quartz-scheduler:quartz:2.5.0")
+
+    testImplementation("io.mockk:mockk:1.14.4")
+    testImplementation("org.mockito.kotlin:mockito-kotlin:3.2.0")
+    testImplementation("org.hamcrest:hamcrest:2.1")
+    testImplementation("org.assertj:assertj-core:3.24.2")
+
+    integrationTestImplementation(platform("io.ktor:ktor-bom:${Versions.ktorVersion}"))
+    integrationTestImplementation("io.ktor:ktor-client-content-negotiation")
+    integrationTestImplementation("io.ktor:ktor-serialization-kotlinx-json")
+}
+
+ktlint {
+    ignoreFailures.set(false)
+    outputColorName.set("RED")
+}
+
+radarKotlin {
+    javaVersion.set(Versions.java)
+    kotlinVersion.set(Versions.kotlinVersion)
+//    kotlinApiVersion.set(Versions.kotlinVersion)
+    junitVersion.set(Versions.junit5Version)
+    log4j2Version.set(Versions.log4j2)
+}

appserver-jersey/docker-compose.yml

@@ -0,0 +1,63 @@
+version: '3.8'
+
+services:
+  #---------------------------------------------------------------------------#
+  # ManagementPortal Postgres                                                 #
+  #---------------------------------------------------------------------------#
+  managementportal-postgresql:
+    image: postgres
+    environment:
+      POSTGRES_USER: radarbase
+      POSTGRES_PASSWORD: radarbase
+      POSTGRES_DB: managementportal
+
+
+  #---------------------------------------------------------------------------#
+  # Management Portal                                                         #
+  #---------------------------------------------------------------------------#
+  managementportal:
+    image: radarbase/management-portal:2.1.0
+    environment:
+      SERVER_PORT: 8081
+      SPRING_PROFILES_ACTIVE: prod
+      SPRING_DATASOURCE_URL: jdbc:postgresql://managementportal-postgresql:5432/managementportal
+      SPRING_DATASOURCE_USERNAME: radarbase
+      SPRING_DATASOURCE_PASSWORD: radarbase
+      SPRING_LIQUIBASE_CONTEXTS: dev #includes testing_data, remove for production builds
+      JHIPSTER_SLEEP: 10 # gives time for the database to boot before the application
+      JAVA_OPTS: -Xmx512m  # maximum heap size for the JVM running ManagementPortal, increase this as necessary
+      MANAGEMENTPORTAL_COMMON_BASE_URL: http://localhost:8081/managementportal
+      MANAGEMENTPORTAL_COMMON_MANAGEMENT_PORTAL_BASE_URL: http://localhost:8081/managementportal
+      MANAGEMENTPORTAL_FRONTEND_CLIENT_SECRET:
+      MANAGEMENTPORTAL_OAUTH_CLIENTS_FILE: /mp-includes/config/oauth_client_details.csv
+    volumes:
+      - ./src/integrationTest/resources/docker/etc/:/mp-includes/
+
+  #---------------------------------------------------------------------------#
+  # Appserver Postgres                                                        #
+  #---------------------------------------------------------------------------#
+  appserver-postgres:
+    image: postgres
+    environment:
+      POSTGRES_DB: appserver
+      POSTGRES_USER: radar
+      POSTGRES_PASSWORD: radar
+
+  #---------------------------------------------------------------------------#
+  # Appserver                                                                 #
+  #---------------------------------------------------------------------------#
+  appserver:
+    build:
+      context: ../
+      dockerfile: Dockerfile.appserver-jersey
+    image: radarbase/radar-appserver:SNAPSHOT
+    restart: always
+    ports:
+      - "8080:8080"
+    environment:
+      JDK_JAVA_OPTIONS: -Xmx4G -Djava.security.egd=file:/dev/./urandom
+      APPSERVER_JDBC_URL: jdbc:postgresql://postgres:5432/appserver
+      APPSERVER_JDBC_USERNAME: radar
+      APPSERVER_JDBC_PASSWORD: radar
+      APPSERVER_JDBC_DRIVER: org.postgresql.Driver
+      APPSERVER_HIBERNATE_DIALECT: org.hibernate.dialect.PostgreSQLDialect