refactor: Move microservice classes from app to root folder (#397)

pagopa · Oct 3, 2024 · 8bff0b9 · 8bff0b9
1 parent 02e08d4
commit 8bff0b9
Show file tree

Hide file tree

Showing 365 changed files with 302 additions and 311 deletions.
diff --git a/.github/workflows/release_ms.yml b/.github/workflows/release_ms.yml
@@ -35,6 +35,7 @@ jobs:
       environment: dev
       tf_environment: dev
       dir: 'infra/container_apps'
+      path_openapi_docs: src/main/resources/swagger/api-docs.json
 
   release_uat:
     uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
@@ -45,6 +46,7 @@ jobs:
       environment: uat
       tf_environment: uat
       dir: 'infra/container_apps'
+      path_openapi_docs: src/main/resources/swagger/api-docs.json
 
   release_prod:
     uses: pagopa/selfcare-commons/.github/workflows/call_release_docker.yml@main
@@ -55,6 +57,7 @@ jobs:
       environment: prod
       tf_environment: prod
       dir: 'infra/container_apps'
+      path_openapi_docs: src/main/resources/swagger/api-docs.json
 
   promote_release:
     name: 'Promote prerelase release'

diff --git a/.github/workflows/release_open_api.yml b/.github/workflows/release_open_api.yml
@@ -24,5 +24,5 @@ jobs:
       - id: swagger-detect
         uses: pagopa/selfcare-commons/github-actions-template/swagger-detect-conflict-spring@main
         with:
-          path_openapi_docs: app/src/main/resources/swagger/api-docs.json
+          path_openapi_docs: src/main/resources/swagger/api-docs.json
           github_token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitignore b/.gitignore
@@ -41,9 +41,9 @@ build/
 ### VS Code ###
 .vscode/
 
-app/src/main/resources/.DS_Store
-app/src/main/.DS_Store
-app/src/.DS_Store
+src/main/resources/.DS_Store
+src/main/.DS_Store
+src/.DS_Store
 app/.DS_Store
 .DS_Store
 

diff --git a/.opex/api-selfcare-external-api-pnpg/env/prod/config.yaml b/.opex/api-selfcare-external-api-pnpg/env/prod/config.yaml
@@ -1,4 +1,4 @@
-oa3_spec: app/src/main/resources/swagger/api-docs.json
+oa3_spec: src/main/resources/swagger/api-docs.json
 name: opex_api-external-api-pnpg
 location: West Europe
 timespan: 30m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan

diff --git a/.opex/api-selfcare-external-api/env/prod/config.yaml b/.opex/api-selfcare-external-api/env/prod/config.yaml
@@ -1,4 +1,4 @@
-oa3_spec: app/src/main/resources/swagger/api-docs.json
+oa3_spec: src/main/resources/swagger/api-docs.json
 name: opex_api-external-api
 location: West Europe
 timespan: 30m # Default, a number or a timespan https://docs.microsoft.com/en-us/azure/data-explorer/kusto/query/scalar-data-types/timespan

diff --git a/Dockerfile.new b/Dockerfile.new
@@ -24,7 +24,7 @@ ENV LANG='en_US.UTF-8' LANGUAGE='en_US:en'
 
 WORKDIR /app
 
-COPY --from=builder ./app/target/*-FATJAR.jar ./app.jar
+COPY --from=builder ./target/*.jar ./app.jar
 
 ADD https://github.com/microsoft/ApplicationInsights-Java/releases/download/3.2.11/applicationinsights-agent-3.2.11.jar ./applicationinsights-agent.jar
 RUN chmod 755 ./applicationinsights-agent.jar

diff --git a/app/pom.xml b/app/pom.xml
diff --git a/infra/apim_v2/api/external_api_contract/v1/openapi_merge/openapi_merge.json b/infra/apim_v2/api/external_api_contract/v1/openapi_merge/openapi_merge.json
@@ -7,7 +7,7 @@
           "inputFile": "./openapi_template.json"
         },
         {
-          "inputFile": "../../../../../../app/src/main/resources/swagger/api-docs.json",
+          "inputFile": "../../../../../../src/main/resources/swagger/api-docs.json",
           "operationSelection": {
             "includeTags": ["contract"]
           }

diff --git a/infra/apim_v2/api/ms_external_api/v2/openapi_merge/openapi_merge.json b/infra/apim_v2/api/ms_external_api/v2/openapi_merge/openapi_merge.json
@@ -7,7 +7,7 @@
           "inputFile": "./openapi_template.json"
         },
         {
-          "inputFile": "../../../../../../app/src/main/resources/swagger/api-docs.json",
+          "inputFile": "../../../../../../src/main/resources/swagger/api-docs.json",
           "operationSelection": {
             "includeTags": ["external-v2"]
           }

diff --git a/infra/apim_v2/api/ms_internal_api/v1/openapi_merge/openapi_merge.json b/infra/apim_v2/api/ms_internal_api/v1/openapi_merge/openapi_merge.json
@@ -7,7 +7,7 @@
           "inputFile": "./openapi_template.json"
         },
         {
-          "inputFile": "../../../../../../app/src/main/resources/swagger/api-docs.json",
+          "inputFile": "../../../../../../src/main/resources/swagger/api-docs.json",
           "operationSelection": {
             "includeTags": ["internal-v1"]
           }

diff --git a/infra/apim_v2/api/selfcare_support_service/v1/openapi_merge/openapi_merge.json b/infra/apim_v2/api/selfcare_support_service/v1/openapi_merge/openapi_merge.json
@@ -7,7 +7,7 @@
           "inputFile": "./openapi_template.json"
         },
         {
-          "inputFile": "../../../../../../app/src/main/resources/swagger/api-docs.json",
+          "inputFile": "../../../../../../src/main/resources/swagger/api-docs.json",
           "operationSelection": {
             "includeTags": ["support"]
           }