From f0624d9792c73811c8e7a849910e32fa6142bc9d Mon Sep 17 00:00:00 2001 From: Felix Reichenbach <felix.reichenbach@mgm-tp.com> Date: Fri, 28 Mar 2025 14:44:35 +0100 Subject: [PATCH] OZG-7906 move aggregation manager job into own module --- Jenkinsfile | 42 +-- .../lombok.config | 0 aggregation-manager-job/mvnw | 259 ++++++++++++++++++ aggregation-manager-job/mvnw.cmd | 149 ++++++++++ aggregation-manager-job/pom.xml | 127 +++++++++ .../src}/main/helm/.helmignore | 0 .../src}/main/helm/Chart.yaml | 0 .../src}/main/helm/templates/_helpers.tpl | 0 .../templates/configmap_bindings_type.yaml | 0 .../src}/main/helm/templates/cronjob.yaml | 0 .../main/helm/templates/network_policy.yaml | 0 .../src}/main/helm/templates/service.yaml | 0 .../main/helm/templates/service_account.yaml | 0 .../main/helm/templates/service_monitor.yaml | 0 .../src}/main/helm/values.yaml | 0 .../aggregation/AggregationCallContext.java | 46 ++-- .../AggregationManagerApplication.java | 96 +++---- .../AggregationManagerConfiguration.java | 76 ++--- .../AggregationManagerGrpcConfiguration.java | 46 ++-- .../aggregation/AggregationManagerRunner.java | 0 .../aggregation/ConverterConfiguration.java | 0 .../aggregation/TransformationProperties.java | 0 .../ZonedDateTimeReadConverter.java | 0 .../ZonedDateTimeWriteConverter.java | 0 .../transformation/AggregationMapping.java | 0 .../transformation/JSLTransformation.java | 0 .../JSLTransformationService.java | 0 .../transformation/Transformation.java | 0 .../TransformationException.java | 0 .../transformation/TransformationService.java | 0 .../transformation/VorgangMapper.java | 0 .../aggregation/warehouse/DocumentEntry.java | 104 +++---- .../DocumentToJsonNodeConverter.java | 0 .../JsonNodeToDocumentConverter.java | 0 .../warehouse/WarehouseRepository.java | 64 ++--- .../src}/main/resources/application-local.yml | 0 .../src}/main/resources/application.yml | 0 .../src}/test/helm-linter-values.yaml | 0 .../helm/configmap_bindings_type_test.yaml | 0 .../src}/test/helm/cronjob_database_test.yaml | 0 .../helm/cronjob_defaults_labels_test.yaml | 0 .../src}/test/helm/cronjob_env_test.yaml | 0 .../helm/cronjob_image_pull_secret_test.yaml | 0 .../test/helm/cronjob_resources_test.yaml | 0 .../helm/cronjob_service_account_test.yaml | 0 .../helm/cronjob_spring_profile_test.yaml | 0 .../src}/test/helm/cronjob_test.yaml | 0 .../src}/test/helm/cronjob_volume_test.yaml | 0 .../src}/test/helm/network_policy_test.yaml | 0 .../src}/test/helm/service_account_test.yaml | 0 .../src}/test/helm/service_monitor_test.yaml | 0 .../src}/test/helm/service_test.yaml | 0 .../AggregationManagerApplicationTest.java | 0 .../AggregationManagerRunnerITCase.java | 0 .../AggregationManagerRunnerTest.java | 0 .../AggregationMappingTestFactory.java | 0 .../DotExpressionTestFactory.java | 0 .../FieldMappingTestFactory.java | 0 .../FormIdentifierTestFactory.java | 0 .../transformation/JSLTServiceITCase.java | 0 .../JSLTransformationServiceTest.java | 0 .../transformation/JSLTransformationTest.java | 0 .../transformation/VorgangMapperTest.java | 0 .../warehouse/DocumentEntryTestFactory.java | 0 .../warehouse/ObjectNodeTestFactory.java | 0 .../warehouse/WarehouseRepositoryITCase.java | 0 .../org.junit.jupiter.api.extension.Extension | 0 .../test/resources/application-itcase.yml | 0 .../test/resources/junit-platform.properties | 0 pom.xml | 121 +++----- 70 files changed, 804 insertions(+), 326 deletions(-) rename lombok.config => aggregation-manager-job/lombok.config (100%) create mode 100644 aggregation-manager-job/mvnw create mode 100644 aggregation-manager-job/mvnw.cmd create mode 100644 aggregation-manager-job/pom.xml rename {src => aggregation-manager-job/src}/main/helm/.helmignore (100%) rename {src => aggregation-manager-job/src}/main/helm/Chart.yaml (100%) rename {src => aggregation-manager-job/src}/main/helm/templates/_helpers.tpl (100%) rename {src => aggregation-manager-job/src}/main/helm/templates/configmap_bindings_type.yaml (100%) rename {src => aggregation-manager-job/src}/main/helm/templates/cronjob.yaml (100%) rename {src => aggregation-manager-job/src}/main/helm/templates/network_policy.yaml (100%) rename {src => aggregation-manager-job/src}/main/helm/templates/service.yaml (100%) rename {src => aggregation-manager-job/src}/main/helm/templates/service_account.yaml (100%) rename {src => aggregation-manager-job/src}/main/helm/templates/service_monitor.yaml (100%) rename {src => aggregation-manager-job/src}/main/helm/values.yaml (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/AggregationCallContext.java (98%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/AggregationManagerApplication.java (97%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java (97%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java (99%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/ConverterConfiguration.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/TransformationProperties.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/ZonedDateTimeReadConverter.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/ZonedDateTimeWriteConverter.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/transformation/JSLTransformation.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/transformation/Transformation.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/transformation/TransformationException.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/transformation/TransformationService.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/transformation/VorgangMapper.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/warehouse/DocumentEntry.java (96%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/warehouse/DocumentToJsonNodeConverter.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/warehouse/JsonNodeToDocumentConverter.java (100%) rename {src => aggregation-manager-job/src}/main/java/de/ozgcloud/aggregation/warehouse/WarehouseRepository.java (97%) rename {src => aggregation-manager-job/src}/main/resources/application-local.yml (100%) rename {src => aggregation-manager-job/src}/main/resources/application.yml (100%) rename {src => aggregation-manager-job/src}/test/helm-linter-values.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/configmap_bindings_type_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_database_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_defaults_labels_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_env_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_image_pull_secret_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_resources_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_service_account_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_spring_profile_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/cronjob_volume_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/network_policy_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/service_account_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/service_monitor_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/helm/service_test.yaml (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/AggregationManagerApplicationTest.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerITCase.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/AggregationMappingTestFactory.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/DotExpressionTestFactory.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/FieldMappingTestFactory.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/FormIdentifierTestFactory.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/JSLTServiceITCase.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationServiceTest.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationTest.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/transformation/VorgangMapperTest.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/warehouse/DocumentEntryTestFactory.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/warehouse/ObjectNodeTestFactory.java (100%) rename {src => aggregation-manager-job/src}/test/java/de/ozgcloud/aggregation/warehouse/WarehouseRepositoryITCase.java (100%) rename {src => aggregation-manager-job/src}/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension (100%) rename {src => aggregation-manager-job/src}/test/resources/application-itcase.yml (100%) rename {src => aggregation-manager-job/src}/test/resources/junit-platform.properties (100%) diff --git a/Jenkinsfile b/Jenkinsfile index 812eee7..c36c05b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,11 +78,11 @@ pipeline { } configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) { sh "mvn -s $MAVEN_SETTINGS versions:set -DnewVersion=${JAR_TAG} -DprocessAllModules=true" - + } } - } - + } + stage('Build AggregationManager') { steps { script { @@ -94,7 +94,7 @@ pipeline { } } } - + stage('Deploy to Nexus'){ steps { script { @@ -123,14 +123,14 @@ pipeline { FAILED_STAGE=env.STAGE_NAME IMAGE_TAG = buildVersionName() - tagAndPushDockerImage(IMAGE_TAG) + tagAndPushDockerImage('aggregation-manager-job', IMAGE_TAG) if (env.BRANCH_NAME == 'main') { - tagAndPushDockerImage('snapshot-latest') - + tagAndPushDockerImage('aggregation-manager-job', 'snapshot-latest') + } else if (env.BRANCH_NAME == 'release') { - tagAndPushDockerImage('latest') + tagAndPushDockerImage('aggregation-manager-job', 'latest') } } } @@ -143,7 +143,7 @@ pipeline { HELM_CHART_VERSION = buildVersionName() sh "./run_helm_test.sh" - + dir('src/main/helm') { sh "helm package --version=${HELM_CHART_VERSION} ." @@ -151,8 +151,8 @@ pipeline { } } } - } - + } + stage('Trigger Dev rollout') { when { @@ -173,10 +173,10 @@ pipeline { stage('Trigger Test rollout') { when { branch 'release' - } - - steps { - script { + } + + steps { + script { FAILED_STAGE = env.STAGE_NAME cloneGitopsRepo() @@ -185,7 +185,7 @@ pipeline { pushTestGitopsRepo() } - } + } } stage ('Deploy SBOM to DependencyTrack') { @@ -261,7 +261,7 @@ Void sendFailureMessage() { "format": "org.matrix.custom.html", \ "formatted_body":"AggregationManager: Build Failed. Stage: ${FAILED_STAGE} Build-ID: <a href='${JENKINS_URL}'>${env.BUILD_NUMBER}</a>"}""" - + if (env.BRANCH_NAME == 'main') { room = "!GjqhmouBtnDbwUkAjx:matrix.ozg-sh.de" } @@ -278,7 +278,7 @@ String getElementAccessToken() { } } -Void deployHelmChart(String helmChartVersion) { +Void deployHelmChart(String helmChartVersion) { withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){ if (env.BRANCH_NAME == 'release') { result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps -F file=@aggregation-manager-'''+helmChartVersion+'''.tgz''', returnStdout: true @@ -311,12 +311,12 @@ String buildVersionName() { return "${getPomVersion('pom.xml')}-${validateBranchName(env.BRANCH_NAME)}-${env.GIT_COMMIT.take(7)}".replaceAll("_", "-") } -Void tagAndPushDockerImage(String newTag){ +Void tagAndPushDockerImage(String imageName, String newTag){ withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USER', passwordVariable: 'PASSWORD')]) { sh 'docker login docker.ozg-sh.de -u ${USER} -p ${PASSWORD}' - sh "docker tag docker.ozg-sh.de/aggregation-manager:build-latest docker.ozg-sh.de/aggregation-manager:${newTag}" - sh "docker push docker.ozg-sh.de/aggregation-manager:${newTag}" + sh "docker tag docker.ozg-sh.de/${imageName}:build-latest docker.ozg-sh.de/${imageName}:${newTag}" + sh "docker push docker.ozg-sh.de/${imageName}:${newTag}" } } diff --git a/lombok.config b/aggregation-manager-job/lombok.config similarity index 100% rename from lombok.config rename to aggregation-manager-job/lombok.config diff --git a/aggregation-manager-job/mvnw b/aggregation-manager-job/mvnw new file mode 100644 index 0000000..19529dd --- /dev/null +++ b/aggregation-manager-job/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + 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" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/aggregation-manager-job/mvnw.cmd b/aggregation-manager-job/mvnw.cmd new file mode 100644 index 0000000..249bdf3 --- /dev/null +++ b/aggregation-manager-job/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-<version>,maven-mvnd-<version>-<platform>}/<hash> +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/aggregation-manager-job/pom.xml b/aggregation-manager-job/pom.xml new file mode 100644 index 0000000..aed2e5e --- /dev/null +++ b/aggregation-manager-job/pom.xml @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + + Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den + Ministerpräsidenten des Landes Schleswig-Holstein + Staatskanzlei + Abteilung Digitalisierung und zentrales IT-Management der Landesregierung + + Lizenziert unter der EUPL, Version 1.2 oder - sobald + diese von der Europäischen Kommission genehmigt wurden - + Folgeversionen der EUPL ("Lizenz"); + Sie dürfen dieses Werk ausschließlich gemäß + dieser Lizenz nutzen. + Eine Kopie der Lizenz finden Sie hier: + + https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + + Sofern nicht durch anwendbare Rechtsvorschriften + gefordert oder in schriftlicher Form vereinbart, wird + die unter der Lizenz verbreitete Software "so wie sie + ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - + ausdrücklich oder stillschweigend - verbreitet. + Die sprachspezifischen Genehmigungen und Beschränkungen + unter der Lizenz sind dem Lizenztext zu entnehmen. + +--> +<project xmlns="https://maven.apache.org/POM/4.0.0" + xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>de.ozgcloud.aggregation</groupId> + <artifactId>aggregation-manager-parent</artifactId> + <version>1.3.0-SNAPSHOT</version> + <relativePath>../</relativePath> + </parent> + <artifactId>aggregation-manager-job</artifactId> + <name>OZG-Cloud Aggregation Manager Job</name> + + <properties> + <spring-boot.build-image.imageName>docker.ozg-sh.de/aggregation-manager:build-latest</spring-boot.build-image.imageName> + </properties> + <dependencies> + <dependency> + <artifactId>ozg-cloud-spring-boot-starter</artifactId> + <groupId>de.ozgcloud.api-lib</groupId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-actuator</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-data-mongodb</artifactId> + </dependency> + <dependency> + <groupId>org.springframework.cloud</groupId> + <artifactId>spring-cloud-starter-config</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.datatype</groupId> + <artifactId>jackson-datatype-jsr310</artifactId> + </dependency> + <dependency> + <groupId>org.mapstruct</groupId> + <artifactId>mapstruct</artifactId> + </dependency> + <dependency> + <groupId>com.schibsted.spt.data</groupId> + <artifactId>jslt</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-starter-test</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <artifactId>api-lib-core</artifactId> + <groupId>de.ozgcloud.api-lib</groupId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot-maven-plugin</artifactId> + <configuration> + <mainClass>de.ozgcloud.aggregation.AggregationManagerApplication</mainClass> + <image> + <env> + <BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS> + <BPE_APPEND_JAVA_TOOL_OPTIONS>-Dfile.encoding=UTF-8</BPE_APPEND_JAVA_TOOL_OPTIONS> + </env> + </image> + </configuration> + </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-failsafe-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + </plugin> + <plugin> + <groupId>com.mycila</groupId> + <artifactId>license-maven-plugin</artifactId> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file diff --git a/src/main/helm/.helmignore b/aggregation-manager-job/src/main/helm/.helmignore similarity index 100% rename from src/main/helm/.helmignore rename to aggregation-manager-job/src/main/helm/.helmignore diff --git a/src/main/helm/Chart.yaml b/aggregation-manager-job/src/main/helm/Chart.yaml similarity index 100% rename from src/main/helm/Chart.yaml rename to aggregation-manager-job/src/main/helm/Chart.yaml diff --git a/src/main/helm/templates/_helpers.tpl b/aggregation-manager-job/src/main/helm/templates/_helpers.tpl similarity index 100% rename from src/main/helm/templates/_helpers.tpl rename to aggregation-manager-job/src/main/helm/templates/_helpers.tpl diff --git a/src/main/helm/templates/configmap_bindings_type.yaml b/aggregation-manager-job/src/main/helm/templates/configmap_bindings_type.yaml similarity index 100% rename from src/main/helm/templates/configmap_bindings_type.yaml rename to aggregation-manager-job/src/main/helm/templates/configmap_bindings_type.yaml diff --git a/src/main/helm/templates/cronjob.yaml b/aggregation-manager-job/src/main/helm/templates/cronjob.yaml similarity index 100% rename from src/main/helm/templates/cronjob.yaml rename to aggregation-manager-job/src/main/helm/templates/cronjob.yaml diff --git a/src/main/helm/templates/network_policy.yaml b/aggregation-manager-job/src/main/helm/templates/network_policy.yaml similarity index 100% rename from src/main/helm/templates/network_policy.yaml rename to aggregation-manager-job/src/main/helm/templates/network_policy.yaml diff --git a/src/main/helm/templates/service.yaml b/aggregation-manager-job/src/main/helm/templates/service.yaml similarity index 100% rename from src/main/helm/templates/service.yaml rename to aggregation-manager-job/src/main/helm/templates/service.yaml diff --git a/src/main/helm/templates/service_account.yaml b/aggregation-manager-job/src/main/helm/templates/service_account.yaml similarity index 100% rename from src/main/helm/templates/service_account.yaml rename to aggregation-manager-job/src/main/helm/templates/service_account.yaml diff --git a/src/main/helm/templates/service_monitor.yaml b/aggregation-manager-job/src/main/helm/templates/service_monitor.yaml similarity index 100% rename from src/main/helm/templates/service_monitor.yaml rename to aggregation-manager-job/src/main/helm/templates/service_monitor.yaml diff --git a/src/main/helm/values.yaml b/aggregation-manager-job/src/main/helm/values.yaml similarity index 100% rename from src/main/helm/values.yaml rename to aggregation-manager-job/src/main/helm/values.yaml diff --git a/src/main/java/de/ozgcloud/aggregation/AggregationCallContext.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationCallContext.java similarity index 98% rename from src/main/java/de/ozgcloud/aggregation/AggregationCallContext.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationCallContext.java index aac2e2e..5971fb1 100644 --- a/src/main/java/de/ozgcloud/aggregation/AggregationCallContext.java +++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationCallContext.java @@ -1,26 +1,26 @@ -/* - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ +/* + * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den + * Ministerpräsidenten des Landes Schleswig-Holstein + * Staatskanzlei + * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung + * + * Lizenziert unter der EUPL, Version 1.2 oder - sobald + * diese von der Europäischen Kommission genehmigt wurden - + * Folgeversionen der EUPL ("Lizenz"); + * Sie dürfen dieses Werk ausschließlich gemäß + * dieser Lizenz nutzen. + * Eine Kopie der Lizenz finden Sie hier: + * + * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * Sofern nicht durch anwendbare Rechtsvorschriften + * gefordert oder in schriftlicher Form vereinbart, wird + * die unter der Lizenz verbreitete Software "so wie sie + * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - + * ausdrücklich oder stillschweigend - verbreitet. + * Die sprachspezifischen Genehmigungen und Beschränkungen + * unter der Lizenz sind dem Lizenztext zu entnehmen. + */ package de.ozgcloud.aggregation; import org.springframework.stereotype.Component; diff --git a/src/main/java/de/ozgcloud/aggregation/AggregationManagerApplication.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerApplication.java similarity index 97% rename from src/main/java/de/ozgcloud/aggregation/AggregationManagerApplication.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerApplication.java index 2790a8f..9d54963 100644 --- a/src/main/java/de/ozgcloud/aggregation/AggregationManagerApplication.java +++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerApplication.java @@ -1,49 +1,49 @@ -/* - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -package de.ozgcloud.aggregation; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.properties.ConfigurationPropertiesScan; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.EnableAspectJAutoProxy; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.annotation.EnableScheduling; - -import lombok.RequiredArgsConstructor; - -@SpringBootApplication -@EnableAsync -@EnableScheduling -@EnableAspectJAutoProxy(proxyTargetClass = true) -@ComponentScan({ "de.ozgcloud.*" }) -@ConfigurationPropertiesScan("de.ozgcloud.*") -@RequiredArgsConstructor -public class AggregationManagerApplication { - - public static void main(String[] args) { - SpringApplication.run(AggregationManagerApplication.class, args).close(); - } - +/* + * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den + * Ministerpräsidenten des Landes Schleswig-Holstein + * Staatskanzlei + * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung + * + * Lizenziert unter der EUPL, Version 1.2 oder - sobald + * diese von der Europäischen Kommission genehmigt wurden - + * Folgeversionen der EUPL ("Lizenz"); + * Sie dürfen dieses Werk ausschließlich gemäß + * dieser Lizenz nutzen. + * Eine Kopie der Lizenz finden Sie hier: + * + * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * Sofern nicht durch anwendbare Rechtsvorschriften + * gefordert oder in schriftlicher Form vereinbart, wird + * die unter der Lizenz verbreitete Software "so wie sie + * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - + * ausdrücklich oder stillschweigend - verbreitet. + * Die sprachspezifischen Genehmigungen und Beschränkungen + * unter der Lizenz sind dem Lizenztext zu entnehmen. + */ +package de.ozgcloud.aggregation; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.EnableAspectJAutoProxy; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; + +import lombok.RequiredArgsConstructor; + +@SpringBootApplication +@EnableAsync +@EnableScheduling +@EnableAspectJAutoProxy(proxyTargetClass = true) +@ComponentScan({ "de.ozgcloud.*" }) +@ConfigurationPropertiesScan("de.ozgcloud.*") +@RequiredArgsConstructor +public class AggregationManagerApplication { + + public static void main(String[] args) { + SpringApplication.run(AggregationManagerApplication.class, args).close(); + } + } \ No newline at end of file diff --git a/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java similarity index 97% rename from src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java index 16a2bcd..d4ac274 100644 --- a/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java +++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerConfiguration.java @@ -1,38 +1,38 @@ -/* - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -package de.ozgcloud.aggregation; - -import org.springframework.boot.context.properties.ConfigurationProperties; - -import lombok.Getter; -import lombok.Setter; - -@ConfigurationProperties(prefix = "aggregation-manager") -@Getter -@Setter -public class AggregationManagerConfiguration { - - private int fetchingBatchSize; - -} +/* + * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den + * Ministerpräsidenten des Landes Schleswig-Holstein + * Staatskanzlei + * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung + * + * Lizenziert unter der EUPL, Version 1.2 oder - sobald + * diese von der Europäischen Kommission genehmigt wurden - + * Folgeversionen der EUPL ("Lizenz"); + * Sie dürfen dieses Werk ausschließlich gemäß + * dieser Lizenz nutzen. + * Eine Kopie der Lizenz finden Sie hier: + * + * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * Sofern nicht durch anwendbare Rechtsvorschriften + * gefordert oder in schriftlicher Form vereinbart, wird + * die unter der Lizenz verbreitete Software "so wie sie + * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - + * ausdrücklich oder stillschweigend - verbreitet. + * Die sprachspezifischen Genehmigungen und Beschränkungen + * unter der Lizenz sind dem Lizenztext zu entnehmen. + */ +package de.ozgcloud.aggregation; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +import lombok.Getter; +import lombok.Setter; + +@ConfigurationProperties(prefix = "aggregation-manager") +@Getter +@Setter +public class AggregationManagerConfiguration { + + private int fetchingBatchSize; + +} diff --git a/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java similarity index 99% rename from src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java index 5a98db9..0d13fd9 100644 --- a/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java +++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerGrpcConfiguration.java @@ -1,26 +1,26 @@ -/* - * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ +/* + * Copyright (C) 2024 Das Land Schleswig-Holstein vertreten durch den + * Ministerpräsidenten des Landes Schleswig-Holstein + * Staatskanzlei + * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung + * + * Lizenziert unter der EUPL, Version 1.2 oder - sobald + * diese von der Europäischen Kommission genehmigt wurden - + * Folgeversionen der EUPL ("Lizenz"); + * Sie dürfen dieses Werk ausschließlich gemäß + * dieser Lizenz nutzen. + * Eine Kopie der Lizenz finden Sie hier: + * + * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * Sofern nicht durch anwendbare Rechtsvorschriften + * gefordert oder in schriftlicher Form vereinbart, wird + * die unter der Lizenz verbreitete Software "so wie sie + * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - + * ausdrücklich oder stillschweigend - verbreitet. + * Die sprachspezifischen Genehmigungen und Beschränkungen + * unter der Lizenz sind dem Lizenztext zu entnehmen. + */ package de.ozgcloud.aggregation; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/AggregationManagerRunner.java diff --git a/src/main/java/de/ozgcloud/aggregation/ConverterConfiguration.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/ConverterConfiguration.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/ConverterConfiguration.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/ConverterConfiguration.java diff --git a/src/main/java/de/ozgcloud/aggregation/TransformationProperties.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/TransformationProperties.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/TransformationProperties.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/TransformationProperties.java diff --git a/src/main/java/de/ozgcloud/aggregation/ZonedDateTimeReadConverter.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/ZonedDateTimeReadConverter.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/ZonedDateTimeReadConverter.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/ZonedDateTimeReadConverter.java diff --git a/src/main/java/de/ozgcloud/aggregation/ZonedDateTimeWriteConverter.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/ZonedDateTimeWriteConverter.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/ZonedDateTimeWriteConverter.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/ZonedDateTimeWriteConverter.java diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/AggregationMapping.java diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformation.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformation.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformation.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformation.java diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/JSLTransformationService.java diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/Transformation.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/Transformation.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/transformation/Transformation.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/Transformation.java diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/TransformationException.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/TransformationException.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/transformation/TransformationException.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/TransformationException.java diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/TransformationService.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/TransformationService.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/transformation/TransformationService.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/TransformationService.java diff --git a/src/main/java/de/ozgcloud/aggregation/transformation/VorgangMapper.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/VorgangMapper.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/transformation/VorgangMapper.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/transformation/VorgangMapper.java diff --git a/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentEntry.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentEntry.java similarity index 96% rename from src/main/java/de/ozgcloud/aggregation/warehouse/DocumentEntry.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentEntry.java index 0b17e77..6fde205 100644 --- a/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentEntry.java +++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentEntry.java @@ -1,52 +1,52 @@ -/* - * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -package de.ozgcloud.aggregation.warehouse; - -import java.time.ZonedDateTime; - -import org.springframework.data.annotation.Id; -import org.springframework.data.annotation.TypeAlias; -import org.springframework.data.mongodb.core.mapping.Document; - -import com.fasterxml.jackson.databind.node.ObjectNode; - -import lombok.Builder; -import lombok.Getter; - -@Document(collection = DocumentEntry.COLLECTION) -@Getter -@Builder -@TypeAlias("Vorgang") -public class DocumentEntry { - - static final String COLLECTION = "vorgang"; - - @Id - private String id; - - private String status; - private ZonedDateTime eingangsdatum; - private String vorgangsname; - private ObjectNode payload; -} +/* + * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den + * Ministerpräsidenten des Landes Schleswig-Holstein + * Staatskanzlei + * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung + * + * Lizenziert unter der EUPL, Version 1.2 oder - sobald + * diese von der Europäischen Kommission genehmigt wurden - + * Folgeversionen der EUPL ("Lizenz"); + * Sie dürfen dieses Werk ausschließlich gemäß + * dieser Lizenz nutzen. + * Eine Kopie der Lizenz finden Sie hier: + * + * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * Sofern nicht durch anwendbare Rechtsvorschriften + * gefordert oder in schriftlicher Form vereinbart, wird + * die unter der Lizenz verbreitete Software "so wie sie + * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - + * ausdrücklich oder stillschweigend - verbreitet. + * Die sprachspezifischen Genehmigungen und Beschränkungen + * unter der Lizenz sind dem Lizenztext zu entnehmen. + */ +package de.ozgcloud.aggregation.warehouse; + +import java.time.ZonedDateTime; + +import org.springframework.data.annotation.Id; +import org.springframework.data.annotation.TypeAlias; +import org.springframework.data.mongodb.core.mapping.Document; + +import com.fasterxml.jackson.databind.node.ObjectNode; + +import lombok.Builder; +import lombok.Getter; + +@Document(collection = DocumentEntry.COLLECTION) +@Getter +@Builder +@TypeAlias("Vorgang") +public class DocumentEntry { + + static final String COLLECTION = "vorgang"; + + @Id + private String id; + + private String status; + private ZonedDateTime eingangsdatum; + private String vorgangsname; + private ObjectNode payload; +} diff --git a/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentToJsonNodeConverter.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentToJsonNodeConverter.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/warehouse/DocumentToJsonNodeConverter.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/DocumentToJsonNodeConverter.java diff --git a/src/main/java/de/ozgcloud/aggregation/warehouse/JsonNodeToDocumentConverter.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/JsonNodeToDocumentConverter.java similarity index 100% rename from src/main/java/de/ozgcloud/aggregation/warehouse/JsonNodeToDocumentConverter.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/JsonNodeToDocumentConverter.java diff --git a/src/main/java/de/ozgcloud/aggregation/warehouse/WarehouseRepository.java b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/WarehouseRepository.java similarity index 97% rename from src/main/java/de/ozgcloud/aggregation/warehouse/WarehouseRepository.java rename to aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/WarehouseRepository.java index f8bef95..06edf8f 100644 --- a/src/main/java/de/ozgcloud/aggregation/warehouse/WarehouseRepository.java +++ b/aggregation-manager-job/src/main/java/de/ozgcloud/aggregation/warehouse/WarehouseRepository.java @@ -1,32 +1,32 @@ -/* - * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den - * Ministerpräsidenten des Landes Schleswig-Holstein - * Staatskanzlei - * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung - * - * Lizenziert unter der EUPL, Version 1.2 oder - sobald - * diese von der Europäischen Kommission genehmigt wurden - - * Folgeversionen der EUPL ("Lizenz"); - * Sie dürfen dieses Werk ausschließlich gemäß - * dieser Lizenz nutzen. - * Eine Kopie der Lizenz finden Sie hier: - * - * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 - * - * Sofern nicht durch anwendbare Rechtsvorschriften - * gefordert oder in schriftlicher Form vereinbart, wird - * die unter der Lizenz verbreitete Software "so wie sie - * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - - * ausdrücklich oder stillschweigend - verbreitet. - * Die sprachspezifischen Genehmigungen und Beschränkungen - * unter der Lizenz sind dem Lizenztext zu entnehmen. - */ -package de.ozgcloud.aggregation.warehouse; - -import org.springframework.data.mongodb.repository.MongoRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface WarehouseRepository extends MongoRepository<DocumentEntry, String> { - -} +/* + * Copyright (C) 2025 Das Land Schleswig-Holstein vertreten durch den + * Ministerpräsidenten des Landes Schleswig-Holstein + * Staatskanzlei + * Abteilung Digitalisierung und zentrales IT-Management der Landesregierung + * + * Lizenziert unter der EUPL, Version 1.2 oder - sobald + * diese von der Europäischen Kommission genehmigt wurden - + * Folgeversionen der EUPL ("Lizenz"); + * Sie dürfen dieses Werk ausschließlich gemäß + * dieser Lizenz nutzen. + * Eine Kopie der Lizenz finden Sie hier: + * + * https://joinup.ec.europa.eu/collection/eupl/eupl-text-eupl-12 + * + * Sofern nicht durch anwendbare Rechtsvorschriften + * gefordert oder in schriftlicher Form vereinbart, wird + * die unter der Lizenz verbreitete Software "so wie sie + * ist", OHNE JEGLICHE GEWÄHRLEISTUNG ODER BEDINGUNGEN - + * ausdrücklich oder stillschweigend - verbreitet. + * Die sprachspezifischen Genehmigungen und Beschränkungen + * unter der Lizenz sind dem Lizenztext zu entnehmen. + */ +package de.ozgcloud.aggregation.warehouse; + +import org.springframework.data.mongodb.repository.MongoRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface WarehouseRepository extends MongoRepository<DocumentEntry, String> { + +} diff --git a/src/main/resources/application-local.yml b/aggregation-manager-job/src/main/resources/application-local.yml similarity index 100% rename from src/main/resources/application-local.yml rename to aggregation-manager-job/src/main/resources/application-local.yml diff --git a/src/main/resources/application.yml b/aggregation-manager-job/src/main/resources/application.yml similarity index 100% rename from src/main/resources/application.yml rename to aggregation-manager-job/src/main/resources/application.yml diff --git a/src/test/helm-linter-values.yaml b/aggregation-manager-job/src/test/helm-linter-values.yaml similarity index 100% rename from src/test/helm-linter-values.yaml rename to aggregation-manager-job/src/test/helm-linter-values.yaml diff --git a/src/test/helm/configmap_bindings_type_test.yaml b/aggregation-manager-job/src/test/helm/configmap_bindings_type_test.yaml similarity index 100% rename from src/test/helm/configmap_bindings_type_test.yaml rename to aggregation-manager-job/src/test/helm/configmap_bindings_type_test.yaml diff --git a/src/test/helm/cronjob_database_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_database_test.yaml similarity index 100% rename from src/test/helm/cronjob_database_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_database_test.yaml diff --git a/src/test/helm/cronjob_defaults_labels_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_defaults_labels_test.yaml similarity index 100% rename from src/test/helm/cronjob_defaults_labels_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_defaults_labels_test.yaml diff --git a/src/test/helm/cronjob_env_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_env_test.yaml similarity index 100% rename from src/test/helm/cronjob_env_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_env_test.yaml diff --git a/src/test/helm/cronjob_image_pull_secret_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_image_pull_secret_test.yaml similarity index 100% rename from src/test/helm/cronjob_image_pull_secret_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_image_pull_secret_test.yaml diff --git a/src/test/helm/cronjob_resources_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_resources_test.yaml similarity index 100% rename from src/test/helm/cronjob_resources_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_resources_test.yaml diff --git a/src/test/helm/cronjob_service_account_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_service_account_test.yaml similarity index 100% rename from src/test/helm/cronjob_service_account_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_service_account_test.yaml diff --git a/src/test/helm/cronjob_spring_profile_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_spring_profile_test.yaml similarity index 100% rename from src/test/helm/cronjob_spring_profile_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_spring_profile_test.yaml diff --git a/src/test/helm/cronjob_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_test.yaml similarity index 100% rename from src/test/helm/cronjob_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_test.yaml diff --git a/src/test/helm/cronjob_volume_test.yaml b/aggregation-manager-job/src/test/helm/cronjob_volume_test.yaml similarity index 100% rename from src/test/helm/cronjob_volume_test.yaml rename to aggregation-manager-job/src/test/helm/cronjob_volume_test.yaml diff --git a/src/test/helm/network_policy_test.yaml b/aggregation-manager-job/src/test/helm/network_policy_test.yaml similarity index 100% rename from src/test/helm/network_policy_test.yaml rename to aggregation-manager-job/src/test/helm/network_policy_test.yaml diff --git a/src/test/helm/service_account_test.yaml b/aggregation-manager-job/src/test/helm/service_account_test.yaml similarity index 100% rename from src/test/helm/service_account_test.yaml rename to aggregation-manager-job/src/test/helm/service_account_test.yaml diff --git a/src/test/helm/service_monitor_test.yaml b/aggregation-manager-job/src/test/helm/service_monitor_test.yaml similarity index 100% rename from src/test/helm/service_monitor_test.yaml rename to aggregation-manager-job/src/test/helm/service_monitor_test.yaml diff --git a/src/test/helm/service_test.yaml b/aggregation-manager-job/src/test/helm/service_test.yaml similarity index 100% rename from src/test/helm/service_test.yaml rename to aggregation-manager-job/src/test/helm/service_test.yaml diff --git a/src/test/java/de/ozgcloud/aggregation/AggregationManagerApplicationTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerApplicationTest.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/AggregationManagerApplicationTest.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerApplicationTest.java diff --git a/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerITCase.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerITCase.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerITCase.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerITCase.java diff --git a/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/AggregationManagerRunnerTest.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/AggregationMappingTestFactory.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/AggregationMappingTestFactory.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/AggregationMappingTestFactory.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/AggregationMappingTestFactory.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/DotExpressionTestFactory.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/DotExpressionTestFactory.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/DotExpressionTestFactory.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/DotExpressionTestFactory.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/FieldMappingTestFactory.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/FieldMappingTestFactory.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/FieldMappingTestFactory.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/FieldMappingTestFactory.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/FormIdentifierTestFactory.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/FormIdentifierTestFactory.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/FormIdentifierTestFactory.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/FormIdentifierTestFactory.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/JSLTServiceITCase.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/JSLTServiceITCase.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/JSLTServiceITCase.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/JSLTServiceITCase.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationServiceTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationServiceTest.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationServiceTest.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationServiceTest.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationTest.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationTest.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/JSLTransformationTest.java diff --git a/src/test/java/de/ozgcloud/aggregation/transformation/VorgangMapperTest.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/VorgangMapperTest.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/transformation/VorgangMapperTest.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/transformation/VorgangMapperTest.java diff --git a/src/test/java/de/ozgcloud/aggregation/warehouse/DocumentEntryTestFactory.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/DocumentEntryTestFactory.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/warehouse/DocumentEntryTestFactory.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/DocumentEntryTestFactory.java diff --git a/src/test/java/de/ozgcloud/aggregation/warehouse/ObjectNodeTestFactory.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/ObjectNodeTestFactory.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/warehouse/ObjectNodeTestFactory.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/ObjectNodeTestFactory.java diff --git a/src/test/java/de/ozgcloud/aggregation/warehouse/WarehouseRepositoryITCase.java b/aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/WarehouseRepositoryITCase.java similarity index 100% rename from src/test/java/de/ozgcloud/aggregation/warehouse/WarehouseRepositoryITCase.java rename to aggregation-manager-job/src/test/java/de/ozgcloud/aggregation/warehouse/WarehouseRepositoryITCase.java diff --git a/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/aggregation-manager-job/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension similarity index 100% rename from src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension rename to aggregation-manager-job/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension diff --git a/src/test/resources/application-itcase.yml b/aggregation-manager-job/src/test/resources/application-itcase.yml similarity index 100% rename from src/test/resources/application-itcase.yml rename to aggregation-manager-job/src/test/resources/application-itcase.yml diff --git a/src/test/resources/junit-platform.properties b/aggregation-manager-job/src/test/resources/junit-platform.properties similarity index 100% rename from src/test/resources/junit-platform.properties rename to aggregation-manager-job/src/test/resources/junit-platform.properties diff --git a/pom.xml b/pom.xml index 305c056..e55344e 100644 --- a/pom.xml +++ b/pom.xml @@ -35,103 +35,46 @@ <relativePath /> </parent> <groupId>de.ozgcloud.aggregation</groupId> - <artifactId>aggregation-manager</artifactId> + <artifactId>aggregation-manager-parent</artifactId> <version>1.3.0-SNAPSHOT</version> <name>OZG-Cloud Aggregation Manager</name> <inceptionYear>2024</inceptionYear> + <packaging>pom</packaging> + <modules> + <module>aggregation-manager-job</module> + </modules> <properties> <ozgcloud.api-lib.version>0.18.0</ozgcloud.api-lib.version> <jslt.version>0.1.14</jslt.version> <hibernate-validator.version>8.0.2.Final</hibernate-validator.version> - <spring-boot.build-image.imageName>docker.ozg-sh.de/aggregation-manager:build-latest</spring-boot.build-image.imageName> </properties> - <dependencies> - <dependency> - <artifactId>ozg-cloud-spring-boot-starter</artifactId> - <groupId>de.ozgcloud.api-lib</groupId> - <version>${ozgcloud.api-lib.version}</version> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-actuator</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-mongodb</artifactId> - </dependency> - <dependency> - <groupId>org.springframework.cloud</groupId> - <artifactId>spring-cloud-starter-config</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-jsr310</artifactId> - </dependency> - <dependency> - <groupId>org.mapstruct</groupId> - <artifactId>mapstruct</artifactId> - </dependency> - <dependency> - <groupId>com.schibsted.spt.data</groupId> - <artifactId>jslt</artifactId> - <version>${jslt.version}</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <version>${hibernate-validator.version}</version> - </dependency> + <dependencyManagment> + <dependencies> + <dependency> + <artifactId>ozg-cloud-spring-boot-starter</artifactId> + <groupId>de.ozgcloud.api-lib</groupId> + <version>${ozgcloud.api-lib.version}</version> + </dependency> + <dependency> + <groupId>com.schibsted.spt.data</groupId> + <artifactId>jslt</artifactId> + <version>${jslt.version}</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>${hibernate-validator.version}</version> + </dependency> - <!-- Test dependencies --> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <artifactId>api-lib-core</artifactId> - <groupId>de.ozgcloud.api-lib</groupId> - <version>${ozgcloud.api-lib.version}</version> - <type>test-jar</type> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-maven-plugin</artifactId> - <configuration> - <mainClass>de.ozgcloud.aggregation.AggregationManagerApplication</mainClass> - <image> - <env> - <BPE_DELIM_JAVA_TOOL_OPTIONS xml:space="preserve"> </BPE_DELIM_JAVA_TOOL_OPTIONS> - <BPE_APPEND_JAVA_TOOL_OPTIONS>-Dfile.encoding=UTF-8</BPE_APPEND_JAVA_TOOL_OPTIONS> - </env> - </image> - </configuration> - </plugin> - <plugin> - <groupId>org.jacoco</groupId> - <artifactId>jacoco-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - </plugin> - <plugin> - <groupId>com.mycila</groupId> - <artifactId>license-maven-plugin</artifactId> - </plugin> - </plugins> - </build> + <!-- Test dependencies --> + <dependency> + <artifactId>api-lib-core</artifactId> + <groupId>de.ozgcloud.api-lib</groupId> + <version>${ozgcloud.api-lib.version}</version> + <type>test-jar</type> + <scope>test</scope> + </dependency> + </dependencies> + </dependencyManagment> </project> \ No newline at end of file -- GitLab