From 508f4965a3d288c7e391c40743a530c13d645596 Mon Sep 17 00:00:00 2001 From: pmortas Date: Fri, 7 Oct 2022 16:26:01 +0200 Subject: [PATCH 1/8] remove update stanza --- psc-api-maj.nomad.tpl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/psc-api-maj.nomad.tpl b/psc-api-maj.nomad.tpl index 77fae8a..40f962c 100644 --- a/psc-api-maj.nomad.tpl +++ b/psc-api-maj.nomad.tpl @@ -22,13 +22,6 @@ job "psc-api-maj-v2" { mode = "fail" } - update { - max_parallel = 1 - min_healthy_time = "30s" - progress_deadline = "5m" - healthy_deadline = "2m" - } - network { port "http" { to = 8080 From 8a57f30d8060ddc1965fdb2ef826f3b8744679a4 Mon Sep 17 00:00:00 2001 From: pmortas Date: Thu, 10 Nov 2022 16:34:53 +0100 Subject: [PATCH 2/8] test filebeat with monitoring --- psc-api-maj.nomad.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psc-api-maj.nomad.tpl b/psc-api-maj.nomad.tpl index 898d75e..20f353d 100644 --- a/psc-api-maj.nomad.tpl +++ b/psc-api-maj.nomad.tpl @@ -140,7 +140,7 @@ EOH env = true } config { - image = "prosanteconnect/filebeat:7.14.2" + image = "prosanteconnect/filebeat:7.17.0" } } } From 2425fd15fc7a7561df9867864bd9c38f172391f1 Mon Sep 17 00:00:00 2001 From: pmortas Date: Thu, 10 Nov 2022 16:46:46 +0100 Subject: [PATCH 3/8] add log-shipper service --- psc-api-maj.nomad.tpl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/psc-api-maj.nomad.tpl b/psc-api-maj.nomad.tpl index 20f353d..573791d 100644 --- a/psc-api-maj.nomad.tpl +++ b/psc-api-maj.nomad.tpl @@ -28,6 +28,9 @@ job "psc-api-maj-v2" { port "http" { to = 8080 } + port "monitoring" { + to = 5066 + } } scaling { @@ -141,6 +144,16 @@ EOH } config { image = "prosanteconnect/filebeat:7.17.0" + ports = [ + "monitoring"] + } + service { + name = "log-shipper" + port = "monitoring" + check { + type = "tcp" + port = "monitoring" + } } } } From d7229732c06e1d41aadf715a158a17b93dc87b05 Mon Sep 17 00:00:00 2001 From: pmortas Date: Thu, 10 Nov 2022 16:50:04 +0100 Subject: [PATCH 4/8] fix interval error --- psc-api-maj.nomad.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/psc-api-maj.nomad.tpl b/psc-api-maj.nomad.tpl index 573791d..953cf21 100644 --- a/psc-api-maj.nomad.tpl +++ b/psc-api-maj.nomad.tpl @@ -153,6 +153,8 @@ EOH check { type = "tcp" port = "monitoring" + interval = "30s" + timeout = "2s" } } } From 5b2111526417ae5ed5576120479d5282d2588607 Mon Sep 17 00:00:00 2001 From: pmortas Date: Thu, 10 Nov 2022 17:27:49 +0100 Subject: [PATCH 5/8] rename port --- psc-api-maj.nomad.tpl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/psc-api-maj.nomad.tpl b/psc-api-maj.nomad.tpl index 953cf21..6f3547f 100644 --- a/psc-api-maj.nomad.tpl +++ b/psc-api-maj.nomad.tpl @@ -28,7 +28,7 @@ job "psc-api-maj-v2" { port "http" { to = 8080 } - port "monitoring" { + port "filebeat" { to = 5066 } } @@ -145,14 +145,14 @@ EOH config { image = "prosanteconnect/filebeat:7.17.0" ports = [ - "monitoring"] + "filebeat"] } service { name = "log-shipper" - port = "monitoring" + port = "filebeat" check { type = "tcp" - port = "monitoring" + port = "filebeat" interval = "30s" timeout = "2s" } From 328dafd389a7d6b42625868441917ef66b9bc623 Mon Sep 17 00:00:00 2001 From: pmortas Date: Tue, 29 Nov 2022 17:09:35 +0100 Subject: [PATCH 6/8] add sidecar task to export filebeat metrics in prometheus format --- psc-api-maj.nomad.tpl | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/psc-api-maj.nomad.tpl b/psc-api-maj.nomad.tpl index 6f3547f..dc9126d 100644 --- a/psc-api-maj.nomad.tpl +++ b/psc-api-maj.nomad.tpl @@ -31,6 +31,9 @@ job "psc-api-maj-v2" { port "filebeat" { to = 5066 } + port "exporter" { + to = 8088 + } } scaling { @@ -158,5 +161,41 @@ EOH } } } + task "beats-exporter" { + lifecycle { + hook = "poststart" + sidecar = true + } + driver = "docker" + config { + image = "prosanteconnect/beats-exporter" + args = [ + "-m=8088" + ] + ports = [ + "exporter" + ] + } + env { + ADDRESSES_TO_SCRAPE = "$\u007BNOMAD_ADDR_filebeat\u007D" + } + resources { + cpu = 100 + memory = 32 + } + + service { + name = "$\u007BNOMAD_JOB_NAME\u007D" + port = "exporter" + check { + name = "log-exporter alive" + type = "http" + path = "/metrics" + interval = "30s" + timeout = "2s" + failures_before_critical = 5 + } + } + } } } From fcb19267a904287237a8a80c84c140ac74785020 Mon Sep 17 00:00:00 2001 From: pmortas Date: Tue, 29 Nov 2022 17:28:33 +0100 Subject: [PATCH 7/8] change service name to match task --- psc-api-maj.nomad.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psc-api-maj.nomad.tpl b/psc-api-maj.nomad.tpl index dc9126d..6cbd957 100644 --- a/psc-api-maj.nomad.tpl +++ b/psc-api-maj.nomad.tpl @@ -185,7 +185,7 @@ EOH } service { - name = "$\u007BNOMAD_JOB_NAME\u007D" + name = "$\u007BNOMAD_TASK_NAME\u007D" port = "exporter" check { name = "log-exporter alive" From 1a7e64b31a6501b9a42cafdbc98c9d5d775b90b9 Mon Sep 17 00:00:00 2001 From: bbo Date: Mon, 30 Oct 2023 16:38:26 +0100 Subject: [PATCH 8/8] - rm deprecated Dockerfile - add license headers --- .mvn/wrapper/MavenWrapperDownloader.java | 6 +- Dockerfile | 3 +- Dockerfile.ext | 11 - LICENSE.txt | 201 ++++++++++++++++++ mvnw.cmd | 29 ++- pom.xml | 48 ++++- settings-docker.xml | 14 -- .../java/fr/ans/psc/PscApiMajApplication.java | 15 ++ .../psc/config/OpenApiDocketConfigurer.java | 15 ++ .../fr/ans/psc/config/ValidatorConfig.java | 15 ++ .../RestResponseEntityExceptionHandler.java | 16 +- .../ans/psc/delegate/PsApiDelegateImpl.java | 15 ++ .../psc/delegate/ToggleApiDelegateImpl.java | 15 ++ src/main/java/fr/ans/psc/model/Error.java | 15 ++ src/main/java/fr/ans/psc/model/Expertise.java | 15 ++ src/main/java/fr/ans/psc/model/FirstName.java | 15 ++ .../java/fr/ans/psc/model/Profession.java | 15 ++ src/main/java/fr/ans/psc/model/Ps.java | 15 ++ src/main/java/fr/ans/psc/model/PsRef.java | 15 ++ src/main/java/fr/ans/psc/model/Structure.java | 15 ++ .../java/fr/ans/psc/model/WorkSituation.java | 15 ++ .../fr/ans/psc/repository/PsRepository.java | 15 ++ .../psc/repository/StructureRepository.java | 15 ++ src/main/java/fr/ans/psc/utils/ApiUtils.java | 15 ++ .../PscApiMajV2ApplicationTests.java | 15 ++ .../pscapimajv2/api/BaseOperationTest.java | 15 ++ .../psc/pscapimajv2/api/PsOperationTest.java | 15 ++ .../pscapimajv2/api/ToggleOperationTest.java | 15 ++ .../psc/pscapimajv2/utils/MemoryAppender.java | 15 ++ waypoint.hcl | 2 +- 30 files changed, 595 insertions(+), 50 deletions(-) delete mode 100644 Dockerfile.ext create mode 100644 LICENSE.txt delete mode 100644 settings-docker.xml diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java index e76d1f3..3902461 100644 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ b/.mvn/wrapper/MavenWrapperDownloader.java @@ -1,11 +1,11 @@ -/* - * Copyright 2007-present the original author or authors. +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * https://www.apache.org/licenses/LICENSE-2.0 + * 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, diff --git a/Dockerfile b/Dockerfile index e4f6fed..f765480 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,8 @@ FROM maven:3-jdk-11 AS build -COPY settings-docker.xml /usr/share/maven/ref/ COPY src /usr/src/app/src COPY pom.xml /usr/src/app COPY .openapi-generator-ignore /usr/src/app -RUN mvn -f /usr/src/app/pom.xml -gs /usr/share/maven/ref/settings-docker.xml clean package +RUN mvn -f /usr/src/app/pom.xml clean package FROM openjdk:11-slim-buster COPY --from=build /usr/src/app/target/psc-api-maj-*.jar /usr/app/psc-api-maj.jar diff --git a/Dockerfile.ext b/Dockerfile.ext deleted file mode 100644 index f765480..0000000 --- a/Dockerfile.ext +++ /dev/null @@ -1,11 +0,0 @@ -FROM maven:3-jdk-11 AS build -COPY src /usr/src/app/src -COPY pom.xml /usr/src/app -COPY .openapi-generator-ignore /usr/src/app -RUN mvn -f /usr/src/app/pom.xml clean package - -FROM openjdk:11-slim-buster -COPY --from=build /usr/src/app/target/psc-api-maj-*.jar /usr/app/psc-api-maj.jar -USER daemon -EXPOSE 8080 -ENTRYPOINT ["java","-jar","/usr/app/psc-api-maj.jar"] diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..f04bf9f --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2022-2023 Agence du Numérique en Santé (ANS) + + 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. \ No newline at end of file diff --git a/mvnw.cmd b/mvnw.cmd index c8d4337..69c71f3 100644 --- a/mvnw.cmd +++ b/mvnw.cmd @@ -1,21 +1,18 @@ -@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 https://www.apache.org/licenses/LICENSE-2.0 +@REM Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) +@REM +@REM Licensed under the Apache License, Version 2.0 (the "License"); +@REM you may not use this file except in compliance with the License. +@REM You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, software +@REM distributed under the License is distributed on an "AS IS" BASIS, +@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@REM See the License for the specific language governing permissions and +@REM limitations under the License. @REM -@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 Maven Start Up Batch script diff --git a/pom.xml b/pom.xml index 3da3468..bffbad6 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,21 @@ + @@ -14,6 +31,7 @@ 2.0.1-SNAPSHOT psc-api-maj-v2 API for PS CRUD + 2022-2023 @@ -235,7 +253,35 @@ - + + + com.mycila + license-maven-plugin + 2.11 + +
com/mycila/maven/plugin/license/templates/APACHE-2.txt
+ + Agence du Numérique en Santé (ANS) + https://esante.gouv.fr + + + LICENSE.txt + Dockerfile + **/README + src/main/packaging/** + src/test/resources/** + src/main/resources/** + src/main/webapp/** + node_modules/** + dist/** + .tmp/** + settings-docker.xml + **/*.properties + .github/** + + + + org.asciidoctor asciidoctor-maven-plugin diff --git a/settings-docker.xml b/settings-docker.xml deleted file mode 100644 index 35ea698..0000000 --- a/settings-docker.xml +++ /dev/null @@ -1,14 +0,0 @@ - - /usr/share/maven/ref/repository - - - artifactory - * - ASIP repository. - http://repo.proxy-dev-forge.asip.hst.fluxus.net/artifactory/repo-tnr/ - - - diff --git a/src/main/java/fr/ans/psc/PscApiMajApplication.java b/src/main/java/fr/ans/psc/PscApiMajApplication.java index 6b4cdc2..9b9353f 100644 --- a/src/main/java/fr/ans/psc/PscApiMajApplication.java +++ b/src/main/java/fr/ans/psc/PscApiMajApplication.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/fr/ans/psc/config/OpenApiDocketConfigurer.java b/src/main/java/fr/ans/psc/config/OpenApiDocketConfigurer.java index 1854dcb..9d2eb48 100644 --- a/src/main/java/fr/ans/psc/config/OpenApiDocketConfigurer.java +++ b/src/main/java/fr/ans/psc/config/OpenApiDocketConfigurer.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.config; diff --git a/src/main/java/fr/ans/psc/config/ValidatorConfig.java b/src/main/java/fr/ans/psc/config/ValidatorConfig.java index 0eef693..f664a69 100644 --- a/src/main/java/fr/ans/psc/config/ValidatorConfig.java +++ b/src/main/java/fr/ans/psc/config/ValidatorConfig.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.config; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/fr/ans/psc/controller/RestResponseEntityExceptionHandler.java b/src/main/java/fr/ans/psc/controller/RestResponseEntityExceptionHandler.java index e65bf96..c87127f 100644 --- a/src/main/java/fr/ans/psc/controller/RestResponseEntityExceptionHandler.java +++ b/src/main/java/fr/ans/psc/controller/RestResponseEntityExceptionHandler.java @@ -1,5 +1,17 @@ -/* - * (c) Copyright 1998-2021, ANS. All rights reserved. +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. */ package fr.ans.psc.controller; diff --git a/src/main/java/fr/ans/psc/delegate/PsApiDelegateImpl.java b/src/main/java/fr/ans/psc/delegate/PsApiDelegateImpl.java index dd7ab65..7fae39d 100644 --- a/src/main/java/fr/ans/psc/delegate/PsApiDelegateImpl.java +++ b/src/main/java/fr/ans/psc/delegate/PsApiDelegateImpl.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.delegate; import fr.ans.psc.api.PsApiDelegate; diff --git a/src/main/java/fr/ans/psc/delegate/ToggleApiDelegateImpl.java b/src/main/java/fr/ans/psc/delegate/ToggleApiDelegateImpl.java index 68d45c0..88f232e 100644 --- a/src/main/java/fr/ans/psc/delegate/ToggleApiDelegateImpl.java +++ b/src/main/java/fr/ans/psc/delegate/ToggleApiDelegateImpl.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.delegate; import fr.ans.psc.api.ToggleApiDelegate; diff --git a/src/main/java/fr/ans/psc/model/Error.java b/src/main/java/fr/ans/psc/model/Error.java index f37559f..4c1e695 100644 --- a/src/main/java/fr/ans/psc/model/Error.java +++ b/src/main/java/fr/ans/psc/model/Error.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import java.util.Objects; diff --git a/src/main/java/fr/ans/psc/model/Expertise.java b/src/main/java/fr/ans/psc/model/Expertise.java index e3e831c..5be2324 100644 --- a/src/main/java/fr/ans/psc/model/Expertise.java +++ b/src/main/java/fr/ans/psc/model/Expertise.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import java.util.Objects; diff --git a/src/main/java/fr/ans/psc/model/FirstName.java b/src/main/java/fr/ans/psc/model/FirstName.java index 1e2839e..258a7d7 100644 --- a/src/main/java/fr/ans/psc/model/FirstName.java +++ b/src/main/java/fr/ans/psc/model/FirstName.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/fr/ans/psc/model/Profession.java b/src/main/java/fr/ans/psc/model/Profession.java index 54a9844..fbcb4e2 100644 --- a/src/main/java/fr/ans/psc/model/Profession.java +++ b/src/main/java/fr/ans/psc/model/Profession.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import java.util.Objects; diff --git a/src/main/java/fr/ans/psc/model/Ps.java b/src/main/java/fr/ans/psc/model/Ps.java index 0d31e40..3d0ea65 100644 --- a/src/main/java/fr/ans/psc/model/Ps.java +++ b/src/main/java/fr/ans/psc/model/Ps.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import java.util.ArrayList; diff --git a/src/main/java/fr/ans/psc/model/PsRef.java b/src/main/java/fr/ans/psc/model/PsRef.java index 6df5972..5185261 100644 --- a/src/main/java/fr/ans/psc/model/PsRef.java +++ b/src/main/java/fr/ans/psc/model/PsRef.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import java.util.Objects; diff --git a/src/main/java/fr/ans/psc/model/Structure.java b/src/main/java/fr/ans/psc/model/Structure.java index 44782f6..ff56d8b 100644 --- a/src/main/java/fr/ans/psc/model/Structure.java +++ b/src/main/java/fr/ans/psc/model/Structure.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/fr/ans/psc/model/WorkSituation.java b/src/main/java/fr/ans/psc/model/WorkSituation.java index 810d3a4..d5e190f 100644 --- a/src/main/java/fr/ans/psc/model/WorkSituation.java +++ b/src/main/java/fr/ans/psc/model/WorkSituation.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.model; import java.util.Objects; diff --git a/src/main/java/fr/ans/psc/repository/PsRepository.java b/src/main/java/fr/ans/psc/repository/PsRepository.java index 9642cca..ff9cd20 100644 --- a/src/main/java/fr/ans/psc/repository/PsRepository.java +++ b/src/main/java/fr/ans/psc/repository/PsRepository.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.repository; import fr.ans.psc.model.Ps; diff --git a/src/main/java/fr/ans/psc/repository/StructureRepository.java b/src/main/java/fr/ans/psc/repository/StructureRepository.java index 445aa3f..c477e95 100644 --- a/src/main/java/fr/ans/psc/repository/StructureRepository.java +++ b/src/main/java/fr/ans/psc/repository/StructureRepository.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ //package fr.ans.psc.repository; // //import fr.ans.psc.model.Structure; diff --git a/src/main/java/fr/ans/psc/utils/ApiUtils.java b/src/main/java/fr/ans/psc/utils/ApiUtils.java index e3b3374..8c7a520 100644 --- a/src/main/java/fr/ans/psc/utils/ApiUtils.java +++ b/src/main/java/fr/ans/psc/utils/ApiUtils.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.utils; import fr.ans.psc.model.Ps; diff --git a/src/test/java/fr/ans/psc/pscapimajv2/PscApiMajV2ApplicationTests.java b/src/test/java/fr/ans/psc/pscapimajv2/PscApiMajV2ApplicationTests.java index 6ea813c..d3e59f1 100644 --- a/src/test/java/fr/ans/psc/pscapimajv2/PscApiMajV2ApplicationTests.java +++ b/src/test/java/fr/ans/psc/pscapimajv2/PscApiMajV2ApplicationTests.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.pscapimajv2; import fr.ans.psc.PscApiMajApplication; diff --git a/src/test/java/fr/ans/psc/pscapimajv2/api/BaseOperationTest.java b/src/test/java/fr/ans/psc/pscapimajv2/api/BaseOperationTest.java index 9ac4b3a..c1fab2f 100644 --- a/src/test/java/fr/ans/psc/pscapimajv2/api/BaseOperationTest.java +++ b/src/test/java/fr/ans/psc/pscapimajv2/api/BaseOperationTest.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.pscapimajv2.api; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java b/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java index 2297772..f279454 100644 --- a/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java +++ b/src/test/java/fr/ans/psc/pscapimajv2/api/PsOperationTest.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.pscapimajv2.api; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java b/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java index 07c3db9..a3fa158 100644 --- a/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java +++ b/src/test/java/fr/ans/psc/pscapimajv2/api/ToggleOperationTest.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.pscapimajv2.api; import ch.qos.logback.classic.Level; diff --git a/src/test/java/fr/ans/psc/pscapimajv2/utils/MemoryAppender.java b/src/test/java/fr/ans/psc/pscapimajv2/utils/MemoryAppender.java index b18c3d2..31294b2 100644 --- a/src/test/java/fr/ans/psc/pscapimajv2/utils/MemoryAppender.java +++ b/src/test/java/fr/ans/psc/pscapimajv2/utils/MemoryAppender.java @@ -1,3 +1,18 @@ +/** + * Copyright (C) 2022-2023 Agence du Numérique en Santé (ANS) (https://esante.gouv.fr) + * + * 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. + */ package fr.ans.psc.pscapimajv2.utils; import ch.qos.logback.classic.Level; diff --git a/waypoint.hcl b/waypoint.hcl index c40f821..2c6df65 100644 --- a/waypoint.hcl +++ b/waypoint.hcl @@ -84,5 +84,5 @@ variable "proxy_address" { variable "dockerfile_path" { type = string - default = "Dockerfile.ext" + default = "Dockerfile" }