Merge branch 'main' into feat/PZ-4496-show-case-decision

infonl · Dec 4, 2024 · 2cb7745 · 2cb7745
2 parents 362d4ae + bac6cda
commit 2cb7745
Show file tree

Hide file tree

Showing 26 changed files with 83 additions and 30 deletions.
diff --git a/.licenserc.yaml b/.licenserc.yaml
@@ -20,7 +20,6 @@ header:
     - 'config'
     - 'docs'
     - 'gradle'
-    - 'helm'
     - 'scripts'
     - 'target'
     - 'wildfly-*'

diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -260,7 +260,7 @@ services:
       - "8181:8181"
 
   openldap:
-    image: docker.io/bitnami/openldap:2.6.8@sha256:ef16af5f5565168fd77b3f728b3e4dc51538f80ea4c736af2c288eb55900b5c6
+    image: docker.io/bitnami/openldap:2.6.9@sha256:8e3f28db7a8c05d7db99ec688b8ca1044f0deaf8f98ea5b1f71c42276e3c1583
     ports:
       - "1389:1389"
       - "1636:1636"

diff --git a/helm/Chart.lock b/helm/Chart.lock
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 dependencies:
 - name: opentelemetry-collector
   repository: https://open-telemetry.github.io/opentelemetry-helm-charts

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -1,5 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2024 Lifely
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
 # SPDX-License-Identifier: EUPL-1.2+
 #
 apiVersion: v2

diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt
diff --git a/helm/templates/_helpers.tpl b/helm/templates/_helpers.tpl
@@ -1,3 +1,8 @@
+{{/*
+ SPDX-FileCopyrightText: 2024 Lifely
+ SPDX-License-Identifier: EUPL-1.2+
+*/}}
+
 {{/*
 Expand the name of the chart.
 */}}

diff --git a/helm/templates/config.yaml b/helm/templates/config.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/helm/templates/configmap-nginx.yaml b/helm/templates/configmap-nginx.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+  # SPDX-License-Identifier: EUPL-1.2+
+  #
 {{- if not .Values.nginx.existingConfigmap }}
 {{- if .Values.nginx.enabled }}
 apiVersion: v1

diff --git a/helm/templates/deployment.yaml b/helm/templates/deployment.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/helm/templates/extra-deploy.yaml b/helm/templates/extra-deploy.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- range .Values.extraDeploy }}
 ---
 {{ include "common.tplvalues.render" (dict "value" . "context" $) }}

diff --git a/helm/templates/hpa.yaml b/helm/templates/hpa.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- if .Values.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler

diff --git a/helm/templates/ingress.yaml b/helm/templates/ingress.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "zaakafhandelcomponent.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}

diff --git a/helm/templates/nginx-deployment.yaml b/helm/templates/nginx-deployment.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- if .Values.nginx.enabled }}
 apiVersion: apps/v1
 kind: Deployment

diff --git a/helm/templates/nginx-service.yaml b/helm/templates/nginx-service.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- if .Values.nginx.enabled }}
 apiVersion: v1
 kind: Service

diff --git a/helm/templates/office-converter-deployment.yaml b/helm/templates/office-converter-deployment.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: apps/v1
 kind: Deployment
 metadata:

diff --git a/helm/templates/office-converter-service.yaml b/helm/templates/office-converter-service.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/helm/templates/opa-deployment.yaml b/helm/templates/opa-deployment.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- if .Values.opa.enabled }}
 {{- if not .Values.opa.sidecar }}
 apiVersion: apps/v1

diff --git a/helm/templates/opa-service.yaml b/helm/templates/opa-service.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- if .Values.opa.enabled }}
 {{- if not .Values.opa.sidecar }}
 apiVersion: v1

diff --git a/helm/templates/secret.yaml b/helm/templates/secret.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: v1
 kind: Secret
 metadata:

diff --git a/helm/templates/service.yaml b/helm/templates/service.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: v1
 kind: Service
 metadata:

diff --git a/helm/templates/serviceaccount.yaml b/helm/templates/serviceaccount.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount

diff --git a/helm/templates/signaleren-cron-job.yaml b/helm/templates/signaleren-cron-job.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: batch/v1
 kind: CronJob
 metadata:

diff --git a/helm/templates/signaleren-delete-cron-job.yaml b/helm/templates/signaleren-delete-cron-job.yaml
@@ -1,3 +1,7 @@
+#
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
+# SPDX-License-Identifier: EUPL-1.2+
+#
 apiVersion: batch/v1
 kind: CronJob
 metadata:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -1,5 +1,5 @@
 #
-# SPDX-FileCopyrightText: 2024 Lifely
+# SPDX-FileCopyrightText: 2022 Atos, 2024 Lifely
 # SPDX-License-Identifier: EUPL-1.2+
 #
 

diff --git a/publiccode.yaml b/publiccode.yaml
@@ -10,7 +10,7 @@ publiccodeYmlVersion: "0.4"
 
 name: Dimpact Zaakafhandelcomponent (ZAC)
 url: "git://github.com/infonl/dimpact-zaakafhandelcomponent.git"
-softwareVersion: "1.11.80"
+softwareVersion: "1.11.83"
 releaseDate: "2024-12-04"
 
 platforms:

diff --git a/src/main/kotlin/net/atos/zac/admin/ZaakafhandelParameterBeheerService.kt b/src/main/kotlin/net/atos/zac/admin/ZaakafhandelParameterBeheerService.kt
@@ -135,7 +135,7 @@ class ZaakafhandelParameterBeheerService @Inject constructor(
      * @param zaaktypeUri uri of the new zaaktype
      */
     fun createNewZaakafhandelParametersOnZaakTypeChange(zaaktypeUri: URI) {
-        // if we already have a zaakafhandelparameters for this zaaktype UUID, so do not attempt to create a new one
+        // if we already have a zaakafhandelparameters for this zaaktype UUID, do not attempt to create a new one
         if (listZaakafhandelParametersForZaaktypeUuid(zaaktypeUri.extractUuid()).isNotEmpty()) return
 
         ztcClientService.readZaaktype(zaaktypeUri).takeIf { !it.concept }?.let { zaaktype ->
@@ -169,8 +169,7 @@ class ZaakafhandelParameterBeheerService @Inject constructor(
         val builder = entityManager.criteriaBuilder
         val query = builder.createQuery(ZaakafhandelParameters::class.java)
         val root = query.from(ZaakafhandelParameters::class.java)
-        query.select(root)
-            .where(builder.equal(root.get<Any>(ZAAKTYPE_OMSCHRIJVING), zaaktypeDescription))
+        query.select(root).where(builder.equal(root.get<Any>(ZAAKTYPE_OMSCHRIJVING), zaaktypeDescription))
         query.orderBy(builder.desc(root.get<Any>(CREATIEDATUM)))
         val resultList = entityManager.createQuery(query).setMaxResults(1).resultList
         return if (resultList.isNotEmpty()) {