(WIP) Final Iteration of appserver Refactor to Jersey #531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

this-Aditya merged 59 commits into restructure-project from rp-second-iteration

Aug 18, 2025

appserver-jersey/Dockerfile

-Original file line number
+Diff line change
@@ -0,0 +1,42 @@
+    # 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 ./build.gradle.kts /code/radar-appserver
+    RUN gradle downloadDependencies copyDependencies
+    COPY ./src /code/radar-appserver/src
+    RUN gradle jar
+    FROM eclipse-temurin:17-jre
+    COPY --from=builder /code/radar-appserver/build/scripts/* /usr/bin/
+    COPY --from=builder /code/radar-appserver/build/third-party/* /usr/lib/
+    COPY --from=builder /code/radar-appserver/build/libs/*.jar /usr/lib/
+    USER 101
+    EXPOSE 8080
+    CMD ["radar-appserver"]

appserver-jersey/build.gradle.kts

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,11 +1,9 @@
  
    plugins {

        application

        kotlin("plugin.serialization") version Versions.kotlinVersion

        id("org.radarbase.radar-kotlin") version Versions.radarCommonsVersion

        kotlin("plugin.allopen")

        kotlin("plugin.noarg")

        id("org.jetbrains.kotlin.plugin.spring")

        id("org.jetbrains.kotlin.plugin.jpa")

    }

    application {

    @@ -20,7 +18,6 @@ application {
  
        )

    }

    description = "RADAR Appserver for scheduling tasks and notifications."

    val integrationTestSourceSet = sourceSets.create("integrationTest") {

    @@ -51,11 +48,9 @@ allOpen {
  
    }

    dependencies {

    //    implementation(kotlin("stdlib-jdk8"))

        implementation(kotlin("reflect"))

    //    implementation("org.radarbase:radar-commons:${Versions.radarCommons}")

    //    implementation("org.radarbase:radar-commons-kotlin:${Versions.radarCommons}")

        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}")

    @@ -76,27 +71,24 @@ dependencies {
  
                }

            }

        }

        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")

    //    implementation("org.radarbase:managementportal-client:${Versions.radarAuth}")

    //    implementation("org.radarbase:lzfse-decode:${Versions.lzfse}")

    //    implementation("org.radarbase:radar-auth:${Versions.radarAuth}")

        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")

    //    implementation(platform("io.ktor:ktor-bom:${Versions.ktor}"))

    //    implementation("io.ktor:ktor-client-auth")

    //    runtimeOnly("org.glassfish.grizzly:grizzly-framework-monitoring:${Versions.grizzly}")

    //    runtimeOnly("org.glassfish.grizzly:grizzly-http-monitoring:${Versions.grizzly}")

    //    runtimeOnly("org.glassfish.grizzly:grizzly-http-server-monitoring:${Versions.grizzly}")

    //

    //    testImplementation("org.mockito.kotlin:mockito-kotlin:${Versions.mockitoKotlin}")

    //    testImplementation("org.hamcrest:hamcrest:${Versions.hamcrest}")

    //    testImplementation("com.squareup.okhttp3:mockwebserver:${Versions.okHttp}")

        integrationTestImplementation(platform("io.ktor:ktor-bom:${Versions.ktorVersion}"))

        integrationTestImplementation("io.ktor:ktor-client-content-negotiation")

        integrationTestImplementation("io.ktor:ktor-serialization-kotlinx-json")

    }

    //    integrationTestImplementation(platform("io.ktor:ktor-bom:${Versions.ktor}"))

    //    integrationTestImplementation("io.ktor:ktor-client-content-negotiation")

    //    integrationTestImplementation("io.ktor:ktor-serialization-kotlinx-json")

    ktlint {

        ignoreFailures.set(false)

        outputColorName.set("RED")

    }

    radarKotlin {

appserver-jersey/docker-compose.yml

-Original file line number
+Diff line change
@@ -0,0 +1,59 @@
+    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:
+        image: radarbase/radar-appserver
+        build: ./
+        restart: always
+        ports:
+          - "8080:8080"
+        environment:
+          JDK_JAVA_OPTIONS: -Xmx4G -Djava.security.egd=file:/dev/./urandom
+          FCMSERVER_SENDERID: "1043784930865"
+          FCMSERVER_SERVERKEY: "AAAA8wZuFjE:APA91bGpJQ3Sft0mZAaVMjDJGNLjFsdDLTo-37ZN69r4lKlHiRN78t4bCfkNKcXG5c9cJg-eGtWB7FqceQUDVtf7B1Zvw_2ycynqwKe2YqXFeyaq83Gf0R3AS1EKSWFS60GCr8eUEliz"
+          APPSERVER_JDBC_URL: jdbc:postgresql://postgres:5432/radar

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

(WIP) Final Iteration of appserver Refactor to Jersey #531

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!