diff --git a/.gitlab-ci/deploy.yml b/.gitlab-ci/deploy.yml index 320cf7fcdf..1b513dab27 100644 --- a/.gitlab-ci/deploy.yml +++ b/.gitlab-ci/deploy.yml @@ -150,6 +150,7 @@ deploy helm operator openshift image: extends: .deploy image variables: IMAGE_NAME: "stackgres/helm-operator" + IMAGE_TAG_SUFFIX: "-release-openshift" IMAGE_PUSH_TAG_SUFFIX: "-openshift" TARGET_REGISTRIES: "quay.io" @@ -157,6 +158,7 @@ deploy helm operator openshift bundle image: extends: .deploy image variables: IMAGE_NAME: "stackgres/helm-operator-bundle" + IMAGE_TAG_SUFFIX: "-release-openshift" IMAGE_PUSH_TAG_SUFFIX: "-openshift" TARGET_REGISTRIES: "quay.io" diff --git a/.gitlab-ci/image-release.yml b/.gitlab-ci/image-release.yml index 42214504dc..9de9140d57 100644 --- a/.gitlab-ci/image-release.yml +++ b/.gitlab-ci/image-release.yml @@ -68,6 +68,7 @@ - $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY + - $DO_RELEASE_IMAGE .release native image amd64: extends: .release image @@ -83,6 +84,7 @@ - $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY && $DO_NATIVE + - $DO_RELEASE_IMAGE && $DO_NATIVE release operator jvm image amd64: extends: .release jvm image amd64 @@ -171,6 +173,7 @@ release admin-ui image amd64: - $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY + - $DO_RELEASE_IMAGE .release jvm image arm64: extends: .release image @@ -185,6 +188,7 @@ release admin-ui image amd64: variables: - $SKIP_DEPLOY != "true" && $SKIP_ARM != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY && $DO_ARM + - $DO_RELEASE_IMAGE && $DO_ARM .release native image arm64: extends: .release image @@ -199,6 +203,7 @@ release admin-ui image amd64: variables: - $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $SKIP_ARM != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY && $DO_NATIVE && $DO_ARM + - $DO_RELEASE_IMAGE && $DO_NATIVE && $DO_ARM release operator jvm image arm64: extends: .release jvm image arm64 @@ -286,6 +291,7 @@ release admin-ui image arm64: variables: - $SKIP_DEPLOY != "true" && $SKIP_ARM != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY && $DO_ARM + - $DO_RELEASE_IMAGE && $DO_ARM .release jvm image multi archs: extends: .release image multi archs @@ -298,6 +304,7 @@ release admin-ui image arm64: - $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY + - $DO_RELEASE_IMAGE .release native image multi archs: extends: .release image multi archs @@ -310,6 +317,7 @@ release admin-ui image arm64: - $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $SKIP_NATIVE != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY && $DO_NATIVE + - $DO_RELEASE_IMAGE && $DO_NATIVE release operator jvm image multi archs: extends: .release jvm image multi archs @@ -373,6 +381,7 @@ release admin-ui image multi archs: - $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY + - $DO_RELEASE_IMAGE .release helm operator image amd64: extends: .release image @@ -389,6 +398,7 @@ release admin-ui image multi archs: - $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY + - $DO_RELEASE_IMAGE .release helm operator image arm64: extends: .release image @@ -404,62 +414,63 @@ release admin-ui image multi archs: variables: - $SKIP_DEPLOY != "true" && $SKIP_ARM != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY && $DO_ARM + - $DO_RELEASE_IMAGE && $DO_ARM release helm operator image amd64: extends: .release helm operator image amd64 variables: - LOCK_FILE: stackgres-helm-operator-build-image - IMAGE_MODULE_NAME: helm-operator-image + LOCK_FILE: stackgres-helm-operator-release-build-image + IMAGE_MODULE_NAME: helm-operator-release-image release helm operator image arm64: extends: .release helm operator image arm64 variables: - LOCK_FILE: stackgres-helm-operator-build-image - IMAGE_MODULE_NAME: helm-operator-image + LOCK_FILE: stackgres-helm-operator-release-build-image + IMAGE_MODULE_NAME: helm-operator-release-image release helm operator bundle image amd64: extends: .release helm operator image amd64 variables: IMAGE_BASE_NAME: stackgres/helm-operator-bundle - LOCK_FILE: stackgres-helm-operator-bundle-build-image - IMAGE_MODULE_NAME: helm-operator-bundle-image + LOCK_FILE: stackgres-helm-operator-release-bundle-build-image + IMAGE_MODULE_NAME: helm-operator-release-bundle-image release helm operator bundle image arm64: extends: .release helm operator image arm64 variables: IMAGE_BASE_NAME: stackgres/helm-operator-bundle - LOCK_FILE: stackgres-helm-operator-bundle-build-image - IMAGE_MODULE_NAME: helm-operator-bundle-image + LOCK_FILE: stackgres-helm-operator-release-bundle-build-image + IMAGE_MODULE_NAME: helm-operator-release-bundle-image release helm operator openshift image amd64: extends: .release helm operator image amd64 variables: IMAGE_SUFFIX: '-release-openshift-amd64' - LOCK_FILE: stackgres-helm-operator-openshift-build-image - IMAGE_MODULE_NAME: helm-operator-openshift-image + LOCK_FILE: stackgres-helm-operator-release-openshift-build-image + IMAGE_MODULE_NAME: helm-operator-release-openshift-image release helm operator openshift image arm64: extends: .release helm operator image arm64 variables: IMAGE_SUFFIX: '-release-openshift-arm64' - LOCK_FILE: stackgres-helm-operator-openshift-build-image - IMAGE_MODULE_NAME: helm-operator-openshift-image + LOCK_FILE: stackgres-helm-operator-release-openshift-build-image + IMAGE_MODULE_NAME: helm-operator-release-openshift-image release helm operator openshift bundle image amd64: extends: .release helm operator image amd64 variables: IMAGE_SUFFIX: '-release-openshift-amd64' IMAGE_BASE_NAME: stackgres/helm-operator-bundle - LOCK_FILE: stackgres-helm-operator-openshift-bundle-build-image - IMAGE_MODULE_NAME: helm-operator-openshift-bundle-image + LOCK_FILE: stackgres-helm-operator-release-openshift-bundle-build-image + IMAGE_MODULE_NAME: helm-operator-release-openshift-bundle-image release helm operator openshift bundle image arm64: extends: .release helm operator image arm64 variables: IMAGE_SUFFIX: '-release-openshift-arm64' IMAGE_BASE_NAME: stackgres/helm-operator-bundle - LOCK_FILE: stackgres-helm-operator-openshift-bundle-build-image - IMAGE_MODULE_NAME: helm-operator-openshift-bundle-image + LOCK_FILE: stackgres-helm-operator-release-openshift-bundle-build-image + IMAGE_MODULE_NAME: helm-operator-release-openshift-bundle-image .release helm operator image multi archs: extends: .release image multi archs @@ -473,6 +484,7 @@ release helm operator openshift bundle image arm64: - $SKIP_DEPLOY != "true" && $CI_COMMIT_REF_NAME =~ /^main.*$/ - $SKIP_DEPLOY != "true" && $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^latest-.*$/ - $DO_DEPLOY + - $DO_RELEASE_IMAGE release helm operator image multi archs: extends: .release helm operator image multi archs diff --git a/.gitlab/issue_templates/Beta Release.md b/.gitlab/issue_templates/Beta Release.md index 36d1d79fdf..23441f5c26 100644 --- a/.gitlab/issue_templates/Beta Release.md +++ b/.gitlab/issue_templates/Beta Release.md @@ -3,7 +3,7 @@ Set title to: ``` -Release StackGres 1.5.0-beta1 +Release StackGres 1.6.0-beta1 ``` Generate template using the command: @@ -16,29 +16,29 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION # Pre Checks -1. [ ] Make sure all tasks marked with label ~"target_version::1.5.0-beta1" are done. +1. [ ] Make sure all tasks marked with label ~"target_version::1.6.0-beta1" are done. # Release steps -1. [ ] Create local branch `release-1.5.0-beta1` from `main`: +1. [ ] Create local branch `release-1.6.0-beta1` from `main`: ``` - git checkout "main" && git pull && git checkout -b "release-1.5.0-beta1" + git checkout "main" && git pull && git checkout -b "release-1.6.0-beta1" ``` -1. [ ] Update project version to `1.5.0-beta1`: +1. [ ] Update project version to `1.6.0-beta1`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.0-beta1" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.6.0-beta1" ``` 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`) -1. [ ] Add 1.5.0-beta1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` +1. [ ] Add 1.6.0-beta1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` 1. [ ] Check the changes to ensure everything is correct before commit: ``` git diff ``` -1. [ ] Commit changes with message `version: 1.5.0-beta1`: +1. [ ] Commit changes with message `version: 1.6.0-beta1`: ``` - git commit -S -a -m "version: 1.5.0-beta1" + git commit -S -a -m "version: 1.6.0-beta1" ``` -1. [ ] Push `release-1.5.0-beta1` branch: +1. [ ] Push `release-1.6.0-beta1` branch: **This step requires at least one ARM instance with docker installed and a gitlab runner registered with the StackGres project. All this setup is already built in a template. The only action we need to do is scale up the auto-scaling group `sg-army-builder` auto scaling group.** @@ -53,87 +53,87 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner' ``` - Now we can push `release-1.5.0-beta1` branch and wait for the pipeline to complete: + Now we can push `release-1.6.0-beta1` branch and wait for the pipeline to complete: ``` - git push origin "release-1.5.0-beta1" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" + git push origin "release-1.6.0-beta1" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" ``` -1. [ ] Create tag `1.5.0-beta1`: +1. [ ] Create tag `1.6.0-beta1`: ``` - git tag "1.5.0-beta1" + git tag "1.6.0-beta1" ``` -1. [ ] Push tag `1.5.0-beta1` to the origin and wait for the pipeline to complete: +1. [ ] Push tag `1.6.0-beta1` to the origin and wait for the pipeline to complete: ``` - git push origin "1.5.0-beta1" + git push origin "1.6.0-beta1" ``` 1. [ ] After pipeline succeeded, scale down the ARM runners (or terminate the instance created with the script): ``` aws autoscaling update-auto-scaling-group --auto-scaling-group-name sg-army-builder --min-size 0 --max-size 0 --desired-capacity 0 ``` -1. [ ] Edit the [release notes of tag 1.5.0-beta1](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.5.0-beta1) by Copying and Pasting `CHANGELOG.md` section for version `1.5.0-beta1` (GitLab) -1. [ ] Create branch `main-1.5` from `release-1.5.0-beta1`: +1. [ ] Edit the [release notes of tag 1.6.0-beta1](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.6.0-beta1) by Copying and Pasting `CHANGELOG.md` section for version `1.6.0-beta1` (GitLab) +1. [ ] Create branch `main-1.6` from `release-1.6.0-beta1`: ``` - git checkout -b "main-1.5" + git checkout -b "main-1.6" ``` -1. [ ] Update project version to `1.5.1-SNAPSHOT`: +1. [ ] Update project version to `1.6.1-SNAPSHOT`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.1-SNAPSHOT" "main-1.5" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.6.1-SNAPSHOT" "main-1.6" ``` -1. [ ] Commit changes with message `version: 1.5.1-SNAPSHOT`: +1. [ ] Commit changes with message `version: 1.6.1-SNAPSHOT`: ``` - git commit -S -a -m "version: 1.5.1-SNAPSHOT" + git commit -S -a -m "version: 1.6.1-SNAPSHOT" ``` -1. [ ] Push `main-1.5` branch: +1. [ ] Push `main-1.6` branch: ``` - git push --set-upstream origin "main-1.5" + git push --set-upstream origin "main-1.6" ``` -1. [ ] Create branch `add-version-1.6` and merge local branch `release-1.5.0-beta1` into it: +1. [ ] Create branch `add-version-1.7` and merge local branch `release-1.6.0-beta1` into it: ``` - git checkout main && git pull && git checkout -b "add-version-1.6" && git merge release-1.5.0-beta1 + git checkout main && git pull && git checkout -b "add-version-1.7" && git merge release-1.6.0-beta1 ``` -1. [ ] Update project version to `1.6.0-SNAPSHOT`: +1. [ ] Update project version to `1.7.0-SNAPSHOT`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.6.0"-SNAPSHOT main + sh -x stackgres-k8s/ci/utils/update-version.sh "1.7.0"-SNAPSHOT main ``` -1. Add support for version 1.6 and remove support for version 1.3 - * [ ] Edit file `stackgres-k8s/src/common/src/main/java/io/stackgres/common/StackGresVersion.java` to add suppor for version 1.6, remove support for version 1.3 and fix the failing code and tests - * [ ] Edit file `stackgres-k8s/src/common/src/main/java/io/stackgres/common/component/Components.java` to add version 1.6 and fix the failing code and tests - * [ ] Edit file `stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/parameters/PostgresDefaultValues.java` to add version 1.6 and fix the failing code and tests - * [ ] Edit file `stackgres-k8s/install/helm/stackgres-operator/templates/check-upgrade.yaml` to add support for upgrade from version 1.6 and remove support to upgrade from version 1.3 - * [ ] Update the e2e test `stackgres-k8s/e2e/spec/operator` to check support for upgrade from version 1.5 and remove check for support to upgrade from version 1.3. - * [ ] Add support for previous version 1.5 in e2e tests +1. Add support for version 1.7 and remove support for version 1.4 + * [ ] Edit file `stackgres-k8s/src/common/src/main/java/io/stackgres/common/StackGresVersion.java` to add suppor for version 1.7, remove support for version 1.4 and fix the failing code and tests + * [ ] Edit file `stackgres-k8s/src/common/src/main/java/io/stackgres/common/component/Components.java` to add version 1.7 and fix the failing code and tests + * [ ] Edit file `stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/parameters/PostgresDefaultValues.java` to add version 1.7 and fix the failing code and tests + * [ ] Edit file `stackgres-k8s/install/helm/stackgres-operator/templates/check-upgrade.yaml` to add support for upgrade from version 1.7 and remove support to upgrade from version 1.4 + * [ ] Update the e2e test `stackgres-k8s/e2e/spec/operator` to check support for upgrade from version 1.6 and remove check for support to upgrade from version 1.4. + * [ ] Add support for previous version 1.6 in e2e tests ``` - mkdir -p stackgres-k8s/e2e/spec/previous/1.5/spec - cp stackgres-k8s/e2e/spec/* stackgres-k8s/e2e/spec/previous/1.5/spec/. - cp -a stackgres-k8s/e2e/spec/abstract stackgres-k8s/e2e/spec/previous/1.5/spec/abstract - cp -a stackgres-k8s/e2e/spec/aks stackgres-k8s/e2e/spec/previous/1.5/spec/aks - cp -a stackgres-k8s/e2e/spec/eks stackgres-k8s/e2e/spec/previous/1.5/spec/eks - cp -a stackgres-k8s/e2e/spec/gke stackgres-k8s/e2e/spec/previous/1.5/spec/gke + mkdir -p stackgres-k8s/e2e/spec/previous/1.6/spec + cp stackgres-k8s/e2e/spec/* stackgres-k8s/e2e/spec/previous/1.6/spec/. + cp -a stackgres-k8s/e2e/spec/abstract stackgres-k8s/e2e/spec/previous/1.6/spec/abstract + cp -a stackgres-k8s/e2e/spec/aks stackgres-k8s/e2e/spec/previous/1.6/spec/aks + cp -a stackgres-k8s/e2e/spec/eks stackgres-k8s/e2e/spec/previous/1.6/spec/eks + cp -a stackgres-k8s/e2e/spec/gke stackgres-k8s/e2e/spec/previous/1.6/spec/gke ``` - * [ ] Remove support for previous version 1.3 in e2e tests: + * [ ] Remove support for previous version 1.4 in e2e tests: ``` - rm -rf stackgres-k8s/e2e/spec/previous/1.3 + rm -rf stackgres-k8s/e2e/spec/previous/1.4 ``` -1. [ ] Commit changes with message `version: 1.6.0-SNAPSHOT`: +1. [ ] Commit changes with message `version: 1.7.0-SNAPSHOT`: ``` git add . - git commit -S -a -m "version: 1.6.0-SNAPSHOT" + git commit -S -a -m "version: 1.7.0-SNAPSHOT" ``` -1. [ ] Push branch `add-version-1.6`: +1. [ ] Push branch `add-version-1.7`: ``` - git push origin add-version-1.6 + git push origin add-version-1.7 ``` -1. [ ] Wait for the pipeline of `add-version-1.6` branch to complete -1. [ ] Merge local branch `add-version-1.6` into `main`: +1. [ ] Wait for the pipeline of `add-version-1.7` branch to complete +1. [ ] Merge local branch `add-version-1.7` into `main`: ``` - git checkout main && git pull && git merge --ff-only add-version-1.6 + git checkout main && git pull && git merge --ff-only add-version-1.7 ``` 1. [ ] Push `main` to origin: ``` git push ``` -1. [ ] Change scheduled pipeline to test previous version `1.3` to use branch `main-1.5`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules -1. [ ] Create scheduled pipeline to test previous version `1.5`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules -1. [ ] Remove scheduled pipeline to test previous version `1.2`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules +1. [ ] Change scheduled pipeline to test previous version `1.4` to use branch `main-1.6`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules +1. [ ] Create scheduled pipeline to test previous version `1.6`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules +1. [ ] Remove scheduled pipeline to test previous version `1.3`: https://gitlab.com/ongresinc/stackgres/-/pipeline_schedules # Deploy Web @@ -142,27 +142,27 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION ``` git checkout development && git pull ``` -1. [ ] Set `STACKGRES_REFS` in `.gitlab-ci.yml` by setting `main-1.5` as the first value. -1. [ ] Set `STACKGRES_FULL_VERSIONS` in `.gitlab-ci.yml` by setting `1.5.0-beta1` as the first value. +1. [ ] Set `STACKGRES_REFS` in `.gitlab-ci.yml` by setting `main-1.6` as the first value. +1. [ ] Set `STACKGRES_FULL_VERSIONS` in `.gitlab-ci.yml` by setting `1.6.0-beta1` as the first value. 1. [ ] Set `STACKGRES_STABLE_VERSION_INDEX` to `0` -1. [ ] Commit changes with message `version: 1.5.0-beta1`: `git commit -a -m 'version: 1.5.0-beta1'` +1. [ ] Commit changes with message `version: 1.6.0-beta1`: `git commit -a -m 'version: 1.6.0-beta1'` 1. [ ] Push development to origin: `git push` 1. [ ] Check staging Web: `https://ongresinc.gitlab.io/web/stackgres/` 1. [ ] Merge `development` branch into `master`: ``` git checkout master && git pull && git merge --ff-only development ``` -1. [ ] Create tag `1.5.0-beta1`: +1. [ ] Create tag `1.6.0-beta1`: ``` - git tag 1.5.0-beta1 + git tag 1.6.0-beta1 ``` 1. [ ] Push master to origin: ``` git push ``` -1. [ ] Push tag `1.5.0-beta1` to origin: +1. [ ] Push tag `1.6.0-beta1` to origin: ``` - git push origin 1.5.0-beta1 + git push origin 1.6.0-beta1 ``` # Post Checks @@ -174,11 +174,11 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION # Changelog ~~~ -# :rocket: Release 1.5.0-beta1 (${DATE}) +# :rocket: Release 1.6.0-beta1 (${DATE}) ## :notepad_spiral: NOTES -StackGres 1.5.0-beta1 is out! :confetti_ball: :champagne: +StackGres 1.6.0-beta1 is out! :confetti_ball: :champagne: So, what you are waiting for to try this release and have a look to the future of StackGres! @@ -211,5 +211,9 @@ Alpha or beta version should not be used to upgrade since the upgrade process wi Thank you for all the issues created, ideas, and code contributions by the StackGres Community! -## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.5.0-beta1) +## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.6.0-beta1) ~~~ + +/label ~StackGres ~"target_version::1.6.0-beta1" ~"team::DEV" +/milestone %"StackGres 1.6.0-beta1" +/confidential diff --git a/.gitlab/issue_templates/GA Release.md b/.gitlab/issue_templates/GA Release.md index 5397a5e6aa..cea384848d 100644 --- a/.gitlab/issue_templates/GA Release.md +++ b/.gitlab/issue_templates/GA Release.md @@ -3,7 +3,7 @@ Set title to: ``` -Release StackGres 1.5.0 +Release StackGres 1.6.0 ``` Generate template using the command: @@ -16,29 +16,29 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION # Pre Checks -1. [ ] Make sure all tasks marked with label ~"target_version::1.5.0" are done. +1. [ ] Make sure all tasks marked with label ~"target_version::1.6.0" are done. # Release steps -1. [ ] Create local branch `release-1.5.0` from `main-1.5`: +1. [ ] Create local branch `release-1.6.0` from `main-1.6`: ``` - git checkout "main-1.5" && git pull && git checkout -b "release-1.5.0" + git checkout "main-1.6" && git pull && git checkout -b "release-1.6.0" ``` -1. [ ] Update project version to `1.5.0`: +1. [ ] Update project version to `1.6.0`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.0" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.6.0" ``` 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`) -1. [ ] Add 1.5.0 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` +1. [ ] Add 1.6.0 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` 1. [ ] Check the changes to ensure everything is correct before commit: ``` git diff ``` -1. [ ] Commit changes with message `version: 1.5.0`: +1. [ ] Commit changes with message `version: 1.6.0`: ``` - git commit -S -a -m "version: 1.5.0" + git commit -S -a -m "version: 1.6.0" ``` -1. [ ] Push `release-1.5.0` branch: +1. [ ] Push `release-1.6.0` branch: **This step requires at least one ARM instance with docker installed and a gitlab runner registered with the StackGres project. All this setup is already built in a template. The only action we need to do is scale up the auto-scaling group `sg-army-builder` auto scaling group.** @@ -53,44 +53,44 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner' ``` - Now we can push `release-1.5.0` branch and wait for the pipeline to complete: + Now we can push `release-1.6.0` branch and wait for the pipeline to complete: ``` - git push origin "release-1.5.0" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" + git push origin "release-1.6.0" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" ``` -1. [ ] Create tag `1.5.0`: +1. [ ] Create tag `1.6.0`: ``` - git tag "1.5.0" + git tag "1.6.0" ``` -1. [ ] Push tag `1.5.0` to the origin and wait for the pipeline to complete: +1. [ ] Push tag `1.6.0` to the origin and wait for the pipeline to complete: ``` - git push origin "1.5.0" + git push origin "1.6.0" ``` 1. [ ] After pipeline succeeded, scale down the ARM runners (or terminate the instance created with the script): ``` aws autoscaling update-auto-scaling-group --auto-scaling-group-name sg-army-builder --min-size 0 --max-size 0 --desired-capacity 0 ``` -1. [ ] Edit the [release notes of tag 1.5.0](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.5.0) by Copying and Pasting `CHANGELOG.md` section for version `1.5.0` (GitLab) -1. [ ] Merge local branch `release-1.5.0` into `main-1.5`: +1. [ ] Edit the [release notes of tag 1.6.0](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.6.0) by Copying and Pasting `CHANGELOG.md` section for version `1.6.0` (GitLab) +1. [ ] Merge local branch `release-1.6.0` into `main-1.6`: ``` - git checkout "main-1.5" && git pull && git merge --ff-only "release-1.5.0" + git checkout "main-1.6" && git pull && git merge --ff-only "release-1.6.0" ``` -1. [ ] Update version to be `1.5.1-SNAPSHOT`: +1. [ ] Update version to be `1.6.1-SNAPSHOT`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.1-SNAPSHOT" "main-1.5" - git commit -a -m "version: 1.5.1-SNAPSHOT" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.6.1-SNAPSHOT" "main-1.6" + git commit -a -m "version: 1.6.1-SNAPSHOT" git push ``` -1. [ ] Create branch `merge-1.5.0` from `main`: +1. [ ] Create branch `merge-1.6.0` from `main`: ``` - git checkout main && git pull && git checkout -b "merge-1.5.0" + git checkout main && git pull && git checkout -b "merge-1.6.0" ``` -1. [ ] Merge branch `main-1.5` into `merge-1.5.0`: +1. [ ] Merge branch `main-1.6` into `merge-1.6.0`: ``` - git merge "main-1.5" + git merge "main-1.6" ``` -1. [ ] Push `merge-1.5.0` to origin, create the merge request to merge it into `main` and wait for the pipeline to complete fixing any encountered issues: +1. [ ] Push `merge-1.6.0` to origin, create the merge request to merge it into `main` and wait for the pipeline to complete fixing any encountered issues: ``` - git push origin "merge-1.5.0" + git push origin "merge-1.6.0" ``` # Deploy Web @@ -100,25 +100,25 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION ``` git checkout development && git pull ``` -1. [ ] Set `STACKGRES_FULL_VERSIONS` in `.gitlab-ci.yml` by setting `1.5.0` as the first value. -1. [ ] Commit changes with message `version: 1.5.0`: `git commit -a -m 'version: 1.5.0'` +1. [ ] Set `STACKGRES_FULL_VERSIONS` in `.gitlab-ci.yml` by setting `1.6.0` as the first value. +1. [ ] Commit changes with message `version: 1.6.0`: `git commit -a -m 'version: 1.6.0'` 1. [ ] Push development to origin: `git push` 1. [ ] Check staging Web: `https://ongresinc.gitlab.io/web/stackgres/` 1. [ ] Merge `development` branch into `master`: ``` git checkout master && git pull && git merge --ff-only development ``` -1. [ ] Create tag `1.5.0`: +1. [ ] Create tag `1.6.0`: ``` - git tag 1.5.0 + git tag 1.6.0 ``` 1. [ ] Push master to origin: ``` git push ``` -1. [ ] Push tag `1.5.0` to origin: +1. [ ] Push tag `1.6.0` to origin: ``` - git push origin 1.5.0 + git push origin 1.6.0 ``` # Post Checks @@ -130,11 +130,11 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION # Changelog ~~~ -# :rocket: Release 1.5.0 (${DATE}) +# :rocket: Release 1.6.0 (${DATE}) ## :notepad_spiral: NOTES -StackGres 1.5.0 is out! :confetti_ball: :champagne: +StackGres 1.6.0 is out! :confetti_ball: :champagne: So, what you are waiting for to try this release and have a look to the future of StackGres! @@ -166,11 +166,15 @@ To upgrade from a previous installation of the StackGres operator's helm chart y To upgrade StackGres operator's (upgrade only works starting from 1.1 version or above) helm chart issue the following commands (replace namespace and release name if you used something different): -`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.5.0/helm/stackgres-operator.tgz` +`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.6.0/helm/stackgres-operator.tgz` > IMPORTANT: This release is incompatible with previous `alpha` or `beta` versions. Upgrading from those versions will require uninstalling completely StackGres including all clusters and StackGres CRDs (those in `stackgres.io` group) first. Thank you for all the issues created, ideas, and code contributions by the StackGres Community! -## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.5.0) +## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.6.0) ~~~ + +/label ~StackGres ~"target_version::1.6.0" ~"team::DEV" +/milestone %"StackGres 1.6.0" +/confidential diff --git a/.gitlab/issue_templates/Patch Release.md b/.gitlab/issue_templates/Patch Release.md index 7c7c7a459d..27d3805cdc 100644 --- a/.gitlab/issue_templates/Patch Release.md +++ b/.gitlab/issue_templates/Patch Release.md @@ -1,50 +1,49 @@ # Pre Checks -1. [ ] Make sure all tasks marked with label ~"target_version::1.4.4" are done. +1. [ ] Make sure all tasks marked with label ~"target_version::1.5.1" are done. # Release steps -1. [ ] Create local branch `release-1.4.4` from `main`: +1. [ ] Create local branch `release-1.5.1` from `main-1.5`: ``` - git checkout "main" && git pull && git checkout -b "release-1.4.4" + git checkout "main-1.5" && git pull && git checkout -b "release-1.5.1" ``` -1. [ ] Update project version to `1.4.4`: +1. [ ] Update project version to `1.5.1`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.4.4" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.1" ``` 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`) -1. [ ] Add 1.4.4 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` +1. [ ] Add 1.5.1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` 1. [ ] Check the changes to ensure everything is correct before commit: ``` git diff ``` -1. [ ] Commit changes with message `version: 1.4.4`: +1. [ ] Commit changes with message `version: 1.5.1`: ``` - git commit -S -a -m "version: 1.4.4" + git commit -S -a -m "version: 1.5.1" ``` -1. [ ] Push `release-1.4.4` branch: +1. [ ] Push `release-1.5.1` branch: **This step requires at least one ARM instance with docker installed and a gitlab runner registered with the StackGres project. All this setup is already built in a template. The only action we need to do is scale up the auto-scaling group `sg-army-builder` auto scaling group.** ``` - for ASG in sg-army-builder; do aws --profile ongres --region us-east-1 autoscaling set-desired-capacity --desired-capacity 1 --auto-scaling-group-name ""; done + for ASG in sg-army-builder; do aws --profile ongres --region us-east-1 autoscaling set-desired-capacity --desired-capacity 1 --auto-scaling-group-name "$ASG"; done ``` **As an alternative approach [here](https://gitlab.com/snippets/1985684) is a handy snippet that allows to spin up such an instance in AWS.** @@ -54,67 +53,88 @@ export DATE="$(date +%Y-%m-%d)" VERSION \ curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner' ``` - Now we can push `release-1.4.4` branch and wait for the pipeline to complete: + Now we can push `release-1.5.1` branch and wait for the pipeline to complete: ``` - git push origin "release-1.4.4" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" + git push origin "release-1.5.1" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" ``` -1. [ ] Create tag `1.4.4`: +1. [ ] Create tag `1.5.1`: ``` - git tag "1.4.4" + git tag "1.5.1" ``` -1. [ ] Push tag `1.4.4` to the origin and wait for the pipeline to complete: +1. [ ] Push tag `1.5.1` to the origin and wait for the pipeline to complete: ``` - git push origin "1.4.4" + git push origin "1.5.1" ``` 1. [ ] After pipeline succeeded, scale down the ARM runners (or terminate the instance created with the script): ``` aws autoscaling update-auto-scaling-group --auto-scaling-group-name sg-army-builder --min-size 0 --max-size 0 --desired-capacity 0 ``` -1. [ ] Edit the [release notes of tag 1.4.4](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.4.4) by Copying and Pasting `CHANGELOG.md` section for version `1.4.4` (GitLab) -1. [ ] Merge local branch `release-1.4.4` into `main-1.4`: +1. [ ] Edit the [release notes of tag 1.5.1](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.5.1) by Copying and Pasting `CHANGELOG.md` section for version `1.5.1` (GitLab) +1. [ ] Merge local branch `release-1.5.1` into `main-1.5`: ``` - git checkout "main-1.4" && git pull && git merge --ff-only "release-1.4.4" + git checkout "main-1.5" && git pull && git merge --ff-only "release-1.5.1" ``` -1. [ ] Update version to be `1.4.5-SNAPSHOT`: +1. [ ] Update version to be `1.5.2-SNAPSHOT`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.4.5-SNAPSHOT" "main-1.4" - git commit -a -m "version: 1.4.5-SNAPSHOT" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.2-SNAPSHOT" "main-1.5" + git commit -a -m "version: 1.5.2-SNAPSHOT" git push ``` -1. [ ] Create branch `merge-1.4.4` from `main`: +1. [ ] Create branch `merge-1.5.1` from `main`: ``` - git checkout main && git pull && git checkout -b "merge-1.4.4" + git checkout main && git pull && git checkout -b "merge-1.5.1" ``` -1. [ ] Merge branch `main-1.4` into `merge-1.4.4`: +1. [ ] Merge branch `main-1.5` into `merge-1.5.1`: ``` - git merge "main-1.4" + git merge "main-1.5" ``` -1. [ ] Push `merge-1.4.4` to origin, create the merge request to merge it into `main` and wait for the pipeline to complete fixing any encountered issues: +1. [ ] Push `merge-1.5.1` to origin, create the merge request to merge it into `main` and wait for the pipeline to complete fixing any encountered issues: ``` - git push origin "merge-1.4.4" + git push origin "merge-1.5.1" ``` # Deploy Web -1. [ ] Run [stackgres-web pipeline](https://gitlab.com/ongresinc/web/stackgres/-/pipelines/new) +1. [ ] Checkout [stackgres-web](https://gitlab.com/ongresinc/web/stackgres) project +1. [ ] Checkout and update `development` branch: + ``` + git checkout development && git pull + ``` +1. [ ] Set `STACKGRES_FULL_VERSIONS` in `.gitlab-ci.yml` by setting `1.5.1` as the first value. +1. [ ] Commit changes with message `version: 1.5.1`: `git commit -a -m 'version: 1.5.1'` +1. [ ] Push development to origin: `git push` +1. [ ] Check staging Web: `https://ongresinc.gitlab.io/web/stackgres/` +1. [ ] Merge `development` branch into `master`: + ``` + git checkout master && git pull && git merge --ff-only development + ``` +1. [ ] Create tag `1.5.1`: + ``` + git tag 1.5.1 + ``` +1. [ ] Push master to origin: + ``` + git push + ``` +1. [ ] Push tag `1.5.1` to origin: + ``` + git push origin 1.5.1 + ``` # Post Checks -* Helm Hubs: - * [ ] Update helm chart repository by creating a [new pipeline](https://gitlab.com/ongresinc/helm-charts/-/pipelines/new) - -* Publishing: +* Announcements: * [ ] Publish release on Announcement Slack channel * [ ] Publish release on Announcement Discord channel # Changelog ~~~ -# :rocket: Release 1.4.4 (${DATE}) +# :rocket: Release 1.5.1 (${DATE}) ## :notepad_spiral: NOTES -StackGres 1.4.4 is out! :confetti_ball: :champagne: +StackGres 1.5.1 is out! :confetti_ball: :champagne: So, what you are waiting for to try this release and have a look to the future of StackGres! @@ -146,11 +166,15 @@ To upgrade from a previous installation of the StackGres operator's helm chart y To upgrade StackGres operator's (upgrade only works starting from 1.1 version or above) helm chart issue the following commands (replace namespace and release name if you used something different): -`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.4.4/helm/stackgres-operator.tgz` +`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.5.1/helm/stackgres-operator.tgz` > IMPORTANT: This release is incompatible with previous `alpha` or `beta` versions. Upgrading from those versions will require uninstalling completely StackGres including all clusters and StackGres CRDs (those in `stackgres.io` group) first. Thank you for all the issues created, ideas, and code contributions by the StackGres Community! -## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.4.4) +## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.5.1) ~~~ + +/label ~StackGres ~"target_version::1.5.1" ~"team::DEV" +/milestone %"StackGres 1.5.1" +/confidential diff --git a/.gitlab/issue_templates/RC Release.md b/.gitlab/issue_templates/RC Release.md index c1fc01e40e..385826c352 100644 --- a/.gitlab/issue_templates/RC Release.md +++ b/.gitlab/issue_templates/RC Release.md @@ -3,7 +3,7 @@ Set title to: ``` -Release StackGres 1.5.0-rc3 +Release StackGres 1.6.0-rc1 ``` Generate template using the command: @@ -16,29 +16,29 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION # Pre Checks -1. [ ] Make sure all tasks marked with label ~"target_version::1.5.0-rc3" are done. +1. [ ] Make sure all tasks marked with label ~"target_version::1.6.0-rc1" are done. # Release steps -1. [ ] Create local branch `release-1.5.0-rc3` from `main-1.5`: +1. [ ] Create local branch `release-1.6.0-rc1` from `main-1.6`: ``` - git checkout "main-1.5" && git pull && git checkout -b "release-1.5.0-rc3" + git checkout "main-1.6" && git pull && git checkout -b "release-1.6.0-rc1" ``` -1. [ ] Update project version to `1.5.0-rc3`: +1. [ ] Update project version to `1.6.0-rc1`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.0-rc3" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.6.0-rc1" ``` 1. [ ] Update `CHANGELOG.md` (review commit messages to populate the changelog: `git log`) -1. [ ] Add 1.5.0-rc3 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` +1. [ ] Add 1.6.0-rc1 section in `doc/content/en/01-introduction/06-versions/_index.md` with values from `stackgres-k8s/src/common/src/main/resources/versions.properties` 1. [ ] Check the changes to ensure everything is correct before commit: ``` git diff ``` -1. [ ] Commit changes with message `version: 1.5.0-rc3`: +1. [ ] Commit changes with message `version: 1.6.0-rc1`: ``` - git commit -S -a -m "version: 1.5.0-rc3" + git commit -S -a -m "version: 1.6.0-rc1" ``` -1. [ ] Push `release-1.5.0-rc3` branch: +1. [ ] Push `release-1.6.0-rc1` branch: **This step requires at least one ARM instance with docker installed and a gitlab runner registered with the StackGres project. All this setup is already built in a template. The only action we need to do is scale up the auto-scaling group `sg-army-builder` auto scaling group.** @@ -53,44 +53,44 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION curl -s https://gitlab.com/snippets/1985684/raw | bash -s -- -r "" -t m6gd.4xlarge -i "" -d 14400 -df internal -dp /dev/nvme1n1 -rn army-builder -tl 'docker-junit-extension-runner, oci-image, ongresinc, stackgres-maven-runner, stackgres-native-build-runner, stackgres-quarkus-test-runner, stackgres-runner-v2, linux-arm64, stackgres-e2e-runner' ``` - Now we can push `release-1.5.0-rc3` branch and wait for the pipeline to complete: + Now we can push `release-1.6.0-rc1` branch and wait for the pipeline to complete: ``` - git push origin "release-1.5.0-rc3" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" + git push origin "release-1.6.0-rc1" -o ci.variable="DO_IMAGES=true" -o ci.variable="DO_NATIVE=true" -o ci.variable="DO_ARM=true" ``` -1. [ ] Create tag `1.5.0-rc3`: +1. [ ] Create tag `1.6.0-rc1`: ``` - git tag "1.5.0-rc3" + git tag "1.6.0-rc1" ``` -1. [ ] Push tag `1.5.0-rc3` to the origin and wait for the pipeline to complete: +1. [ ] Push tag `1.6.0-rc1` to the origin and wait for the pipeline to complete: ``` - git push origin "1.5.0-rc3" + git push origin "1.6.0-rc1" ``` 1. [ ] After pipeline succeeded, scale down the ARM runners (or terminate the instance created with the script): ``` aws autoscaling update-auto-scaling-group --auto-scaling-group-name sg-army-builder --min-size 0 --max-size 0 --desired-capacity 0 ``` -1. [ ] Edit the [release notes of tag 1.5.0-rc3](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.5.0-rc3) by Copying and Pasting `CHANGELOG.md` section for version `1.5.0-rc3` (GitLab) -1. [ ] Merge local branch `release-1.5.0-rc3` into `main-1.5`: +1. [ ] Edit the [release notes of tag 1.6.0-rc1](https://gitlab.com/ongresinc/stackgres/-/releases/new?tag_name=1.6.0-rc1) by Copying and Pasting `CHANGELOG.md` section for version `1.6.0-rc1` (GitLab) +1. [ ] Merge local branch `release-1.6.0-rc1` into `main-1.6`: ``` - git checkout "main-1.5" && git pull && git merge --ff-only "release-1.5.0-rc3" + git checkout "main-1.6" && git pull && git merge --ff-only "release-1.6.0-rc1" ``` -1. [ ] Update version to be `1.5.0-SNAPSHOT`: +1. [ ] Update version to be `1.6.0-SNAPSHOT`: ``` - sh -x stackgres-k8s/ci/utils/update-version.sh "1.5.0-SNAPSHOT" "main-1.5" - git commit -a -m "version: 1.5.0-SNAPSHOT" + sh -x stackgres-k8s/ci/utils/update-version.sh "1.6.0-SNAPSHOT" "main-1.6" + git commit -a -m "version: 1.6.0-SNAPSHOT" git push ``` -1. [ ] Create branch `merge-1.5.0-rc3` from `main`: +1. [ ] Create branch `merge-1.6.0-rc1` from `main`: ``` - git checkout main && git pull && git checkout -b "merge-1.5.0-rc3" + git checkout main && git pull && git checkout -b "merge-1.6.0-rc1" ``` -1. [ ] Merge branch `main-1.5` into `merge-1.5.0-rc3`: +1. [ ] Merge branch `main-1.6` into `merge-1.6.0-rc1`: ``` - git merge "main-1.5" + git merge "main-1.6" ``` -1. [ ] Push `merge-1.5.0-rc3` to origin, create the merge request to merge it into `main` and wait for the pipeline to complete fixing any encountered issues: +1. [ ] Push `merge-1.6.0-rc1` to origin, create the merge request to merge it into `main` and wait for the pipeline to complete fixing any encountered issues: ``` - git push origin "merge-1.5.0-rc3" + git push origin "merge-1.6.0-rc1" ``` # Deploy Web @@ -100,25 +100,25 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION ``` git checkout development && git pull ``` -1. [ ] Set `STACKGRES_FULL_VERSIONS` in `.gitlab-ci.yml` by setting `1.5.0-rc3` as the first value. -1. [ ] Commit changes with message `version: 1.5.0-rc3`: `git commit -a -m 'version: 1.5.0-rc3'` +1. [ ] Set `STACKGRES_FULL_VERSIONS` in `.gitlab-ci.yml` by setting `1.6.0-rc1` as the first value. +1. [ ] Commit changes with message `version: 1.6.0-rc1`: `git commit -a -m 'version: 1.6.0-rc1'` 1. [ ] Push development to origin: `git push` 1. [ ] Check staging Web: `https://ongresinc.gitlab.io/web/stackgres/` 1. [ ] Merge `development` branch into `master`: ``` git checkout master && git pull && git merge --ff-only development ``` -1. [ ] Create tag `1.5.0-rc3`: +1. [ ] Create tag `1.6.0-rc1`: ``` - git tag 1.5.0-rc3 + git tag 1.6.0-rc1 ``` 1. [ ] Push master to origin: ``` git push ``` -1. [ ] Push tag `1.5.0-rc3` to origin: +1. [ ] Push tag `1.6.0-rc1` to origin: ``` - git push origin 1.5.0-rc3 + git push origin 1.6.0-rc1 ``` # Post Checks @@ -130,11 +130,11 @@ sh stackgres-k8s/ci/utils/generate-release-template.sh $VERSION # Changelog ~~~ -# :rocket: Release 1.5.0-rc3 (${DATE}) +# :rocket: Release 1.6.0-rc1 (${DATE}) ## :notepad_spiral: NOTES -StackGres 1.5.0-rc3 is out! :confetti_ball: :champagne: +StackGres 1.6.0-rc1 is out! :confetti_ball: :champagne: So, what you are waiting for to try this release and have a look to the future of StackGres! @@ -166,11 +166,15 @@ To upgrade from a previous installation of the StackGres operator's helm chart y To upgrade StackGres operator's (upgrade only works starting from 1.1 version or above) helm chart issue the following commands (replace namespace and release name if you used something different): -`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.5.0-rc3/helm/stackgres-operator.tgz` +`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.6.0-rc1/helm/stackgres-operator.tgz` > IMPORTANT: This release is incompatible with previous `alpha` or `beta` versions. Upgrading from those versions will require uninstalling completely StackGres including all clusters and StackGres CRDs (those in `stackgres.io` group) first. Thank you for all the issues created, ideas, and code contributions by the StackGres Community! -## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.5.0-rc3) +## :twisted_rightwards_arrows: [FULL LIST OF COMMITS](https://gitlab.com/ongresinc/stackgres/-/commits/1.6.0-rc1) ~~~ + +/label ~StackGres ~"target_version::1.6.0-rc1" ~"team::DEV" +/milestone %"StackGres 1.6.0-rc1" +/confidential diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ffb4d696f..11595ca203 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,194 @@ +# :rocket: StackGres 1.5.0 GA (2023-07-03) + +The Postgres You Love :heart_eyes:, At Any Scale :sparkles: + +We are thrilled to announce the release of StackGres 1.5.0! This update brings a host of new features, enhancements, and optimizations, further solidifying StackGres as the go-to solution for running your mission-critical Postgres workloads on Kubernetes. Let's dive into the exciting highlights of this release: + +1. :fire: Sharding Cluster Support: + + StackGres 1.5.0 introduces seamless integration with Citus and Patroni, empowering you to scale your Postgres database horizontally. Now you can effortlessly shard your clusters, distributing data across multiple nodes for improved performance, scalability, and fault tolerance. + + Citus uses a technique called sharding to divide your data into smaller, manageable pieces called shards. Each shard contains a subset of your data and is stored on a separate node within the cluster. Sharding allows for parallel processing of queries and efficient data storage across multiple machines. + When you execute a query, Citus intelligently routes the query to the relevant shards. It analyzes the query and determines which shards hold the necessary data to process the request. By distributing the workload across multiple nodes, Citus enables parallel query execution, leading to faster query performance. + + Citus provides a scalable and distributed database solution by leveraging PostgreSQL's powerful extensibility. It enables you to handle large datasets, process complex queries, and achieve high performance by harnessing the capabilities of a distributed cluster architecture, as you can add more nodes to your cluster to accommodate increasing data volumes or user traffic. + + A new CRD called `SGShardedCluster` will bring you the power of sharding by creating multiple SGClusters that will behave like a single one. This also features an automated SSL/TLS support by default on sharded clusters. + + StackGres provides with the `SGShardedCluster` a fault tolerance HA solution on each shard (as well as the coordinators) so that any failed node will be automatically recovered as if one node goes down, the other nodes can still continue serving your application. + + The Web Console has also been updated with first-class support for this feature, try it out :wink:. + + | :warning: WARNING | + |:---------------------------| + | The feature is still in alpha so you might expect breaking changes in the CRD, if you encounter any issue please report it and we will provide a fix. Also, 2 day operations are currently not supported and will be implemented in 1.6 release. | + +2. :elephant: Updated Postgres and components: + + In this release, we have updated the Postgres engine to the latest minor versions supported up to 15.3, 14.8, and 13.11, incorporating the latest advancements and bug fixes from the PostgreSQL community. This upgrade brings improved performance, enhanced security features, and better compatibility with the latest Postgres ecosystem. Also, we have updated Babelfish for PostgreSQL to the latest release 2.3.0 so you can continue experimenting with this SQL Server alternative with expanded language support, improved compatibility and bug fixes and stability improvements. + +3. :anchor: Compatibility with Kubernetes 1.27 and 1.26: + + StackGres is now fully compatible with Kubernetes versions 1.27 and 1.26. This means you can confidently deploy and manage StackGres in Kubernetes clusters running these specific versions, taking advantage of their features and improvements. + +4. :arrows_counterclockwise: Transition from Docker.io to Quay.io Container Registry: + + Due to Docker.io imposing lower download rate-limits, we are transitioning from Docker.io to Quay.io as our preferred container registry. + +5. :bug: Bug Fixes and Stability Improvements: + + As part of our commitment to delivering a reliable and stable database solution, we have addressed reported issues and incorporated bug fixes in StackGres 1.5.0. The update offers enhanced stability, ensuring a smooth and uninterrupted experience for your critical workloads. + +### Call to action + +We encourage all users to upgrade to StackGres 1.5.0 to take advantage of these exciting new features and enhancements. We value your feedback and suggestions, so please don't hesitate to reach out to our dedicated support team with any questions or comments. Join us on our [Slack](https://slack.stackgres.io/)/[Discord](https://discord.stackgres.io/) to share any comments or to get help from [StackGres Community](https://stackgres.io/community/). + +Thank you for choosing StackGres as your trusted Postgres database stack. We remain dedicated to providing top-notch performance, security, and scalability for your data needs. + +Thank you for all the issues created, ideas, and code contributions by the StackGres Community! + +Enjoy the power of StackGres 1.5.0! + +The StackGres Team + +## :up: Upgrade + +To upgrade from a previous installation of the StackGres operator's helm chart you will have to upgrade the helm chart release. + For more detailed information please refer to [our documentation](https://stackgres.io/doc/latest/install/helm/upgrade/#upgrade-operator). + +To upgrade StackGres operator's (upgrade only works starting from 1.1 version or above) Helm chart issue the following commands (replace namespace and release name if you used something different): + +`helm upgrade -n "stackgres" "stackgres-operator" https://stackgres.io/downloads/stackgres-k8s/stackgres/1.5.0/helm/stackgres-operator.tgz` + +#### :exclamation: IMPORTANT +After each operator upgrade, remember to perform a security upgrade SGDbOps on each existing SGCluster after the operator has been upgraded. + +Example: +```yaml +apiVersion: stackgres.io/v1 +kind: SGDbOps +metadata: + name: secupgr +spec: + sgCluster: my-cluster + op: securityUpgrade + maxRetries: 1 + securityUpgrade: + method: InPlace +``` + +> :warning: NOTE: This release is incompatible with previous `alpha` or `beta` versions. Upgrading from those versions will require uninstalling completely StackGres including all clusters and StackGres CRDs (those in `stackgres.io` group) first. + +### :construction: Known issues + +* Backups may be restored with inconsistencies when performed with a Postgres instance running on a different architecture ([#1539](https://gitlab.com/ongresinc/stackgres/-/issues/1539)) + +## :clipboard: List of features and changes + +### :sparkles: NEW FEATURES AND CHANGES + +* Added PostgreSQL 15.3, 15.2, 14.8, 14.7, 13.11, 13.10, 12.15, 12.14 +* Added Babelfish for PostgreSQL 14.6, 13.9 +* Added Patroni 3.0.2 +* Support for Kubernetes 1.27 and 1.26 +* Added SGShardedCluster CRD +* Support to specify Patroni initial config +* Support to set labels for Services (and Endpoints) +* Support to set much more services parameters for Services +* New sync-all and strict-sync-all to adjust the number of synchronous nodes to all replicas +* Shift from docker.io to quay.io +* Improved operator startup +* Improved cluster startup +* Enhanced cluster stats endpoint to fallback for cgroup v1 and v2 +* Make CronJob generator for v1 or v1beta1 api versions dependent on Kubernetes version +* Enable SSL by default on SGShardedCluster +* Generate SSL certificate and private key if only enabled is specified +* Change ssl configuration at run time +* Use job backoffLimit to implements SGDbOps maxRetries +* Improve current PgBouncer variable check query +* Support for self signed certificate when using S3 compatible storage +* Added priority class support +* Changed Operator Bundle installation name to `stackgres-operator` +* Cleanup CSR in operator helm chart +* Return username key for cluster and sharded cluster info in REST API +* Added sharded cluster stats REST API endpoints +* Section sgshardedcluster.status.clusters returned by REST API the ordered names of the sgclusters that will be created +* Updated base images for builds and release images + +#### Web Console + +* Support for Sharded Clusters +* Support user-supplied sidecars for SGCluster services +* Add loadBalancerIP to SGCluster and SGDistributedLogs +* Support user-supplied sidecars for pods customVolumes, customInitContainers and customContainers +* Enable SSL specs +* Implemented cascading replication with WAL shipping +* Implemented cascade replication from an external instance +* Implemented cascade replication from a local sgcluster +* Improve performance on REST API requests +* Replace crd details table layouts with summary tree structure + +### :bug: FIXES + +* ClusterBootstrapCompleted sent every few seconds +* Empty backupPath for majorVersionUpgrade SGDbOps make the operation fail +* Repeating restart ReducedImpact with 1 instance fails +* Major version upgrade must never change extension version +* Patroni do not clean up history after converting a cluster to standby cluster +* Failed SGScript without retryOnError do not re-execute if version is changed +* SGScript retry on error do not respect the backoff +* Deleting a resource a SGDistributedLogs depends on should not be possible +* pgbench SGDbOps fail if scale contains point +* Helm Controller Manager selectors are too generic +* Duplicate restartPolicy lines in the test operator template +* REST API can-i do not return permissions for SGShardedCluster +* REST API model is exposing parameters not present in the sharded cluster CRD +* sgcluster REST API returns all pods for a sharded cluster +* restart SGDbOps does not work on SGCluster when patroni scope is set +* when SSL enable causes boostrap to fail and breaks synchronous replication +* Sharded cluster primary service and shards service can not be set to NodePort or LoadBalancer +* PgBouncer queries for postgres exporter are failing +* Command `readlink /proc/$$/exe` may fail +* During security upgrade cluster Pods are not found + +#### Web Console + +* Edit SGPostgresConfig form should only list custom parameters +* Remove Advanced switch from Azure section +* Summaries should not open unless all required fields are filled in +* Backup scheduling inserting trailing zero in cron job minutes config +* Script source not cleared when deleting a script +* notValid class not being removed on Babelfish Experimental Feature +* Unify click behavious when clicked on a switch and on its label +* Cluster name on SGDbOp details is not clickable +* Sidebar items hidden behind dialog popups +* PITR date and time picker not working +* Continue on SGScripts Error should not be visible if there are no Scripts set +* Fix Extensions table layout +* View Script button text and icon on Cluster Configuration tab have different behaviours +* Hide empty sections on summaries +* Disable Connection Pooling not working properly on Cluster Form +* Object Storage selector on Cluster form shows all Object Storages from all Namespaces +* Make sure crontab is shown on preferred timezone +* Script content not shown on summary when set from a ConfigMap +* Show secretKeySelectors for GCS service account json on edit mode +* Review interceptors to REST API responses +* SGBackups list won't load when start time is not present on a backup +* Allow empty Backup path generate errors after update +* Sets wrong path for SGCluster backup config +* Edit SGPoolingConfig form should only list custom parameters +* Replace instances dropdown with numeric input on SGCluster form +* Service Account JSON not shown on Summary +* Error when updating an SGCluster with a ConfigMap in managed SQL section +* Cluster Summary opens and displays empty Custom Port properties +* Only show form when ready to be edited + +### :construction: KNOWN ISSUES + +* Backups may be restored with inconsistencies when performed with a Postgres instance running on a different architecture ([#1539](https://gitlab.com/ongresinc/stackgres/-/issues/1539)) + +### :twisted_rightwards_arrows: [Full list of commits](https://gitlab.com/ongresinc/stackgres/-/commits/1.5.0) + # :rocket: Release 1.5.0-rc2 (28-06-2023) ## :notepad_spiral: NOTES diff --git a/doc/content/en/01-introduction/06-versions/_index.md b/doc/content/en/01-introduction/06-versions/_index.md index f2fe90bb77..1e921f56f2 100755 --- a/doc/content/en/01-introduction/06-versions/_index.md +++ b/doc/content/en/01-introduction/06-versions/_index.md @@ -6,6 +6,25 @@ description: Details about StackGres versions. showToc: true --- +## StackGres 1.5.0 + +| Component | Versions | +| ------ | ----------- | +| PostgreSQL 15 | 15.3, 15.2, 15.1, 15.0 | +| PostgreSQL 14 | 14.8, 14.7, 14.6, 14.5, 14.4, ~14.2, 14.1, 14.0~ | +| PostgreSQL 13 | 13.11, 13.10, 13.9, 13.8, 13.7, 13.6, 13.5, 13.4, 13.3, 13.2, 13.1, 13.0 | +| PostgreSQL 12 | 12.15, 12.14, 12.13, 12.12, 12.11, 12.10, 12.9, 12.8, 12.7, 12.6, 12.5, 12.4, 12.3, 12.2 and 12.1 | +| PostgreSQL for Babelfish 14 | 14.6, 14.3 | +| PostgreSQL for Babelfish 13 | 13.9, 13.4 | +| Patroni | 3.0.2, 2.1.4, 2.1.3, 2.1.2, 2.1.0 | +| WAL-G | 2.0.1, 2.0.0, 1.1 | +| PgBouncer | 1.18.0 | +| Postgres Exporter | 0.11.1, 0.10.1 | +| Envoy | 1.24.3 | +| Fluent-Bit | 1.9.9 | +| Fluentd | 1.15.3 | +| Babelfish Compass | 2022.12 | + ## StackGres 1.5.0-rc2 | Component | Versions | diff --git a/stackgres-k8s/ci/build/Dockerfile-builder b/stackgres-k8s/ci/build/Dockerfile-builder index d6d1fdbbb1..2b021230a7 100644 --- a/stackgres-k8s/ci/build/Dockerfile-builder +++ b/stackgres-k8s/ci/build/Dockerfile-builder @@ -7,7 +7,7 @@ # ### -FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.3.0 +FROM ghcr.io/graalvm/graalvm-ce:ol8-java17-22.3.2 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 RUN gu --auto-yes install native-image RUN microdnf --nodocs install python3-pip jq util-linux diff --git a/stackgres-k8s/ci/build/config.yml b/stackgres-k8s/ci/build/config.yml index 208d8d15d5..bc358e216b 100644 --- a/stackgres-k8s/ci/build/config.yml +++ b/stackgres-k8s/ci/build/config.yml @@ -1,12 +1,12 @@ .images: ci_image: &ci_image registry.gitlab.com/ongresinc/stackgres/ci:1.20 jdk_build_image: &jdk_build_image registry.gitlab.com/ongresinc/stackgres/builder:1.5 - jdk_runtime_image: &jdk_runtime_image registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16-1 - ubi8_micro_image: &ubi8_micro_image registry.access.redhat.com/ubi8-micro:8.8-1 - ubi8_minimal_image: &ubi8_minimal_image registry.access.redhat.com/ubi8-minimal:8.8-860 - admin_ui_build_image: &admin_ui_build_image registry.access.redhat.com/ubi8/nodejs-16:1-105.1684740145 - admin_ui_nginx_image: &admin_ui_nginx_image registry.access.redhat.com/ubi8/nginx-120:1-106 - helm_operator_image: &helm_operator_image quay.io/operator-framework/helm-operator:v1.29.0 + jdk_runtime_image: &jdk_runtime_image registry.access.redhat.com/ubi8/openjdk-17-runtime:1.16-1.1687182770 + ubi8_micro_image: &ubi8_micro_image registry.access.redhat.com/ubi8-micro:8.8-3 + ubi9_minimal_image: &ubi9_minimal_image registry.access.redhat.com/ubi9-minimal:9.2-691 + admin_ui_build_image: &admin_ui_build_image registry.access.redhat.com/ubi8/nodejs-16:1-111 + admin_ui_nginx_image: &admin_ui_nginx_image registry.access.redhat.com/ubi8/nginx-120:1-92.1679484498 + helm_operator_image: &helm_operator_image quay.io/operator-framework/helm-operator:v1.30.0 platforms: - linux-x86_64 - linux-aarch64 @@ -345,7 +345,7 @@ modules: type: native-image platform_dependent: true path: stackgres-k8s/src/operator - target_image: *ubi8_minimal_image + target_image: *ubi9_minimal_image dockerfile: &native-image-dockerfile path: stackgres-k8s/src/operator/src/main/docker/Dockerfile.native args: &native-image-args diff --git a/stackgres-k8s/e2e/envs/aks b/stackgres-k8s/e2e/envs/aks index 66b056f261..3068683a6b 100644 --- a/stackgres-k8s/e2e/envs/aks +++ b/stackgres-k8s/e2e/envs/aks @@ -3,25 +3,14 @@ K8S_AZ_LOCATION="${K8S_AZ_LOCATION:-northeurope}" K8S_AZ_RESOURCE_GROUP="${K8S_AZ_RESOURCE_GROUP:-stackgres-e2e}" K8S_AZ_K8S_NAME="${K8S_AZ_K8S_NAME:-stackgres}" -K8S_VERSION="${K8S_VERSION:-1.21.9}" -K8S_AZ_NODE_SIZE="${K8S_AZ_NODE_SIZE:-Standard_B2s}" +K8S_VERSION="${K8S_VERSION:-1.27}" +K8S_AZ_NODE_SIZE="${K8S_AZ_NODE_SIZE:-Standard_A2m_v2}" K8S_AZ_NODE_COUNT="${K8S_AZ_NODE_COUNT:-4}" K8S_AZ_REGISTRY="${K8S_AZ_REGISTRY:-stackgrese2e}" export E2E_USE_INTERMIDIATE_PRIVATE_REPO="${E2E_USE_INTERMIDIATE_PRIVATE_REPO:-true}" export E2E_OPERATOR_PULL_POLICY=Always -if [ "$K8S_AZ_NODE_SIZE" = "Standard_B2s" ] && [ "$E2E_PARALLELISM" -gt "$K8S_AZ_NODE_COUNT" ] -then - echo "Warning: to avoid false failures is recommended to match the E2E_PARALLELISM with K8S_AZ_NODE_COUNT" -fi - -if [ "$K8S_VERSION" = "$DEFAULT_K8S_VERSION" ] -then - >&2 echo "Warning: using kubernetes version 1.21.9 since e2e default $DEFAULT_K8S_VERSION is not available for aks" - K8S_VERSION=1.21.9 -fi - get_k8s_env_version() { echo "az version $(az version 2>/dev/null | grep -F '"azure-cli"' | cut -d '"' -f 4)" echo @@ -47,14 +36,16 @@ reset_k8s() { az aks create --name "$K8S_AZ_K8S_NAME" --resource-group "$K8S_AZ_RESOURCE_GROUP" \ --kubernetes-version "$K8S_VERSION" --node-count "$K8S_AZ_NODE_COUNT" \ --node-vm-size "$K8S_AZ_NODE_SIZE" \ - --generate-ssh-keys + --generate-ssh-keys \ + --enable-node-public-ip else az aks create --name "$K8S_AZ_K8S_NAME" --resource-group "$K8S_AZ_RESOURCE_GROUP" \ --kubernetes-version "$K8S_VERSION" --node-count "$K8S_AZ_NODE_COUNT" \ --node-vm-size "$K8S_AZ_NODE_SIZE" \ --service-principal "$SP_APP_ID" \ --client-secret "$SP_PASSWORD" \ - --generate-ssh-keys + --generate-ssh-keys \ + --enable-node-public-ip fi az aks get-credentials --name "$K8S_AZ_K8S_NAME" --resource-group "$K8S_AZ_RESOURCE_GROUP" --overwrite-existing diff --git a/stackgres-k8s/e2e/envs/crc b/stackgres-k8s/e2e/envs/crc index c8545d8746..8c7918526f 100644 --- a/stackgres-k8s/e2e/envs/crc +++ b/stackgres-k8s/e2e/envs/crc @@ -140,6 +140,7 @@ reset_k8s() { fi export PATH="$PATH:/usr/sbin" crc start \ + $([ -z "$E2E_CRC_BUNDLE" ] || printf %s "--bundle $E2E_CRC_BUNDLE") \ --pull-secret-file "$HOME/.crc/pull-secret" \ --cpus "$K8S_CRC_CPUS" \ --memory "$K8S_CRC_MEMORY" \ diff --git a/stackgres-k8s/e2e/envs/eks b/stackgres-k8s/e2e/envs/eks index e379dd1f65..4d855ecc0b 100644 --- a/stackgres-k8s/e2e/envs/eks +++ b/stackgres-k8s/e2e/envs/eks @@ -1,12 +1,6 @@ #!/bin/sh K8S_EKS_NAME="${K8S_EKS_NAME:-stackgres-e2e}" -K8S_VERSION="${K8S_VERSION:-1.18.20}" -if [ "$K8S_VERSION" = "$DEFAULT_K8S_VERSION" ] -then - >&2 echo "Warning: using kubernetes version 1.16 since e2e default $DEFAULT_K8S_VERSION is not available for eks" - K8S_VERSION=1.18.11 -fi K8S_EKS_REGION="${K8S_EKS_REGION:-us-west-2}" K8S_EKS_NODE_TYPE="${K8S_EKS_NODE_TYPE:-m5.large}" K8S_EKS_NODES="${K8S_EKS_NODES:-1}" @@ -44,6 +38,7 @@ reset_k8s() { delete_k8s eksctl create cluster --name "$K8S_EKS_NAME" \ + --spot \ --region "$K8S_EKS_REGION" \ --node-type "$K8S_EKS_NODE_TYPE" \ --node-volume-size "$K8S_EKS_DISK_SIZE" \ diff --git a/stackgres-k8s/e2e/spec/dbops-security-upgrade-olm b/stackgres-k8s/e2e/spec/dbops-security-upgrade-olm index 4f0287fbea..e5603e8b1d 100644 --- a/stackgres-k8s/e2e/spec/dbops-security-upgrade-olm +++ b/stackgres-k8s/e2e/spec/dbops-security-upgrade-olm @@ -72,10 +72,18 @@ e2e_install_previous_operator() { --timeout "${E2E_TIMEOUT}s" fi - PREVIOUS_BUNDLE_IMAGE_NAME="$(wait_until eval \ - 'kubectl exec -n olm "$(kubectl get pod -n olm -l olm.catalogSource=operatorhubio-catalog -o name | grep "^pod/")" \ - -- cat configs/stackgres/catalog.yaml \ - | yq -sr ".[]|select(.name == \"stackgres.v$BUNDLE_STACKGRES_PREVIOUS_VERSION\").image" | grep .')" + if [ "$E2E_ENV" != "minishift" ] && [ "$E2E_ENV" != "crc" ] && [ "$E2E_ENV" != "microshift" ] + then + PREVIOUS_BUNDLE_IMAGE_NAME="$(wait_until eval \ + 'kubectl exec -n olm "$(kubectl get pod -n olm -l olm.catalogSource=operatorhubio-catalog -o name | grep "^pod/")" \ + -- cat configs/stackgres/catalog.yaml \ + | yq -sr ".[]|select(.name == \"stackgres.v$BUNDLE_STACKGRES_PREVIOUS_VERSION\").image" | grep .')" + else + PREVIOUS_BUNDLE_IMAGE_NAME="$(wait_until eval \ + 'kubectl exec -n openshift-marketplace "$(kubectl get pod -n openshift-marketplace -l olm.catalogSource=redhat-marketplace -o name | grep "^pod/")" \ + -- cat /configs/stackgres/catalog.json \ + | jq -sr ".[]|select(.name == \"stackgres.v$BUNDLE_STACKGRES_PREVIOUS_VERSION\").image" | grep .')" + fi CATALOG_IMAGE_NAME="$E2E_OPERATOR_REGISTRY${E2E_OPERATOR_REGISTRY_PATH%/}/stackgres/${HELM_OPERATOR_CATALOG_IMAGE_NAME##*/}" mkdir -p "$LOG_PATH/helm-operator-catalog" diff --git a/stackgres-k8s/e2e/spec/operator-helm-chart b/stackgres-k8s/e2e/spec/operator-helm-chart index 5ff4688de6..99c3a28dba 100644 --- a/stackgres-k8s/e2e/spec/operator-helm-chart +++ b/stackgres-k8s/e2e/spec/operator-helm-chart @@ -1,5 +1,9 @@ #!/bin/sh +e2e_exclusive_lock() { + true +} + e2e_test_install() { echo "Check Operator Helm Chart properties" OPERATOR_HELM_JOB_NAMES="$(helm template -n "$OPERATOR_NAMESPACE" stackgres-operator "$OPERATOR_CHART_PATH" | yq -r 'select(.kind == "Job").metadata.name')" @@ -197,4 +201,4 @@ check_operator_specific_property() { echo "SUCCESS! Property $KEY has value $EXPECTED_VALUE on $NAME $KIND" fi done; -} \ No newline at end of file +} diff --git a/stackgres-k8s/install/operator-sdk/openshift-certification/preflight.sh b/stackgres-k8s/install/operator-sdk/openshift-certification/preflight.sh index 5c1e3f32fc..4ee323e5b3 100755 --- a/stackgres-k8s/install/operator-sdk/openshift-certification/preflight.sh +++ b/stackgres-k8s/install/operator-sdk/openshift-certification/preflight.sh @@ -13,15 +13,15 @@ PROJECT_ID="$(jq -r ".[\"$REPOSITORY\"] | if . != null then . else error(\"Proje . "${OPENSHIFT_CERTIFICATION_TOKENS_PATH:-$HOME/.openshift-tokens}" REPOSITORY="${IMAGE%%/*}" -if [ "$REPOSITORY" = quay.io ] +if [ "$REPOSITORY" = docker.io ] then - REPOSITORY=https://index.quay.io/v1/ + REPOSITORY=https://index.docker.io/v1/ fi AUTH="$(jq -r '.auths|to_entries|.[]|select(.key == "'"$REPOSITORY"'").value.auth' "${OPENSHIFT_CERTIFICATION_PROJECTS_JSON_PATH:-$HOME/.openshift-certification-auths.json}")" if [ -z "$AUTH" ] then - echo "No auth found for repository $REPOSITORY in auths.json" + echo "No auth found for repository $REPOSITORY in ${OPENSHIFT_CERTIFICATION_PROJECTS_JSON_PATH:-$HOME/.openshift-certification-auths.json}" exit 1 fi diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/Makefile b/stackgres-k8s/install/operator-sdk/stackgres-operator/Makefile index 43833e8aa0..b8abf6b8bf 100644 --- a/stackgres-k8s/install/operator-sdk/stackgres-operator/Makefile +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/Makefile @@ -3,11 +3,11 @@ # To re-generate a bundle for another specific version without changing the standard setup, you can: # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2) # - use environment variables to overwrite this value (e.g export VERSION=0.0.2) -PROJECT_DIR ?= ../../../.. -STACKGRES_VERSION ?= $(shell sh $(PROJECT_DIR)/stackgres-k8s/ci/build/version.sh) +PROJECT_PATH ?= ../../../.. +STACKGRES_VERSION ?= $(shell sh $(PROJECT_PATH)/stackgres-k8s/ci/build/version.sh) VERSION = $(shell echo $(STACKGRES_VERSION) | tr A-Z a-z) IMAGE_TAG ?= $(VERSION) -HELM_OPERATOR_BASE_IMAGE ?= quay.io/operator-framework/helm-operator:v1.26.0 +HELM_OPERATOR_BASE_IMAGE ?= quay.io/operator-framework/helm-operator:v1.30.0 BUNDLE_BASE_IMAGE ?= scratch # CHANNELS define the bundle channels used in the bundle. @@ -84,7 +84,7 @@ run: helm-operator ## Run against the configured Kubernetes cluster in ~/.kube/c .PHONY: docker-build docker-build: ## Build docker image with the manager. - docker build -t ${IMG} -f Dockerfile --build-arg BASE_IMAGE=$(HELM_OPERATOR_BASE_IMAGE) $(PROJECT_DIR) + docker build -t ${IMG} -f Dockerfile --build-arg BASE_IMAGE=$(HELM_OPERATOR_BASE_IMAGE) $(PROJECT_PATH) .PHONY: docker-push docker-push: ## Push docker image with the manager. @@ -164,11 +164,11 @@ endif .PHONY: bundle bundle: kustomize ## Generate bundle manifests and metadata, then validate generated files. - VERSION="$(VERSION)" eval "$$(printf 'cat << MAKE_EOF\n%s\nMAKE_EOF' "$$(cat config/manifests/bases/stackgres.clusterserviceversion.template.yaml)")" \ + VERSION="$(VERSION)" IMAGE_TAG="$(IMAGE_TAG)" PROJECT_PATH="$(PROJECT_PATH)" eval "$$(printf 'cat << MAKE_EOF\n%s\nMAKE_EOF' "$$(cat config/manifests/bases/stackgres.clusterserviceversion.template.yaml)")" \ > config/manifests/bases/stackgres.clusterserviceversion.yaml VERSION="$(VERSION)" eval "$$(printf "cat << MAKE_EOF\n$$(cat config/manager/kustomization.template.yaml)\nMAKE_EOF")" \ > config/manager/kustomization.yaml - cp -a "$(PROJECT_DIR)/stackgres-k8s/src/common/src/main/resources/crds/." config/crd/bases/. + cp -a "$(PROJECT_PATH)/stackgres-k8s/src/common/src/main/resources/crds/." config/crd/bases/. VERSION="$(VERSION)" eval "$$(printf "cat << MAKE_EOF\n$$(cat config/crd/kustomization.template.yaml)\nMAKE_EOF")" \ > config/crd/kustomization.yaml VERSION="$(VERSION)" OPENSHIFT_BUNDLE="$(OPENSHIFT_BUNDLE)" eval "$$(printf 'cat << MAKE_EOF\n%s\nMAKE_EOF' "$$(cat config/manager/manager.template.yaml)")" \ @@ -190,17 +190,18 @@ bundle-openshift: bundle yq -y -s '.[0] * .[1]' \ bundle/manifests/stackgres.clusterserviceversion.yaml \ openshift-operator-bundle/manifests/stackgres.clusterserviceversion.yaml \ - > bundle/manifests/stackgres.clusterserviceversion.yaml.bak && mv bundle/manifests/stackgres.clusterserviceversion.yaml.bak bundle/manifests/stackgres.clusterserviceversion.yaml + > bundle/manifests/stackgres.clusterserviceversion.yaml.new + mv bundle/manifests/stackgres.clusterserviceversion.yaml.new bundle/manifests/stackgres.clusterserviceversion.yaml yq -y -s '.[0] * .[1]' \ bundle/metadata/annotations.yaml \ openshift-operator-bundle/metadata/annotations.yaml \ - > bundle/metadata/annotations.yaml.bak - mv bundle/metadata/annotations.yaml.bak bundle/metadata/annotations.yaml + > bundle/metadata/annotations.yaml.new + mv bundle/metadata/annotations.yaml.new bundle/metadata/annotations.yaml operator-sdk bundle validate ./bundle .PHONY: bundle-build bundle-build: ## Build the bundle image. - docker build -f Dockerfile.bundle -t $(BUNDLE_IMG) --build-arg BASE_IMAGE="$(BUNDLE_BASE_IMAGE)" $(PROJECT_DIR) + docker build -f Dockerfile.bundle -t $(BUNDLE_IMG) --build-arg BASE_IMAGE="$(BUNDLE_BASE_IMAGE)" $(PROJECT_PATH) .PHONY: bundle-push bundle-push: ## Push the bundle image. diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-operatorhub.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-operatorhub.yaml new file mode 100644 index 0000000000..c9bd0d082b --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-operatorhub.yaml @@ -0,0 +1,7 @@ +--- +updateGraph: semver-mode + +reviewers: +- ahachete +- teoincontatto +- jorsol \ No newline at end of file diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-certified.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-certified.yaml new file mode 100644 index 0000000000..557ab1676b --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-certified.yaml @@ -0,0 +1,2 @@ +--- +cert_project_id: 64a68601aa534dcfb95f8715 \ No newline at end of file diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-community.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-community.yaml new file mode 100644 index 0000000000..78fb022d33 --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-community.yaml @@ -0,0 +1,2 @@ +--- +cert_project_id: 64a687c10ac1519ed78df760 \ No newline at end of file diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-marketplace.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-marketplace.yaml new file mode 100644 index 0000000000..08fb4f97e8 --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/ci-red-hat-marketplace.yaml @@ -0,0 +1,2 @@ +--- +cert_project_id: 641b15d6b22c5a72d6155224 \ No newline at end of file diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/default/manager_auth_proxy_patch.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/default/manager_auth_proxy_patch.yaml index d2c4fcfc7a..7b75339ff7 100644 --- a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/default/manager_auth_proxy_patch.yaml +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/default/manager_auth_proxy_patch.yaml @@ -18,8 +18,6 @@ spec: values: - amd64 - arm64 - - ppc64le - - s390x - key: kubernetes.io/os operator: In values: diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.description.txt b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.description.txt index f1ec3062ff..039049d0ba 100644 --- a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.description.txt +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.description.txt @@ -18,7 +18,6 @@ Built by [OnGres](https://ongres.com) ("**On** Post**Gres**"), StackGres require * **100% Open Source**. No "premium version with advanced features", no production usage restrictions. Just Open Source. * **[24/7 Support](https://stackgres.io/pricing/) Available from OnGres** - ## Installation and documentation Installation: diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.template.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.template.yaml index b3b58ba731..a689356369 100644 --- a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.template.yaml +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/manifests/bases/stackgres.clusterserviceversion.template.yaml @@ -9,18 +9,17 @@ metadata: Fully Open Source. alm-examples: '[]' capabilities: Deep Insights - operatorhub.io/ui-metadata-max-k8s-version: "1.25.999" + operatorhub.io/ui-metadata-max-k8s-version: "$(yq -r '.kubeVersion|match("^[^ ]+ - ([^.]+\\.[^.]+)\\..*$").captures[0].string' helm-charts/stackgres-operator/Chart.yaml).999" categories: Database repository: https://gitlab.com/ongresinc/stackgres - containerImage: quay.io/stackgres/operator:${VERSION} - olm.skipRange: '<${VERSION}' + containerImage: quay.io/stackgres/operator:${IMAGE_TAG} spec: displayName: StackGres provider: name: OnGres url: https://ongres.com - version: ${VERSION} - minKubeVersion: "1.18.0" + version: "${VERSION}" + minKubeVersion: "$(yq -r '.kubeVersion|match("^([^.]+\\.[^.]+)\\..*$").captures[0].string' helm-charts/stackgres-operator/Chart.yaml).0" maturity: stable apiservicedefinitions: {} customresourcedefinitions: @@ -69,12 +68,16 @@ $( maintainers: - email: stackgres@ongres.com name: OnGres + labels: + operatorframework.io/arch.amd64: supported + operatorframework.io/arch.arm64: supported + operatorframework.io/os.linux: supported relatedImages: - - image: ongres/kubectl:v1.25.5-build-6.19 + - image: quay.io/ongres/kubectl:v1.25.5-build-6.19 name: kubectl_1_25_5 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0 name: kube-rbac-proxy_0_13_0 - - image: quay.io/stackgres/helm-operator:${VERSION} + - image: quay.io/stackgres/helm-operator:${IMAGE_TAG} name: stackgres-operator-helm - image: quay.io/stackgres/operator:${VERSION} name: stackgres-operator diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/samples/SGShardedCluster.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/samples/SGShardedCluster.yaml new file mode 100644 index 0000000000..fd1d9bd65b --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/samples/SGShardedCluster.yaml @@ -0,0 +1,21 @@ +apiVersion: stackgres.io/v1alpha1 +kind: SGShardedCluster +metadata: + namespace: demo-db + name: demo-shardeddb +spec: + type: citus + database: sharded + postgres: + version: '15.3' + coordinator: + instances: 2 + pods: + persistentVolume: + size: 10Gi + shards: + clusters: 3 + instancesPerCluster: 2 + pods: + persistentVolume: + size: 10Gi diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/samples/kustomization.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/samples/kustomization.yaml index d2eeb36678..48db6c2cd2 100644 --- a/stackgres-k8s/install/operator-sdk/stackgres-operator/config/samples/kustomization.yaml +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/config/samples/kustomization.yaml @@ -10,4 +10,5 @@ resources: - SGScript.yaml - SGBackup.yaml - SGDbOps.yaml +- SGShardedCluster.yaml #+kubebuilder:scaffold:manifestskustomizesamples diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-operatorhub.sh b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-operatorhub.sh new file mode 100644 index 0000000000..0fc5f6a33f --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-operatorhub.sh @@ -0,0 +1,9 @@ +#!/bin/sh + +UPSTREAM_NAME="OperatorHub" +UPSTREAM_GIT_URL="https://github.com/k8s-operatorhub/community-operators" +FORK_GIT_URL="${FORK_GIT_URL:-$1}" +PROJECT_NAME="stackgres" +DO_PIN_IMAGES=false + +. "$(dirname "$0")/deploy.sh" diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-certified.sh b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-certified.sh new file mode 100644 index 0000000000..9c1184460d --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-certified.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +UPSTREAM_NAME="Red Hat Certified" +UPSTREAM_GIT_URL="https://github.com/redhat-openshift-ecosystem/certified-operators" +FORK_GIT_URL="${FORK_GIT_URL:-$1}" +PROJECT_NAME="stackgres-certified" +DO_PIN_IMAGES=true +HELM_OPERATOR_BUNDLE_IMAGE_TAG_SUFFIX=-openshift + +deploy_extra_steps() { + yq -y -s '.[0] * .[1]' \ + "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml \ + openshift-operator-bundle/red-hat-certified/stackgres.clusterserviceversion.yaml \ + > "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml.new + mv "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml.new \ + "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml +} + +. "$(dirname "$0")/deploy.sh" diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-community.sh b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-community.sh new file mode 100644 index 0000000000..2d9d792bfd --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-community.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +UPSTREAM_NAME="Red Hat Community" +UPSTREAM_GIT_URL="https://github.com/redhat-openshift-ecosystem/community-operators-prod" +FORK_GIT_URL="${FORK_GIT_URL:-$1}" +PROJECT_NAME="stackgres-community" +DO_PIN_IMAGES=true +HELM_OPERATOR_BUNDLE_IMAGE_TAG_SUFFIX=-openshift + +deploy_extra_steps() { + yq -y -s '.[0] * .[1]' \ + "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml \ + openshift-operator-bundle/red-hat-certified/stackgres.clusterserviceversion.yaml \ + > "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml.new + mv "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml.new \ + "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml +} + +. "$(dirname "$0")/deploy.sh" diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-marketplace.sh b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-marketplace.sh new file mode 100644 index 0000000000..6dfa87ff7d --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy-to-red-hat-marketplace.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +UPSTREAM_NAME="Red Hat Maretplace" +UPSTREAM_GIT_URL="https://github.com/redhat-openshift-ecosystem/redhat-marketplace-operators" +FORK_GIT_URL="${FORK_GIT_URL:-$1}" +PROJECT_NAME="stackgres" +DO_PIN_IMAGES=true +HELM_OPERATOR_BUNDLE_IMAGE_TAG_SUFFIX=-openshift + +deploy_extra_steps() { + yq -y -s '.[0] * .[1]' \ + "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml \ + openshift-operator-bundle/red-hat-marketplace/stackgres.clusterserviceversion.yaml \ + > "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml.new + mv "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml.new \ + "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml +} + +. "$(dirname "$0")/deploy.sh" diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy.sh b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy.sh new file mode 100644 index 0000000000..162ba39b0f --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/deploy.sh @@ -0,0 +1,148 @@ +#!/bin/sh + +set -e + +if [ -z "$UPSTREAM_NAME" ] +then + >&2 echo "Must set UPSTREAM_NAME env var" + exit 1 +fi + +if [ -z "$UPSTREAM_GIT_URL" ] +then + >&2 echo "Must set UPSTREAM_GIT_URL env var" + exit 1 +fi + +if [ -z "$FORK_GIT_URL" ] +then + >&2 echo "Must set FORK_GIT_URL env var" + exit 1 +fi + +if [ -z "$PROJECT_NAME" ] +then + >&2 echo "Must set PROJECT_NAME env var" + exit 1 +fi + +PROJECT_PATH=../../../../ + +cd "$(dirname "$0")" + +STACKGRES_VERSION="${STACKGRES_VERSION:-$(sh "$PROJECT_PATH"/stackgres-k8s/ci/build/version.sh)}" + +mkdir -p target +UPSTREAM_SUFFIX="$(printf %s "$UPSTREAM_NAME" | tr '[A-Z] ' '[a-z]-' | tr -dc '[a-z0-9]-')" +UPSTREAM_GIT_PATH=target/"upstream-$UPSTREAM_SUFFIX" +FORK_GIT_PATH=target/"fork-$UPSTREAM_SUFFIX" +HELM_OPERATOR_BUNDLE_IMAGE_TAG="${STACKGRES_VERSION}$HELM_OPERATOR_BUNDLE_IMAGE_TAG_SUFFIX" + +if [ -d "$UPSTREAM_GIT_PATH" ] && git -C "$UPSTREAM_GIT_PATH" remote -v | grep -qF "$UPSTREAM_GIT_URL" +then + echo "Resetting Upstream $UPSTREAM_NAME from $UPSTREAM_GIT_URL" + git -C "$UPSTREAM_GIT_PATH" fetch + git -C "$UPSTREAM_GIT_PATH" reset --hard HEAD + git -C "$UPSTREAM_GIT_PATH" checkout main + git -C "$UPSTREAM_GIT_PATH" reset --hard origin/main +else + echo "Cloning Upstream $UPSTREAM_NAME from $UPSTREAM_GIT_URL" + rm -rf "$UPSTREAM_GIT_PATH" + git clone "$UPSTREAM_GIT_URL" "$UPSTREAM_GIT_PATH" +fi + +if [ -d "$FORK_GIT_PATH" ] && git -C "$FORK_GIT_PATH" remote -v | grep -qF "$FORK_GIT_URL" +then + echo "Resetting OperatorHub fork for StackGres from $FORK_GIT_URL" + if ! git -C "$FORK_GIT_PATH" remote -v | tr -s '[:blank:]' ' ' | grep -qxF "upstream $UPSTREAM_GIT_URL (fetch)" + then + git -C "$FORK_GIT_PATH" remote add upstream "$UPSTREAM_GIT_URL" + fi + git -C "$FORK_GIT_PATH" fetch upstream + git -C "$FORK_GIT_PATH" reset --hard HEAD + git -C "$FORK_GIT_PATH" checkout main + git -C "$FORK_GIT_PATH" reset --hard upstream/main +else + echo "Cloning OperatorHub fork for StackGres from $FORK_GIT_URL" + rm -rf "$FORK_GIT_PATH" + git clone "$FORK_GIT_URL" "$FORK_GIT_PATH" +fi + +if [ "$(git -C "$FORK_GIT_PATH" rev-list --max-parents=0 HEAD)" != "$(git -C "$UPSTREAM_GIT_PATH" rev-list --max-parents=0 HEAD)" ] +then + >&2 echo "Git repository $FORK_GIT_URL seems not a fork of $UPSTREAM_GIT_URL" + exit 1 +fi + +echo "Copying new files to path operators/$PROJECT_NAME/$STACKGRES_VERSION from quay.io/stackgres/helm-operator-bundle:$HELM_OPERATOR_BUNDLE_IMAGE_TAG" +( +rm -rf "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION" +mkdir -p "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION" +cd "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION" +docker pull quay.io/stackgres/helm-operator-bundle:$HELM_OPERATOR_BUNDLE_IMAGE_TAG +docker save quay.io/stackgres/helm-operator-bundle:$HELM_OPERATOR_BUNDLE_IMAGE_TAG | tar tv | tr -s ' ' | cut -d ' ' -f 6 | grep -F layer.tar \ + | while read LAYER + do + docker save quay.io/stackgres/helm-operator-bundle:$HELM_OPERATOR_BUNDLE_IMAGE_TAG | tar xO "$LAYER" | tar xv + done +) +find "$FORK_GIT_PATH" -name '.wh*' \ + | while read FILE + do + rm "$FILE" + done +cp ci-"$UPSTREAM_SUFFIX".yaml "$FORK_GIT_PATH/operators/$PROJECT_NAME/ci.yaml" + +if [ "$DO_PIN_IMAGES" = true ] +then + echo "Pinning images:" + echo + ( + cd "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION" + IMAGES="$(grep 'image:' "manifests/stackgres.clusterserviceversion.yaml" | tr -d ' ' | cut -d : -f 2-)" + echo "$IMAGES" \ + | while read -r IMAGE + do + DIGEST="$(docker buildx imagetools inspect "$IMAGE" | grep '^Digest:' | tr -d ' ' | cut -d : -f 2-)" + IMAGE_NAME="${IMAGE%%:*}" + IMAGE_NAME="${IMAGE_NAME%%@sha256}" + echo "Pinning $IMAGE to $IMAGE_NAME@$DIGEST" + sed -i "s#\([iI]\)mage: $IMAGE\$#\1mage: $IMAGE_NAME@$DIGEST#" "manifests/stackgres.clusterserviceversion.yaml" + done + echo + ) + git -C "$FORK_GIT_PATH" diff + echo "Pinning done!" +fi + +if command -v deploy_extra_steps > /dev/null 2>&1 +then + deploy_extra_steps +fi + +mv "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/stackgres.clusterserviceversion.yaml \ + "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION"/manifests/"${PROJECT_NAME}.clusterserviceversion.yaml" + +# Pass Red Hat YAML checks +find "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION" -name '*.yaml' | xargs -I % sh -c 'yq -y . % > %.new && mv %.new %' + +operator-sdk bundle validate "$FORK_GIT_PATH/operators/$PROJECT_NAME/$STACKGRES_VERSION" + +git -C "$FORK_GIT_PATH" add . +git -C "$FORK_GIT_PATH" status +echo "Creating commit" +git -C "$FORK_GIT_PATH" commit -m "operator $PROJECT_NAME (${STACKGRES_VERSION})" +echo "To push use the following command" +echo git -C "$PROJECT_PATH"/stackgres-k8s/install/operator-sdk/stackgres-operator/"$FORK_GIT_PATH" push +echo +if [ "$UPSTREAM_GIT_URL" != "${UPSTREAM_GIT_URL#https://github.com}" ] +then + if [ "$FORK_GIT_URL" != "${FORK_GIT_URL#https://github.com}" ] + then + echo "To create the PR go to: $UPSTREAM_GIT_URL/compare/main...$(printf %s "$FORK_GIT_URL" | cut -d / -f 4):$(printf %s "$FORK_GIT_URL" | cut -d / -f 5):main?expand=1" + fi + if [ "$FORK_GIT_URL" != "${FORK_GIT_URL#git@github.com}" ] + then + echo "To create the PR go to: $UPSTREAM_GIT_URL/compare/main...$(printf %s "$FORK_GIT_URL" | cut -d / -f 1 | cut -d : -f 2):$(printf %s "$FORK_GIT_URL" | cut -d / -f 2 | cut -d . -f 1):main?expand=1" + fi +fi diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/manifests/stackgres.clusterserviceversion.template.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/manifests/stackgres.clusterserviceversion.template.yaml index 8495d06b9e..2ddbfb0d98 100644 --- a/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/manifests/stackgres.clusterserviceversion.template.yaml +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/manifests/stackgres.clusterserviceversion.template.yaml @@ -1,25 +1,6 @@ -apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion -metadata: - annotations: - marketplace.openshift.io/remote-workflow: "https://marketplace.redhat.com/en-us/operators/stackgres/pricing?utm_source=openshift_console" - marketplace.openshift.io/support-workflow: "https://marketplace.redhat.com/en-us/operators/stackgres/support?utm_source=openshift_console" - # olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.11"}]' # Uncomment to specify max OpenShift supported version. - # Beware that k8s version is already enforced and this check may prevent - # operator installation on newer OpenShift version without a real need. -spec: - relatedImages: - - name: kubectl_1_25_5 - image: ongres/kubectl:v1.25.5-build-6.19 - - name: kube-rbac-proxy_0_13_0 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0 - - name: stackgres-operator-helm - image: quay.io/stackgres/helm-operator:${VERSION}-openshift - - name: stackgres-operator - image: quay.io/stackgres/operator:${VERSION} - - name: stackgres-restapi - image: quay.io/stackgres/restapi:${VERSION} - - name: stackgres-admin-ui - image: quay.io/stackgres/admin-ui:${VERSION} - - name: stackgres-jobs - image: quay.io/stackgres/jobs:${VERSION} +# metadata: +# annotations: +# olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.13"}]' # Uncomment to specify max OpenShift supported version. +# # Beware that k8s version is already enforced and this check may prevent +# # operator installation on newer OpenShift version without a real need. diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/metadata/annotations.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/metadata/annotations.yaml index f24081a4d1..f6f6175305 100644 --- a/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/metadata/annotations.yaml +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/metadata/annotations.yaml @@ -1,4 +1,4 @@ annotations: # Red Hat annotations. - com.redhat.openshift.versions: v4.9-v4.12 + com.redhat.openshift.versions: v4.9-v4.13 diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/red-hat-certified/stackgres.clusterserviceversion.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/red-hat-certified/stackgres.clusterserviceversion.yaml new file mode 100644 index 0000000000..d8ccf61402 --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/red-hat-certified/stackgres.clusterserviceversion.yaml @@ -0,0 +1,4 @@ +kind: ClusterServiceVersion +metadata: + annotations: + certified: 'true' diff --git a/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/red-hat-marketplace/stackgres.clusterserviceversion.yaml b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/red-hat-marketplace/stackgres.clusterserviceversion.yaml new file mode 100644 index 0000000000..d2bf504128 --- /dev/null +++ b/stackgres-k8s/install/operator-sdk/stackgres-operator/openshift-operator-bundle/red-hat-marketplace/stackgres.clusterserviceversion.yaml @@ -0,0 +1,5 @@ +kind: ClusterServiceVersion +metadata: + annotations: + marketplace.openshift.io/remote-workflow: "https://marketplace.redhat.com/en-us/operators/stackgres/pricing?utm_source=openshift_console" + marketplace.openshift.io/support-workflow: "https://marketplace.redhat.com/en-us/operators/stackgres/support?utm_source=openshift_console" diff --git a/stackgres-k8s/src/api-web/pom.xml b/stackgres-k8s/src/api-web/pom.xml index cbeb41da7e..675f44232f 100644 --- a/stackgres-k8s/src/api-web/pom.xml +++ b/stackgres-k8s/src/api-web/pom.xml @@ -56,8 +56,8 @@ quarkus-smallrye-health - org.jooq - jooq + io.quarkiverse.jooq + quarkus-jooq org.apache.commons @@ -80,7 +80,12 @@ io.swagger.core.v3 - swagger-annotations + swagger-annotations-jakarta + + + io.swagger.core.v3 + swagger-maven-plugin-jakarta + 2.2.15 io.quarkus @@ -186,8 +191,8 @@ jandex-maven-plugin - io.openapitools.swagger - swagger-maven-plugin + io.swagger.core.v3 + swagger-maven-plugin-jakarta false @@ -195,16 +200,19 @@ io.stackgres.apiweb.dto io.stackgres.apiweb.security - ${basedir}/target/ - swagger - JSON,YAML + ${basedir}/target/ + swagger + YAML true - true + true + true + true + compile - generate + resolve diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/app/KubernetesClientProvider.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/app/KubernetesClientProvider.java index 8c48371c34..e4a62896cf 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/app/KubernetesClientProvider.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/app/KubernetesClientProvider.java @@ -5,17 +5,16 @@ package io.stackgres.apiweb.app; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Alternative; -import javax.enterprise.inject.Produces; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.Config; import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; -import io.quarkus.arc.Priority; import io.quarkus.security.identity.SecurityIdentity; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Inject; import org.eclipse.microprofile.jwt.Claim; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/application/bbfcompass/BabelfishCompass.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/application/bbfcompass/BabelfishCompass.java index 40a08c7b4d..ef2f6ca44f 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/application/bbfcompass/BabelfishCompass.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/application/bbfcompass/BabelfishCompass.java @@ -20,10 +20,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.WebApplicationException; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.Quantity; @@ -43,6 +39,9 @@ import io.stackgres.common.StringUtil; import io.stackgres.common.resource.PodExecutor; import io.stackgres.common.resource.ResourceUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.WebApplicationException; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/config/WebApiPropertyContext.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/config/WebApiPropertyContext.java index 0f701d906b..0ec763ec70 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/config/WebApiPropertyContext.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/config/WebApiPropertyContext.java @@ -5,9 +5,8 @@ package io.stackgres.apiweb.config; -import javax.inject.Singleton; - import io.stackgres.common.StackGresPropertyContext; +import jakarta.inject.Singleton; @Singleton public class WebApiPropertyContext implements StackGresPropertyContext { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/distributedlogs/DistributedLogsFetcherImpl.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/distributedlogs/DistributedLogsFetcherImpl.java index 9f1b2fc8c6..332aa91035 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/distributedlogs/DistributedLogsFetcherImpl.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/distributedlogs/DistributedLogsFetcherImpl.java @@ -15,10 +15,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Secret; import io.stackgres.apiweb.dto.cluster.ClusterDistributedLogs; @@ -32,6 +28,9 @@ import io.stackgres.common.postgres.PostgresConnectionManager; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; import org.jooq.DSLContext; import org.jooq.Record; import org.jooq.Select; @@ -59,8 +58,8 @@ public DistributedLogsFetcherImpl(ResourceFinder secretFinder, @Override public List logs(DistributedLogsQueryParameters parameters) { - try (Connection connection = getConnection(parameters.getCluster()); - DSLContext context = DSL.using(connection)) { + try (Connection connection = getConnection(parameters.getCluster())) { + DSLContext context = DSL.using(connection); connection.setTransactionIsolation(Connection.TRANSACTION_REPEATABLE_READ); connection.setReadOnly(true); connection.setAutoCommit(true); diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/AbstractGenericExceptionMapper.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/AbstractGenericExceptionMapper.java index 67b108763d..16931d7f3f 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/AbstractGenericExceptionMapper.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/AbstractGenericExceptionMapper.java @@ -5,14 +5,13 @@ package io.stackgres.apiweb.exception; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; - import com.google.common.base.Throwables; import io.quarkus.security.UnauthorizedException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ApplicationExceptionMapper.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ApplicationExceptionMapper.java index dd8b1b0859..910da982cf 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ApplicationExceptionMapper.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ApplicationExceptionMapper.java @@ -5,14 +5,13 @@ package io.stackgres.apiweb.exception; -import javax.inject.Inject; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.Provider; - import com.google.common.base.Throwables; import io.fabric8.kubernetes.client.KubernetesClientException; import io.stackgres.apiweb.rest.utils.StatusParser; import io.stackgres.apiweb.rest.utils.StatusParserProvider; +import jakarta.inject.Inject; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.ApplicationException; @Provider diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/IllegalArgumentExceptionMapper.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/IllegalArgumentExceptionMapper.java index abd0b725aa..1405ac1511 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/IllegalArgumentExceptionMapper.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/IllegalArgumentExceptionMapper.java @@ -5,10 +5,10 @@ package io.stackgres.apiweb.exception; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.ext.ExceptionMapper; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.ext.ExceptionMapper; +import jakarta.ws.rs.ext.Provider; @Provider public class IllegalArgumentExceptionMapper implements ExceptionMapper { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/KubernetesExceptionMapper.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/KubernetesExceptionMapper.java index ca945c9add..f3149c224d 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/KubernetesExceptionMapper.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/KubernetesExceptionMapper.java @@ -9,10 +9,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; - import com.fasterxml.jackson.core.io.JsonStringEncoder; import io.fabric8.kubernetes.api.model.Status; import io.fabric8.kubernetes.api.model.StatusCause; @@ -20,6 +16,9 @@ import io.stackgres.apiweb.rest.utils.Kubernetes16StatusParser; import io.stackgres.apiweb.rest.utils.StatusParser; import io.stackgres.common.ErrorType; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.ext.ExceptionMapper; import org.jooq.lambda.Seq; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -103,7 +102,7 @@ private Response toResponse(Status status) { .entity(response).build(); } - if (status.getCode() == javax.ws.rs.core.Response.Status.FORBIDDEN.getStatusCode()) { + if (status.getCode() == jakarta.ws.rs.core.Response.Status.FORBIDDEN.getStatusCode()) { LOGGER.debug("Kubernetes responded with FORBIDDEN status. Parsing response"); String type = ErrorType.getErrorTypeUri(ErrorType.FORBIDDEN_AUTHORIZATION); String title = ErrorType.FORBIDDEN_AUTHORIZATION.getTitle(); diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ReaderExceptionMapper.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ReaderExceptionMapper.java index 321bfe4a8a..22c135f3f6 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ReaderExceptionMapper.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/ReaderExceptionMapper.java @@ -5,8 +5,7 @@ package io.stackgres.apiweb.exception; -import javax.ws.rs.ext.Provider; - +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.ReaderException; @Provider diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/WriterExceptionMapper.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/WriterExceptionMapper.java index 8b24210642..f161e540e1 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/WriterExceptionMapper.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/exception/WriterExceptionMapper.java @@ -5,8 +5,7 @@ package io.stackgres.apiweb.exception; -import javax.ws.rs.ext.Provider; - +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.WriterException; @Provider diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/nativeimage/DefaultRecordMapperSubstitutions.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/nativeimage/DefaultRecordMapperSubstitutions.java deleted file mode 100644 index 76c490e580..0000000000 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/nativeimage/DefaultRecordMapperSubstitutions.java +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (C) 2020 OnGres, Inc. - * SPDX-License-Identifier: AGPL-3.0-or-later - */ - -package io.stackgres.apiweb.nativeimage; - -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; - -@TargetClass(className = "org.jooq.impl.DefaultRecordMapper", innerClass = "ProxyMapper") -public final class DefaultRecordMapperSubstitutions { - @Substitute - private E proxy() { //NOPMD - return null; - } -} diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/nativeimage/ParserImplSubstitutions.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/nativeimage/ParserImplSubstitutions.java deleted file mode 100644 index 492dff07f4..0000000000 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/nativeimage/ParserImplSubstitutions.java +++ /dev/null @@ -1,254 +0,0 @@ -/* - * Copyright (C) 2020 OnGres, Inc. - * SPDX-License-Identifier: AGPL-3.0-or-later - */ - -package io.stackgres.apiweb.nativeimage; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.CompletionStage; -import java.util.concurrent.Executor; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.TargetClass; -import org.jooq.Configuration; -import org.jooq.DDLQuery; -import org.jooq.Param; -import org.jooq.Query; -import org.jooq.conf.ParamType; -import org.jooq.exception.DataAccessException; -import org.jooq.exception.DataTypeException; -import org.reactivestreams.Subscriber; - -@TargetClass(className = "org.jooq.impl.ParserImpl") -public final class ParserImplSubstitutions { - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) - public static DDLQuery IGNORE; - @Alias - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.FromAlias) - public static Query IGNORE_NO_DELIMITER; - - static { - IGNORE = new DDLQuery() { - - private static final long serialVersionUID = 1L; - - @Override - public void subscribe(Subscriber subscriber) { - - } - - @Override - public void attach(Configuration configuration) { - - } - - @Override - public void detach() { - - } - - @Override - public Configuration configuration() { - return null; - } - - @Override - public int execute() throws DataAccessException { - return 0; - } - - @Override - public CompletionStage executeAsync() { - return null; - } - - @Override - public CompletionStage executeAsync(Executor executor) { - return null; - } - - @Override - public boolean isExecutable() { - return false; - } - - @Override - public String getSQL() { - return null; - } - - @Override - public String getSQL(boolean inline) { - return null; - } - - @Override - public String getSQL(ParamType paramType) { - return null; - } - - @Override - public List getBindValues() { - return null; - } - - @Override - public Map> getParams() { - return null; - } - - @Override - public Param getParam(String name) { - return null; - } - - @Override - public Query bind(String param, Object value) - throws IllegalArgumentException, DataTypeException { - return null; - } - - @Override - public Query bind(int index, Object value) - throws IllegalArgumentException, DataTypeException { - return null; - } - - @Override - public Query poolable(boolean poolable) { - return null; - } - - @Override - public Query queryTimeout(int seconds) { - return null; - } - - @Override - public Query keepStatement(boolean keepStatement) { - return null; - } - - @Override - public void close() throws DataAccessException { - - } - - @Override - public void cancel() throws DataAccessException { - - } - }; - - IGNORE_NO_DELIMITER = new Query() { - - private static final long serialVersionUID = 1L; - - @Override - public void attach(Configuration configuration) { - - } - - @Override - public void detach() { - - } - - @Override - public Configuration configuration() { - return null; - } - - @Override - public int execute() throws DataAccessException { - return 0; - } - - @Override - public CompletionStage executeAsync() { - return null; - } - - @Override - public CompletionStage executeAsync(Executor executor) { - return null; - } - - @Override - public boolean isExecutable() { - return false; - } - - @Override - public String getSQL() { - return null; - } - - @Override - public String getSQL(boolean inline) { - return null; - } - - @Override - public String getSQL(ParamType paramType) { - return null; - } - - @Override - public List getBindValues() { - return null; - } - - @Override - public Map> getParams() { - return null; - } - - @Override - public Param getParam(String name) { - return null; - } - - @Override - public Query bind(String param, Object value) - throws IllegalArgumentException, DataTypeException { - return null; - } - - @Override - public Query bind(int index, Object value) - throws IllegalArgumentException, DataTypeException { - return null; - } - - @Override - public Query poolable(boolean poolable) { - return null; - } - - @Override - public Query queryTimeout(int seconds) { - return null; - } - - @Override - public Query keepStatement(boolean keepStatement) { - return null; - } - - @Override - public void close() throws DataAccessException { - - } - - @Override - public void cancel() throws DataAccessException { - - } - }; - } -} diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/AbstractClusterStatsDtoFinder.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/AbstractClusterStatsDtoFinder.java index 2a461be8f5..fb4b0a0294 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/AbstractClusterStatsDtoFinder.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/AbstractClusterStatsDtoFinder.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.ContainerState; import io.fabric8.kubernetes.api.model.ContainerStateRunning; @@ -29,6 +27,7 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.PersistentVolumeClaimFinder; import io.stackgres.common.resource.PodExecutor; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoFinder.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoFinder.java index 0b6da0e59f..f60131f307 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoFinder.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoFinder.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.stackgres.apiweb.dto.cluster.ClusterDto; import io.stackgres.apiweb.transformer.ClusterTransformer; @@ -18,6 +15,8 @@ import io.stackgres.common.labels.LabelFactoryForCluster; import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.PodFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterDtoFinder implements CustomResourceFinder { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoScanner.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoScanner.java index d2a6606486..f128fa8874 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoScanner.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterDtoScanner.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.stackgres.apiweb.dto.cluster.ClusterDto; import io.stackgres.apiweb.transformer.ClusterTransformer; @@ -19,6 +16,8 @@ import io.stackgres.common.labels.LabelFactoryForCluster; import io.stackgres.common.resource.CustomResourceScanner; import io.stackgres.common.resource.PodFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterStatsDtoFinder.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterStatsDtoFinder.java index 37f49f13cc..4bf239d145 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterStatsDtoFinder.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ClusterStatsDtoFinder.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Pod; import io.stackgres.apiweb.dto.cluster.ClusterStatsDto; @@ -21,6 +18,8 @@ import io.stackgres.common.resource.PersistentVolumeClaimFinder; import io.stackgres.common.resource.PodExecutor; import io.stackgres.common.resource.PodFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.jooq.lambda.tuple.Tuple; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ConfigMapDtoScanner.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ConfigMapDtoScanner.java index eb6ce10f76..11c6908a9c 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ConfigMapDtoScanner.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ConfigMapDtoScanner.java @@ -7,14 +7,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.apiweb.dto.configmap.ConfigMapDto; import io.stackgres.apiweb.transformer.ConfigMapMapper; import io.stackgres.common.resource.ResourceScanner; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ConfigMapDtoScanner implements ResourceScanner { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/EventDtoScanner.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/EventDtoScanner.java index 22924b0268..3ab838b497 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/EventDtoScanner.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/EventDtoScanner.java @@ -7,14 +7,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.apiweb.dto.event.EventDto; import io.stackgres.apiweb.transformer.EventMapper; import io.stackgres.common.resource.ResourceScanner; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class EventDtoScanner implements ResourceScanner { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/SecretDtoScanner.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/SecretDtoScanner.java index cdc8fd0a9b..d4dd4d40c4 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/SecretDtoScanner.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/SecretDtoScanner.java @@ -7,14 +7,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.apiweb.dto.secret.SecretDto; import io.stackgres.apiweb.transformer.SecretMapper; import io.stackgres.common.resource.ResourceScanner; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class SecretDtoScanner implements ResourceScanner { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoFinder.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoFinder.java index 11f683bc40..9a31a89d24 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoFinder.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoFinder.java @@ -7,13 +7,12 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterDto; import io.stackgres.apiweb.transformer.ShardedClusterTransformer; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.resource.CustomResourceFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterDtoFinder implements CustomResourceFinder { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoScanner.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoScanner.java index 3330704921..d042279f11 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoScanner.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterDtoScanner.java @@ -9,13 +9,12 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterDto; import io.stackgres.apiweb.transformer.ShardedClusterTransformer; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.resource.CustomResourceScanner; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterStatsDtoFinder.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterStatsDtoFinder.java index 8d80265fe4..31cc2dc6fc 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterStatsDtoFinder.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/resource/ShardedClusterStatsDtoFinder.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Pod; import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterStatsDto; @@ -24,6 +21,8 @@ import io.stackgres.common.resource.PersistentVolumeClaimFinder; import io.stackgres.common.resource.PodExecutor; import io.stackgres.common.resource.PodFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.eclipse.microprofile.context.ManagedExecutor; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestService.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestService.java index 44063b12ba..b8648ee087 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestService.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestService.java @@ -5,18 +5,17 @@ package io.stackgres.apiweb.rest; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.fabric8.kubernetes.client.CustomResource; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.ResourceDto; import io.stackgres.apiweb.rest.utils.CommonApiResponses; import io.stackgres.apiweb.transformer.ResourceTransformer; import io.stackgres.common.resource.CustomResourceFinder; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Authenticated public abstract class AbstractNamespacedRestService diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestServiceDependency.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestServiceDependency.java index 4ce77286f8..5b179c0c3b 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestServiceDependency.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractNamespacedRestServiceDependency.java @@ -7,12 +7,6 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.fabric8.kubernetes.client.CustomResource; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.ResourceDto; @@ -22,6 +16,11 @@ import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.CustomResourceScanner; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jooq.lambda.Seq; @Authenticated diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestService.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestService.java index 119ab48d6e..eb44b18362 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestService.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestService.java @@ -7,13 +7,6 @@ import java.util.List; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; - import io.fabric8.kubernetes.client.CustomResource; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.ResourceDto; @@ -22,6 +15,12 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.CustomResourceScanner; import io.stackgres.common.resource.CustomResourceScheduler; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestServiceDependency.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestServiceDependency.java index cc846594c7..86192893c2 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestServiceDependency.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AbstractRestServiceDependency.java @@ -8,13 +8,6 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; - import io.fabric8.kubernetes.client.CustomResource; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.ResourceDto; @@ -25,6 +18,12 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.CustomResourceScanner; import io.stackgres.common.resource.CustomResourceScheduler; +import jakarta.inject.Inject; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ApplicationsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ApplicationsResource.java index 9d77253d77..d2e13890c7 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ApplicationsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ApplicationsResource.java @@ -12,18 +12,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.application.SgApplication; @@ -37,6 +25,17 @@ import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.parameters.RequestBody; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.annotations.jaxrs.PathParam; import org.jboss.resteasy.annotations.providers.multipart.MultipartForm; import org.jboss.resteasy.plugins.providers.multipart.InputPart; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AuthResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AuthResource.java index 70135a1b00..76f8baadc3 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AuthResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/AuthResource.java @@ -8,17 +8,6 @@ import java.net.URI; import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.validation.Valid; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.CacheControl; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import io.quarkus.security.Authenticated; import io.quarkus.security.AuthenticationFailedException; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -31,6 +20,16 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.validation.Valid; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.CacheControl; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.eclipse.microprofile.config.inject.ConfigProperty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupConfigResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupConfigResource.java index e39ab318ad..85920d1557 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupConfigResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupConfigResource.java @@ -11,10 +11,6 @@ import java.util.List; import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Path; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.Secret; @@ -32,6 +28,9 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; import org.jooq.lambda.Seq; @Path("sgbackupconfigs") diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupResource.java index 2a79c5e696..9efbe4a400 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/BackupResource.java @@ -7,9 +7,6 @@ import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.backup.BackupDto; import io.stackgres.common.crd.sgbackup.StackGresBackup; @@ -18,6 +15,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("sgbackups") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ClusterResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ClusterResource.java index e6f413376a..78b22f9de7 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ClusterResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ClusterResource.java @@ -14,10 +14,6 @@ import java.util.Optional; import java.util.function.Consumer; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Path; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; @@ -56,6 +52,9 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ConnectionPoolingConfigResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ConnectionPoolingConfigResource.java index 994a8725a8..95d708d330 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ConnectionPoolingConfigResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ConnectionPoolingConfigResource.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.pooling.PoolingConfigDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -20,6 +17,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("sgpoolconfigs") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DbOpsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DbOpsResource.java index 71029f6b32..b3d70d73c1 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DbOpsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DbOpsResource.java @@ -7,9 +7,6 @@ import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.dbops.DbOpsDto; import io.stackgres.common.crd.sgdbops.StackGresDbOps; @@ -18,6 +15,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("sgdbops") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DistributedLogsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DistributedLogsResource.java index ff62749888..1fa5eb31cb 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DistributedLogsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/DistributedLogsResource.java @@ -9,9 +9,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.distributedlogs.DistributedLogsDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -22,6 +19,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("sgdistributedlogs") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ExtensionsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ExtensionsResource.java index 93c43d476d..53241865e3 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ExtensionsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ExtensionsResource.java @@ -5,13 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.extension.ExtensionsDto; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -24,6 +17,12 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; @Path("extensions") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/KubernetesInfoResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/KubernetesInfoResource.java index b213ee9f07..81994a0aa8 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/KubernetesInfoResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/KubernetesInfoResource.java @@ -5,12 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; - import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -18,6 +12,11 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; @Path("kubernetes-cluster-info") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespaceResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespaceResource.java index d670683cf4..264eea66bf 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespaceResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespaceResource.java @@ -7,11 +7,6 @@ import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; - import io.fabric8.kubernetes.api.model.Namespace; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -21,6 +16,10 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("namespaces") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupConfigResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupConfigResource.java index ca83609920..6633928b9a 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupConfigResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupConfigResource.java @@ -7,10 +7,6 @@ import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Path; - import io.fabric8.kubernetes.api.model.Secret; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.backupconfig.BackupConfigDto; @@ -21,6 +17,9 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgbackupconfigs") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupResource.java index e398ff9a2a..555d8ea04d 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedBackupResource.java @@ -5,9 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.backup.BackupDto; import io.stackgres.common.crd.sgbackup.StackGresBackup; @@ -15,6 +12,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgbackups") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterEventsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterEventsResource.java index bcd0dda010..7733d3efb4 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterEventsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterEventsResource.java @@ -14,12 +14,6 @@ import java.util.Optional; import java.util.regex.Pattern; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.event.EventDto; @@ -35,6 +29,11 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterLogsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterLogsResource.java index 739ba00bb2..84c1a5fdc9 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterLogsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterLogsResource.java @@ -10,15 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.BadRequestException; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; @@ -38,6 +29,14 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.BadRequestException; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterResource.java index aa28d39752..c57c8ef7c4 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterResource.java @@ -5,11 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.cluster.ClusterDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -18,6 +13,10 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgclusters") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterStatsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterStatsResource.java index 58be5094f8..c805362a45 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterStatsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedClusterStatsResource.java @@ -5,13 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.cluster.ClusterStatsDto; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -20,6 +13,12 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgclusters") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConfigMapResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConfigMapResource.java index d272df9247..45c043cdbf 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConfigMapResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConfigMapResource.java @@ -7,12 +7,6 @@ import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.configmap.ConfigMapDto; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -22,6 +16,11 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/configmaps") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConnectionPoolingConfigResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConnectionPoolingConfigResource.java index a5dfc18c3f..5b04a90e69 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConnectionPoolingConfigResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedConnectionPoolingConfigResource.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.pooling.PoolingConfigDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -18,6 +15,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgpoolconfigs") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsEventsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsEventsResource.java index 9ccd652022..d7dcc8fa1a 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsEventsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsEventsResource.java @@ -12,12 +12,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.batch.v1.Job; @@ -31,6 +25,11 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import org.jooq.lambda.Seq; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgdbops") diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsResource.java index 3f6ada3a46..73f4bb6520 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDbOpsResource.java @@ -5,9 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.dbops.DbOpsDto; import io.stackgres.common.crd.sgdbops.StackGresDbOps; @@ -15,6 +12,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgdbops") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDistributedLogsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDistributedLogsResource.java index 5fa86b5390..b0792c4307 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDistributedLogsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedDistributedLogsResource.java @@ -8,9 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.distributedlogs.DistributedLogsDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -20,6 +17,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgdistributedlogs") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedObjectStorageResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedObjectStorageResource.java index 91ffec2fb8..5298b7dc18 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedObjectStorageResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedObjectStorageResource.java @@ -8,10 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Path; - import io.fabric8.kubernetes.api.model.Secret; import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.objectstorage.ObjectStorageDto; @@ -25,6 +21,9 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgobjectstorages") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedPostgresConfigResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedPostgresConfigResource.java index eee09fb4f4..a43afed628 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedPostgresConfigResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedPostgresConfigResource.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.pgconfig.PostgresConfigDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -18,6 +15,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgpgconfigs") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedProfileResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedProfileResource.java index b1d41f45c8..7293670e1d 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedProfileResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedProfileResource.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.profile.ProfileDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -18,6 +15,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sginstanceprofiles") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedScriptResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedScriptResource.java index fd586a608f..0f9e67125e 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedScriptResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedScriptResource.java @@ -9,11 +9,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.script.ScriptDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -25,6 +20,10 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgscripts") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedSecretResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedSecretResource.java index 9ab69d93e4..a7d8e60b02 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedSecretResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedSecretResource.java @@ -7,12 +7,6 @@ import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.secret.SecretDto; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -22,6 +16,11 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/secrets") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterResource.java index 84cd8a91e8..82712c6724 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterResource.java @@ -7,11 +7,6 @@ import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.cluster.ClusterDto; import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterDto; @@ -21,6 +16,10 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgshardedclusters") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterStatsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterStatsResource.java index 9c8158757f..2275020e68 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterStatsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/NamespacedShardedClusterStatsResource.java @@ -5,13 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterStatsDto; import io.stackgres.apiweb.rest.utils.CommonApiResponses; @@ -20,6 +13,12 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.NotFoundException; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("namespaces/{namespace:[a-z0-9]([-a-z0-9]*[a-z0-9])?}/sgshardedclusters") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ObjectStorageResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ObjectStorageResource.java index 9beb2fddff..cf7a9e21ac 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ObjectStorageResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ObjectStorageResource.java @@ -9,10 +9,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Path; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.Secret; @@ -33,6 +29,9 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; import org.jetbrains.annotations.NotNull; @Path("sgobjectstorages") diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/PostgresConfigResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/PostgresConfigResource.java index bd56bd61b9..949b96238a 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/PostgresConfigResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/PostgresConfigResource.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.pgconfig.PostgresConfigDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -20,6 +17,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("sgpgconfigs") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ProfileResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ProfileResource.java index 3cc75f38d0..263cff2157 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ProfileResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ProfileResource.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.Path; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.dto.profile.ProfileDto; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -20,6 +17,8 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.Path; @Path("sginstanceprofiles") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RbacResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RbacResource.java index 10da0443dc..866497e1a7 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RbacResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RbacResource.java @@ -11,15 +11,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview; import io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewBuilder; @@ -46,6 +37,14 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; import org.eclipse.microprofile.jwt.Claim; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApiExtensionMetadataManager.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApiExtensionMetadataManager.java index 1832930ce5..32c0ef3ee3 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApiExtensionMetadataManager.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApiExtensionMetadataManager.java @@ -7,14 +7,13 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.apiweb.config.WebApiProperty; import io.stackgres.apiweb.config.WebApiPropertyContext; import io.stackgres.common.WebClientFactory; import io.stackgres.common.extension.ExtensionMetadataManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApplication.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApplication.java index c9d02c2f5f..69dfda1c46 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApplication.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/RestApplication.java @@ -5,9 +5,15 @@ package io.stackgres.apiweb.rest; -import javax.ws.rs.ApplicationPath; -import javax.ws.rs.core.Application; +import io.swagger.v3.oas.annotations.OpenAPIDefinition; +import io.swagger.v3.oas.annotations.info.Info; +import jakarta.ws.rs.ApplicationPath; +import jakarta.ws.rs.core.Application; +@OpenAPIDefinition(info = @Info( + title = "StackGres REST API" + ) +) @ApplicationPath("/stackgres") public class RestApplication extends Application { } diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ScriptResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ScriptResource.java index c054e563a7..bd6241c040 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ScriptResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ScriptResource.java @@ -11,10 +11,6 @@ import java.util.Optional; import java.util.function.Consumer; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Path; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.Secret; @@ -39,6 +35,9 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ShardedClusterResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ShardedClusterResource.java index c3d5320c7f..cb738b8033 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ShardedClusterResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/ShardedClusterResource.java @@ -14,10 +14,6 @@ import java.util.Optional; import java.util.function.Consumer; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.Path; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; @@ -58,6 +54,9 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.Path; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/StorageClassResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/StorageClassResource.java index 69f459a83c..9468ac7c23 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/StorageClassResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/StorageClassResource.java @@ -7,11 +7,6 @@ import java.util.List; -import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.quarkus.security.Authenticated; @@ -22,6 +17,10 @@ import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("storageclasses") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/VersionsResource.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/VersionsResource.java index 004e03118e..161d857f1b 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/VersionsResource.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/VersionsResource.java @@ -10,18 +10,17 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.RequestScoped; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; - import io.quarkus.security.Authenticated; import io.stackgres.apiweb.rest.utils.CommonApiResponses; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.responses.ApiResponse; +import jakarta.enterprise.context.RequestScoped; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; @Path("version") @RequestScoped diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/utils/StatusParserProviderImpl.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/utils/StatusParserProviderImpl.java index 258f480cb2..8c1912ae32 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/utils/StatusParserProviderImpl.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/rest/utils/StatusParserProviderImpl.java @@ -9,12 +9,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.VersionInfo; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/CustomAuthMechanism.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/CustomAuthMechanism.java index c72f24d236..d1c5c4803b 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/CustomAuthMechanism.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/CustomAuthMechanism.java @@ -7,11 +7,6 @@ import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; - -import io.quarkus.arc.Priority; import io.quarkus.oidc.runtime.OidcAuthenticationMechanism; import io.quarkus.security.identity.IdentityProviderManager; import io.quarkus.security.identity.SecurityIdentity; @@ -21,6 +16,10 @@ import io.quarkus.vertx.http.runtime.security.HttpAuthenticationMechanism; import io.smallrye.mutiny.Uni; import io.vertx.ext.web.RoutingContext; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; /** * Allows to switch between local JWT authentication and OIDC authentication. diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/SecretVerification.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/SecretVerification.java index bca90b386d..c8f4475311 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/SecretVerification.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/SecretVerification.java @@ -8,10 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.base.Strings; import io.fabric8.kubernetes.api.model.Secret; import io.quarkus.security.AuthenticationFailedException; @@ -19,6 +15,9 @@ import io.stackgres.common.StackGresContext; import io.stackgres.common.resource.ResourceScanner; import io.stackgres.common.resource.ResourceUtil; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class SecretVerification { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/TokenResponse.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/TokenResponse.java index 15171be4a5..dd06e12345 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/TokenResponse.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/TokenResponse.java @@ -5,12 +5,11 @@ package io.stackgres.apiweb.security; -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; +import jakarta.validation.constraints.NotBlank; @JsonInclude(Include.NON_DEFAULT) @RegisterForReflection diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/UserPassword.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/UserPassword.java index d9d8ed4403..ea336b2ff2 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/UserPassword.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/security/UserPassword.java @@ -5,12 +5,11 @@ package io.stackgres.apiweb.security; -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; +import jakarta.validation.constraints.NotBlank; @JsonInclude(Include.NON_DEFAULT) @RegisterForReflection diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupConfigTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupConfigTransformer.java index 76b44cf473..73ebbcc9c2 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupConfigTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupConfigTransformer.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.apiweb.dto.backupconfig.BackupConfigDto; import io.stackgres.apiweb.dto.backupconfig.BackupConfigSpec; @@ -21,6 +18,8 @@ import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigSpec; import io.stackgres.common.crd.sgbackupconfig.StackGresBaseBackupConfig; import io.stackgres.common.crd.storages.BackupStorage; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupConfigTransformer diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupStorageTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupStorageTransformer.java index 8714c63515..9c24e65bb0 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupStorageTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupStorageTransformer.java @@ -5,12 +5,11 @@ package io.stackgres.apiweb.transformer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.apiweb.dto.storages.BackupStorageDto; import io.stackgres.common.crd.storages.BackupStorage; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupStorageTransformer implements Transformer { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupTransformer.java index 53258afe9c..22ea063ccf 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/BackupTransformer.java @@ -5,9 +5,6 @@ package io.stackgres.apiweb.transformer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.apiweb.dto.backup.BackupDto; import io.stackgres.apiweb.dto.backup.BackupInformation; @@ -19,6 +16,8 @@ import io.stackgres.common.crd.sgbackup.StackGresBackupProcess; import io.stackgres.common.crd.sgbackup.StackGresBackupSpec; import io.stackgres.common.crd.sgbackup.StackGresBackupStatus; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupTransformer extends AbstractResourceTransformer { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterPodTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterPodTransformer.java index 02bb718aac..869e1c53e6 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterPodTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterPodTransformer.java @@ -11,12 +11,11 @@ import java.util.List; import java.util.Map; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.ContainerStatus; import io.fabric8.kubernetes.api.model.Pod; import io.stackgres.apiweb.dto.cluster.KubernetesPod; import io.stackgres.common.PatroniUtil; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ClusterPodTransformer { diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterStatsTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterStatsTransformer.java index cab6cbbf80..863afa87c9 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterStatsTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterStatsTransformer.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.apiweb.dto.cluster.ClusterStatsDto; import io.stackgres.apiweb.resource.PodStats; import io.stackgres.common.crd.sgcluster.StackGresCluster; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterStatsTransformer diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterTransformer.java index 14506d5c93..5934b4b3a4 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ClusterTransformer.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Pod; @@ -28,6 +25,8 @@ import io.stackgres.common.crd.sgcluster.StackGresClusterManagedSqlStatus; import io.stackgres.common.crd.sgcluster.StackGresClusterSpec; import io.stackgres.common.crd.sgcluster.StackGresClusterStatus; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jooq.lambda.Seq; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DbOpsTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DbOpsTransformer.java index 3a6d60e717..f15839a929 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DbOpsTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DbOpsTransformer.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.apiweb.dto.dbops.DbOpsDto; import io.stackgres.apiweb.dto.dbops.DbOpsSpec; @@ -17,6 +14,8 @@ import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdbops.StackGresDbOpsSpec; import io.stackgres.common.crd.sgdbops.StackGresDbOpsStatus; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsTransformer diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DistributedLogsTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DistributedLogsTransformer.java index ca7db4eee9..c38ca49ebd 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DistributedLogsTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/DistributedLogsTransformer.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.stackgres.apiweb.dto.distributedlogs.DistributedLogsCondition; @@ -21,6 +18,8 @@ import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsSpec; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsStatus; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsTransformer diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ExtensionsTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ExtensionsTransformer.java index 45e47a0297..bc2c1bdde0 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ExtensionsTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ExtensionsTransformer.java @@ -8,9 +8,6 @@ import java.util.Collection; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.apiweb.dto.extension.Extension; import io.stackgres.apiweb.dto.extension.ExtensionPublisher; @@ -22,6 +19,8 @@ import io.stackgres.common.extension.StackGresExtensionMetadata; import io.stackgres.common.extension.StackGresExtensionPublisher; import io.stackgres.common.extension.StackGresExtensionVersion; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ObjectStorageTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ObjectStorageTransformer.java index 2d612dacd5..bc700a40f3 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ObjectStorageTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ObjectStorageTransformer.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.apiweb.dto.objectstorage.ObjectStorageDto; import io.stackgres.apiweb.dto.objectstorage.ObjectStorageStatus; import io.stackgres.apiweb.dto.storages.BackupStorageDto; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.common.crd.storages.BackupStorage; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PoolingConfigTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PoolingConfigTransformer.java index 0a596293f9..bf5f817e9d 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PoolingConfigTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PoolingConfigTransformer.java @@ -19,8 +19,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.apiweb.dto.pooling.PgBouncerIniParameter; import io.stackgres.apiweb.dto.pooling.PoolingConfigDto; import io.stackgres.apiweb.dto.pooling.PoolingConfigPgBouncer; @@ -32,6 +30,7 @@ import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigPgBouncerPgbouncerIni; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigSpec; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigStatus; +import jakarta.enterprise.context.ApplicationScoped; import org.apache.commons.configuration2.INIConfiguration; import org.apache.commons.configuration2.SubnodeConfiguration; import org.apache.commons.configuration2.ex.ConfigurationException; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PostgresConfigTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PostgresConfigTransformer.java index 89e8dac7c0..05d4acaddd 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PostgresConfigTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/PostgresConfigTransformer.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.apiweb.dto.pgconfig.PostgresConfigDto; import io.stackgres.apiweb.dto.pgconfig.PostgresConfigSpec; import io.stackgres.apiweb.dto.pgconfig.PostgresConfigStatus; @@ -18,6 +16,7 @@ import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigSpec; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigStatus; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple3; diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ProfileTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ProfileTransformer.java index edb4f2d29e..435b8fab9c 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ProfileTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ProfileTransformer.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.apiweb.dto.profile.ProfileDto; import io.stackgres.apiweb.dto.profile.ProfileSpec; import io.stackgres.apiweb.dto.profile.ProfileStatus; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ProfileTransformer diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ScriptTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ScriptTransformer.java index 5ea253b8df..ead186505c 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ScriptTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ScriptTransformer.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.stackgres.apiweb.dto.script.ScriptDto; @@ -22,6 +19,8 @@ import io.stackgres.common.crd.sgscript.StackGresScriptEntry; import io.stackgres.common.crd.sgscript.StackGresScriptFrom; import io.stackgres.common.crd.sgscript.StackGresScriptSpec; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ScriptTransformer diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterStatsTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterStatsTransformer.java index f8440b68b7..15655fb63e 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterStatsTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterStatsTransformer.java @@ -7,13 +7,12 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterClusterStats; import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterStatsDto; import io.stackgres.apiweb.resource.PodStats; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterStatsTransformer diff --git a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterTransformer.java b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterTransformer.java index 9059ac13d2..35cf1d4e6c 100644 --- a/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterTransformer.java +++ b/stackgres-k8s/src/api-web/src/main/java/io/stackgres/apiweb/transformer/ShardedClusterTransformer.java @@ -11,9 +11,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.stackgres.apiweb.config.WebApiProperty; @@ -28,6 +25,8 @@ import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterSpec; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterStatus; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jooq.lambda.Seq; diff --git a/stackgres-k8s/src/api-web/src/main/resources/application.properties b/stackgres-k8s/src/api-web/src/main/resources/application.properties index 38ecca2bbe..32d5417fb7 100644 --- a/stackgres-k8s/src/api-web/src/main/resources/application.properties +++ b/stackgres-k8s/src/api-web/src/main/resources/application.properties @@ -33,13 +33,13 @@ quarkus.log.category."okhttp3.mockwebserver".level=ERROR %test.quarkus.log.category."okhttp3.mockwebserver".level=WARN %test.quarkus.log.category."com.gargoylesoftware.htmlunit.javascript.host.css.CSSStyleSheet".level=OFF +%test.quarkus.http.ssl.certificate.files= +%test.quarkus.http.ssl.certificate.key-files= + # SSL configuration quarkus.http.ssl.certificate.files=/etc/operator/certs/tls.crt quarkus.http.ssl.certificate.key-files=/etc/operator/certs/tls.key -%test.quarkus.http.ssl.certificate.files= -%test.quarkus.http.ssl.certificate.key-files= - # StackGres REST API Authentication stackgres.auth.type=jwt # OpenID Connect @@ -76,5 +76,8 @@ smallrye.jwt.new-token.lifespan=28800 stackgres.applications.babelfish-compass.enabled=true # jOOQ +quarkus.jooq.dialect=postgresql +quarkus.log.category."io.quarkus.ext.jooq".level = OFF +quarkus.log.category."io.quarkus.ext.jooq.sql".level = OFF quarkus.log.category."org.jooq.Constants".level=OFF quarkus.log.category."org.jooq.tools.LoggerListener".level=OFF diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ClusterResourceMockedTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ClusterResourceMockedTest.java index 40e8f71f38..d411ffd865 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ClusterResourceMockedTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ClusterResourceMockedTest.java @@ -31,8 +31,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.ws.rs.BadRequestException; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.ConfigMap; @@ -104,6 +102,7 @@ import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceWriter; import io.stackgres.testutil.JsonUtil; +import jakarta.ws.rs.BadRequestException; import org.eclipse.microprofile.context.ManagedExecutor; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; @@ -682,7 +681,7 @@ private void clusterMocks() { } private void mockPodExecutor() { - when(podExecutor.exec(any(), anyString(), any())).thenReturn(ImmutableList.of( + when(podExecutor.exec(any(), anyString(), any(String[].class))).thenReturn(ImmutableList.of( "cpuFound:4", "cpuQuota:50000", "cpuPeriod:100000", diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/KubernetesExceptionMapperTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/KubernetesExceptionMapperTest.java index 796fc8d5fe..07758a6892 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/KubernetesExceptionMapperTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/KubernetesExceptionMapperTest.java @@ -5,8 +5,6 @@ package io.stackgres.apiweb.rest; -import javax.ws.rs.core.Response; - import io.fabric8.kubernetes.api.model.Status; import io.fabric8.kubernetes.api.model.StatusBuilder; import io.fabric8.kubernetes.api.model.StatusDetailsBuilder; @@ -16,6 +14,7 @@ import io.stackgres.apiweb.rest.utils.Kubernetes16StatusParser; import io.stackgres.common.ErrorType; import io.stackgres.common.fixture.Fixtures; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/RbacResourceTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/RbacResourceTest.java index 8f0404c0fd..c1c783a6d9 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/RbacResourceTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/RbacResourceTest.java @@ -15,8 +15,6 @@ import java.util.Map; import java.util.Optional; -import javax.ws.rs.core.Response; - import io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReview; import io.fabric8.kubernetes.api.model.authorization.v1.SubjectAccessReviewStatus; import io.fabric8.kubernetes.client.KubernetesClient; @@ -27,6 +25,7 @@ import io.stackgres.apiweb.app.KubernetesClientProvider; import io.stackgres.apiweb.dto.PermissionsListDto; import io.stackgres.apiweb.dto.PermissionsListDto.Namespaced; +import jakarta.ws.rs.core.Response; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ResourcesSerializationTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ResourcesSerializationTest.java index 57d6a4d5b4..b8a42ca731 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ResourcesSerializationTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ResourcesSerializationTest.java @@ -14,19 +14,18 @@ import java.util.Collection; import java.util.stream.Stream; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import com.google.common.reflect.ClassPath; import com.google.common.reflect.TypeToken; import io.quarkus.runtime.annotations.RegisterForReflection; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; import org.junit.jupiter.api.BeforeAll; diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ShardedClusterResourceMockedTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ShardedClusterResourceMockedTest.java index 629dfc5205..073349920d 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ShardedClusterResourceMockedTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/rest/ShardedClusterResourceMockedTest.java @@ -648,7 +648,7 @@ private void clusterMocks() { } private void mockPodExecutor() { - when(podExecutor.exec(any(), anyString(), any())).thenReturn(ImmutableList.of( + when(podExecutor.exec(any(), anyString(), any(String[].class))).thenReturn(ImmutableList.of( "cpuFound:4", "cpuQuota:50000", "cpuPeriod:100000", diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupConfigTransformerTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupConfigTransformerTest.java index bbb93ad420..0c403c4e84 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupConfigTransformerTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupConfigTransformerTest.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.Random; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.apiweb.dto.backupconfig.BackupConfigDto; import io.stackgres.apiweb.dto.backupconfig.BackupConfigSpec; @@ -40,6 +38,7 @@ import io.stackgres.common.crd.storages.GoogleCloudSecretKeySelector; import io.stackgres.common.crd.storages.GoogleCloudStorage; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupTransformerTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupTransformerTest.java index 7ac902782b..4b8d55ac0c 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupTransformerTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/BackupTransformerTest.java @@ -5,8 +5,6 @@ package io.stackgres.apiweb.transformer; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.apiweb.dto.backup.BackupDto; import io.stackgres.apiweb.dto.backup.BackupSpec; @@ -14,6 +12,7 @@ import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupSpec; import io.stackgres.common.crd.sgbackup.StackGresBackupStatus; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ClusterTransformerTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ClusterTransformerTest.java index 87b784b36f..2f36b7735e 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ClusterTransformerTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ClusterTransformerTest.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.apiweb.dto.cluster.ClusterCondition; import io.stackgres.apiweb.dto.cluster.ClusterConfiguration; @@ -47,6 +45,7 @@ import io.stackgres.common.crd.sgcluster.StackGresClusterSpecMetadata; import io.stackgres.common.crd.sgcluster.StackGresClusterStatus; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/DbOpsTransformerTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/DbOpsTransformerTest.java index 2869301a5a..32014e4221 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/DbOpsTransformerTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/DbOpsTransformerTest.java @@ -5,8 +5,6 @@ package io.stackgres.apiweb.transformer; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.apiweb.dto.dbops.DbOpsDto; import io.stackgres.apiweb.dto.dbops.DbOpsSpec; @@ -14,6 +12,7 @@ import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdbops.StackGresDbOpsSpec; import io.stackgres.common.crd.sgdbops.StackGresDbOpsStatus; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ProfileTransformerTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ProfileTransformerTest.java index 32c6ffe7a0..1e97575ee4 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ProfileTransformerTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ProfileTransformerTest.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.apiweb.dto.profile.ProfileDto; import io.stackgres.apiweb.dto.profile.ProfileSpec; @@ -17,6 +15,7 @@ import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ScriptTransformerTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ScriptTransformerTest.java index 0dfd609002..0fd939e43c 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ScriptTransformerTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ScriptTransformerTest.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.apiweb.dto.script.ScriptDto; import io.stackgres.apiweb.dto.script.ScriptSpec; @@ -18,6 +16,7 @@ import io.stackgres.common.crd.sgscript.StackGresScriptSpec; import io.stackgres.common.crd.sgscript.StackGresScriptStatus; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ShardedClusterTransformerTest.java b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ShardedClusterTransformerTest.java index 7aa4d31090..00a7a6a3e6 100644 --- a/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ShardedClusterTransformerTest.java +++ b/stackgres-k8s/src/api-web/src/test/java/io/stackgres/apiweb/transformer/ShardedClusterTransformerTest.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterDto; import io.stackgres.apiweb.dto.shardedcluster.ShardedClusterSpec; @@ -18,6 +16,7 @@ import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterSpec; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterStatus; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/api-web/src/test/resources/cluster-logs-queries.properties b/stackgres-k8s/src/api-web/src/test/resources/cluster-logs-queries.properties index db41ec0d36..fb8bfecc7c 100644 --- a/stackgres-k8s/src/api-web/src/test/resources/cluster-logs-queries.properties +++ b/stackgres-k8s/src/api-web/src/test/resources/cluster-logs-queries.properties @@ -1,73 +1,73 @@ -log_patroni_window="log_patroni_window"("log_type", "log_time", "log_time_index", "pod_name", "role", "error_severity", "message", "user_name", "database_name", "process_id", "connection_from", "session_id", "session_line_num", "command_tag", "session_start_time", "virtual_transaction_id", "transaction_id", "sql_state_code", "detail", "hint", "internal_query", "internal_query_pos", "context", "query", "query_pos", "location", "application_name") as (select 'pa' as "log_type", log_time, log_time_index, pod_name, case role when 'master' then 'Primary' when 'replica' then 'Replica' when 'promoted' then 'Promoted' when 'demoted' then 'Demoted' when 'uninitialized' then 'Uninitialized' when 'standby_leader' then 'ReplicaLeader' when 'sync_standby' then 'SyncReplica' else cast(null as varchar) end as "role", error_severity, message, cast(null as varchar) as "user_name", cast(null as varchar) as "database_name", cast(null as int) as "process_id", cast(null as varchar) as "connection_from", cast(null as varchar) as "session_id", cast(null as bigint) as "session_line_num", cast(null as varchar) as "command_tag", cast(null as timestamp with time zone) as "session_start_time", cast(null as varchar) as "virtual_transaction_id", cast(null as int) as "transaction_id", cast(null as varchar) as "sql_state_code", cast(null as varchar) as "detail", cast(null as varchar) as "hint", cast(null as varchar) as "internal_query", cast(null as int) as "internal_query_pos", cast(null as varchar) as "context", cast(null as varchar) as "query", cast(null as int) as "query_pos", cast(null as varchar) as "location", cast(null as varchar) as "application_name" from log_patroni -log_postgres_window="log_postgres_window"("log_type", "log_time", "log_time_index", "pod_name", "role", "error_severity", "message", "user_name", "database_name", "process_id", "connection_from", "session_id", "session_line_num", "command_tag", "session_start_time", "virtual_transaction_id", "transaction_id", "sql_state_code", "detail", "hint", "internal_query", "internal_query_pos", "context", "query", "query_pos", "location", "application_name") as (select 'pg' as "log_type", log_time, log_time_index, pod_name, case role when 'master' then 'Primary' when 'replica' then 'Replica' when 'promoted' then 'Promoted' when 'demoted' then 'Demoted' when 'uninitialized' then 'Uninitialized' when 'standby_leader' then 'ReplicaLeader' when 'sync_standby' then 'SyncReplica' else cast(null as varchar) end as "role", error_severity, message, user_name, database_name, process_id, connection_from, session_id, session_line_num, command_tag, session_start_time, virtual_transaction_id, transaction_id, sql_state_code, detail, hint, internal_query, internal_query_pos, context, query, query_pos, location, application_name from log_postgres +log_patroni_window="log_patroni_window"(log_type, log_time, log_time_index, pod_name, role, error_severity, message, user_name, database_name, process_id, connection_from, session_id, session_line_num, command_tag, session_start_time, virtual_transaction_id, transaction_id, sql_state_code, detail, hint, internal_query, internal_query_pos, context, query, query_pos, location, application_name) as (select 'pa' as log_type, log_time, log_time_index, pod_name, case role when 'master' then 'Primary' when 'replica' then 'Replica' when 'promoted' then 'Promoted' when 'demoted' then 'Demoted' when 'uninitialized' then 'Uninitialized' when 'standby_leader' then 'ReplicaLeader' when 'sync_standby' then 'SyncReplica' else cast(null as varchar) end as role, error_severity, message, cast(null as varchar) as "user_name", cast(null as varchar) as "database_name", cast(null as int) as "process_id", cast(null as varchar) as "connection_from", cast(null as varchar) as "session_id", cast(null as bigint) as "session_line_num", cast(null as varchar) as "command_tag", cast(null as timestamp with time zone) as "session_start_time", cast(null as varchar) as "virtual_transaction_id", cast(null as int) as "transaction_id", cast(null as varchar) as "sql_state_code", cast(null as varchar) as "detail", cast(null as varchar) as "hint", cast(null as varchar) as "internal_query", cast(null as int) as "internal_query_pos", cast(null as varchar) as "context", cast(null as varchar) as "query", cast(null as int) as "query_pos", cast(null as varchar) as "location", cast(null as varchar) as "application_name" from log_patroni +log_postgres_window="log_postgres_window"(log_type, log_time, log_time_index, pod_name, role, error_severity, message, user_name, database_name, process_id, connection_from, session_id, session_line_num, command_tag, session_start_time, virtual_transaction_id, transaction_id, sql_state_code, detail, hint, internal_query, internal_query_pos, context, query, query_pos, location, application_name) as (select 'pg' as log_type, log_time, log_time_index, pod_name, case role when 'master' then 'Primary' when 'replica' then 'Replica' when 'promoted' then 'Promoted' when 'demoted' then 'Demoted' when 'uninitialized' then 'Uninitialized' when 'standby_leader' then 'ReplicaLeader' when 'sync_standby' then 'SyncReplica' else cast(null as varchar) end as role, error_severity, message, user_name, database_name, process_id, connection_from, session_id, session_line_num, command_tag, session_start_time, virtual_transaction_id, transaction_id, sql_state_code, detail, hint, internal_query, internal_query_pos, context, query, query_pos, location, application_name from log_postgres log_select_patroni_window=select log_type, log_time, log_time_index, pod_name, role, error_severity, message, user_name, database_name, process_id, connection_from, session_id, session_line_num, command_tag, session_start_time, virtual_transaction_id, transaction_id, sql_state_code, detail, hint, internal_query, internal_query_pos, context, query, query_pos, location, application_name from log_patroni_window log_select_postgres_window=select log_type, log_time, log_time_index, pod_name, role, error_severity, message, user_name, database_name, process_id, connection_from, session_id, session_line_num, command_tag, session_start_time, virtual_transaction_id, transaction_id, sql_state_code, detail, hint, internal_query, internal_query_pos, context, query, query_pos, location, application_name from log_postgres_window -log_select=${log_select_patroni_window} union ${log_select_postgres_window} -descQueryTest=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -fromDescQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -fromInclusiveDescQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -toDescQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -fromToDescQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -fromInclusiveToDescQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -ascQueryTest=with ${log_patroni_window} where 1 = 1 order by log_time asc, log_time_index asc limit 1), ${log_postgres_window} where 1 = 1 order by log_time asc, log_time_index asc limit 1) ${log_select} order by log_time asc, log_time_index asc limit 1 -fromAscQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1) ${log_select} order by log_time asc, log_time_index asc limit 1 -fromInclusiveAscQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1) ${log_select} order by log_time asc, log_time_index asc limit 1 -toAscQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1) ${log_select} order by log_time asc, log_time_index asc limit 1 -fromToAscQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1) ${log_select} order by log_time asc, log_time_index asc limit 1 -fromInclusiveToAscQueryTest=with ${log_patroni_window} where (1 = 1 and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1), ${log_postgres_window} where (1 = 1 and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc limit 1) ${log_select} order by log_time asc, log_time_index asc limit 1 -filterQueryTest_logTime=with ${log_patroni_window} where (1 = 1 and log_time in (cast(null as timestamp with time zone))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and log_time in (cast(null as timestamp with time zone))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_logTimeIndex=with ${log_patroni_window} where (1 = 1 and log_time_index in (cast(null as int))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and log_time_index in (cast(null as int))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_logType=with ${log_patroni_window} where 1 = 0 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where 1 = 0 order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_podName=with ${log_patroni_window} where (1 = 1 and pod_name in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and pod_name in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_role=with ${log_patroni_window} where (1 = 1 and role in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and role in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_errorLevel=with ${log_patroni_window} where (1 = 1 and error_severity in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and error_severity in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_message=with ${log_patroni_window} where (1 = 1 and message in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and message in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_userName=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and user_name in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_databaseName=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and database_name in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_processId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and process_id in (cast(null as int))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_connectionFrom=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and connection_from in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_sessionId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and session_id in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_sessionLineNum=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and session_line_num in (cast(null as bigint))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_commandTag=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and command_tag in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_sessionStartTime=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and session_start_time in (cast(null as timestamp with time zone))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_virtualTransactionId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and virtual_transaction_id in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_transactionId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and transaction_id in (cast(null as int))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_sqlStateCode=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and sql_state_code in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_detail=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and detail in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_hint=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and hint in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_internalQuery=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and internal_query in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_internalQueryPos=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and internal_query_pos in (cast(null as int))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_context=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and context in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_query=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and query in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_queryPos=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and query_pos in (cast(null as int))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_location=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and location in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -filterQueryTest_applicationName=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and application_name in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_logTime=with ${log_patroni_window} where (1 = 1 and log_time is null) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and log_time is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_logTimeIndex=with ${log_patroni_window} where (1 = 1 and log_time_index is null) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and log_time_index is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_logType=with ${log_patroni_window} where 1 = 0 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where 1 = 0 order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_podName=with ${log_patroni_window} where (1 = 1 and pod_name is null) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and pod_name is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_role=with ${log_patroni_window} where (1 = 1 and (role is null or role not in (cast('Primary' as varchar), cast('Replica' as varchar), cast('Promoted' as varchar), cast('Demoted' as varchar), cast('Uninitialized' as varchar), cast('ReplicaLeader' as varchar), cast('SyncReplica' as varchar)))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and (role is null or role not in (cast('Primary' as varchar), cast('Replica' as varchar), cast('Promoted' as varchar), cast('Demoted' as varchar), cast('Uninitialized' as varchar), cast('ReplicaLeader' as varchar), cast('SyncReplica' as varchar)))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_errorLevel=with ${log_patroni_window} where (1 = 1 and error_severity is null) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and error_severity is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_message=with ${log_patroni_window} where (1 = 1 and message is null) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and message is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_userName=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and user_name is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_databaseName=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and database_name is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_processId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and process_id is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_connectionFrom=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and connection_from is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_sessionId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and session_id is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_sessionLineNum=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and session_line_num is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_commandTag=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and command_tag is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_sessionStartTime=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and session_start_time is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_virtualTransactionId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and virtual_transaction_id is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_transactionId=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and transaction_id is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_sqlStateCode=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and sql_state_code is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_detail=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and detail is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_hint=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and hint is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_internalQuery=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and internal_query is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_internalQueryPos=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and internal_query_pos is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_context=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and context is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_query=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and query is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_queryPos=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and query_pos is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_location=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and location is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -nullFilterQueryTest_applicationName=with ${log_patroni_window} where 1 = 1 order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and application_name is null) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -allFiltersQueryTest=with ${log_patroni_window} where (1 = 0 and log_time in (cast(null as timestamp with time zone)) and log_time_index in (cast(null as int)) and pod_name in (cast('' as varchar)) and role in (cast('' as varchar)) and error_severity in (cast('' as varchar)) and message in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 0 and log_time in (cast(null as timestamp with time zone)) and log_time_index in (cast(null as int)) and pod_name in (cast('' as varchar)) and role in (cast('' as varchar)) and error_severity in (cast('' as varchar)) and message in (cast('' as varchar)) and user_name in (cast('' as varchar)) and database_name in (cast('' as varchar)) and process_id in (cast(null as int)) and connection_from in (cast('' as varchar)) and session_id in (cast('' as varchar)) and session_line_num in (cast(null as bigint)) and command_tag in (cast('' as varchar)) and session_start_time in (cast(null as timestamp with time zone)) and virtual_transaction_id in (cast('' as varchar)) and transaction_id in (cast(null as int)) and sql_state_code in (cast('' as varchar)) and detail in (cast('' as varchar)) and hint in (cast('' as varchar)) and internal_query in (cast('' as varchar)) and internal_query_pos in (cast(null as int)) and context in (cast('' as varchar)) and query in (cast('' as varchar)) and query_pos in (cast(null as int)) and location in (cast('' as varchar)) and application_name in (cast('' as varchar))) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 -fullTextQueryTest=with ${log_patroni_window} where (1 = 1 and (log_patroni_tsvector(log_patroni) @@ 'test:*'::tsquery)) order by log_time desc, log_time_index desc limit 1), ${log_postgres_window} where (1 = 1 and (log_postgres_tsvector(log_postgres) @@ 'test:*'::tsquery)) order by log_time desc, log_time_index desc limit 1) ${log_select} order by log_time desc, log_time_index desc limit 1 +log_select=(${log_select_patroni_window}) union (${log_select_postgres_window}) +descQueryTest=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +fromDescQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +fromInclusiveDescQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +toDescQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +fromToDescQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) < (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +fromInclusiveToDescQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +ascQueryTest=with ${log_patroni_window} where true order by log_time asc, log_time_index asc fetch next 1 rows only), ${log_postgres_window} where true order by log_time asc, log_time_index asc fetch next 1 rows only) ${log_select} order by log_time asc, log_time_index asc fetch next 1 rows only +fromAscQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only) ${log_select} order by log_time asc, log_time_index asc fetch next 1 rows only +fromInclusiveAscQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only) ${log_select} order by log_time asc, log_time_index asc fetch next 1 rows only +toAscQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only) ${log_select} order by log_time asc, log_time_index asc fetch next 1 rows only +fromToAscQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) > (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only) ${log_select} order by log_time asc, log_time_index asc fetch next 1 rows only +fromInclusiveToAscQueryTest=with ${log_patroni_window} where (true and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only), ${log_postgres_window} where (true and (log_time, log_time_index) >= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0) and (log_time, log_time_index) <= (timestamp with time zone '1970-01-01 00:00:00+00:00', 0)) order by log_time asc, log_time_index asc fetch next 1 rows only) ${log_select} order by log_time asc, log_time_index asc fetch next 1 rows only +filterQueryTest_logTime=with ${log_patroni_window} where (true and log_time in (cast(null as timestamp with time zone))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and log_time in (cast(null as timestamp with time zone))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_logTimeIndex=with ${log_patroni_window} where (true and log_time_index in (cast(null as int))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and log_time_index in (cast(null as int))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_logType=with ${log_patroni_window} where false order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where false order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_podName=with ${log_patroni_window} where (true and pod_name in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and pod_name in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_role=with ${log_patroni_window} where (true and role in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and role in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_errorLevel=with ${log_patroni_window} where (true and error_severity in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and error_severity in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_message=with ${log_patroni_window} where (true and message in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and message in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_userName=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and user_name in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_databaseName=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and database_name in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_processId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and process_id in (cast(null as int))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_connectionFrom=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and connection_from in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_sessionId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and session_id in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_sessionLineNum=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and session_line_num in (cast(null as bigint))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_commandTag=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and command_tag in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_sessionStartTime=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and session_start_time in (cast(null as timestamp with time zone))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_virtualTransactionId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and virtual_transaction_id in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_transactionId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and transaction_id in (cast(null as int))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_sqlStateCode=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and sql_state_code in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_detail=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and detail in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_hint=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and hint in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_internalQuery=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and internal_query in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_internalQueryPos=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and internal_query_pos in (cast(null as int))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_context=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and context in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_query=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and query in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_queryPos=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and query_pos in (cast(null as int))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_location=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and location in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +filterQueryTest_applicationName=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and application_name in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_logTime=with ${log_patroni_window} where (true and log_time is null) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and log_time is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_logTimeIndex=with ${log_patroni_window} where (true and log_time_index is null) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and log_time_index is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_logType=with ${log_patroni_window} where false order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where false order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_podName=with ${log_patroni_window} where (true and pod_name is null) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and pod_name is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_role=with ${log_patroni_window} where (true and (role is null or role not in (cast('Primary' as varchar), cast('Replica' as varchar), cast('Promoted' as varchar), cast('Demoted' as varchar), cast('Uninitialized' as varchar), cast('ReplicaLeader' as varchar), cast('SyncReplica' as varchar)))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and (role is null or role not in (cast('Primary' as varchar), cast('Replica' as varchar), cast('Promoted' as varchar), cast('Demoted' as varchar), cast('Uninitialized' as varchar), cast('ReplicaLeader' as varchar), cast('SyncReplica' as varchar)))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_errorLevel=with ${log_patroni_window} where (true and error_severity is null) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and error_severity is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_message=with ${log_patroni_window} where (true and message is null) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and message is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_userName=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and user_name is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_databaseName=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and database_name is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_processId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and process_id is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_connectionFrom=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and connection_from is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_sessionId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and session_id is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_sessionLineNum=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and session_line_num is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_commandTag=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and command_tag is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_sessionStartTime=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and session_start_time is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_virtualTransactionId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and virtual_transaction_id is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_transactionId=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and transaction_id is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_sqlStateCode=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and sql_state_code is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_detail=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and detail is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_hint=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and hint is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_internalQuery=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and internal_query is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_internalQueryPos=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and internal_query_pos is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_context=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and context is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_query=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and query is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_queryPos=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and query_pos is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_location=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and location is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +nullFilterQueryTest_applicationName=with ${log_patroni_window} where true order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and application_name is null) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +allFiltersQueryTest=with ${log_patroni_window} where (false and log_time in (cast(null as timestamp with time zone)) and log_time_index in (cast(null as int)) and pod_name in (cast('' as varchar)) and role in (cast('' as varchar)) and error_severity in (cast('' as varchar)) and message in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (false and log_time in (cast(null as timestamp with time zone)) and log_time_index in (cast(null as int)) and pod_name in (cast('' as varchar)) and role in (cast('' as varchar)) and error_severity in (cast('' as varchar)) and message in (cast('' as varchar)) and user_name in (cast('' as varchar)) and database_name in (cast('' as varchar)) and process_id in (cast(null as int)) and connection_from in (cast('' as varchar)) and session_id in (cast('' as varchar)) and session_line_num in (cast(null as bigint)) and command_tag in (cast('' as varchar)) and session_start_time in (cast(null as timestamp with time zone)) and virtual_transaction_id in (cast('' as varchar)) and transaction_id in (cast(null as int)) and sql_state_code in (cast('' as varchar)) and detail in (cast('' as varchar)) and hint in (cast('' as varchar)) and internal_query in (cast('' as varchar)) and internal_query_pos in (cast(null as int)) and context in (cast('' as varchar)) and query in (cast('' as varchar)) and query_pos in (cast(null as int)) and location in (cast('' as varchar)) and application_name in (cast('' as varchar))) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only +fullTextQueryTest=with ${log_patroni_window} where (true and (log_patroni_tsvector(log_patroni) @@ 'test:*'::tsquery)) order by log_time desc, log_time_index desc fetch next 1 rows only), ${log_postgres_window} where (true and (log_postgres_tsvector(log_postgres) @@ 'test:*'::tsquery)) order by log_time desc, log_time_index desc fetch next 1 rows only) ${log_select} order by log_time desc, log_time_index desc fetch next 1 rows only diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerBootstrapImpl.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerBootstrapImpl.java index db78cf7065..7cdd81f5f2 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerBootstrapImpl.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerBootstrapImpl.java @@ -7,11 +7,10 @@ import java.net.SocketTimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerWatchersHandlerImpl.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerWatchersHandlerImpl.java index 0413f9f6de..81e42fa641 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerWatchersHandlerImpl.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ClusterControllerWatchersHandlerImpl.java @@ -9,9 +9,6 @@ import java.util.List; import java.util.function.BiConsumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClient; @@ -22,6 +19,8 @@ import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterList; import io.stackgres.operatorframework.resource.WatcherMonitor; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterControllerWatchersHandlerImpl diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ReconciliationClockImpl.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ReconciliationClockImpl.java index f2a65c2ed8..1d7c0f14c4 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ReconciliationClockImpl.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/ReconciliationClockImpl.java @@ -5,11 +5,10 @@ package io.stackgres.cluster.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.cluster.controller.ClusterControllerReconciliationCycle; import io.stackgres.common.app.AbstractReconciliationClock; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ReconciliationClockImpl extends AbstractReconciliationClock { diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerApp.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerApp.java index 247fa71bff..7a8dde0318 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerApp.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerApp.java @@ -5,13 +5,12 @@ package io.stackgres.cluster.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.stackgres.cluster.app.StackGresClusterControllerMain.StackGresClusterControllerAppShutdownEvent; import io.stackgres.cluster.app.StackGresClusterControllerMain.StackGresClusterControllerAppStartupEvent; import io.stackgres.common.app.ReconciliationClock; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerMain.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerMain.java index 1efcd2ae70..7ac8f901d0 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerMain.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/app/StackGresClusterControllerMain.java @@ -8,9 +8,6 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.event.Event; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; @@ -18,6 +15,8 @@ import io.stackgres.cluster.controller.ClusterControllerReconciliationCycle; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operatorframework.reconciliation.ReconciliationCycle.ReconciliationCycleResult; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/configuration/ClusterControllerPropertyContext.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/configuration/ClusterControllerPropertyContext.java index aa97901409..c5c81b6445 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/configuration/ClusterControllerPropertyContext.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/configuration/ClusterControllerPropertyContext.java @@ -5,11 +5,10 @@ package io.stackgres.cluster.configuration; -import javax.inject.Singleton; - import io.stackgres.common.ClusterControllerProperty; import io.stackgres.common.StackGresPropertyContext; import io.stackgres.common.controller.PodLocalControllerContext; +import jakarta.inject.Singleton; @Singleton public class ClusterControllerPropertyContext diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerPostgresBootstrapReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerPostgresBootstrapReconciliator.java index 83759459e4..1fbd1e7d1f 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerPostgresBootstrapReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerPostgresBootstrapReconciliator.java @@ -9,10 +9,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.cluster.common.ClusterBootstrapEventReason; @@ -20,6 +16,9 @@ import io.stackgres.common.ClusterControllerProperty; import io.stackgres.common.postgres.PostgresBootstrapReconciliator; import io.stackgres.common.resource.ResourceFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterControllerPostgresBootstrapReconciliator diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliationCycle.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliationCycle.java index b6b644c418..5c5a52adc9 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliationCycle.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliationCycle.java @@ -12,11 +12,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClient; @@ -34,6 +29,10 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.operatorframework.reconciliation.ReconciliationCycle; import io.stackgres.operatorframework.resource.ResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.jooq.lambda.tuple.Tuple2; import org.slf4j.helpers.MessageFormatter; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliator.java index 560c9aae19..742de51523 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterControllerReconciliator.java @@ -9,10 +9,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.cluster.common.StackGresClusterContext; @@ -26,6 +22,9 @@ import io.stackgres.common.resource.CustomResourceScheduler; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; import io.stackgres.operatorframework.reconciliation.Reconciliator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jooq.lambda.tuple.Tuple; @ApplicationScoped diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionManager.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionManager.java index 8e4b11d990..f1d07d4785 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionManager.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionManager.java @@ -5,13 +5,12 @@ package io.stackgres.cluster.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.FileSystemHandler; import io.stackgres.common.WebClientFactory; import io.stackgres.common.extension.ExtensionManager; import io.stackgres.common.extension.ExtensionMetadataManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterExtensionManager extends ExtensionManager { diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionMetadataManager.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionMetadataManager.java index f3ba21ec91..29d4da2a5a 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionMetadataManager.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionMetadataManager.java @@ -7,14 +7,13 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.cluster.configuration.ClusterControllerPropertyContext; import io.stackgres.common.ClusterControllerProperty; import io.stackgres.common.WebClientFactory; import io.stackgres.common.extension.ExtensionMetadataManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionReconciliator.java index 8495c83f64..0209bfa174 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterExtensionReconciliator.java @@ -5,10 +5,6 @@ package io.stackgres.cluster.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.cluster.common.ClusterControllerEventReason; import io.stackgres.cluster.common.StackGresClusterContext; @@ -18,6 +14,9 @@ import io.stackgres.common.extension.ExtensionEventEmitter; import io.stackgres.common.extension.ExtensionManager; import io.stackgres.common.extension.ExtensionReconciliator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.helpers.MessageFormatter; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterPersistentVolumeSizeReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterPersistentVolumeSizeReconciliator.java index cfebf84efc..df829a64bb 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterPersistentVolumeSizeReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ClusterPersistentVolumeSizeReconciliator.java @@ -5,15 +5,14 @@ package io.stackgres.cluster.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.stackgres.cluster.configuration.ClusterControllerPropertyContext; import io.stackgres.common.controller.PersistentVolumeSizeReconciliator; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceWriter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterPersistentVolumeSizeReconciliator extends diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/EventController.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/EventController.java index b9a74ca2c3..989246dfe9 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/EventController.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/EventController.java @@ -5,15 +5,14 @@ package io.stackgres.cluster.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.ClusterControllerProperty; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.operatorframework.resource.EventEmitter; import io.stackgres.operatorframework.resource.EventReason; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class EventController extends EventEmitter { diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ExtensionEventEmitterImpl.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ExtensionEventEmitterImpl.java index fabbb66221..7577bab280 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ExtensionEventEmitterImpl.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ExtensionEventEmitterImpl.java @@ -7,9 +7,6 @@ import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.cluster.common.ExtensionEventReason; import io.stackgres.common.ClusterControllerProperty; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -17,6 +14,8 @@ import io.stackgres.common.event.EventEmitter; import io.stackgres.common.extension.ExtensionEventEmitter; import io.stackgres.common.resource.CustomResourceFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ExtensionEventEmitterImpl implements ExtensionEventEmitter { diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlReconciliator.java index 88640337e2..5691aaaee2 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlReconciliator.java @@ -10,10 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.Endpoints; @@ -43,6 +39,9 @@ import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jooq.lambda.tuple.Tuple; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlScriptEntryExecutor.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlScriptEntryExecutor.java index 724b70782e..f520b08209 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlScriptEntryExecutor.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ManagedSqlScriptEntryExecutor.java @@ -14,13 +14,12 @@ import java.time.Instant; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.EnvoyUtil; import io.stackgres.common.crd.sgscript.StackGresScriptTransactionIsolationLevel; import io.stackgres.common.postgres.PostgresConnectionManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniReconciliator.java index 4da77b1f96..2507be4054 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniReconciliator.java @@ -21,10 +21,6 @@ import java.util.Optional; import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import com.ongres.process.FluentProcess; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @@ -45,6 +41,9 @@ import io.stackgres.common.kubernetesclient.KubernetesClientUtil; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniStandbyHistoryReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniStandbyHistoryReconciliator.java index 42c8f05709..538f9005aa 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniStandbyHistoryReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PatroniStandbyHistoryReconciliator.java @@ -11,10 +11,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -27,6 +23,9 @@ import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceWriter; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PgBouncerReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PgBouncerReconciliator.java index e3bd06e164..8e06fb9742 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PgBouncerReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PgBouncerReconciliator.java @@ -15,10 +15,6 @@ import java.util.regex.Pattern; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import com.ongres.process.FluentProcess; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.KubernetesClient; @@ -34,6 +30,9 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PostgresSslReconciliator.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PostgresSslReconciliator.java index cf5818c4a7..8489f7a09f 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PostgresSslReconciliator.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/PostgresSslReconciliator.java @@ -18,10 +18,6 @@ import java.util.Set; import java.util.function.Predicate; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.KubernetesClient; @@ -40,6 +36,9 @@ import io.stackgres.common.postgres.PostgresConnectionManager; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; import org.jooq.lambda.tuple.Tuple; diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ResourceWatcherFactory.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ResourceWatcherFactory.java index d2fa3855e5..40a33a81ef 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ResourceWatcherFactory.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/controller/ResourceWatcherFactory.java @@ -5,13 +5,12 @@ package io.stackgres.cluster.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.WatcherException; import io.stackgres.cluster.common.ClusterControllerEventReason; import io.stackgres.operatorframework.resource.AbstractResourceWatcherFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ResourceWatcherFactory extends AbstractResourceWatcherFactory { diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/ClusterResourceHandlerSelector.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/ClusterResourceHandlerSelector.java index d45c0abac0..3228cac43f 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/ClusterResourceHandlerSelector.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/ClusterResourceHandlerSelector.java @@ -8,14 +8,13 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.cluster.common.StackGresClusterContext; import io.stackgres.operatorframework.resource.AbstractResourceHandlerSelector; import io.stackgres.operatorframework.resource.ResourceHandler; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/DefaultClusterResourceHandler.java b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/DefaultClusterResourceHandler.java index 26df916805..35f511863f 100644 --- a/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/DefaultClusterResourceHandler.java +++ b/stackgres-k8s/src/cluster-controller/src/main/java/io/stackgres/cluster/resource/DefaultClusterResourceHandler.java @@ -7,14 +7,13 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.cluster.common.StackGresClusterContext; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.labels.LabelFactoryForCluster; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultClusterResourceHandler diff --git a/stackgres-k8s/src/cluster-controller/src/test/java/io/stackgres/cluster/controller/ExtensionEventEmitterImplTest.java b/stackgres-k8s/src/cluster-controller/src/test/java/io/stackgres/cluster/controller/ExtensionEventEmitterImplTest.java index f053daaf5c..ce5b12ab9f 100644 --- a/stackgres-k8s/src/cluster-controller/src/test/java/io/stackgres/cluster/controller/ExtensionEventEmitterImplTest.java +++ b/stackgres-k8s/src/cluster-controller/src/test/java/io/stackgres/cluster/controller/ExtensionEventEmitterImplTest.java @@ -13,8 +13,6 @@ import java.util.Optional; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.stackgres.cluster.common.ExtensionEventReason; @@ -27,6 +25,7 @@ import io.stackgres.common.resource.ClusterFinder; import io.stackgres.operatorframework.resource.EventReason; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/JsonMapperCustomizer.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/JsonMapperCustomizer.java index 60953e98e9..1f2c73152b 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/JsonMapperCustomizer.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/JsonMapperCustomizer.java @@ -5,13 +5,12 @@ package io.stackgres.common; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import io.quarkus.jackson.ObjectMapperCustomizer; +import jakarta.inject.Singleton; @Singleton public class JsonMapperCustomizer implements ObjectMapperCustomizer { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/KubectlUtil.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/KubectlUtil.java index 2d911d1372..6aa3dcffd4 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/KubectlUtil.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/KubectlUtil.java @@ -8,15 +8,14 @@ import java.util.EnumMap; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.VersionInfo; import io.stackgres.common.component.Component; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/WebClientFactory.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/WebClientFactory.java index cb214f9184..a2d0cc7074 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/WebClientFactory.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/WebClientFactory.java @@ -28,19 +28,19 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.Dependent; import javax.net.ssl.HostnameVerifier; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLSession; import javax.net.ssl.X509TrustManager; -import javax.validation.constraints.NotNull; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Invocation.Builder; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.UriBuilder; import com.google.common.net.HttpHeaders; +import jakarta.enterprise.context.Dependent; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.Invocation.Builder; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.UriBuilder; import org.jboss.resteasy.plugins.interceptors.AcceptEncodingGZIPFilter; import org.jboss.resteasy.plugins.interceptors.GZIPDecodingInterceptor; import org.jboss.resteasy.plugins.interceptors.GZIPEncodingInterceptor; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/YamlMapperProvider.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/YamlMapperProvider.java index d86fe54a6d..98acdc0189 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/YamlMapperProvider.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/YamlMapperProvider.java @@ -7,8 +7,6 @@ import java.util.function.Supplier; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; @@ -17,6 +15,7 @@ import com.fasterxml.jackson.dataformat.yaml.YAMLMapper; import io.fabric8.kubernetes.client.utils.Serialization; import io.quarkus.arc.Unremovable; +import jakarta.inject.Singleton; @Singleton @Unremovable diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Condition.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Condition.java index 9eabd9f817..4c3fd29cab 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Condition.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Condition.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +15,7 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotBlank; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/ConfigMapKeySelector.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/ConfigMapKeySelector.java index a8fefef4dd..65252c2163 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/ConfigMapKeySelector.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/ConfigMapKeySelector.java @@ -5,8 +5,6 @@ package io.stackgres.common.crd; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -16,6 +14,7 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/SecretKeySelector.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/SecretKeySelector.java index 76ba9f7f2a..91144b533b 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/SecretKeySelector.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/SecretKeySelector.java @@ -5,8 +5,6 @@ package io.stackgres.common.crd; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -16,6 +14,7 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Toleration.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Toleration.java index 2ac6d062a2..2d56dcfe33 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Toleration.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/Toleration.java @@ -7,8 +7,6 @@ import java.util.Objects; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +17,7 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/postgres/service/StackGresPostgresServices.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/postgres/service/StackGresPostgresServices.java index 6ba7abc7b6..bb1078b462 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/postgres/service/StackGresPostgresServices.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/postgres/service/StackGresPostgresServices.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackup.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackup.java index f6553d97af..dc12337cf7 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackup.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackup.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupInformation.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupInformation.java index 3ff22fb332..0ace58a268 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupInformation.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupInformation.java @@ -8,13 +8,12 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupProcess.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupProcess.java index 5548b7297a..9e82ae7564 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupProcess.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupProcess.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupSpec.java index a06461b7c0..93212b9507 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupSpec.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupStatus.java index ab03d0fccc..e307b1f147 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackup/StackGresBackupStatus.java @@ -7,8 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,6 +14,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigSpec; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfig.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfig.java index 5be7e126a1..11985417aa 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfig.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfig.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfigSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfigSpec.java index 42a11d36b8..d02740af9f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfigSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBackupConfigSpec.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.storages.BackupStorage; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupConfig.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupConfig.java index bcaff44b97..2e7604c4ec 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupConfig.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupConfig.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.Positive; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Positive; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupPerformance.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupPerformance.java index a872e3954b..0686df76a2 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupPerformance.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgbackupconfig/StackGresBaseBackupPerformance.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.Null; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.Null; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/ClusterDbOpsRestartStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/ClusterDbOpsRestartStatus.java index ecfc6cafce..30835ae570 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/ClusterDbOpsRestartStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/ClusterDbOpsRestartStatus.java @@ -8,9 +8,8 @@ import java.util.List; import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonProperty; +import jakarta.validation.constraints.NotNull; public abstract class ClusterDbOpsRestartStatus { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresCluster.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresCluster.java index 15324287f1..ed6a653d65 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresCluster.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresCluster.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterBackupConfiguration.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterBackupConfiguration.java index d2705f0260..42f4e291da 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterBackupConfiguration.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterBackupConfiguration.java @@ -7,10 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,6 +14,9 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgbackupconfig.StackGresBaseBackupPerformance; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterConfiguration.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterConfiguration.java index c204c224ff..5ebc0ba3d5 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterConfiguration.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterConfiguration.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -20,6 +17,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterCredentials.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterCredentials.java index 9ad932af51..f9d2672b99 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterCredentials.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterCredentials.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMajorVersionUpgradeStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMajorVersionUpgradeStatus.java index e4c93087a6..f4dc7d4698 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMajorVersionUpgradeStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMajorVersionUpgradeStatus.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMinorVersionUpgradeStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMinorVersionUpgradeStatus.java index 41abf8a522..dfc571e328 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMinorVersionUpgradeStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsMinorVersionUpgradeStatus.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsStatus.java index 725a33fba2..9fafddf58a 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterDbOpsStatus.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterExtension.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterExtension.java index 0ca29212c8..014ea40f31 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterExtension.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterExtension.java @@ -8,8 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -18,6 +16,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.extension.ExtensionUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInitData.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInitData.java index f72cc56dc6..c20fcdec89 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInitData.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInitData.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.Null; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Null; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInstalledExtension.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInstalledExtension.java index 4a55a87228..1ff6e587e4 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInstalledExtension.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterInstalledExtension.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntry.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntry.java index 20a3048b15..86dd243ca8 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntry.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntry.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryScriptStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryScriptStatus.java index cdec68601e..77d1292d16 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryScriptStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryScriptStatus.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryStatus.java index 1fe990f5c8..bb3611f0ef 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedScriptEntryStatus.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSql.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSql.java index 09e4b8f497..46c116aaaa 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSql.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSql.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSqlStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSqlStatus.java index 9c842f1741..a1c0058ae5 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSqlStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterManagedSqlStatus.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPatroniCredentials.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPatroniCredentials.java index 19397fa3a1..2da79509f3 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPatroniCredentials.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPatroniCredentials.java @@ -7,8 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,6 +14,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.SecretKeySelector; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPod.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPod.java index 73716feee8..f410504822 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPod.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPod.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -23,6 +20,8 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodScheduling.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodScheduling.java index 5c2eecafca..0a7e9de301 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodScheduling.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodScheduling.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -22,6 +20,7 @@ import io.stackgres.common.crd.Toleration; import io.stackgres.common.crd.TopologySpreadConstraint; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodSchedulingBackup.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodSchedulingBackup.java index f45791f3c2..9ee3324ce8 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodSchedulingBackup.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodSchedulingBackup.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,6 +19,7 @@ import io.stackgres.common.crd.PodAntiAffinity; import io.stackgres.common.crd.Toleration; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodStatus.java index d23c89644d..6cf54626b7 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPodStatus.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -18,6 +15,8 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; import org.jooq.lambda.Seq; @RegisterForReflection diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgres.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgres.java index 1a423068b8..ef3af29870 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgres.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgres.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,6 +15,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgresService.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgresService.java index 917eb83673..4b0299f610 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgresService.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterPostgresService.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonInclude; import io.fabric8.kubernetes.api.model.ServicePort; import io.fabric8.kubernetes.api.model.SessionAffinityConfig; @@ -20,6 +18,7 @@ import io.stackgres.common.crd.postgres.service.StackGresPostgresService; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFrom.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFrom.java index 853324a9a0..4b5c01d202 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFrom.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFrom.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +16,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromExternal.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromExternal.java index 459a61f277..b36a74ab3b 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromExternal.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromExternal.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromInstance.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromInstance.java index 5584a521b6..406a93b006 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromInstance.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromInstance.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +16,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromStorage.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromStorage.java index 06cf6c016e..4011e5b4d0 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromStorage.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromStorage.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgbackupconfig.StackGresBaseBackupPerformance; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUserSecretKeyRef.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUserSecretKeyRef.java index e84dc18718..8f6cab65ae 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUserSecretKeyRef.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUserSecretKeyRef.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.SecretKeySelector; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUsers.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUsers.java index 621011dcae..9faa7ca90b 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUsers.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicateFromUsers.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplication.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplication.java index 1d0812a98f..3cc8ccb631 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplication.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplication.java @@ -8,10 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Min; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -22,6 +18,9 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Min; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicationGroup.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicationGroup.java index 31bc4494d6..4387f9cbf6 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicationGroup.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterReplicationGroup.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestore.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestore.java index ada75642cf..a8f4e00451 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestore.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestore.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestoreFromBackup.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestoreFromBackup.java index 870fc1672c..2a8e33e731 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestoreFromBackup.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestoreFromBackup.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +16,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestorePitr.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestorePitr.java index 2b92d14eac..e69dee1488 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestorePitr.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterRestorePitr.java @@ -9,9 +9,6 @@ import java.time.format.DateTimeParseException; import java.util.Objects; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +18,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptEntry.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptEntry.java index cbac472cab..df5878e8ef 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptEntry.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptEntry.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +16,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptFrom.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptFrom.java index f0d15046a4..3b3d486852 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptFrom.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterScriptFrom.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +18,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSpec.java index 4bebc1911a..087628e2ee 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSpec.java @@ -9,9 +9,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -22,6 +19,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSsl.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSsl.java index 28aee3268b..a5eca7101c 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSsl.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterSsl.java @@ -7,8 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,6 +14,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.SecretKeySelector; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterStatus.java index 62de55b668..dcda7c8d2e 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterStatus.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,6 +16,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.Condition; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUserSecretKeyRef.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUserSecretKeyRef.java index 04479a0cf7..d7f61f5fd0 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUserSecretKeyRef.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUserSecretKeyRef.java @@ -7,8 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -16,6 +14,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.SecretKeySelector; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUsersCredentials.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUsersCredentials.java index aac8190bc0..67313dd469 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUsersCredentials.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresClusterUsersCredentials.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresPodPersistentVolume.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresPodPersistentVolume.java index e53e4c1ed8..244807ab4f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresPodPersistentVolume.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgcluster/StackGresPodPersistentVolume.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOps.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOps.java index 949b3ebcd8..da912f54ef 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOps.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOps.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsBenchmark.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsBenchmark.java index 75817fcf89..b03793025f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsBenchmark.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsBenchmark.java @@ -8,10 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +17,9 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotEmpty; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMajorVersionUpgrade.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMajorVersionUpgrade.java index ddfd5f90ee..095b512ab0 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMajorVersionUpgrade.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMajorVersionUpgrade.java @@ -8,9 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -20,6 +17,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotEmpty; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMinorVersionUpgrade.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMinorVersionUpgrade.java index a8e3ecd0c1..5c1e63102f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMinorVersionUpgrade.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsMinorVersionUpgrade.java @@ -7,8 +7,6 @@ import java.util.Objects; -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -17,6 +15,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotEmpty; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsPgbench.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsPgbench.java index a5ef50a935..3beb39789c 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsPgbench.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsPgbench.java @@ -8,10 +8,6 @@ import java.time.format.DateTimeParseException; import java.util.Objects; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +17,9 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsRepackConfig.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsRepackConfig.java index cf0adb5553..5551227cd0 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsRepackConfig.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsRepackConfig.java @@ -8,12 +8,11 @@ import java.time.format.DateTimeParseException; import java.util.Objects; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; +import jakarta.validation.constraints.AssertTrue; public abstract class StackGresDbOpsRepackConfig { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpec.java index fda28a8464..c415a11e7f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpec.java @@ -10,12 +10,6 @@ import java.time.format.DateTimeParseException; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -26,6 +20,11 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpecScheduling.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpecScheduling.java index 8eece80531..84fffa8922 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpecScheduling.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsSpecScheduling.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,6 +19,7 @@ import io.stackgres.common.crd.PodAntiAffinity; import io.stackgres.common.crd.Toleration; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsStatus.java index 8710913a5a..4760b33506 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdbops/StackGresDbOpsStatus.java @@ -11,9 +11,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -24,6 +21,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogs.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogs.java index 484296f433..fea6415e84 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogs.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogs.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsConfiguration.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsConfiguration.java index c600e58636..ecaa6a1794 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsConfiguration.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsConfiguration.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotBlank; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotBlank; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPersistentVolume.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPersistentVolume.java index 7ccefb176f..1e3c59f810 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPersistentVolume.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPersistentVolume.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPodScheduling.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPodScheduling.java index 2d7dd12b53..efa3ecc261 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPodScheduling.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsPodScheduling.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -21,6 +19,7 @@ import io.stackgres.common.crd.PodAntiAffinity; import io.stackgres.common.crd.Toleration; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpec.java index 94b27a9fa4..8603dd8f15 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpec.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -18,6 +15,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgcluster.StackGresClusterInstalledExtension; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpecMetadata.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpecMetadata.java index 5a625d3705..52c8f55808 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpecMetadata.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsSpecMetadata.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.MoreObjects; import io.quarkus.runtime.annotations.RegisterForReflection; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsStatus.java index bffa4d29da..5308b8e9b4 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgdistributedlogs/StackGresDistributedLogsStatus.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -19,6 +17,7 @@ import io.stackgres.common.crd.Condition; import io.stackgres.common.crd.sgcluster.StackGresClusterPodStatus; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgobjectstorage/StackGresObjectStorage.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgobjectstorage/StackGresObjectStorage.java index f578005416..13e4fe6c6d 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgobjectstorage/StackGresObjectStorage.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgobjectstorage/StackGresObjectStorage.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -27,6 +24,8 @@ import io.stackgres.common.crd.storages.BackupStorage; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfig.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfig.java index 6e7d950ecd..ebd491ad85 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfig.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfig.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigSpec.java index 989cf7c835..49eccd01b5 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigSpec.java @@ -8,15 +8,14 @@ import java.util.Map; import java.util.Objects; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigStatus.java index eb653ed718..735ad5ac4e 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpgconfig/StackGresPostgresConfigStatus.java @@ -8,14 +8,13 @@ import java.util.Map; import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfig.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfig.java index 0afecd9d68..e97dcbe69d 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfig.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfig.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncer.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncer.java index 0d05f590a5..b0f9e18710 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncer.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncer.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerPgbouncerIni.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerPgbouncerIni.java index a7951a9090..814f9213cc 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerPgbouncerIni.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerPgbouncerIni.java @@ -8,15 +8,14 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerStatus.java index 74b696fe0b..282c5e540d 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigPgBouncerStatus.java @@ -8,14 +8,13 @@ import java.util.Map; import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigSpec.java index 7d896f0ffa..2685e32f4c 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigSpec.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigStatus.java index 2355b1d9aa..2c6f6e2dae 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgpooling/StackGresPoolingConfigStatus.java @@ -7,13 +7,12 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfile.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfile.java index a6ef85020d..be9905bcf9 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfile.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfile.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileContainer.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileContainer.java index 19a690367b..3a1eefd328 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileContainer.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileContainer.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileHugePages.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileHugePages.java index 60752245d8..266648e65d 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileHugePages.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileHugePages.java @@ -8,8 +8,6 @@ import java.math.BigDecimal; import java.util.Objects; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -20,6 +18,7 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileRequests.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileRequests.java index 8a9d2294fa..dd507c8a84 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileRequests.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileRequests.java @@ -8,14 +8,13 @@ import java.util.Map; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileSpec.java index 68592e8a31..a54fd2587e 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgprofile/StackGresProfileSpec.java @@ -11,9 +11,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -25,6 +22,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScript.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScript.java index 16d9452bd0..47ba4f6613 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScript.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScript.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptEntry.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptEntry.java index 5c53546a5c..7424a1f2a8 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptEntry.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptEntry.java @@ -11,10 +11,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -25,6 +21,9 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptFrom.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptFrom.java index f973c53fb3..096b3b5e6d 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptFrom.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptFrom.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +18,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptSpec.java index ebf5e9cc53..b27aa4bffd 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptSpec.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptStatus.java index 2773c19eb5..44f4c939af 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgscript/StackGresScriptStatus.java @@ -9,14 +9,13 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedCluster.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedCluster.java index cf1fc704fb..9e5da2a04f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedCluster.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedCluster.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -24,6 +21,8 @@ import io.stackgres.common.crd.CommonDefinition; import io.sundr.builder.annotations.Buildable; import io.sundr.builder.annotations.BuildableReference; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_NULL) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterBackupConfiguration.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterBackupConfiguration.java index 1215624a97..f46cdeea81 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterBackupConfiguration.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterBackupConfiguration.java @@ -8,10 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Positive; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -19,6 +15,9 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgbackupconfig.StackGresBaseBackupPerformance; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Positive; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterConfiguration.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterConfiguration.java index c5cbb5008d..54e297c5cc 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterConfiguration.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterConfiguration.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +15,7 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgcluster.StackGresClusterCredentials; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterCoordinator.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterCoordinator.java index c29e68ecab..14d0ecb765 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterCoordinator.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterCoordinator.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -19,6 +16,8 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresCoordinatorServices.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresCoordinatorServices.java index 9f9bb8ed14..7e77a4eec8 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresCoordinatorServices.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresCoordinatorServices.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; @@ -18,6 +15,8 @@ import io.stackgres.common.crd.CustomServicePort; import io.stackgres.common.crd.postgres.service.StackGresPostgresService; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresServices.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresServices.java index 908146f6a8..0af8d8055c 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresServices.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresServices.java @@ -7,13 +7,12 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresShardsServices.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresShardsServices.java index 417f4fed3f..0695298da1 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresShardsServices.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterPostgresShardsServices.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; @@ -18,6 +15,8 @@ import io.stackgres.common.crd.CustomServicePort; import io.stackgres.common.crd.postgres.service.StackGresPostgresService; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShard.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShard.java index 710fe4ceb8..60af429732 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShard.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShard.java @@ -7,11 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Positive; -import javax.validation.constraints.PositiveOrZero; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +16,10 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Positive; +import jakarta.validation.constraints.PositiveOrZero; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShards.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShards.java index 42a2687e57..4cbfc81bd9 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShards.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterShards.java @@ -8,10 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Positive; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +17,9 @@ import io.stackgres.common.validation.FieldReference; import io.stackgres.common.validation.FieldReference.ReferencedField; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Positive; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterSpec.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterSpec.java index acdd6a7de2..8bd058ba73 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterSpec.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterSpec.java @@ -9,11 +9,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -28,6 +23,10 @@ import io.stackgres.common.validation.FieldReference.ReferencedField; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterStatus.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterStatus.java index 2484ca8db1..b19aaebf07 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterStatus.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/sgshardedcluster/StackGresShardedClusterStatus.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -19,6 +17,7 @@ import io.stackgres.common.crd.Condition; import io.stackgres.common.crd.sgcluster.StackGresClusterInstalledExtension; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsCredentials.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsCredentials.java index 3f566dab1e..64ec3892fb 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsCredentials.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsCredentials.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3CompatibleStorage.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3CompatibleStorage.java index 6acd2ca526..5fd0f1dcc4 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3CompatibleStorage.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3CompatibleStorage.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.constraints.URL; @RegisterForReflection diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3Storage.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3Storage.java index 723789b839..624c9a5afa 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3Storage.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsS3Storage.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.validation.ValidEnum; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsSecretKeySelector.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsSecretKeySelector.java index 88651d5b14..db557031ca 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsSecretKeySelector.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AwsSecretKeySelector.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.SecretKeySelector; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobSecretKeySelector.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobSecretKeySelector.java index 43386b64a6..19bca0d265 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobSecretKeySelector.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobSecretKeySelector.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.SecretKeySelector; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorage.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorage.java index 7701f78009..5737415d67 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorage.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorage.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorageCredentials.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorageCredentials.java index 14423cb442..810dffc69b 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorageCredentials.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/AzureBlobStorageCredentials.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupStorage.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupStorage.java index b7c1854b27..86e4e9994f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupStorage.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupStorage.java @@ -8,9 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -18,6 +15,8 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupVolume.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupVolume.java index bcfd5d98cd..adcdee4d73 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupVolume.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/BackupVolume.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudCredentials.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudCredentials.java index 18266e7f6e..2887106636 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudCredentials.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudCredentials.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -17,6 +14,8 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudSecretKeySelector.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudSecretKeySelector.java index deb2831005..2a5a9890ac 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudSecretKeySelector.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudSecretKeySelector.java @@ -7,9 +7,6 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -17,6 +14,8 @@ import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.SecretKeySelector; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudStorage.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudStorage.java index fb5bde82d5..86683ef8ca 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudStorage.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/crd/storages/GoogleCloudStorage.java @@ -7,15 +7,14 @@ import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/AbstractEventEmitter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/AbstractEventEmitter.java index 68b8b23234..4487444323 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/AbstractEventEmitter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/AbstractEventEmitter.java @@ -11,8 +11,6 @@ import java.util.Optional; import java.util.Random; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Event; import io.fabric8.kubernetes.api.model.EventBuilder; import io.fabric8.kubernetes.api.model.EventSourceBuilder; @@ -20,6 +18,7 @@ import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.operatorframework.resource.EventReason; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/BackupEventEmitter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/BackupEventEmitter.java index 297837f857..c1f49d2519 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/BackupEventEmitter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/BackupEventEmitter.java @@ -5,9 +5,8 @@ package io.stackgres.common.event; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackup.StackGresBackup; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupEventEmitter extends AbstractEventEmitter { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ClusterEventEmitter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ClusterEventEmitter.java index 62e998c99c..d9311e481c 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ClusterEventEmitter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ClusterEventEmitter.java @@ -5,9 +5,8 @@ package io.stackgres.common.event; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ClusterEventEmitter extends AbstractEventEmitter { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DbOpsEventEmitter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DbOpsEventEmitter.java index 616540a267..1a01f4cc35 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DbOpsEventEmitter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DbOpsEventEmitter.java @@ -5,9 +5,8 @@ package io.stackgres.common.event; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DbOpsEventEmitter extends AbstractEventEmitter { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DistributedLogsEventEmitter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DistributedLogsEventEmitter.java index b7e8fb0aad..b77418c786 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DistributedLogsEventEmitter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/DistributedLogsEventEmitter.java @@ -5,9 +5,8 @@ package io.stackgres.common.event; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DistributedLogsEventEmitter extends AbstractEventEmitter { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ScriptEventEmitter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ScriptEventEmitter.java index 40da399bb8..4bfdf0e056 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ScriptEventEmitter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ScriptEventEmitter.java @@ -5,9 +5,8 @@ package io.stackgres.common.event; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgscript.StackGresScript; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ScriptEventEmitter extends AbstractEventEmitter { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ShardedClusterEventEmitter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ShardedClusterEventEmitter.java index 060c4df609..186fb54971 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ShardedClusterEventEmitter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/event/ShardedClusterEventEmitter.java @@ -5,9 +5,8 @@ package io.stackgres.common.event; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ShardedClusterEventEmitter extends AbstractEventEmitter { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionMetadataManager.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionMetadataManager.java index 3afb9c4cce..c8d6dfc2c1 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionMetadataManager.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionMetadataManager.java @@ -17,14 +17,13 @@ import java.util.Map; import java.util.Optional; -import javax.ws.rs.core.UriBuilder; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.stackgres.common.CdiUtil; import io.stackgres.common.WebClientFactory; import io.stackgres.common.WebClientFactory.WebClient; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterExtension; +import jakarta.ws.rs.core.UriBuilder; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple3; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionUtil.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionUtil.java index e03856160c..ef78eadf9a 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionUtil.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/ExtensionUtil.java @@ -17,8 +17,6 @@ import java.util.regex.Pattern; import java.util.stream.Collectors; -import javax.ws.rs.core.UriBuilder; - import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -27,6 +25,7 @@ import io.stackgres.common.crd.sgcluster.StackGresClusterExtension; import io.stackgres.common.crd.sgcluster.StackGresClusterInstalledExtension; import io.stackgres.common.crd.sgcluster.StackGresClusterStatus; +import jakarta.ws.rs.core.UriBuilder; import org.jetbrains.annotations.Nullable; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtension.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtension.java index ed8a58788c..a16312f3d1 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtension.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtension.java @@ -10,10 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; @@ -21,6 +17,9 @@ import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionPublisher.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionPublisher.java index fabb71d994..a6baeb52a6 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionPublisher.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionPublisher.java @@ -7,13 +7,12 @@ import java.util.Objects; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersion.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersion.java index bde4b6e52a..306625d36c 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersion.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersion.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersionTarget.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersionTarget.java index b7cd6c75c7..b88db4c2d8 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersionTarget.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensionVersionTarget.java @@ -8,14 +8,13 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.constraints.NotNull; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import com.google.common.base.Predicates; import io.quarkus.runtime.annotations.RegisterForReflection; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.constraints.NotNull; @RegisterForReflection @JsonInclude(JsonInclude.Include.NON_DEFAULT) diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensions.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensions.java index 6c8621d165..f875b11392 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensions.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/extension/StackGresExtensions.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.Objects; -import javax.validation.Valid; -import javax.validation.constraints.AssertTrue; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonInclude; import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.StackGresUtil; import io.sundr.builder.annotations.Buildable; +import jakarta.validation.Valid; +import jakarta.validation.constraints.AssertTrue; import org.jooq.lambda.Seq; @RegisterForReflection diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/kubernetesclient/KubernetesClientProducer.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/kubernetesclient/KubernetesClientProducer.java index 8429f832f0..93a0eb61c7 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/kubernetesclient/KubernetesClientProducer.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/kubernetesclient/KubernetesClientProducer.java @@ -9,12 +9,11 @@ import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import javax.annotation.PreDestroy; -import javax.enterprise.inject.Produces; -import javax.inject.Singleton; - import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.inject.Produces; +import jakarta.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelFactory.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelFactory.java index 70c6de7ae5..61b2c554bf 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelFactory.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelFactory.java @@ -9,11 +9,10 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgbackup.StackGresBackup; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupLabelFactory extends AbstractLabelFactory diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelMapper.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelMapper.java index a44a531f46..4d748b1069 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelMapper.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/BackupLabelMapper.java @@ -5,10 +5,9 @@ package io.stackgres.common.labels; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgbackup.StackGresBackup; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupLabelMapper implements LabelMapperForBackup { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelFactory.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelFactory.java index 223ddaf2f3..4b39822a14 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelFactory.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelFactory.java @@ -8,14 +8,13 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresVersion; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; import io.stackgres.common.crd.sgcluster.StackGresClusterSpec; import io.stackgres.common.labels.v14.ClusterLabelFactoryV14; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelMapper.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelMapper.java index 64cb0709d3..c5b6a45de1 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelMapper.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ClusterLabelMapper.java @@ -7,13 +7,12 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.StackGresVersion; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterStatus; import io.stackgres.common.labels.v14.ClusterLabelMapperV14; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ClusterLabelMapper implements LabelMapperForCluster { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelFactory.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelFactory.java index e1178e5495..191fbaeae2 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelFactory.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelFactory.java @@ -9,11 +9,10 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgdbops.StackGresDbOps; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsLabelFactory diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelMapper.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelMapper.java index 7a7a58a1e1..865e348e04 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelMapper.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DbOpsLabelMapper.java @@ -5,10 +5,9 @@ package io.stackgres.common.labels; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgdbops.StackGresDbOps; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DbOpsLabelMapper implements LabelMapperForDbOps { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelFactory.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelFactory.java index 8a2d1202d7..9327693674 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelFactory.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelFactory.java @@ -7,12 +7,11 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresVersion; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.labels.v14.DistributedLogsLabelFactoryV14; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelMapper.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelMapper.java index 00859e93ed..779a397029 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelMapper.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/DistributedLogsLabelMapper.java @@ -7,13 +7,12 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.StackGresVersion; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsStatus; import io.stackgres.common.labels.v14.DistributedLogsLabelMapperV14; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DistributedLogsLabelMapper implements LabelMapperForCluster { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/LabelFactoryProducers.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/LabelFactoryProducers.java index fcc1ad7570..6f3272b240 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/LabelFactoryProducers.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/LabelFactoryProducers.java @@ -5,14 +5,13 @@ package io.stackgres.common.labels; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - import io.quarkus.arc.DefaultBean; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; @ApplicationScoped public class LabelFactoryProducers { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelFactory.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelFactory.java index 31a40548ad..3460af1226 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelFactory.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelFactory.java @@ -9,11 +9,10 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelMapper.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelMapper.java index 6e98c4cf73..f2da32b6a7 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelMapper.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/labels/ShardedClusterLabelMapper.java @@ -5,10 +5,9 @@ package io.stackgres.common.labels; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ShardedClusterLabelMapper implements LabelMapperForShardedCluster { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/postgres/PostgresConnectionManager.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/postgres/PostgresConnectionManager.java index b16b03131b..7349975810 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/postgres/PostgresConnectionManager.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/postgres/PostgresConnectionManager.java @@ -12,8 +12,8 @@ import java.util.Map; import java.util.Properties; -import javax.inject.Singleton; -import javax.validation.constraints.NotNull; +import jakarta.inject.Singleton; +import jakarta.validation.constraints.NotNull; @Singleton public class PostgresConnectionManager { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/AbstractCustomResourceScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/AbstractCustomResourceScheduler.java index 010df51d41..1644481bb9 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/AbstractCustomResourceScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/AbstractCustomResourceScheduler.java @@ -9,8 +9,6 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.DefaultKubernetesResourceList; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClient; @@ -18,6 +16,7 @@ import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; import io.stackgres.common.kubernetesclient.KubernetesClientUtil; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; public abstract class AbstractCustomResourceScheduler, diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigFinder.java index f07796f0a2..1996640bc2 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupConfigFinder diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigScanner.java index f0b18585fb..8b2f5003ca 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupConfigScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupConfigScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupFinder.java index 60053aaf22..9acd1e4830 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupFinder diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScanner.java index ccc6aa2b5e..0d5a399b48 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScheduler.java index 2e7f74f0f2..e289c2e007 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/BackupScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterFinder.java index 66b1abb585..445e60d489 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterFinder extends AbstractCustomResourceFinder { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScanner.java index 1bc14e7d31..93bfc5ec13 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScheduler.java index fd33ca8785..9d6dedca94 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ClusterScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ClusterScheduler extends diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapFinder.java index 52b4e2e8fc..671978ce79 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapFinder.java @@ -7,11 +7,10 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ConfigMapFinder implements ResourceFinder { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapWriter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapWriter.java index bdb33e5c90..37f2d0c1e9 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapWriter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ConfigMapWriter.java @@ -5,14 +5,13 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapList; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.Resource; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ConfigMapWriter extends AbstractResourceWriter< diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsFinder.java index 9018f90216..3ea249fdc9 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdbops.StackGresDbOpsList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsFinder diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScanner.java index 29c8d2d4ac..7e8433ae79 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdbops.StackGresDbOpsList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScheduler.java index 65f7f5260b..6e6802fe23 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DbOpsScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdbops.StackGresDbOpsList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DbOpsScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsFinder.java index d9b6a24f8b..947f75cd86 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsFinder diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScanner.java index e8f33b420a..9a9570f733 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScheduler.java index fd11e753b3..ce3db77884 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/DistributedLogsScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DistributedLogsScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsFinder.java index 89c0840eba..d782776810 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsFinder.java @@ -10,11 +10,10 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class EndpointsFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsWriter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsWriter.java index f02ab75958..31c3d160d9 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsWriter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/EndpointsWriter.java @@ -5,14 +5,13 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.EndpointsList; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.Resource; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class EndpointsWriter diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobFinder.java index c9c191eb50..196e97ea27 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobFinder.java @@ -9,11 +9,10 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class JobFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobWriter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobWriter.java index e064be98b0..5fa6ec2bae 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobWriter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/JobWriter.java @@ -5,14 +5,13 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.api.model.batch.v1.JobList; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.ScalableResource; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class JobWriter extends AbstractResourceWriter> { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/NamespaceFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/NamespaceFinder.java index d7d6563ed1..99eaa3e212 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/NamespaceFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/NamespaceFinder.java @@ -8,11 +8,10 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Namespace; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class NamespaceFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageFinder.java index 34775ac2b4..d390ebf792 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorageList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ObjectStorageFinder extends AbstractCustomResourceFinder { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScanner.java index ce64a6fd77..398b9ca8a0 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorageList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ObjectStorageScanner extends AbstractCustomResourceScanner< diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScheduler.java index e6525981a2..384cd008f1 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ObjectStorageScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorageList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ObjectStorageScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimFinder.java index 078532cd1f..423c84a2b6 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimFinder.java @@ -9,11 +9,10 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PersistentVolumeClaimFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimWriter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimWriter.java index 9a14807fdb..842ef336e6 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimWriter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PersistentVolumeClaimWriter.java @@ -5,11 +5,10 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScanner.java index a08cf22d2f..cc9856e82d 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PgConfigScanner extends diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScheduler.java index 335dd6cf8a..7999a86a7b 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgConfigScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PgConfigScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScanner.java index db5f20c5c8..5657dd0f31 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PgPoolingConfigScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScheduler.java index 9beb119b15..eb2b537030 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PgPoolingConfigScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PgPoolingConfigScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodExecutor.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodExecutor.java index 84043054a2..693449ab90 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodExecutor.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodExecutor.java @@ -18,9 +18,6 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.Status; import io.fabric8.kubernetes.api.model.StatusCause; @@ -28,6 +25,8 @@ import io.fabric8.kubernetes.client.dsl.ExecListener; import io.fabric8.kubernetes.client.dsl.ExecWatch; import io.fabric8.kubernetes.client.utils.Serialization; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodFinder.java index 42ef936f79..4e3dbf630e 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodFinder.java @@ -10,11 +10,10 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PodFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodWriter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodWriter.java index 6e3eab890b..fbe3f5776c 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodWriter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PodWriter.java @@ -5,11 +5,10 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PoolingConfigFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PoolingConfigFinder.java index 1c447d8953..937ca97a38 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PoolingConfigFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PoolingConfigFinder.java @@ -5,11 +5,10 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PoolingConfigFinder diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresBackupScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresBackupScheduler.java index e5a569386e..398dcac2f2 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresBackupScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresBackupScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PostgresBackupScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresConfigFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresConfigFinder.java index ce1ec33591..1a02f3d2ea 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresConfigFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/PostgresConfigFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PostgresConfigFinder diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileConfigFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileConfigFinder.java index 8f278c2fd3..55906633e1 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileConfigFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileConfigFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgprofile.StackGresProfileList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ProfileConfigFinder extends AbstractCustomResourceFinder { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScanner.java index 4e99a676d1..2527e024eb 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgprofile.StackGresProfileList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ProfileScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScheduler.java index af904d9c64..ae03694672 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ProfileScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgprofile.StackGresProfileList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ProfileScheduler diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ResourceWriterProducers.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ResourceWriterProducers.java index a5d0994d58..61dc7a1454 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ResourceWriterProducers.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ResourceWriterProducers.java @@ -5,13 +5,12 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.quarkus.arc.DefaultBean; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; @ApplicationScoped public class ResourceWriterProducers { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptFinder.java index 41dad9bfc6..d182018735 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptFinder.java @@ -7,12 +7,11 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.common.crd.sgscript.StackGresScriptList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ScriptFinder implements CustomResourceFinder { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScanner.java index 691dc4e8ce..c5284cefc2 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.common.crd.sgscript.StackGresScriptList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ScriptScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScheduler.java index 401fcbea1f..874bdfbad4 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ScriptScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.common.crd.sgscript.StackGresScriptList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ScriptScheduler extends diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretFinder.java index 7a87d93623..e917812430 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretFinder.java @@ -8,11 +8,10 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class SecretFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretWriter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretWriter.java index 7a7c4410a6..a899f4cd2e 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretWriter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/SecretWriter.java @@ -5,14 +5,13 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretList; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.Resource; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class SecretWriter extends AbstractResourceWriter> { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ServiceFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ServiceFinder.java index 67c2ef6cdd..3a3489e213 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ServiceFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ServiceFinder.java @@ -8,11 +8,10 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ServiceFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterFinder.java index b7d5800e2f..e1e901f4ff 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterFinder.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterFinder extends AbstractCustomResourceFinder { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScanner.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScanner.java index 38855ca7c2..1e9792a424 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScanner.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScanner.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterList; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterScanner diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScheduler.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScheduler.java index 7664e96ac7..ba82bc24ad 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScheduler.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/ShardedClusterScheduler.java @@ -5,10 +5,9 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterList; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ShardedClusterScheduler extends diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetFinder.java index b89ace817b..af776eb21d 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetFinder.java @@ -9,11 +9,10 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class StatefulSetFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetWriter.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetWriter.java index 73e5f4eb7e..1cc38f2386 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetWriter.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StatefulSetWriter.java @@ -5,12 +5,11 @@ package io.stackgres.common.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.DeletionPropagation; import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StorageClassFinder.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StorageClassFinder.java index e12b841970..9275a5dd8f 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StorageClassFinder.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/resource/StorageClassFinder.java @@ -8,11 +8,10 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.fabric8.kubernetes.client.KubernetesClient; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class StorageClassFinder implements diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumListValueValidator.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumListValueValidator.java index 80ff6b32ad..d77eb13249 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumListValueValidator.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumListValueValidator.java @@ -7,8 +7,8 @@ import java.util.List; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class EnumListValueValidator implements ConstraintValidator> { private ValidEnumList annotation; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumValueValidator.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumValueValidator.java index 5f7ad0b3f7..8bd854b9bf 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumValueValidator.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/EnumValueValidator.java @@ -5,8 +5,8 @@ package io.stackgres.common.validation; -import javax.validation.ConstraintValidator; -import javax.validation.ConstraintValidatorContext; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; public class EnumValueValidator implements ConstraintValidator { private ValidEnum annotation; diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/FieldReference.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/FieldReference.java index bd9c3553c6..1dd17ef2f4 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/FieldReference.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/FieldReference.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Payload; +import jakarta.validation.Payload; public interface FieldReference extends Payload { diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnum.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnum.java index 7b1cee54a0..f312561622 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnum.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnum.java @@ -11,8 +11,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; /** * Perform a validaton on a String field based on the values of an Enum. diff --git a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnumList.java b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnumList.java index b7da3f0d82..8ebaf81fef 100644 --- a/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnumList.java +++ b/stackgres-k8s/src/common/src/main/java/io/stackgres/common/validation/ValidEnumList.java @@ -11,8 +11,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.validation.Constraint; -import javax.validation.Payload; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; /** * Perform a validaton on a String field based on the values of an Enum. diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerBootstrapImpl.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerBootstrapImpl.java index 998383d5f7..ea6bc3c9f1 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerBootstrapImpl.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerBootstrapImpl.java @@ -7,11 +7,10 @@ import java.net.SocketTimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerWatchersHandlerImpl.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerWatchersHandlerImpl.java index 4c389e743a..31bdeb6caa 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerWatchersHandlerImpl.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/DistributedLogsControllerWatchersHandlerImpl.java @@ -9,9 +9,6 @@ import java.util.List; import java.util.function.BiConsumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClient; @@ -22,6 +19,8 @@ import io.stackgres.distributedlogs.controller.DistributedLogsControllerReconciliationCycle; import io.stackgres.distributedlogs.controller.ResourceWatcherFactory; import io.stackgres.operatorframework.resource.WatcherMonitor; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsControllerWatchersHandlerImpl diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/ReconciliationClockImpl.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/ReconciliationClockImpl.java index 5759b55bc9..39f66f3aa4 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/ReconciliationClockImpl.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/ReconciliationClockImpl.java @@ -5,11 +5,10 @@ package io.stackgres.distributedlogs.app; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.app.AbstractReconciliationClock; import io.stackgres.distributedlogs.controller.DistributedLogsControllerReconciliationCycle; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ReconciliationClockImpl extends AbstractReconciliationClock { diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerApp.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerApp.java index 1a8ba38c72..cf2add6b18 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerApp.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerApp.java @@ -5,13 +5,12 @@ package io.stackgres.distributedlogs.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.stackgres.common.app.ReconciliationClock; import io.stackgres.distributedlogs.app.StackGresDistributedLogsControllerMain.StackGresDistributedLogsControllerAppShutdownEvent; import io.stackgres.distributedlogs.app.StackGresDistributedLogsControllerMain.StackGresDistributedLogsControllerAppStartupEvent; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerMain.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerMain.java index 649290ee09..8ee85c7df7 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerMain.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/app/StackGresDistributedLogsControllerMain.java @@ -8,9 +8,6 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicReference; -import javax.enterprise.event.Event; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.quarkus.runtime.Quarkus; import io.quarkus.runtime.QuarkusApplication; @@ -18,6 +15,8 @@ import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.distributedlogs.controller.DistributedLogsControllerReconciliationCycle; import io.stackgres.operatorframework.reconciliation.ReconciliationCycle.ReconciliationCycleResult; +import jakarta.enterprise.event.Event; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/configuration/DistributedLogsControllerPropertyContext.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/configuration/DistributedLogsControllerPropertyContext.java index 262e5d70ca..746c71c119 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/configuration/DistributedLogsControllerPropertyContext.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/configuration/DistributedLogsControllerPropertyContext.java @@ -5,11 +5,10 @@ package io.stackgres.distributedlogs.configuration; -import javax.inject.Singleton; - import io.stackgres.common.DistributedLogsControllerProperty; import io.stackgres.common.StackGresPropertyContext; import io.stackgres.common.controller.PodLocalControllerContext; +import jakarta.inject.Singleton; @Singleton public class DistributedLogsControllerPropertyContext diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsClusterReconciliator.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsClusterReconciliator.java index c122446c69..2cfc8b7c2a 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsClusterReconciliator.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsClusterReconciliator.java @@ -10,10 +10,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.fabric8.kubernetes.api.model.Pod; @@ -30,6 +26,9 @@ import io.stackgres.distributedlogs.common.StackGresDistributedLogsContext; import io.stackgres.distributedlogs.configuration.DistributedLogsControllerPropertyContext; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsConfigManager.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsConfigManager.java index ef00123b48..c10448677f 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsConfigManager.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsConfigManager.java @@ -12,11 +12,10 @@ import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; -import javax.enterprise.context.ApplicationScoped; - import com.ongres.process.FluentProcess; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.stackgres.common.StackGresUtil; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerPostgresBootstrapReconciliator.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerPostgresBootstrapReconciliator.java index b57d525453..6a039fa594 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerPostgresBootstrapReconciliator.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerPostgresBootstrapReconciliator.java @@ -5,10 +5,6 @@ package io.stackgres.distributedlogs.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.DistributedLogsControllerProperty; @@ -16,6 +12,9 @@ import io.stackgres.common.resource.ResourceFinder; import io.stackgres.distributedlogs.common.ClusterBootstrapEventReason; import io.stackgres.distributedlogs.configuration.DistributedLogsControllerPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsControllerPostgresBootstrapReconciliator diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliationCycle.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliationCycle.java index 42a427c0b3..1423726949 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliationCycle.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliationCycle.java @@ -13,11 +13,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClient; @@ -37,6 +32,10 @@ import io.stackgres.distributedlogs.resource.DistributedLogsResourceHandlerSelector; import io.stackgres.operatorframework.reconciliation.ReconciliationCycle; import io.stackgres.operatorframework.resource.ResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.jooq.lambda.tuple.Tuple2; import org.slf4j.helpers.MessageFormatter; diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliator.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliator.java index c7328f1485..87dd92c66f 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliator.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsControllerReconciliator.java @@ -11,10 +11,6 @@ import java.util.function.Consumer; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.CdiUtil; @@ -29,6 +25,9 @@ import io.stackgres.distributedlogs.configuration.DistributedLogsControllerPropertyContext; import io.stackgres.operatorframework.reconciliation.ReconciliationResult; import io.stackgres.operatorframework.reconciliation.Reconciliator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsControllerReconciliator diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsDatabaseManager.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsDatabaseManager.java index 6d84880279..df02a7f475 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsDatabaseManager.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsDatabaseManager.java @@ -16,11 +16,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; -import javax.ws.rs.NotFoundException; - import com.google.common.collect.ImmutableMap; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.fabric8.kubernetes.api.model.Secret; @@ -31,6 +26,10 @@ import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceUtil; import io.stackgres.distributedlogs.common.StackGresDistributedLogsContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; +import jakarta.ws.rs.NotFoundException; @ApplicationScoped public class DistributedLogsDatabaseManager { diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionManager.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionManager.java index a7f9bd7da4..7d78462734 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionManager.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionManager.java @@ -5,13 +5,12 @@ package io.stackgres.distributedlogs.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.FileSystemHandler; import io.stackgres.common.WebClientFactory; import io.stackgres.common.extension.ExtensionManager; import io.stackgres.common.extension.ExtensionMetadataManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsExtensionManager extends ExtensionManager { diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionMetadataManager.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionMetadataManager.java index 136726be76..2702bfe241 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionMetadataManager.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionMetadataManager.java @@ -7,14 +7,13 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.DistributedLogsControllerProperty; import io.stackgres.common.WebClientFactory; import io.stackgres.common.extension.ExtensionMetadataManager; import io.stackgres.distributedlogs.configuration.DistributedLogsControllerPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionReconciliator.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionReconciliator.java index 8edc45929d..ac9b27688f 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionReconciliator.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsExtensionReconciliator.java @@ -5,10 +5,6 @@ package io.stackgres.distributedlogs.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.DistributedLogsControllerProperty; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -17,6 +13,9 @@ import io.stackgres.distributedlogs.common.DistributedLogsControllerEventReason; import io.stackgres.distributedlogs.common.StackGresDistributedLogsContext; import io.stackgres.distributedlogs.configuration.DistributedLogsControllerPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.slf4j.helpers.MessageFormatter; diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsPersistentVolumeSizeReconciliator.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsPersistentVolumeSizeReconciliator.java index d70574a22b..3192278d20 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsPersistentVolumeSizeReconciliator.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsPersistentVolumeSizeReconciliator.java @@ -5,15 +5,14 @@ package io.stackgres.distributedlogs.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.stackgres.common.controller.PersistentVolumeSizeReconciliator; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceWriter; import io.stackgres.distributedlogs.configuration.DistributedLogsControllerPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsPersistentVolumeSizeReconciliator extends diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsStatusManager.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsStatusManager.java index 9a08ac03e8..4391a24cd2 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsStatusManager.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/DistributedLogsStatusManager.java @@ -9,12 +9,11 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.Condition; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsStatus; import io.stackgres.distributedlogs.common.StackGresDistributedLogsContext; import io.stackgres.operatorframework.resource.ConditionUpdater; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DistributedLogsStatusManager diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/EventController.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/EventController.java index 9e20600f77..7c85d61fab 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/EventController.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/EventController.java @@ -5,15 +5,14 @@ package io.stackgres.distributedlogs.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.DistributedLogsControllerProperty; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.operatorframework.resource.EventEmitter; import io.stackgres.operatorframework.resource.EventReason; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class EventController extends EventEmitter { diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImpl.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImpl.java index eb33576c92..bf18cfb692 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImpl.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImpl.java @@ -7,9 +7,6 @@ import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.DistributedLogsControllerProperty; import io.stackgres.common.crd.sgcluster.StackGresClusterInstalledExtension; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; @@ -17,6 +14,8 @@ import io.stackgres.common.extension.ExtensionEventEmitter; import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.distributedlogs.common.ExtensionEventReason; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ExtensionEventEmitterImpl implements ExtensionEventEmitter { diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ResourceWatcherFactory.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ResourceWatcherFactory.java index c4b9e65988..3a0c8dcc8a 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ResourceWatcherFactory.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/controller/ResourceWatcherFactory.java @@ -5,9 +5,6 @@ package io.stackgres.distributedlogs.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.WatcherException; import io.stackgres.common.DistributedLogsControllerProperty; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; @@ -15,6 +12,8 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.distributedlogs.common.DistributedLogsControllerEventReason; import io.stackgres.operatorframework.resource.AbstractResourceWatcherFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ResourceWatcherFactory extends AbstractResourceWatcherFactory { diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DefaultDistributedLogsResourceHandler.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DefaultDistributedLogsResourceHandler.java index 6f787c6164..ad1d7ce780 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DefaultDistributedLogsResourceHandler.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DefaultDistributedLogsResourceHandler.java @@ -7,14 +7,13 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.labels.LabelFactoryForCluster; import io.stackgres.distributedlogs.common.StackGresDistributedLogsContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultDistributedLogsResourceHandler diff --git a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DistributedLogsResourceHandlerSelector.java b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DistributedLogsResourceHandlerSelector.java index f8eb3537f5..6c85ad297e 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DistributedLogsResourceHandlerSelector.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/main/java/io/stackgres/distributedlogs/resource/DistributedLogsResourceHandlerSelector.java @@ -8,14 +8,13 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.distributedlogs.common.StackGresDistributedLogsContext; import io.stackgres.operatorframework.resource.AbstractResourceHandlerSelector; import io.stackgres.operatorframework.resource.ResourceHandler; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/distributedlogs-controller/src/test/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImplTest.java b/stackgres-k8s/src/distributedlogs-controller/src/test/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImplTest.java index 7d6c10e0b7..909468a29a 100644 --- a/stackgres-k8s/src/distributedlogs-controller/src/test/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImplTest.java +++ b/stackgres-k8s/src/distributedlogs-controller/src/test/java/io/stackgres/distributedlogs/controller/ExtensionEventEmitterImplTest.java @@ -13,8 +13,6 @@ import java.util.Optional; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.stackgres.common.DistributedLogsControllerProperty; @@ -26,6 +24,7 @@ import io.stackgres.distributedlogs.common.ExtensionEventReason; import io.stackgres.operatorframework.resource.EventReason; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/Main.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/Main.java index 7d90473406..72aa47a54b 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/Main.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/Main.java @@ -5,8 +5,6 @@ package io.stackgres.jobs; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.SerializationFeature; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.utils.Serialization; @@ -22,6 +20,7 @@ import io.stackgres.jobs.crdupgrade.WebhookConfigurator; import io.stackgres.jobs.crdupgrade.WebhookConfiguratorImpl; import io.stackgres.jobs.dbops.DbOpLauncher; +import jakarta.inject.Inject; @QuarkusMain public class Main implements QuarkusApplication { diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/AbstractRestartStateHandler.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/AbstractRestartStateHandler.java index fe506a4d9a..d229079b38 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/AbstractRestartStateHandler.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/AbstractRestartStateHandler.java @@ -17,8 +17,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.util.concurrent.ThreadFactoryBuilder; @@ -51,6 +49,7 @@ import io.stackgres.jobs.dbops.clusterrestart.InvalidClusterException; import io.stackgres.jobs.dbops.clusterrestart.RestartEvent; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperation.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperation.java index 4dab686f88..90749bb4b7 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperation.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperation.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImpl.java index 93b7708439..edeaee6ada 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImpl.java @@ -7,12 +7,11 @@ import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.event.EventEmitter; import io.stackgres.common.resource.CustomResourceFinder; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DatabaseOperationEventEmitterImpl implements DatabaseOperationEventEmitter { diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationLiteral.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationLiteral.java index 1799e47748..7d7a5a4cda 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationLiteral.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DatabaseOperationLiteral.java @@ -7,7 +7,7 @@ import java.util.Objects; -import javax.enterprise.util.AnnotationLiteral; +import jakarta.enterprise.util.AnnotationLiteral; public class DatabaseOperationLiteral extends AnnotationLiteral implements DatabaseOperation { diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DbOpLauncherImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DbOpLauncherImpl.java index d946e63be8..97116d1b86 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DbOpLauncherImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/DbOpLauncherImpl.java @@ -15,11 +15,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.smallrye.mutiny.TimeoutException; import io.smallrye.mutiny.Uni; @@ -35,6 +30,10 @@ import io.stackgres.jobs.dbops.lock.ImmutableLockRequest; import io.stackgres.jobs.dbops.lock.LockAcquirer; import io.stackgres.jobs.dbops.lock.LockRequest; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/JobsStatefulSetWriter.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/JobsStatefulSetWriter.java index 05d45efce7..f5bd41166a 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/JobsStatefulSetWriter.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/JobsStatefulSetWriter.java @@ -7,16 +7,15 @@ import java.util.function.Function; -import javax.annotation.Priority; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Alternative; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.DeletionPropagation; import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.dsl.RollableScalableResource; import io.stackgres.common.resource.ResourceWriter; +import jakarta.annotation.Priority; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Alternative; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @Priority(1) diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/StateHandler.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/StateHandler.java index 62da931e1e..432c7dd0f6 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/StateHandler.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/StateHandler.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImpl.java index a11b17b50f..3b1088a131 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImpl.java @@ -10,9 +10,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; import io.smallrye.mutiny.Uni; @@ -23,6 +20,8 @@ import io.stackgres.common.resource.CustomResourceScheduler; import io.stackgres.common.resource.ResourceScanner; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterInstanceManagerImpl implements ClusterInstanceManager { diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImpl.java index 62b041672c..90de69603d 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImpl.java @@ -13,9 +13,6 @@ import java.util.function.Consumer; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.fabric8.kubernetes.api.model.Pod; import io.smallrye.mutiny.Multi; @@ -25,6 +22,8 @@ import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.DbOpsMethodType; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImpl.java index f96793bc24..d4bde0becc 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImpl.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.stackgres.common.crd.sgcluster.ClusterDbOpsRestartStatus; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -24,6 +22,7 @@ import io.stackgres.common.crd.sgdbops.StackGresDbOpsStatus; import io.stackgres.jobs.dbops.AbstractRestartStateHandler; import io.stackgres.jobs.dbops.StateHandler; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @StateHandler("restart") diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImpl.java index 39895e1f84..b378f2d547 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImpl.java @@ -10,12 +10,11 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.smallrye.mutiny.Uni; import io.stackgres.common.PatroniUtil; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImpl.java index eb2b8f63ce..879e26f258 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImpl.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.base.Joiner; import com.google.common.base.Predicates; import io.fabric8.kubernetes.api.model.Pod; @@ -22,6 +19,8 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.ResourceScanner; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImpl.java index 8d488303bf..a84cc014a2 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImpl.java @@ -16,9 +16,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; @@ -28,6 +25,8 @@ import io.vertx.mutiny.core.Vertx; import io.vertx.mutiny.ext.web.client.WebClient; import io.vertx.mutiny.ext.web.codec.BodyCodec; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImpl.java index dfc4141367..f4415894af 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImpl.java @@ -9,11 +9,10 @@ import java.util.Base64; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.patroni.StackGresPasswordKeys; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PatroniApiMetadataFinderImpl implements PatroniApiMetadataFinder { diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImpl.java index 11bea6e61d..340aa71802 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImpl.java @@ -7,13 +7,12 @@ import java.time.Duration; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.smallrye.mutiny.Uni; import io.stackgres.common.resource.ResourceWriter; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PodRestartImpl implements PodRestart { diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImpl.java index aa7613162c..dd0a7f43e9 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImpl.java @@ -9,9 +9,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.apps.StatefulSet; @@ -22,6 +19,8 @@ import io.stackgres.common.ClusterPendingRestartUtil.RestartReasons; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImpl.java index cfe7b3d8c6..e4c80457be 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImpl.java @@ -8,13 +8,12 @@ import java.time.Duration; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.base.Predicates; import io.smallrye.mutiny.Uni; import io.stackgres.common.RetryUtil; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/RestartJob.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/RestartJob.java index 41f53d583b..5aa8c220a8 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/RestartJob.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/clusterrestart/RestartJob.java @@ -5,9 +5,6 @@ package io.stackgres.jobs.dbops.clusterrestart; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.smallrye.mutiny.Uni; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.StackGresDbOps; @@ -19,6 +16,8 @@ import io.stackgres.jobs.dbops.DatabaseOperation; import io.stackgres.jobs.dbops.DatabaseOperationJob; import io.stackgres.jobs.dbops.StateHandler; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/lock/LockAcquirerImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/lock/LockAcquirerImpl.java index d71f48a3aa..1af2f5cc76 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/lock/LockAcquirerImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/lock/LockAcquirerImpl.java @@ -10,9 +10,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.util.concurrent.ThreadFactoryBuilder; import io.smallrye.mutiny.Uni; import io.stackgres.common.StackGresUtil; @@ -20,6 +17,8 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.CustomResourceScheduler; import io.stackgres.jobs.dbops.MutinyUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJob.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJob.java index c97cda23c4..81dc966889 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJob.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJob.java @@ -8,9 +8,6 @@ import java.time.Duration; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.smallrye.mutiny.Uni; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.StackGresDbOps; @@ -25,6 +22,8 @@ import io.stackgres.jobs.dbops.StateHandler; import io.stackgres.jobs.dbops.clusterrestart.ClusterRestartState; import io.stackgres.jobs.dbops.securityupgrade.SecurityUpgradeJob; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImpl.java index 81e0ef3e14..e77553bb76 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImpl.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.smallrye.mutiny.Uni; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -28,6 +25,8 @@ import io.stackgres.jobs.dbops.clusterrestart.ClusterRestartState; import io.stackgres.jobs.dbops.clusterrestart.PatroniApiHandler; import io.stackgres.jobs.dbops.clusterrestart.PatroniInformation; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped @StateHandler("minorVersionUpgrade") diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJob.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJob.java index a6d46c70b4..84937a173a 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJob.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJob.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.smallrye.mutiny.Uni; import io.stackgres.common.StackGresContext; @@ -30,6 +27,8 @@ import io.stackgres.jobs.dbops.MutinyUtil; import io.stackgres.jobs.dbops.StateHandler; import io.stackgres.jobs.dbops.clusterrestart.ClusterRestartState; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImpl.java b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImpl.java index 69b6935627..4e625e95f7 100644 --- a/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImpl.java +++ b/stackgres-k8s/src/jobs/src/main/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImpl.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.stackgres.common.crd.sgcluster.ClusterDbOpsRestartStatus; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -24,6 +22,7 @@ import io.stackgres.common.crd.sgdbops.StackGresDbOpsStatus; import io.stackgres.jobs.dbops.AbstractRestartStateHandler; import io.stackgres.jobs.dbops.StateHandler; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @StateHandler("securityUpgrade") diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/ClusterStateHandlerTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/ClusterStateHandlerTest.java index d90ec0d818..bf43b14f55 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/ClusterStateHandlerTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/ClusterStateHandlerTest.java @@ -24,8 +24,6 @@ import java.util.Optional; import java.util.function.Function; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; @@ -50,6 +48,7 @@ import io.stackgres.jobs.dbops.clusterrestart.RestartEventType; import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.apache.commons.compress.utils.Lists; import org.jooq.lambda.Seq; import org.junit.jupiter.api.BeforeEach; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImplTest.java index affab721dd..599f97682d 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DatabaseOperationEventEmitterImplTest.java @@ -9,8 +9,6 @@ import java.time.Instant; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Event; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.ObjectReference; @@ -22,6 +20,7 @@ import io.stackgres.common.fixture.Fixtures; import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DbOpLauncherImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DbOpLauncherImplTest.java index 1b87a8e88a..ed674c1c21 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DbOpLauncherImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/DbOpLauncherImplTest.java @@ -23,8 +23,6 @@ import java.time.Duration; import java.time.Instant; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.Pod; @@ -48,6 +46,7 @@ import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.jobs.dbops.securityupgrade.SecurityUpgradeJob; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImplTest.java index b89a7836a8..b69b392b4e 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterInstanceManagerImplTest.java @@ -18,10 +18,9 @@ import java.util.stream.Collectors; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; +import io.fabric8.kubernetes.client.KubernetesClientException; import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; @@ -35,6 +34,7 @@ import io.stackgres.jobs.dbops.lock.FakeClusterScheduler; import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InOrder; @@ -88,7 +88,7 @@ void givenACleanCluster_increaseInstancesShouldWaitUntilTheNewPodIsCreated() { configureCreationPodWatchers(); - configureNewPodCreated(newPod); + configureNewPodCreatedOnClusterEvent(newPod); final int initialInstances = cluster.getSpec().getInstances(); @@ -114,7 +114,7 @@ void givenAClusterWithANonDisruptablePod_increaseInstancesShouldNotFail() { final String newPodName = newPod.getMetadata().getName(); configureCreationPodWatchers(); - configureNewPodCreated(newPod); + configureNewPodCreatedOnClusterEvent(newPod); Pod createdPod = clusterInstanceManager.increaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -140,7 +140,7 @@ void givenAClusterWithASingleNonDisruptablePod_increaseInstancesShouldNotFail() final String newPodName = newPod.getMetadata().getName(); configureCreationPodWatchers(); - configureNewPodCreated(newPod); + configureNewPodCreatedOnClusterEvent(newPod); Pod createdPod = clusterInstanceManager.increaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -165,7 +165,7 @@ void givenAClusterWithAFarNonDisruptablePod_itShouldWaitForTheRightPodToBeCreate final String newPodName = newPod.getMetadata().getName(); configureCreationPodWatchers(); - configureNewPodCreated(newPod); + configureNewPodCreatedOnClusterEvent(newPod); Pod createdPod = clusterInstanceManager.increaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -192,7 +192,7 @@ void givenACleanCluster_itShouldWaitForTheRightPodToBeDeleted() { when(podWatcher.waitUntilIsRemoved(podName, namespace)) .thenReturn(Uni.createFrom().voidItem()); - configurePodDeleted(replicaToDelete); + configurePodDeletedOnClusterEvent(replicaToDelete); clusterInstanceManager.decreaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -223,7 +223,7 @@ void givenAClusterWithANonDisruptablePod_decreaseInstancesShouldNotFail() { when(podWatcher.waitUntilIsRemoved(podName, namespace)) .thenReturn(Uni.createFrom().voidItem()); - configurePodDeleted(replicaToDelete); + configurePodDeletedOnClusterEvent(replicaToDelete); clusterInstanceManager.decreaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -252,7 +252,7 @@ void givenAClusterWithAFarNonDisruptablePod_decreaseInstancesShouldNotFail() { when(podWatcher.waitUntilIsRemoved(podName, namespace)) .thenReturn(Uni.createFrom().voidItem()); - configurePodDeleted(replicaToDelete); + configurePodDeletedOnClusterEvent(replicaToDelete); clusterInstanceManager.decreaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -283,7 +283,7 @@ void givenAClusterWithASingleNode_decreaseInstancesShouldNotFail() { when(podWatcher.waitUntilIsRemoved(podName, namespace)) .thenReturn(Uni.createFrom().voidItem()); - configurePodDeleted(podToDelete); + configurePodDeletedOnClusterEvent(podToDelete); clusterInstanceManager.decreaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -314,7 +314,7 @@ void givenAClusterWithASingleNonDisruptable_decreaseInstancesShouldNotFail() { when(podWatcher.waitUntilIsRemoved(podName, namespace)) .thenReturn(Uni.createFrom().voidItem()); - configurePodDeleted(podToDelete); + configurePodDeletedOnClusterEvent(podToDelete); clusterInstanceManager.decreaseClusterInstances(clusterName, namespace) .await().indefinitely(); @@ -338,7 +338,7 @@ void givenAIncreasingInstanceFailure_operationShouldBeRetried() { configureCreationPodWatchers(); - configureNewPodCreated(newPod); + configureNewPodCreatedOnClusterEvent(newPod); final int initialInstances = cluster.getSpec().getInstances(); @@ -362,7 +362,7 @@ void givenADecreasingInstanceFailure_operationShouldBeRetried() { configureCreationPodWatchers(); - configureNewPodCreated(newPod); + configureNewPodCreatedOnClusterEvent(newPod); final int initialInstances = cluster.getSpec().getInstances(); @@ -382,17 +382,17 @@ private void configureNonDisruptablePod(int index) { Pod primaryPod = podTestUtil.buildNonDisruptablePrimaryPod(cluster, index); mockServer.getClient().pods().inNamespace(namespace) .resource(primaryPod) - .replace(); + .update(); } - private void configureNewPodCreated(Pod newPod) { + private void configureNewPodCreatedOnClusterEvent(Pod newPod) { kubeDb.watchCluster(clusterName, namespace, cluster -> mockServer.getClient().pods() .inNamespace(namespace) .resource(newPod) - .createOrReplace()); + .create()); } - private void configurePodDeleted(Pod podToDelete) { + private void configurePodDeletedOnClusterEvent(Pod podToDelete) { kubeDb.watchCluster(clusterName, namespace, cluster -> mockServer.getClient().pods() .inNamespace(namespace) .resource(podToDelete) @@ -404,14 +404,9 @@ private void configureCreationPodWatchers() { .thenAnswer(invocation -> { final String podName = invocation.getArgument(1); String namespace = invocation.getArgument(2); - Pod pod = mockServer.getClient().pods().inNamespace(namespace) - .withName(podName).get(); + Pod pod = null; int retries = 0; while (pod == null) { - Thread.sleep(100); - pod = mockServer.getClient().pods().inNamespace(namespace) - .withName(podName).get(); - retries++; if (retries > 10) { fail("Pod " + podName + " not created. Available pods " + mockServer.getClient().pods().inNamespace(namespace) @@ -421,6 +416,18 @@ private void configureCreationPodWatchers() { .map(ObjectMeta::getName) .collect(Collectors.toUnmodifiableList())); } + try { + pod = mockServer.getClient().pods().inNamespace(namespace) + .withName(podName).get(); + } catch (KubernetesClientException ex) { + pod = null; + } + retries++; + try { + Thread.sleep(100); + } catch (InterruptedException ex) { + continue; + } } return Uni.createFrom().item(pod); }); diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImplTest.java index 830dd1bb00..13635ae34c 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartImplTest.java @@ -19,8 +19,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; @@ -36,6 +34,7 @@ import io.stackgres.common.crd.sgdbops.DbOpsOperation; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.fixture.Fixtures; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImplTest.java index ff619abe9d..259d9fe509 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterRestartStateHandlerImplTest.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; import io.quarkus.test.junit.QuarkusTest; @@ -26,6 +24,7 @@ import io.stackgres.jobs.dbops.AbstractRestartStateHandler; import io.stackgres.jobs.dbops.ClusterStateHandlerTest; import io.stackgres.jobs.dbops.StateHandler; +import jakarta.inject.Inject; @QuarkusTest class ClusterRestartStateHandlerImplTest extends ClusterStateHandlerTest { diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImplTest.java index d66be0554e..1bb29d5c89 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterSwitchoverHandlerImplTest.java @@ -14,13 +14,12 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.smallrye.mutiny.Uni; import io.stackgres.common.PatroniUtil; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.mockito.InOrder; import org.mockito.Mockito; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImplTest.java index 6f0c3659e8..623025824b 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/ClusterWatcherImplTest.java @@ -14,8 +14,6 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; @@ -27,6 +25,7 @@ import io.stackgres.common.fixture.Fixtures; import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImplTest.java index 4adad93e9d..4a90db2b89 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiHandlerImplTest.java @@ -14,8 +14,6 @@ import java.util.Random; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.stackgres.testutil.StringUtils; @@ -31,6 +29,7 @@ import io.vertx.ext.web.handler.BasicAuthHandler; import io.vertx.ext.web.handler.BodyHandler; import io.vertx.junit5.VertxTestContext; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImplTest.java index 07004f01d4..f1a9510ade 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PatroniApiMetadataFinderImplTest.java @@ -12,8 +12,6 @@ import java.util.Base64; import java.util.List; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.NamespaceBuilder; import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.fabric8.kubernetes.api.model.Secret; @@ -24,6 +22,7 @@ import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; import io.stackgres.common.fixture.Fixtures; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImplTest.java index da901b7b96..3163375b3c 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodRestartImplTest.java @@ -16,8 +16,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.PodBuilder; import io.quarkus.test.junit.QuarkusTest; @@ -25,6 +23,7 @@ import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.helpers.test.UniAssertSubscriber; import io.stackgres.common.resource.PodWriter; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InOrder; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodTestUtil.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodTestUtil.java index 0d3ec49e17..08d9a576f5 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodTestUtil.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodTestUtil.java @@ -10,9 +10,6 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.Pod; @@ -26,6 +23,8 @@ import io.stackgres.common.labels.LabelFactoryForDbOps; import io.stackgres.testutil.JsonUtil; import io.stackgres.testutil.StringUtils; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PodTestUtil { diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImplTest.java index 2b535642c0..84bc29fcf9 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PodWatcherImplTest.java @@ -13,8 +13,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.NamespaceBuilder; @@ -28,6 +26,7 @@ import io.smallrye.mutiny.helpers.test.UniAssertSubscriber; import io.stackgres.testutil.StringUtils; import io.vertx.junit5.Timeout; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImplTest.java index 470ea94cfd..c2d201d664 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/PostgresRestartImplTest.java @@ -14,12 +14,11 @@ import java.time.Duration; import java.util.List; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.smallrye.mutiny.Uni; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/RestartJobTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/RestartJobTest.java index 9bbe8c74be..737ac7431d 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/RestartJobTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/clusterrestart/RestartJobTest.java @@ -13,8 +13,6 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.smallrye.mutiny.Uni; @@ -25,6 +23,7 @@ import io.stackgres.jobs.dbops.StateHandler; import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterFinder.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterFinder.java index 6a30e7d860..51c208914c 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterFinder.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterFinder.java @@ -7,11 +7,10 @@ import java.util.Optional; -import javax.inject.Inject; - import io.quarkus.test.Mock; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.resource.CustomResourceFinder; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @Mock diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterScheduler.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterScheduler.java index 90a16c7ef4..9da95e54b7 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterScheduler.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeClusterScheduler.java @@ -9,13 +9,12 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.quarkus.test.Mock; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.resource.CustomResourceScheduler; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @Mock diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsFinder.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsFinder.java index 2abb6db684..4b9a91b772 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsFinder.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsFinder.java @@ -7,11 +7,10 @@ import java.util.Optional; -import javax.inject.Inject; - import io.quarkus.test.Mock; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.resource.CustomResourceFinder; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @Mock diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsScheduler.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsScheduler.java index 522fa186fb..5fd04abad2 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsScheduler.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/FakeDbOpsScheduler.java @@ -9,12 +9,11 @@ import java.util.function.Consumer; import java.util.function.Function; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.quarkus.test.Mock; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.resource.CustomResourceScheduler; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @Mock diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/LockAcquirerImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/LockAcquirerImplTest.java index 0111b31e9d..c18e048c30 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/LockAcquirerImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/LockAcquirerImplTest.java @@ -19,12 +19,11 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.fixture.Fixtures; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/MockKubeDb.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/MockKubeDb.java index 2fed8ed09c..e8055aca5c 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/MockKubeDb.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/lock/MockKubeDb.java @@ -13,8 +13,6 @@ import java.util.UUID; import java.util.function.Consumer; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonNode; @@ -23,6 +21,7 @@ import io.fabric8.kubernetes.client.CustomResource; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.StackGresDbOps; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJobTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJobTest.java index 044fc90d1b..4ba4c207ef 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJobTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeJobTest.java @@ -13,8 +13,6 @@ import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.smallrye.mutiny.Uni; @@ -25,6 +23,7 @@ import io.stackgres.jobs.dbops.StateHandler; import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImplTest.java index de06ddcf34..3166e25785 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/minorversionupgrade/MinorVersionUpgradeRestartStateHandlerImplTest.java @@ -12,8 +12,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; import io.quarkus.test.junit.QuarkusTest; @@ -36,6 +34,7 @@ import io.stackgres.jobs.dbops.clusterrestart.MemberRole; import io.stackgres.jobs.dbops.clusterrestart.MemberState; import io.stackgres.jobs.dbops.clusterrestart.PatroniApiHandler; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @QuarkusTest diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJobTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJobTest.java index 1941fb2c79..65171c67ee 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJobTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeJobTest.java @@ -15,8 +15,6 @@ import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.apps.StatefulSet; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; @@ -32,6 +30,7 @@ import io.stackgres.jobs.dbops.StateHandler; import io.stackgres.jobs.dbops.lock.MockKubeDb; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImplTest.java b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImplTest.java index 030577595c..8344665fcc 100644 --- a/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImplTest.java +++ b/stackgres-k8s/src/jobs/src/test/java/io/stackgres/jobs/dbops/securityupgrade/SecurityUpgradeStateHandlerImplTest.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; import io.quarkus.test.junit.QuarkusTest; @@ -26,6 +24,7 @@ import io.stackgres.jobs.dbops.AbstractRestartStateHandler; import io.stackgres.jobs.dbops.ClusterStateHandlerTest; import io.stackgres.jobs.dbops.StateHandler; +import jakarta.inject.Inject; @QuarkusTest class SecurityUpgradeStateHandlerImplTest extends ClusterStateHandlerTest { diff --git a/stackgres-k8s/src/operator-framework/pom.xml b/stackgres-k8s/src/operator-framework/pom.xml index 6e5be9e602..f64dfa14e5 100644 --- a/stackgres-k8s/src/operator-framework/pom.xml +++ b/stackgres-k8s/src/operator-framework/pom.xml @@ -31,8 +31,8 @@ quarkus-hibernate-validator - org.glassfish - jakarta.el + org.glassfish.expressly + expressly io.sundr diff --git a/stackgres-k8s/src/operator-framework/src/main/java/io/stackgres/operatorframework/admissionwebhook/validating/ValidationFailed.java b/stackgres-k8s/src/operator-framework/src/main/java/io/stackgres/operatorframework/admissionwebhook/validating/ValidationFailed.java index 6edb53ea00..8ea0753ab8 100644 --- a/stackgres-k8s/src/operator-framework/src/main/java/io/stackgres/operatorframework/admissionwebhook/validating/ValidationFailed.java +++ b/stackgres-k8s/src/operator-framework/src/main/java/io/stackgres/operatorframework/admissionwebhook/validating/ValidationFailed.java @@ -8,10 +8,9 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.validation.ConstraintViolation; - import io.fabric8.kubernetes.api.model.Status; import io.fabric8.kubernetes.api.model.StatusBuilder; +import jakarta.validation.ConstraintViolation; import org.jetbrains.annotations.NotNull; public class ValidationFailed extends Exception { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorBootstrapImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorBootstrapImpl.java index 6eb241d0ea..d32cf49a3f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorBootstrapImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorBootstrapImpl.java @@ -7,9 +7,6 @@ import java.net.SocketTimeoutException; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.CustomResource; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; @@ -23,6 +20,8 @@ import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorWatchersHandlerImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorWatchersHandlerImpl.java index 1a95705dd4..943f5a344d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorWatchersHandlerImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/OperatorWatchersHandlerImpl.java @@ -11,9 +11,6 @@ import java.util.Optional; import java.util.function.BiConsumer; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.DefaultKubernetesResourceList; import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.EndpointsList; @@ -50,6 +47,8 @@ import io.stackgres.operator.conciliation.shardedcluster.ShardedClusterReconciliator; import io.stackgres.operator.controller.ResourceWatcherFactory; import io.stackgres.operatorframework.resource.WatcherMonitor; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/ReconciliationClockImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/ReconciliationClockImpl.java index 1d1086b36f..7368191ca0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/ReconciliationClockImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/ReconciliationClockImpl.java @@ -5,13 +5,12 @@ package io.stackgres.operator.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.app.AbstractReconciliationClock; import io.stackgres.operator.conciliation.AbstractReconciliator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ReconciliationClockImpl extends AbstractReconciliationClock { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/StackGresOperatorApp.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/StackGresOperatorApp.java index 4cf2d6f111..503943b210 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/StackGresOperatorApp.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/app/StackGresOperatorApp.java @@ -5,15 +5,14 @@ package io.stackgres.operator.app; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.OperatorProperty; import io.stackgres.common.app.ReconciliationClock; import io.stackgres.operator.configuration.OperatorPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/OperatorExtensionMetadataManager.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/OperatorExtensionMetadataManager.java index 38f4de0562..32a08c721d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/OperatorExtensionMetadataManager.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/OperatorExtensionMetadataManager.java @@ -7,14 +7,13 @@ import java.net.URI; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.OperatorProperty; import io.stackgres.common.WebClientFactory; import io.stackgres.common.extension.ExtensionMetadataManager; import io.stackgres.operator.configuration.OperatorPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/Sidecar.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/Sidecar.java index 8e5d56186b..6c2b9bebc1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/Sidecar.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/Sidecar.java @@ -11,9 +11,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; - import io.stackgres.common.StackGresContainer; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/SidecarLiteral.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/SidecarLiteral.java index ae743b7f4a..eb76081071 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/SidecarLiteral.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/common/SidecarLiteral.java @@ -7,9 +7,8 @@ import java.util.Objects; -import javax.enterprise.util.AnnotationLiteral; - import io.stackgres.common.StackGresContainer; +import jakarta.enterprise.util.AnnotationLiteral; public class SidecarLiteral extends AnnotationLiteral implements Sidecar { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/AnnotatedResourceDiscoverer.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/AnnotatedResourceDiscoverer.java index a54d2d0e5c..0aeda73aed 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/AnnotatedResourceDiscoverer.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/AnnotatedResourceDiscoverer.java @@ -7,7 +7,7 @@ import java.lang.annotation.Annotation; -import javax.enterprise.inject.Instance; +import jakarta.enterprise.inject.Instance; public abstract class AnnotatedResourceDiscoverer extends ResourceDiscoverer { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/Conciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/Conciliator.java index b9bd5a8a78..40c5c40810 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/Conciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/Conciliator.java @@ -9,10 +9,9 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.CustomResource; +import jakarta.inject.Inject; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/KubernetesVersionBinder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/KubernetesVersionBinder.java index 33aa5aee21..972d24eca9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/KubernetesVersionBinder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/KubernetesVersionBinder.java @@ -10,8 +10,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinder.java index 3aaef7c4b9..634771db9b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinder.java @@ -10,10 +10,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - import io.stackgres.common.StackGresVersion; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinderLiteral.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinderLiteral.java index 54187aafe5..1543c78cda 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinderLiteral.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/OperatorVersionBinderLiteral.java @@ -5,9 +5,8 @@ package io.stackgres.operator.conciliation; -import javax.enterprise.util.AnnotationLiteral; - import io.stackgres.common.StackGresVersion; +import jakarta.enterprise.util.AnnotationLiteral; public class OperatorVersionBinderLiteral extends AnnotationLiteral implements OperatorVersionBinder { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationResult.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationResult.java index fa8f33fe0f..1a52932c0e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationResult.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationResult.java @@ -8,9 +8,8 @@ import java.util.List; import java.util.Objects; -import javax.validation.constraints.NotNull; - import io.fabric8.kubernetes.api.model.HasMetadata; +import jakarta.validation.constraints.NotNull; import org.jooq.lambda.tuple.Tuple2; public class ReconciliationResult { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScope.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScope.java index d9b8823f59..eec57050c3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScope.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScope.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScopeLiteral.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScopeLiteral.java index 60885bfa45..a656af3e22 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScopeLiteral.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ReconciliationScopeLiteral.java @@ -7,9 +7,8 @@ import java.util.Objects; -import javax.enterprise.util.AnnotationLiteral; - import io.fabric8.kubernetes.client.CustomResource; +import jakarta.enterprise.util.AnnotationLiteral; public class ReconciliationScopeLiteral extends AnnotationLiteral implements ReconciliationScope { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ResourceDiscoverer.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ResourceDiscoverer.java index cc65027a0c..02a4e2f387 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ResourceDiscoverer.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/ResourceDiscoverer.java @@ -13,10 +13,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.inject.Instance; - import com.google.common.base.Predicates; import io.stackgres.common.StackGresVersion; +import jakarta.enterprise.inject.Instance; public abstract class ResourceDiscoverer implements AnnotationFinder { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupConciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupConciliator.java index 45c1bbcdde..f2e2f42284 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupConciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupConciliator.java @@ -5,10 +5,9 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.conciliation.Conciliator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupConciliator extends Conciliator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultComparator.java index 543e5b715e..b38aaaefbd 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ReconciliationScope(value = StackGresBackup.class, kind = "HasMetadata") diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultReconciliationHandler.java index 47350dab9c..025b4f0e6b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDefaultReconciliationHandler.java @@ -5,13 +5,12 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.conciliation.AbstractReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresBackup.class, kind = "HasMetadata") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDeployedResourceScanner.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDeployedResourceScanner.java index 3c6261ca72..d914a706c6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDeployedResourceScanner.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupDeployedResourceScanner.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.api.model.batch.v1.Job; @@ -21,6 +18,8 @@ import io.stackgres.common.labels.LabelFactoryForBackup; import io.stackgres.operator.conciliation.DeployedResourcesScanner; import io.stackgres.operator.conciliation.ReconciliationOperations; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupDeployedResourceScanner extends DeployedResourcesScanner diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupHandlerDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupHandlerDelegator.java index 4cdbbc1ca7..6c6814f5d1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupHandlerDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupHandlerDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class BackupHandlerDelegator implements HandlerDelegator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobComparator.java index d7003987da..46c01238b2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.JobComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresBackup.class, kind = "Job") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobReconciliationHandler.java index 12c4d7ea93..598ce44217 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupJobReconciliationHandler.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.stackgres.common.crd.sgbackup.BackupStatus; @@ -22,6 +19,8 @@ import io.stackgres.operator.conciliation.AbstractJobReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresBackup.class, kind = "Job") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupReconciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupReconciliator.java index 3cbd00c43a..28d03a9b0c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupReconciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupReconciliator.java @@ -5,11 +5,6 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -25,6 +20,10 @@ import io.stackgres.operator.conciliation.Conciliator; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.helpers.MessageFormatter; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecorator.java index 44cd785a5a..af650bd685 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecorator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AbstractRequiredResourceDecorator; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupRequiredResourceDecorator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGenerator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGenerator.java index feeaa00d54..333f232dac 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGenerator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGenerator.java @@ -15,9 +15,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.stackgres.common.StackGresUtil; @@ -37,6 +34,8 @@ import io.stackgres.common.resource.CustomResourceScanner; import io.stackgres.operator.conciliation.RequiredResourceDecorator; import io.stackgres.operator.conciliation.RequiredResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupResourceComparisonDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupResourceComparisonDelegator.java index 2aeacafd09..dda148d93a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupResourceComparisonDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupResourceComparisonDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.backup; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.conciliation.CustomResourceComparisonDelegator; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; import io.stackgres.operator.conciliation.comparator.ResourceComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class BackupResourceComparisonDelegator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupStatusManager.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupStatusManager.java index 46f58d61ac..6041d67135 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupStatusManager.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/BackupStatusManager.java @@ -8,9 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.stackgres.common.JobUtil; import io.stackgres.common.StackGresContext; @@ -23,6 +20,8 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operator.conciliation.factory.backup.BackupJob; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/ResourceGenerationDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/ResourceGenerationDiscovererImpl.java index cb4b82c2c5..fc789d3c86 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/ResourceGenerationDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/backup/ResourceGenerationDiscovererImpl.java @@ -7,14 +7,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ResourceGenerationDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterConciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterConciliator.java index bd2b80f936..cf77bd9fae 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterConciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterConciliator.java @@ -7,13 +7,12 @@ import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.Conciliator; import io.stackgres.operator.conciliation.ReconciliationResult; import io.stackgres.operator.conciliation.ReconciliationUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterConciliator extends Conciliator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterCronJobComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterCronJobComparator.java index 2b30a27d28..9a5bf4a4eb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterCronJobComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterCronJobComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.CronJobComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresCluster.class, kind = "CronJob") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultComparator.java index 958504d79c..e12e665a92 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ReconciliationScope(value = StackGresCluster.class, kind = "HasMetadata") diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultReconciliationHandler.java index b439d91077..acf730065e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDefaultReconciliationHandler.java @@ -5,13 +5,12 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.AbstractReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresCluster.class, kind = "HasMetadata") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDeployedResourceScanner.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDeployedResourceScanner.java index d32cd1699b..26f937114b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDeployedResourceScanner.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterDeployedResourceScanner.java @@ -9,9 +9,6 @@ import java.util.Optional; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.client.KubernetesClient; @@ -24,6 +21,8 @@ import io.stackgres.operator.conciliation.DeployedResourcesScanner; import io.stackgres.operator.conciliation.ReconciliationOperations; import io.stackgres.operator.configuration.OperatorPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterDeployedResourceScanner extends DeployedResourcesScanner diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsComparator.java index 9510421ed5..475177ce02 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsComparator.java @@ -5,14 +5,13 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.CdiUtil; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.PatroniEndpointsComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresCluster.class, kind = "Endpoints") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsReconciliationHandler.java index f3e9d6e245..0e7c4c8ec5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterEndpointsReconciliationHandler.java @@ -9,9 +9,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -26,6 +23,8 @@ import io.stackgres.common.kubernetesclient.KubernetesClientUtil; import io.stackgres.common.patroni.PatroniConfig; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterHandlerDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterHandlerDelegator.java index e01b300b33..e1f1324a27 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterHandlerDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterHandlerDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterHandlerDelegator implements HandlerDelegator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterReconciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterReconciliator.java index a1a23e8ff5..25e12a2f0e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterReconciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterReconciliator.java @@ -7,11 +7,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -32,6 +27,10 @@ import io.stackgres.operator.conciliation.ReconciliationResult; import io.stackgres.operator.conciliation.StatusManager; import io.stackgres.operator.validation.cluster.PostgresConfigValidator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.helpers.MessageFormatter; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecorator.java index 8f4faf1584..057415f138 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecorator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AbstractRequiredResourceDecorator; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterRequiredResourceDecorator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourcesGenerator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourcesGenerator.java index 5c812e8aeb..4a0197dfc5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourcesGenerator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourcesGenerator.java @@ -16,9 +16,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.LabelSelector; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -66,6 +63,8 @@ import io.stackgres.operator.conciliation.factory.cluster.PostgresSslSecret; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniSecret; import io.stackgres.operator.configuration.OperatorPropertyContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterResourceComparisonDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterResourceComparisonDelegator.java index 74533aaa04..8d6198fc5c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterResourceComparisonDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterResourceComparisonDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.CustomResourceComparisonDelegator; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; import io.stackgres.operator.conciliation.comparator.ResourceComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterResourceComparisonDelegator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterScriptComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterScriptComparator.java index 27bce408b0..c8e83ef2a7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterScriptComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterScriptComparator.java @@ -7,12 +7,11 @@ import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresCluster.class, kind = "SGScript") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterSecretComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterSecretComparator.java index 36b6fa952b..faa2de87dd 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterSecretComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterSecretComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.SecretComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresCluster.class, kind = "Secret") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceAccountComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceAccountComparator.java index fd2ee93d18..643dc8766e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceAccountComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceAccountComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.ServiceAccountComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresCluster.class, kind = "ServiceAccount") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceComparator.java index 4b00ac0760..2c4969d803 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterServiceComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.ServiceComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresCluster.class, kind = "Service") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetComparator.java index 4606af5f4e..d1f01b0f3b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetComparator.java @@ -7,9 +7,6 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.OwnerReference; @@ -19,6 +16,8 @@ import io.stackgres.common.resource.ResourceScanner; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.StatefulSetComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresCluster.class, kind = "StatefulSet") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetReconciliationHandler.java index c0ead485a2..5f56589c16 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatefulSetReconciliationHandler.java @@ -5,9 +5,6 @@ package io.stackgres.operator.conciliation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -20,6 +17,8 @@ import io.stackgres.operator.conciliation.AbstractStatefulSetReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresCluster.class, kind = "StatefulSet") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatusManager.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatusManager.java index 08432d4415..f532962e18 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatusManager.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ClusterStatusManager.java @@ -12,9 +12,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; @@ -33,6 +30,8 @@ import io.stackgres.common.labels.LabelFactoryForCluster; import io.stackgres.operator.conciliation.StatusManager; import io.stackgres.operatorframework.resource.ConditionUpdater; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ResourceGenerationDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ResourceGenerationDiscovererImpl.java index a0fe95c0ce..a690163487 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ResourceGenerationDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/cluster/ResourceGenerationDiscovererImpl.java @@ -7,16 +7,15 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.VersionInfo; import io.stackgres.operator.conciliation.KubernetesVersionBinder; import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ResourceGenerationDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/comparator/DefaultComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/comparator/DefaultComparator.java index a6bb70e570..aaad190b09 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/comparator/DefaultComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/comparator/DefaultComparator.java @@ -10,9 +10,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import io.fabric8.kubernetes.api.model.HasMetadata; -import io.fabric8.kubernetes.api.model.ObjectMeta; -import io.fabric8.kubernetes.client.dsl.internal.ObjectMetaMixIn; import io.fabric8.zjsonpatch.JsonDiff; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +28,6 @@ public class DefaultComparator implements ResourceComparator { * This patch mapper is based in io.fabric8.kubernetes.client.internal.PatchUtils class. * It just adds an ORDER_MAP_ENTRIES_BY_KEYS */ - PATCH_MAPPER.addMixIn(ObjectMeta.class, ObjectMetaMixIn.class); PATCH_MAPPER.setConfig( PATCH_MAPPER.getSerializationConfig() .without(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS)); @@ -47,6 +45,33 @@ public boolean isResourceContentEqual(HasMetadata required, HasMetadata deployed public ArrayNode getJsonDiff(HasMetadata required, HasMetadata deployed) { final JsonNode source = PATCH_MAPPER.valueToTree(required); final JsonNode target = PATCH_MAPPER.valueToTree(deployed); + if (source instanceof ObjectNode sourceNode) { + JsonNode sourceMetadata = source.get("metadata"); + if (sourceMetadata != null + && sourceMetadata instanceof ObjectNode sourceMetadataNode) { + sourceMetadataNode.remove("creationTimestamp"); + sourceMetadataNode.remove("deletionTimestamp"); + sourceMetadataNode.remove("generation"); + sourceMetadataNode.remove("resourceVersion"); + sourceMetadataNode.remove("selfLink"); + sourceMetadataNode.remove("uid"); + } + sourceNode.remove("status"); + } + if (target instanceof ObjectNode targetNode) { + JsonNode targetMetadata = target.get("metadata"); + if (targetMetadata != null + && targetMetadata instanceof ObjectNode targetMetadataNode) { + targetMetadataNode.remove("creationTimestamp"); + targetMetadataNode.remove("deletionTimestamp"); + targetMetadataNode.remove("generation"); + targetMetadataNode.remove("resourceVersion"); + targetMetadataNode.remove("selfLink"); + targetMetadataNode.remove("uid"); + } + targetNode.remove("status"); + } + ArrayNode diff = (ArrayNode) JsonDiff.asJson(source, target); return diff; } diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsConciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsConciliator.java index 892919ea71..3d5735d0b6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsConciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsConciliator.java @@ -5,10 +5,9 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.conciliation.Conciliator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DbOpsConciliator extends Conciliator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultComparator.java index 8e0d0284ea..55faa77706 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ReconciliationScope(value = StackGresDbOps.class, kind = "HasMetadata") diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultReconciliationHandler.java index 9775228ab7..eba8a4e8d1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDefaultReconciliationHandler.java @@ -5,13 +5,12 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.conciliation.AbstractReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresDbOps.class, kind = "HasMetadata") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDeployedResourceScanner.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDeployedResourceScanner.java index 501ca83abb..b0872dd3b1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDeployedResourceScanner.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsDeployedResourceScanner.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.api.model.ServiceAccount; @@ -24,6 +21,8 @@ import io.stackgres.common.labels.LabelFactoryForDbOps; import io.stackgres.operator.conciliation.DeployedResourcesScanner; import io.stackgres.operator.conciliation.ReconciliationOperations; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsDeployedResourceScanner extends DeployedResourcesScanner diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsHandlerDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsHandlerDelegator.java index 0ed90a7ac5..5c09601f8c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsHandlerDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsHandlerDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsHandlerDelegator implements HandlerDelegator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobComparator.java index 615449b979..e484fb3f77 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.JobComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresDbOps.class, kind = "Job") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobReconciliationHandler.java index 4cc64f08b7..4bf3a9cae4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsJobReconciliationHandler.java @@ -5,9 +5,6 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Pod; import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.stackgres.common.DbOpsUtil; @@ -18,6 +15,8 @@ import io.stackgres.operator.conciliation.AbstractJobReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresDbOps.class, kind = "Job") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsReconciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsReconciliator.java index 2f01e6432a..e76311acbb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsReconciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsReconciliator.java @@ -5,11 +5,6 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -25,6 +20,10 @@ import io.stackgres.operator.conciliation.Conciliator; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.helpers.MessageFormatter; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecorator.java index b983877ac4..dd2acb8a32 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecorator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AbstractRequiredResourceDecorator; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsRequiredResourceDecorator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGenerator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGenerator.java index 2326902572..60fea2a3f0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGenerator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGenerator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -21,6 +18,8 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.operator.conciliation.RequiredResourceDecorator; import io.stackgres.operator.conciliation.RequiredResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsResourceComparisonDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsResourceComparisonDelegator.java index 897e629fe6..9dfc860ca7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsResourceComparisonDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsResourceComparisonDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.conciliation.CustomResourceComparisonDelegator; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; import io.stackgres.operator.conciliation.comparator.ResourceComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsResourceComparisonDelegator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsServiceAccountComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsServiceAccountComparator.java index 657d60d691..cdba5063c2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsServiceAccountComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsServiceAccountComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.dbops; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.ServiceAccountComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresDbOps.class, kind = "ServiceAccount") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsStatusManager.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsStatusManager.java index da49fbccac..1408dcea06 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsStatusManager.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/DbOpsStatusManager.java @@ -10,9 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.fabric8.kubernetes.api.model.batch.v1.JobStatus; import io.stackgres.common.DbOpsUtil; @@ -23,6 +20,8 @@ import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operator.conciliation.StatusManager; import io.stackgres.operatorframework.resource.ConditionUpdater; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/ResourceGenerationDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/ResourceGenerationDiscovererImpl.java index 4b5b04426f..743574fb08 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/ResourceGenerationDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/dbops/ResourceGenerationDiscovererImpl.java @@ -7,14 +7,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ResourceGenerationDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ConnectedClustersScannerImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ConnectedClustersScannerImpl.java index d11ef708d8..15f29a713b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ConnectedClustersScannerImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ConnectedClustersScannerImpl.java @@ -9,14 +9,13 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterDistributedLogs; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.resource.CustomResourceScanner; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ConnectedClustersScannerImpl implements ConnectedClustersScanner { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsConciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsConciliator.java index 4f28e78126..8e971cb02d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsConciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsConciliator.java @@ -7,13 +7,12 @@ import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.Conciliator; import io.stackgres.operator.conciliation.ReconciliationResult; import io.stackgres.operator.conciliation.ReconciliationUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsConciliator extends Conciliator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultComparator.java index 9b401b4e27..2c80330cfd 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "HasMetadata") diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultReconciliationHandler.java index 99f4f2e4c7..3704783535 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDefaultReconciliationHandler.java @@ -5,13 +5,12 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.AbstractReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "HasMetadata") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDeployedResourceScanner.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDeployedResourceScanner.java index ca433d2e99..99aae4af97 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDeployedResourceScanner.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsDeployedResourceScanner.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.client.KubernetesClient; @@ -20,6 +17,8 @@ import io.stackgres.common.labels.LabelFactoryForCluster; import io.stackgres.operator.conciliation.DeployedResourcesScanner; import io.stackgres.operator.conciliation.ReconciliationOperations; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsDeployedResourceScanner diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsEndpointsComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsEndpointsComparator.java index 512bac82a6..704c272449 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsEndpointsComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsEndpointsComparator.java @@ -5,14 +5,13 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.CdiUtil; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.PatroniEndpointsComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "Endpoints") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsHandlerDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsHandlerDelegator.java index 1dae0841d0..457bc8c4cb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsHandlerDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsHandlerDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsHandlerDelegator implements HandlerDelegator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsReconciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsReconciliator.java index bc24349392..b9a0c86137 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsReconciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsReconciliator.java @@ -8,11 +8,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.runtime.ShutdownEvent; @@ -32,6 +27,10 @@ import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationResult; import io.stackgres.operator.conciliation.StatusManager; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.helpers.MessageFormatter; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecorator.java index d5996a94fc..1081805db7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecorator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AbstractRequiredResourceDecorator; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsRequireResourceDecorator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGenerator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGenerator.java index 294a091631..89d96c62ff 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGenerator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGenerator.java @@ -7,9 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Secret; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -22,6 +19,8 @@ import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operator.conciliation.RequiredResourceDecorator; import io.stackgres.operator.conciliation.RequiredResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsRequiredResourcesGenerator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsResourceComparisonDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsResourceComparisonDelegator.java index 641dd3277e..126d4075b3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsResourceComparisonDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsResourceComparisonDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.CustomResourceComparisonDelegator; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; import io.stackgres.operator.conciliation.comparator.ResourceComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsResourceComparisonDelegator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsSecretComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsSecretComparator.java index 4b0bb5f0ea..702ae45deb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsSecretComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsSecretComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.SecretComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "Secret") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceAccountComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceAccountComparator.java index 5bcf837d64..a7667b93d7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceAccountComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceAccountComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.ServiceAccountComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "ServiceAccount") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceComparator.java index fa5b2b91cf..9389c47579 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsServiceComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.ServiceComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "Service") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetComparator.java index 80de2ce007..5cb0cf65de 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.StatefulSetComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "StatefulSet") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetReconciliationHandler.java index 8c60e1ea39..f8c3b83fd0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatefulSetReconciliationHandler.java @@ -5,9 +5,6 @@ package io.stackgres.operator.conciliation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; @@ -20,6 +17,8 @@ import io.stackgres.operator.conciliation.AbstractStatefulSetReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresDistributedLogs.class, kind = "StatefulSet") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatusManager.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatusManager.java index dfda40815c..5a9d8c5292 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatusManager.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsStatusManager.java @@ -12,9 +12,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.Pod; @@ -33,6 +30,8 @@ import io.stackgres.common.labels.LabelFactoryForCluster; import io.stackgres.operator.conciliation.StatusManager; import io.stackgres.operatorframework.resource.ConditionUpdater; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ResourceGenerationDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ResourceGenerationDiscovererImpl.java index e329fb8c50..77f10e23e2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ResourceGenerationDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/distributedlogs/ResourceGenerationDiscovererImpl.java @@ -7,14 +7,13 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ResourceGenerationDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ContainerUserOverrideMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ContainerUserOverrideMounts.java index 0348a32659..910aad457f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ContainerUserOverrideMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ContainerUserOverrideMounts.java @@ -7,13 +7,12 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.StackGresVolume; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ContainerUserOverrideMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/FactoryName.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/FactoryName.java index 11acbd58fe..2dbd0cc711 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/FactoryName.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/FactoryName.java @@ -10,7 +10,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/InitContainer.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/InitContainer.java index 32387e6ed7..799edb5174 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/InitContainer.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/InitContainer.java @@ -10,10 +10,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - import io.stackgres.common.StackGresInitContainer; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/KubernetesVersionProvider.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/KubernetesVersionProvider.java index a0cfc94c9a..0525b2ff32 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/KubernetesVersionProvider.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/KubernetesVersionProvider.java @@ -7,11 +7,10 @@ import java.util.function.Supplier; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.VersionInfo; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class KubernetesVersionProvider implements Supplier { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/LocalBinMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/LocalBinMounts.java index da1c8a5dc6..ddcb313fc3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/LocalBinMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/LocalBinMounts.java @@ -7,13 +7,12 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.StackGresVolume; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class LocalBinMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/MajorVersionUpgradeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/MajorVersionUpgradeMounts.java index 6a33364f6a..f7200bcc16 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/MajorVersionUpgradeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/MajorVersionUpgradeMounts.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -26,6 +23,8 @@ import io.stackgres.common.crd.sgcluster.StackGresClusterStatus; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; import io.stackgres.operator.conciliation.factory.cluster.PostgresExtensionMounts; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class MajorVersionUpgradeMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PodSecurityFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PodSecurityFactory.java index b773a12286..f6529f01f7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PodSecurityFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PodSecurityFactory.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.factory; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.PodSecurityContext; import io.fabric8.kubernetes.api.model.PodSecurityContextBuilder; import io.stackgres.common.OperatorProperty; import io.stackgres.operator.configuration.OperatorPropertyContext; +import jakarta.inject.Inject; public abstract class PodSecurityFactory { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresDataMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresDataMounts.java index bf76764774..3d2260c3f3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresDataMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresDataMounts.java @@ -7,13 +7,12 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; import io.stackgres.common.ClusterStatefulSetPath; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PostgresDataMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresSocketMount.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresSocketMount.java index 9cfccf6996..5367c1af4c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresSocketMount.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/PostgresSocketMount.java @@ -7,13 +7,12 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.StackGresVolume; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PostgresSocketMount implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/RunningContainer.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/RunningContainer.java index 84ada786ad..3baa193efc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/RunningContainer.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/RunningContainer.java @@ -10,10 +10,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; - import io.stackgres.common.StackGresContainer; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ScriptTemplatesVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ScriptTemplatesVolumeMounts.java index 008ace3c94..b306f07103 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ScriptTemplatesVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/ScriptTemplatesVolumeMounts.java @@ -7,13 +7,12 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.StackGresVolume; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupAnnotationDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupAnnotationDecorator.java index 42e372e347..60fe96ac3a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupAnnotationDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupAnnotationDecorator.java @@ -10,8 +10,6 @@ import java.util.Optional; import java.util.function.BiConsumer; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -30,6 +28,7 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.backup.StackGresBackupContext; import io.stackgres.operator.conciliation.factory.AnnotationDecorator; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJob.java index 7afa7780e3..491afe47b4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJob.java @@ -12,9 +12,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.AffinityBuilder; @@ -56,6 +53,8 @@ import io.stackgres.operator.conciliation.factory.cluster.ClusterEnvironmentVariablesFactoryDiscoverer; import io.stackgres.operator.conciliation.factory.cluster.backup.BackupCronRole; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJobContainerProfileDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJobContainerProfileDecorator.java index 68d8d7f715..f2cf8ae56e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJobContainerProfileDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupJobContainerProfileDecorator.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.batch.v1.Job; @@ -21,6 +19,7 @@ import io.stackgres.operator.conciliation.backup.StackGresBackupContext; import io.stackgres.operator.conciliation.factory.AbstractContainerProfileDecorator; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupPodSecurityFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupPodSecurityFactory.java index 3770fa7993..d63f26e9c5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupPodSecurityFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupPodSecurityFactory.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.factory.backup; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.PodSecurityContext; import io.stackgres.operator.conciliation.backup.StackGresBackupContext; import io.stackgres.operator.conciliation.factory.PodSecurityFactory; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupPodSecurityFactory extends PodSecurityFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupRole.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupRole.java index e7456068ef..137b303ecb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupRole.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupRole.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.rbac.PolicyRuleBuilder; import io.fabric8.kubernetes.api.model.rbac.Role; @@ -28,6 +25,8 @@ import io.stackgres.operator.conciliation.backup.StackGresBackupContext; import io.stackgres.operator.conciliation.factory.cluster.backup.BackupCronRole; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupScriptTemplatesVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupScriptTemplatesVolumeMounts.java index a900817b36..3defda4475 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupScriptTemplatesVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupScriptTemplatesVolumeMounts.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -16,6 +14,7 @@ import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.backup.StackGresBackupContext; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupScriptTemplatesVolumeMounts diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupTemplatesVolumeFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupTemplatesVolumeFactory.java index 9c21beb47c..7dd46215c7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupTemplatesVolumeFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/BackupTemplatesVolumeFactory.java @@ -7,8 +7,6 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeBuilder; @@ -18,6 +16,7 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.enterprise.context.ApplicationScoped; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/DecoratorDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/DecoratorDiscovererImpl.java index 207bc3ecea..c252f94732 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/DecoratorDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/DecoratorDiscovererImpl.java @@ -7,15 +7,14 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.backup.StackGresBackupContext; import io.stackgres.operator.conciliation.factory.Decorator; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DecoratorDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/OwnerReferenceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/OwnerReferenceDecorator.java index 21ee288052..280e5df628 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/OwnerReferenceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/backup/OwnerReferenceDecorator.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Objects; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.OwnerReference; import io.stackgres.common.resource.ResourceUtil; import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.backup.StackGresBackupContext; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupCronJobContainerProfileDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupCronJobContainerProfileDecorator.java index a54ce707f7..4472fd3c1d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupCronJobContainerProfileDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupCronJobContainerProfileDecorator.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.batch.v1.CronJob; @@ -23,6 +21,7 @@ import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.AbstractContainerProfileDecorator; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupVolumeMounts.java index d507caf111..7060667a50 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/BackupVolumeMounts.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -17,6 +15,7 @@ import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupVolumeMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterAnnotationDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterAnnotationDecorator.java index 9493c74d73..adec170225 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterAnnotationDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterAnnotationDecorator.java @@ -5,9 +5,8 @@ package io.stackgres.operator.conciliation.factory.cluster; -import javax.inject.Singleton; - import io.stackgres.operator.conciliation.OperatorVersionBinder; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultScripts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultScripts.java index f8cd2e8094..824bc8da04 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultScripts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterDefaultScripts.java @@ -10,8 +10,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; -import javax.inject.Singleton; - import com.google.common.io.Resources; import io.stackgres.common.StackGresComponent; import io.stackgres.common.crd.SecretKeySelector; @@ -20,6 +18,7 @@ import io.stackgres.common.crd.sgscript.StackGresScriptFrom; import io.stackgres.common.patroni.StackGresPasswordKeys; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniSecret; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariables.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariables.java index 1498454507..347b36780c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariables.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariables.java @@ -7,13 +7,12 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.stackgres.common.ClusterStatefulSetEnvVars; import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operatorframework.resource.factory.SubResourceStreamFactory; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariablesFactoryDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariablesFactoryDiscovererImpl.java index 5046991545..f844134f29 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariablesFactoryDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterEnvironmentVariablesFactoryDiscovererImpl.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.ClusterContext; import io.stackgres.common.StackGresVersion; import io.stackgres.operator.conciliation.ResourceDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterEnvironmentVariablesFactoryDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodSecurityFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodSecurityFactory.java index c77c469d72..c471672f33 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodSecurityFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodSecurityFactory.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.factory.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.PodSecurityContext; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.PodSecurityFactory; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ClusterPodSecurityFactory extends PodSecurityFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodTemplateSpecFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodTemplateSpecFactory.java index 57ee57c7f0..f976095179 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodTemplateSpecFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterPodTemplateSpecFactory.java @@ -12,9 +12,6 @@ import java.util.Set; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.AffinityBuilder; import io.fabric8.kubernetes.api.model.Container; @@ -55,6 +52,8 @@ import io.stackgres.operator.conciliation.factory.PodTemplateResult; import io.stackgres.operator.conciliation.factory.ResourceFactory; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniRole; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSet.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSet.java index d4e0dacbe7..7678a8895d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSet.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSet.java @@ -12,9 +12,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.LabelSelectorBuilder; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -38,6 +35,8 @@ import io.stackgres.operator.conciliation.factory.PodTemplateResult; import io.stackgres.operator.conciliation.factory.VolumeDiscoverer; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetContainerProfileDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetContainerProfileDecorator.java index 6d2b07b33d..316e17c4b0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetContainerProfileDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetContainerProfileDecorator.java @@ -10,8 +10,6 @@ import java.util.Optional; import java.util.function.Supplier; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.PodSpec; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -27,6 +25,7 @@ import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.AbstractContainerProfileDecorator; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetEnvironmentVariables.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetEnvironmentVariables.java index 8a83cc718f..9fcd67c18c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetEnvironmentVariables.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterStatefulSetEnvironmentVariables.java @@ -8,13 +8,12 @@ import java.util.List; import java.util.stream.Collectors; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EnvVar; import io.stackgres.common.ClusterContext; import io.stackgres.common.ClusterStatefulSetEnvVars; import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.operator.conciliation.OperatorVersionBinder; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterVolumeDiscoverer.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterVolumeDiscoverer.java index b0e7baa3ef..4590f3ef8f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterVolumeDiscoverer.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ClusterVolumeDiscoverer.java @@ -9,17 +9,16 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.StackGresGroupKind; import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.VolumeDiscoverer; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterVolumeDiscoverer diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ContainerFactoryDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ContainerFactoryDiscovererImpl.java index 44c295bd40..222cc883a8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ContainerFactoryDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ContainerFactoryDiscovererImpl.java @@ -7,15 +7,14 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AnnotatedResourceDiscoverer; import io.stackgres.operator.conciliation.ContainerFactoryDiscoverer; import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.RunningContainer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ContainerFactoryDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/DecoratorDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/DecoratorDiscovererImpl.java index ef987c2d88..331745a700 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/DecoratorDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/DecoratorDiscovererImpl.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.Decorator; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DecoratorDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/HugePagesMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/HugePagesMounts.java index 5c38b0fe07..de9e13d122 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/HugePagesMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/HugePagesMounts.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -21,6 +19,7 @@ import io.stackgres.common.crd.sgprofile.StackGresProfileHugePages; import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class HugePagesMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitContainerFactoryDiscoverImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitContainerFactoryDiscoverImpl.java index 28e36e4274..2ef9805afe 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitContainerFactoryDiscoverImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitContainerFactoryDiscoverImpl.java @@ -7,15 +7,14 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AnnotatedResourceDiscoverer; import io.stackgres.operator.conciliation.InitContainerFactoryDiscover; import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.InitContainer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class InitContainerFactoryDiscoverImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitRelocateBinaries.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitRelocateBinaries.java index f49cce9690..992cde418a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitRelocateBinaries.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/InitRelocateBinaries.java @@ -5,9 +5,6 @@ package io.stackgres.operator.conciliation.factory.cluster; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -19,6 +16,8 @@ import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.InitContainer; import io.stackgres.operator.conciliation.factory.ScriptTemplatesVolumeMounts; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/LogVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/LogVolumeMounts.java index 4afc193a42..a8e27bd6d5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/LogVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/LogVolumeMounts.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -16,6 +14,7 @@ import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.factory.ContainerContext; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class LogVolumeMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeConfigMap.java index e1dc89ee6c..052683f7e6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeConfigMap.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; @@ -27,6 +24,8 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeInit.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeInit.java index 29bbdf0198..c8642bf690 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeInit.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/MajorVersionUpgradeInit.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMapEnvSourceBuilder; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; @@ -33,6 +30,8 @@ import io.stackgres.operator.conciliation.factory.MajorVersionUpgradeMounts; import io.stackgres.operator.conciliation.factory.ScriptTemplatesVolumeMounts; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniConfigMap; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/OwnerReferenceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/OwnerReferenceDecorator.java index b69117121a..4b51c27797 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/OwnerReferenceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/OwnerReferenceDecorator.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.OwnerReference; import io.fabric8.kubernetes.api.model.apps.StatefulSet; @@ -17,6 +15,7 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PodTemplateFactoryDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PodTemplateFactoryDiscovererImpl.java index 050940f836..d393623f67 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PodTemplateFactoryDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PodTemplateFactoryDiscovererImpl.java @@ -5,13 +5,12 @@ package io.stackgres.operator.conciliation.factory.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.factory.PodTemplateFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class PodTemplateFactoryDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresExtensionMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresExtensionMounts.java index a213d84d2a..670cd72e3d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresExtensionMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresExtensionMounts.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -21,6 +18,8 @@ import io.stackgres.operator.conciliation.factory.ContainerUserOverrideMounts; import io.stackgres.operator.conciliation.factory.PostgresDataMounts; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PostgresExtensionMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresSslSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresSslSecret.java index b9ea7a8cc5..02260fda2e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresSslSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/PostgresSslSecret.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.api.model.SecretVolumeSourceBuilder; @@ -32,6 +29,8 @@ import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ReplicateVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ReplicateVolumeMounts.java index b8c0164bc4..c69e172020 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ReplicateVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ReplicateVolumeMounts.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -17,6 +15,7 @@ import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ReplicateVolumeMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/RestoreVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/RestoreVolumeMounts.java index 6065e68dca..ba9227cb2c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/RestoreVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/RestoreVolumeMounts.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -17,6 +15,7 @@ import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class RestoreVolumeMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ScriptsSetUp.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ScriptsSetUp.java index 18e2118e00..cb596afc5f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ScriptsSetUp.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/ScriptsSetUp.java @@ -7,9 +7,6 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; @@ -25,6 +22,8 @@ import io.stackgres.operator.conciliation.factory.InitContainer; import io.stackgres.operator.conciliation.factory.LocalBinMounts; import io.stackgres.operator.conciliation.factory.ScriptTemplatesVolumeMounts; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/TemplatesConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/TemplatesConfigMap.java index e545a94af8..2f25ce1985 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/TemplatesConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/TemplatesConfigMap.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; @@ -26,6 +23,8 @@ import io.stackgres.operator.conciliation.factory.AbstractPatroniTemplatesConfigMap; import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/UserSetUp.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/UserSetUp.java index 633f8a2469..dc45fb7f10 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/UserSetUp.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/UserSetUp.java @@ -7,9 +7,6 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; @@ -25,6 +22,8 @@ import io.stackgres.operator.conciliation.factory.InitContainer; import io.stackgres.operator.conciliation.factory.PostgresDataMounts; import io.stackgres.operator.conciliation.factory.ScriptTemplatesVolumeMounts; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupConfigMap.java index 6be352f5fc..cdbb540082 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupConfigMap.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Volume; @@ -26,6 +23,8 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJob.java index 50b3d79804..3256eb7bdd 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJob.java @@ -12,9 +12,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.AffinityBuilder; @@ -55,6 +52,8 @@ import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.ClusterEnvironmentVariablesFactory; import io.stackgres.operator.conciliation.factory.cluster.ClusterEnvironmentVariablesFactoryDiscoverer; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJobV1Beta1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJobV1Beta1.java index b4e3affd4b..a604697bc1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJobV1Beta1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronJobV1Beta1.java @@ -12,9 +12,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.AffinityBuilder; @@ -55,6 +52,8 @@ import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.ClusterEnvironmentVariablesFactory; import io.stackgres.operator.conciliation.factory.cluster.ClusterEnvironmentVariablesFactoryDiscoverer; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronRole.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronRole.java index 12386a3c16..9df16def12 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronRole.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupCronRole.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ServiceAccount; import io.fabric8.kubernetes.api.model.ServiceAccountBuilder; @@ -31,6 +28,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupEnvVarFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupEnvVarFactory.java index 3266ef8d76..df11fe0b2f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupEnvVarFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupEnvVarFactory.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretKeySelector; @@ -28,6 +25,8 @@ import io.stackgres.common.crd.storages.GoogleCloudStorage; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupScriptTemplatesVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupScriptTemplatesVolumeMounts.java index f55dc0b945..016d5d368f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupScriptTemplatesVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupScriptTemplatesVolumeMounts.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -16,6 +14,7 @@ import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupScriptTemplatesVolumeMounts diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupSecret.java index 989b0c4e55..8818a18500 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupSecret.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.api.model.Volume; @@ -27,6 +24,8 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupTemplatesVolumeFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupTemplatesVolumeFactory.java index d6fef30b40..1ecdd71cef 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupTemplatesVolumeFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/backup/BackupTemplatesVolumeFactory.java @@ -7,8 +7,6 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeBuilder; @@ -18,6 +16,7 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.enterprise.context.ApplicationScoped; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/Patroni.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/Patroni.java index f3bee6bbab..a4e9fa01e2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/Patroni.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/Patroni.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapEnvSourceBuilder; @@ -53,6 +50,8 @@ import io.stackgres.operator.conciliation.factory.cluster.PostgresExtensionMounts; import io.stackgres.operator.conciliation.factory.cluster.ReplicateVolumeMounts; import io.stackgres.operator.conciliation.factory.cluster.RestoreVolumeMounts; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder(startAt = StackGresVersion.V_1_4) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigEndpoints.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigEndpoints.java index dfc511619f..6096758f49 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigEndpoints.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigEndpoints.java @@ -13,9 +13,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import com.ongres.pgconfig.validator.GucValidator; @@ -48,6 +45,8 @@ import io.stackgres.operator.conciliation.factory.cluster.PostgresSslSecret; import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresBlocklist; import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresDefaultValues; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigMap.java index eb71bf5c98..4de6a033f0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniConfigMap.java @@ -16,9 +16,6 @@ import java.util.function.Predicate; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -57,6 +54,8 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Unchecked; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniDefaultScript.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniDefaultScript.java index cfe87fa3ca..e6d05b6c9a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniDefaultScript.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniDefaultScript.java @@ -8,9 +8,6 @@ import java.util.ArrayList; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.stackgres.common.ManagedSqlUtil; @@ -22,6 +19,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.cluster.ClusterDefaultScripts; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEndpoint.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEndpoint.java index 2388c206f5..d541d9132e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEndpoint.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEndpoint.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.PatroniUtil; @@ -19,6 +16,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder(startAt = StackGresVersion.V_1_5) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEnvironmentVariablesFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEnvironmentVariablesFactory.java index d5d2208e15..4196a828ba 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEnvironmentVariablesFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniEnvironmentVariablesFactory.java @@ -14,8 +14,6 @@ import java.util.Optional; import java.util.function.Function; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -29,6 +27,7 @@ import io.stackgres.common.patroni.StackGresPasswordKeys; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.AbstractPatroniEnvironmentVariablesFactory; +import jakarta.inject.Singleton; @Singleton public class PatroniEnvironmentVariablesFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniFailover.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniFailover.java index 3ddd9aa521..aaa6948d26 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniFailover.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniFailover.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.PatroniUtil; @@ -18,6 +15,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages1Gi.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages1Gi.java index 85f91fce93..bd20f69298 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages1Gi.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages1Gi.java @@ -8,8 +8,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EmptyDirVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeBuilder; @@ -23,6 +21,7 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages2Mi.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages2Mi.java index be9536d3de..c40b75f7e6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages2Mi.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniHugePages2Mi.java @@ -8,8 +8,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EmptyDirVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeBuilder; @@ -23,6 +21,7 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRequirementsFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRequirementsFactory.java index 1351d75847..1e3bd6394b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRequirementsFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRequirementsFactory.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Quantity; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.stackgres.common.crd.sgcluster.StackGresClusterNonProduction; @@ -21,6 +19,7 @@ import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.inject.Singleton; @Singleton public class PatroniRequirementsFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniResetInit.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniResetInit.java index 4da59a3249..cde5ed9b4c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniResetInit.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniResetInit.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVar; @@ -35,6 +32,8 @@ import io.stackgres.operator.conciliation.factory.ResourceFactory; import io.stackgres.operator.conciliation.factory.ScriptTemplatesVolumeMounts; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRole.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRole.java index 243f7dad34..7290d7981b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRole.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniRole.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ServiceAccount; import io.fabric8.kubernetes.api.model.ServiceAccountBuilder; @@ -39,6 +36,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSecret.java index 39ccf7a3f3..2caa08bb52 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSecret.java @@ -12,9 +12,6 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.api.model.SecretVolumeSourceBuilder; @@ -32,6 +29,8 @@ import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniServices.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniServices.java index ac05e7d840..719644d78e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniServices.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniServices.java @@ -12,9 +12,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.Service; @@ -39,6 +36,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniStaticVolumesFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniStaticVolumesFactory.java index c0de87b40f..958c395b0d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniStaticVolumesFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniStaticVolumesFactory.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.factory.cluster.patroni; -import javax.inject.Singleton; - import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.factory.AbstractPatroniStaticVolumesFactory; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSync.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSync.java index f9ab3a1e84..048aa9c21f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSync.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniSync.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.PatroniUtil; @@ -18,6 +15,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniVolumeMounts.java index 2099268341..42cd6f1637 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/PatroniVolumeMounts.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -18,6 +16,7 @@ import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PatroniVolumeMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniEndpoint.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniEndpoint.java index 636de78cda..5c7d7845c6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniEndpoint.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniEndpoint.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.StackGresVersion; @@ -18,6 +15,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder(stopAt = StackGresVersion.V_1_4) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniServices.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniServices.java index a83ee5906a..290946acfc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniServices.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/patroni/v14/PatroniServices.java @@ -12,9 +12,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.Service; @@ -39,6 +36,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateConfigMap.java index ac8035f26f..64a8c2de36 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateConfigMap.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; @@ -30,6 +27,8 @@ import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.backup.AbstractBackupConfigMap; import io.stackgres.operator.conciliation.factory.cluster.backup.BackupEnvVarFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateSecret.java index 5cbb7396e3..abb200a315 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/replicate/ReplicateSecret.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.api.model.SecretVolumeSourceBuilder; @@ -28,6 +25,8 @@ import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.backup.BackupEnvVarFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreConfigMap.java index b2c5249145..1dda62a4ae 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreConfigMap.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; @@ -43,6 +40,8 @@ import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.backup.AbstractBackupConfigMap; import io.stackgres.operator.conciliation.factory.cluster.backup.BackupEnvVarFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreSecret.java index 421a5fab83..6f90bcaafc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/restore/RestoreSecret.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.api.model.SecretVolumeSourceBuilder; @@ -34,6 +31,8 @@ import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.backup.BackupEnvVarFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/ClusterController.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/ClusterController.java index d90d0a753d..ee9a7f4bdf 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/ClusterController.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/ClusterController.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -35,6 +32,8 @@ import io.stackgres.operator.conciliation.factory.PostgresSocketMount; import io.stackgres.operator.conciliation.factory.RunningContainer; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @Sidecar(StackGresContainer.CLUSTER_CONTROLLER) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/InitReconciliationCycle.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/InitReconciliationCycle.java index b66d5f0475..c7514c5b67 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/InitReconciliationCycle.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/controller/InitReconciliationCycle.java @@ -5,8 +5,6 @@ package io.stackgres.operator.conciliation.factory.cluster.sidecars.controller; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -23,6 +21,7 @@ import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.InitContainer; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/Envoy.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/Envoy.java index cbb116b07a..63b26887f9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/Envoy.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/Envoy.java @@ -12,9 +12,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -56,6 +53,8 @@ import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/PrometheusIntegration.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/PrometheusIntegration.java index ea5a24d33e..ce88274f1f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/PrometheusIntegration.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/PrometheusIntegration.java @@ -12,9 +12,6 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.LabelSelector; @@ -32,6 +29,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/v14/Envoy.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/v14/Envoy.java index 70347d42ca..70a093f4c8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/v14/Envoy.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/envoy/v14/Envoy.java @@ -12,9 +12,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -55,6 +52,8 @@ import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/fluentbit/FluentBit.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/fluentbit/FluentBit.java index 0d0286dea8..823004de3f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/fluentbit/FluentBit.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/fluentbit/FluentBit.java @@ -9,9 +9,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; @@ -44,6 +41,8 @@ import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; import io.stackgres.operator.conciliation.factory.cluster.LogVolumeMounts; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Sidecar(StackGresContainer.FLUENT_BIT) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporter.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporter.java index f70a1a5484..c191123374 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporter.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporter.java @@ -11,9 +11,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.io.Resources; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; @@ -48,6 +45,8 @@ import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Unchecked; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PrometheusIntegration.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PrometheusIntegration.java index 1b3180c7d4..54dd3a06ff 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PrometheusIntegration.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PrometheusIntegration.java @@ -12,9 +12,6 @@ import java.util.function.Function; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.LabelSelector; @@ -31,6 +28,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder(startAt = StackGresVersion.V_1_4) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/AbstractPostgresUtil.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/AbstractPostgresUtil.java index 2a30a75784..80773617ee 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/AbstractPostgresUtil.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/AbstractPostgresUtil.java @@ -9,12 +9,11 @@ import java.util.Map; -import javax.inject.Inject; - import io.stackgres.common.StackGresContext; import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.PostgresSocketMount; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.inject.Inject; public abstract class AbstractPostgresUtil implements ContainerFactory { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/PostgresUtil.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/PostgresUtil.java index a66d905ad5..7b694529b3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/PostgresUtil.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgutils/PostgresUtil.java @@ -5,9 +5,6 @@ package io.stackgres.operator.conciliation.factory.cluster.sidecars.pgutils; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -19,6 +16,8 @@ import io.stackgres.operator.conciliation.factory.ContainerUserOverrideMounts; import io.stackgres.operator.conciliation.factory.RunningContainer; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Sidecar(StackGresContainer.POSTGRES_UTIL) @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/InitPgBouncerAuthFile.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/InitPgBouncerAuthFile.java index f74072882d..c7ed630d48 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/InitPgBouncerAuthFile.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/InitPgBouncerAuthFile.java @@ -10,9 +10,6 @@ import static io.stackgres.common.patroni.StackGresPasswordKeys.PGBOUNCER_STATS_PASSWORD_KEY; import static io.stackgres.common.patroni.StackGresPasswordKeys.PGBOUNCER_STATS_USERNAME; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -24,6 +21,8 @@ import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.InitContainer; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/PgBouncerPooling.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/PgBouncerPooling.java index 40ff724c22..4c6f7a3cd8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/PgBouncerPooling.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pooling/PgBouncerPooling.java @@ -11,9 +11,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Container; @@ -53,6 +50,8 @@ import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniSecret; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerBlocklist; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerDefaultValues; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Sidecar(StackGresContainer.PGBOUNCER) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJob.java index b37ad11b8a..7494cfb8c0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJob.java @@ -10,8 +10,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJobDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJobDiscovererImpl.java index 2284218224..6898fb4eac 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJobDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/BenchmarkJobDiscovererImpl.java @@ -9,12 +9,11 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class BenchmarkJobDiscovererImpl extends ResourceDiscoverer diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsAnnotationDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsAnnotationDecorator.java index 051d102a3f..f21ff7d0ad 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsAnnotationDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsAnnotationDecorator.java @@ -10,8 +10,6 @@ import java.util.Optional; import java.util.function.BiConsumer; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -30,6 +28,7 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.AnnotationDecorator; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsBenchmarkJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsBenchmarkJob.java index 7a566e1eab..56eadf94df 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsBenchmarkJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsBenchmarkJob.java @@ -8,14 +8,13 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.stackgres.common.crd.sgdbops.StackGresDbOpsBenchmark; import io.stackgres.common.crd.sgdbops.StackGresDbOpsSpec; import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsEnvironmentVariables.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsEnvironmentVariables.java index 78e9408bf4..687fd8e733 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsEnvironmentVariables.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsEnvironmentVariables.java @@ -7,13 +7,12 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.stackgres.common.ClusterStatefulSetEnvVars; import io.stackgres.common.ClusterStatefulSetPath; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operatorframework.resource.factory.SubResourceStreamFactory; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobContainerProfileDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobContainerProfileDecorator.java index 1a979b8568..37794f486e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobContainerProfileDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobContainerProfileDecorator.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.PodTemplateSpec; import io.fabric8.kubernetes.api.model.batch.v1.Job; @@ -22,6 +20,7 @@ import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.AbstractContainerProfileDecorator; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsDiscovererImpl.java index 2e140ca610..6a048074a6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsDiscovererImpl.java @@ -9,12 +9,11 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsJobsDiscovererImpl extends ResourceDiscoverer diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsGenerator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsGenerator.java index 527cf08e56..03bf58d5a6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsGenerator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobsGenerator.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.DbOpsUtil; import io.stackgres.common.crd.sgdbops.StackGresDbOps; @@ -20,6 +17,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMajorVersionUpgradeJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMajorVersionUpgradeJob.java index 1ba14aeb30..1f40a629aa 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMajorVersionUpgradeJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMajorVersionUpgradeJob.java @@ -9,9 +9,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; @@ -36,6 +33,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMinorVersionUpgradeJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMinorVersionUpgradeJob.java index 5c6c588f90..0325e1cb4f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMinorVersionUpgradeJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsMinorVersionUpgradeJob.java @@ -10,9 +10,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.AffinityBuilder; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -29,6 +26,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsPodSecurityFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsPodSecurityFactory.java index d4baf90d47..4ed9250964 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsPodSecurityFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsPodSecurityFactory.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.factory.dbops; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.PodSecurityContext; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.PodSecurityFactory; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DbOpsPodSecurityFactory extends PodSecurityFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRepackJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRepackJob.java index 40614a87e0..7ee23d069f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRepackJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRepackJob.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; @@ -30,6 +27,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRestartJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRestartJob.java index 17ec4d9acb..f738514300 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRestartJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRestartJob.java @@ -10,9 +10,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.AffinityBuilder; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -29,6 +26,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRole.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRole.java index 3082702454..0e5159c1ca 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRole.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsRole.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ServiceAccount; import io.fabric8.kubernetes.api.model.ServiceAccountBuilder; @@ -30,6 +27,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsSecurityUpgradeJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsSecurityUpgradeJob.java index 070eefe7ff..00a77a1423 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsSecurityUpgradeJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsSecurityUpgradeJob.java @@ -10,9 +10,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.AffinityBuilder; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -29,6 +26,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsTemplatesVolumeFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsTemplatesVolumeFactory.java index e4068dc424..67d5e3e6dc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsTemplatesVolumeFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsTemplatesVolumeFactory.java @@ -7,8 +7,6 @@ import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeBuilder; @@ -18,6 +16,7 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.enterprise.context.ApplicationScoped; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVacuumJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVacuumJob.java index 44b1f50373..cbb9c37888 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVacuumJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVacuumJob.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; @@ -29,6 +26,8 @@ import io.stackgres.operator.conciliation.factory.ResourceFactory; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniSecret; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniServices; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVolumeMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVolumeMounts.java index 8339105aae..3ac5547aae 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVolumeMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsVolumeMounts.java @@ -9,8 +9,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -18,6 +16,7 @@ import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DecoratorDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DecoratorDiscovererImpl.java index fd4128fd61..ca926bc3f6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DecoratorDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/DecoratorDiscovererImpl.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.Decorator; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DecoratorDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OpJob.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OpJob.java index 3df14678c4..1f68e250d9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OpJob.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OpJob.java @@ -10,8 +10,8 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.enterprise.util.Nonbinding; -import javax.inject.Qualifier; +import jakarta.enterprise.util.Nonbinding; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE, ElementType.METHOD, ElementType.PARAMETER, ElementType.FIELD}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OwnerReferenceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OwnerReferenceDecorator.java index 260c3bf7ed..ed6176a0fa 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OwnerReferenceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/OwnerReferenceDecorator.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Objects; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.OwnerReference; import io.stackgres.common.resource.ResourceUtil; import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/PgbenchBenchmark.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/PgbenchBenchmark.java index acfa466815..dc71abdb86 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/PgbenchBenchmark.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/dbops/PgbenchBenchmark.java @@ -10,9 +10,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; @@ -32,6 +29,8 @@ import io.stackgres.operator.conciliation.factory.ResourceFactory; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniSecret; import io.stackgres.operator.conciliation.factory.cluster.patroni.PatroniServices; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ContainerFactoryDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ContainerFactoryDiscovererImpl.java index 445e5e87de..6f5cdabca1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ContainerFactoryDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ContainerFactoryDiscovererImpl.java @@ -7,15 +7,14 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AnnotatedResourceDiscoverer; import io.stackgres.operator.conciliation.ContainerFactoryDiscoverer; import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.RunningContainer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ContainerFactoryDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DecoratorDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DecoratorDiscovererImpl.java index 96e34f3fab..04a7585c87 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DecoratorDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DecoratorDiscovererImpl.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.Decorator; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DecoratorDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsAnnotationDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsAnnotationDecorator.java index 65f5569899..9b8cf581f2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsAnnotationDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsAnnotationDecorator.java @@ -5,9 +5,8 @@ package io.stackgres.operator.conciliation.factory.distributedlogs; -import javax.inject.Singleton; - import io.stackgres.operator.conciliation.OperatorVersionBinder; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodSecurityFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodSecurityFactory.java index 0fb2457b1c..a852c80c52 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodSecurityFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodSecurityFactory.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.factory.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.PodSecurityContext; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.PodSecurityFactory; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DistributedLogsPodSecurityFactory extends PodSecurityFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodTemplateSpecFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodTemplateSpecFactory.java index 110349d95d..0e56073b71 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodTemplateSpecFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsPodTemplateSpecFactory.java @@ -11,9 +11,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.AffinityBuilder; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.LabelSelectorBuilder; @@ -43,6 +40,8 @@ import io.stackgres.operator.conciliation.factory.PodTemplateResult; import io.stackgres.operator.conciliation.factory.ResourceFactory; import io.stackgres.operator.conciliation.factory.distributedlogs.patroni.PatroniRole; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSet.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSet.java index fba84df51c..246c4d12b5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSet.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSet.java @@ -11,9 +11,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.LabelSelectorBuilder; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -37,6 +34,8 @@ import io.stackgres.operator.conciliation.factory.PodTemplateResult; import io.stackgres.operator.conciliation.factory.VolumeDiscoverer; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSetContainerProfileDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSetContainerProfileDecorator.java index 538264ddf9..638b77bb32 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSetContainerProfileDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsStatefulSetContainerProfileDecorator.java @@ -10,8 +10,6 @@ import java.util.Optional; import java.util.function.Supplier; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.PodSpec; import io.fabric8.kubernetes.api.model.PodTemplateSpec; @@ -27,6 +25,7 @@ import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.AbstractContainerProfileDecorator; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsVolumeDiscoverer.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsVolumeDiscoverer.java index 2d53b104ab..fee0b1e751 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsVolumeDiscoverer.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/DistributedLogsVolumeDiscoverer.java @@ -9,17 +9,16 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.StackGresGroupKind; import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.VolumeDiscoverer; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsVolumeDiscoverer diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/FluentdStaticVolumesFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/FluentdStaticVolumesFactory.java index 85f88ecf9c..837d331f59 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/FluentdStaticVolumesFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/FluentdStaticVolumesFactory.java @@ -7,13 +7,12 @@ import java.util.stream.Stream; -import javax.inject.Singleton; - import io.stackgres.common.StackGresVolume; import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/HugePagesMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/HugePagesMounts.java index ef93d0bb72..1389efdffb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/HugePagesMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/HugePagesMounts.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.VolumeMount; import io.fabric8.kubernetes.api.model.VolumeMountBuilder; @@ -21,6 +19,7 @@ import io.stackgres.common.crd.sgprofile.StackGresProfileHugePages; import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class HugePagesMounts implements VolumeMountsProvider { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitContainerFactoryDiscoverImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitContainerFactoryDiscoverImpl.java index d5083d6acc..667a13a096 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitContainerFactoryDiscoverImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitContainerFactoryDiscoverImpl.java @@ -7,15 +7,14 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AnnotatedResourceDiscoverer; import io.stackgres.operator.conciliation.InitContainerFactoryDiscover; import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.InitContainer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class InitContainerFactoryDiscoverImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitRelocateBinaries.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitRelocateBinaries.java index a3e5801d31..1948e186a0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitRelocateBinaries.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/InitRelocateBinaries.java @@ -7,9 +7,6 @@ import java.util.List; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; @@ -24,6 +21,8 @@ import io.stackgres.operator.conciliation.factory.ContainerUserOverrideMounts; import io.stackgres.operator.conciliation.factory.InitContainer; import io.stackgres.operator.conciliation.factory.ScriptTemplatesVolumeMounts; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/OwnerReferenceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/OwnerReferenceDecorator.java index 60fbe75ff6..5371541ad2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/OwnerReferenceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/OwnerReferenceDecorator.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Objects; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.OwnerReference; import io.fabric8.kubernetes.api.model.apps.StatefulSet; @@ -17,6 +15,7 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.Decorator; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PatroniStaticVolumesFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PatroniStaticVolumesFactory.java index e8b462d80c..203250f2d1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PatroniStaticVolumesFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PatroniStaticVolumesFactory.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.factory.distributedlogs; -import javax.inject.Singleton; - import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.AbstractPatroniStaticVolumesFactory; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PostgresExtensionMounts.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PostgresExtensionMounts.java index 65ed1752f0..6a5a427532 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PostgresExtensionMounts.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/PostgresExtensionMounts.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -22,6 +19,8 @@ import io.stackgres.operator.conciliation.factory.ContainerUserOverrideMounts; import io.stackgres.operator.conciliation.factory.PostgresDataMounts; import io.stackgres.operator.conciliation.factory.VolumeMountsProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PostgresExtensionMounts diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ScriptsSetUp.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ScriptsSetUp.java index 95b88b66f4..57ce84207b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ScriptsSetUp.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/ScriptsSetUp.java @@ -5,9 +5,6 @@ package io.stackgres.operator.conciliation.factory.distributedlogs; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -22,6 +19,8 @@ import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.ContainerUserOverrideMounts; import io.stackgres.operator.conciliation.factory.InitContainer; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/UserSetUp.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/UserSetUp.java index 7cfc378da5..e0be596340 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/UserSetUp.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/UserSetUp.java @@ -5,9 +5,6 @@ package io.stackgres.operator.conciliation.factory.distributedlogs; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -21,6 +18,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.factory.ContainerFactory; import io.stackgres.operator.conciliation.factory.InitContainer; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/DistributedLogsController.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/DistributedLogsController.java index 4502815859..cb5d647cba 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/DistributedLogsController.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/DistributedLogsController.java @@ -7,9 +7,6 @@ import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; @@ -33,6 +30,8 @@ import io.stackgres.operator.conciliation.factory.PostgresSocketMount; import io.stackgres.operator.conciliation.factory.RunningContainer; import io.stackgres.operator.conciliation.factory.distributedlogs.DistributedLogsContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/InitReconciliationCycle.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/InitReconciliationCycle.java index 9e75c7561a..8c3adeeb0a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/InitReconciliationCycle.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/controller/InitReconciliationCycle.java @@ -7,9 +7,6 @@ import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -29,6 +26,8 @@ import io.stackgres.operator.conciliation.factory.PostgresDataMounts; import io.stackgres.operator.conciliation.factory.PostgresSocketMount; import io.stackgres.operator.conciliation.factory.distributedlogs.DistributedLogsContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/fluentd/Fluentd.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/fluentd/Fluentd.java index 5706641c30..45672db9e7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/fluentd/Fluentd.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/fluentd/Fluentd.java @@ -12,9 +12,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Container; @@ -52,6 +49,8 @@ import io.stackgres.operator.conciliation.factory.VolumePair; import io.stackgres.operator.conciliation.factory.cluster.sidecars.fluentbit.FluentBit; import io.stackgres.operator.conciliation.factory.distributedlogs.DistributedLogsContainerContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; import org.slf4j.Logger; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/Patroni.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/Patroni.java index 8c7a2bc470..077d4b0e90 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/Patroni.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/Patroni.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.ConfigMapEnvSourceBuilder; import io.fabric8.kubernetes.api.model.Container; @@ -45,6 +42,8 @@ import io.stackgres.operator.conciliation.factory.distributedlogs.DistributedLogsContainerContext; import io.stackgres.operator.conciliation.factory.distributedlogs.HugePagesMounts; import io.stackgres.operator.conciliation.factory.distributedlogs.PostgresExtensionMounts; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigEndpoints.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigEndpoints.java index 20575f001c..c2f9a20728 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigEndpoints.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigEndpoints.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; @@ -26,6 +23,8 @@ import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresBlocklist; import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresDefaultValues; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigMap.java index 546e190625..a9bb9a5fc6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniConfigMap.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; @@ -33,6 +30,8 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEndpoint.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEndpoint.java index 326a572c21..7e92f24186 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEndpoint.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEndpoint.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.PatroniUtil; @@ -19,6 +16,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder(startAt = StackGresVersion.V_1_5) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEnvironmentVariablesFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEnvironmentVariablesFactory.java index 913faa747b..85e4ee8078 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEnvironmentVariablesFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniEnvironmentVariablesFactory.java @@ -7,8 +7,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import com.google.common.collect.ImmutableList; import io.fabric8.kubernetes.api.model.EnvVar; import io.fabric8.kubernetes.api.model.EnvVarBuilder; @@ -17,6 +15,7 @@ import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.AbstractPatroniEnvironmentVariablesFactory; import io.stackgres.operator.conciliation.factory.FactoryName; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @FactoryName(DistributedLogsPatroniEnvironmentVariablesFactory.LATEST_PATRONI_ENV_VAR_FACTORY) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniFailover.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniFailover.java index 04d7e8acfe..faca234e2e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniFailover.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniFailover.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.PatroniUtil; @@ -18,6 +15,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages1Gi.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages1Gi.java index 95be0197af..7a3e636a9e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages1Gi.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages1Gi.java @@ -8,8 +8,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EmptyDirVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeBuilder; @@ -23,6 +21,7 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages2Mi.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages2Mi.java index 712abc3ec3..9e88970c7b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages2Mi.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniHugePages2Mi.java @@ -8,8 +8,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EmptyDirVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.Volume; import io.fabric8.kubernetes.api.model.VolumeBuilder; @@ -23,6 +21,7 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniInitScriptConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniInitScriptConfigMap.java index 21af0f71aa..090834aaaf 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniInitScriptConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniInitScriptConfigMap.java @@ -8,9 +8,6 @@ import java.nio.charset.StandardCharsets; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableMap; import com.google.common.io.Resources; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; @@ -26,6 +23,8 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Unchecked; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRequirementsFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRequirementsFactory.java index 05f4ce24d4..f2eb7e198c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRequirementsFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRequirementsFactory.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Quantity; import io.fabric8.kubernetes.api.model.ResourceRequirements; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsNonProduction; @@ -21,6 +19,7 @@ import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operator.conciliation.factory.ResourceFactory; +import jakarta.inject.Singleton; @Singleton public class PatroniRequirementsFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRole.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRole.java index 9820db34f0..021d14aa7c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRole.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniRole.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ServiceAccount; import io.fabric8.kubernetes.api.model.ServiceAccountBuilder; @@ -37,6 +34,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSecret.java index a9a7005506..907195ed0b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSecret.java @@ -10,9 +10,6 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; @@ -23,6 +20,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniServices.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniServices.java index eb70411d3b..21f2e21302 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniServices.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniServices.java @@ -9,9 +9,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.Service; @@ -29,6 +26,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSync.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSync.java index 291c87a839..fee0cf2ba5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSync.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniSync.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.PatroniUtil; @@ -18,6 +15,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniTemplatesConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniTemplatesConfigMap.java index f910cba837..09037328f7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniTemplatesConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/PatroniTemplatesConfigMap.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ConfigMapBuilder; import io.fabric8.kubernetes.api.model.ConfigMapVolumeSourceBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; @@ -24,6 +21,8 @@ import io.stackgres.operator.conciliation.factory.AbstractPatroniTemplatesConfigMap; import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniConfigMap.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniConfigMap.java index 1ce865ed04..9d504754b9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniConfigMap.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniConfigMap.java @@ -9,9 +9,6 @@ import java.util.Map; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; @@ -33,6 +30,8 @@ import io.stackgres.operator.conciliation.factory.ImmutableVolumePair; import io.stackgres.operator.conciliation.factory.VolumeFactory; import io.stackgres.operator.conciliation.factory.VolumePair; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniEndpoint.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniEndpoint.java index e820b09511..22a0cf78dd 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniEndpoint.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniEndpoint.java @@ -7,9 +7,6 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.PatroniUtil; @@ -19,6 +16,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder(stopAt = StackGresVersion.V_1_4) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniServices.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniServices.java index 363c8fa92d..d951bba109 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniServices.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/distributedlogs/patroni/v14/PatroniServices.java @@ -9,9 +9,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.Service; @@ -29,6 +26,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.distributedlogs.StackGresDistributedLogsContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/DecoratorDiscovererImpl.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/DecoratorDiscovererImpl.java index 7b8eedb3d2..f9b01e03d8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/DecoratorDiscovererImpl.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/DecoratorDiscovererImpl.java @@ -8,15 +8,14 @@ import java.util.List; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.factory.Decorator; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DecoratorDiscovererImpl diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/OwnerReferenceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/OwnerReferenceDecorator.java index 7c3a3c85a1..b68a550454 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/OwnerReferenceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/OwnerReferenceDecorator.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Objects; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.OwnerReference; import io.stackgres.common.resource.ResourceUtil; import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.factory.Decorator; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterConfig.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterConfig.java index 570fe81f8c..d4b974258c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterConfig.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterConfig.java @@ -7,15 +7,14 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.StackGresShardedClusterForCitusUtil; import io.stackgres.common.labels.LabelFactoryForShardedCluster; import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterEndpoints.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterEndpoints.java index 760eadbb02..482508eab4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterEndpoints.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterEndpoints.java @@ -10,9 +10,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.EndpointsBuilder; import io.fabric8.kubernetes.api.model.HasMetadata; @@ -22,6 +19,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterSecret.java index b20b2ce3e9..5dee2ebc55 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterSecret.java @@ -10,9 +10,6 @@ import java.util.UUID; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretBuilder; @@ -24,6 +21,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterServices.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterServices.java index 84624d76d7..dc0ffbf785 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterServices.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusterServices.java @@ -9,9 +9,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.IntOrString; import io.fabric8.kubernetes.api.model.Service; @@ -32,6 +29,8 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusters.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusters.java index 9dad3e8c96..2d72b1c196 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusters.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedClusters.java @@ -7,15 +7,14 @@ import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.labels.LabelFactoryForShardedCluster; import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedPostgresSslSecret.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedPostgresSslSecret.java index 39e8b79c91..f1fab37972 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedPostgresSslSecret.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/factory/shardedcluster/ShardedPostgresSslSecret.java @@ -14,9 +14,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.SecretBuilder; import io.stackgres.common.StackGresUtil; @@ -30,6 +27,8 @@ import io.stackgres.operator.conciliation.ResourceGenerator; import io.stackgres.operator.conciliation.shardedcluster.StackGresShardedClusterContext; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @OperatorVersionBinder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptConciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptConciliator.java index b619fb065f..9eb46eb1d7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptConciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptConciliator.java @@ -5,10 +5,9 @@ package io.stackgres.operator.conciliation.script; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.conciliation.Conciliator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ScriptConciliator extends Conciliator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultComparator.java index 380f1c5b37..1959ba9b22 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.script; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ReconciliationScope(value = StackGresScript.class, kind = "HasMetadata") diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultReconciliationHandler.java index 6764693f9e..5135c376f4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDefaultReconciliationHandler.java @@ -5,13 +5,12 @@ package io.stackgres.operator.conciliation.script; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.conciliation.AbstractReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresScript.class, kind = "HasMetadata") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDeployedResourceScanner.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDeployedResourceScanner.java index a3913b10b6..f867b1e93c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDeployedResourceScanner.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptDeployedResourceScanner.java @@ -9,8 +9,6 @@ import java.util.Map; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesResourceList; import io.fabric8.kubernetes.client.KubernetesClient; @@ -18,6 +16,7 @@ import io.fabric8.kubernetes.client.dsl.Resource; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.conciliation.DeployedResourcesScanner; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ScriptDeployedResourceScanner extends DeployedResourcesScanner { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptHandlerDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptHandlerDelegator.java index cb5307c29b..182104135c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptHandlerDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptHandlerDelegator.java @@ -5,11 +5,6 @@ package io.stackgres.operator.conciliation.script; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgscript.StackGresScript; @@ -17,6 +12,10 @@ import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ScriptHandlerDelegator implements HandlerDelegator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptReconciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptReconciliator.java index 770522bacf..f1c790ddb8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptReconciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptReconciliator.java @@ -5,11 +5,6 @@ package io.stackgres.operator.conciliation.script; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -23,6 +18,10 @@ import io.stackgres.operator.conciliation.Conciliator; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationResult; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.helpers.MessageFormatter; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptRequiredResourcesGenerator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptRequiredResourcesGenerator.java index 68dd9326fe..d0c4668f74 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptRequiredResourcesGenerator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptRequiredResourcesGenerator.java @@ -7,11 +7,10 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.conciliation.RequiredResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptResourceComparisonDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptResourceComparisonDelegator.java index 791a898cf1..2cced9d553 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptResourceComparisonDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptResourceComparisonDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.script; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.conciliation.CustomResourceComparisonDelegator; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; import io.stackgres.operator.conciliation.comparator.ResourceComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ScriptResourceComparisonDelegator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptStatusManager.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptStatusManager.java index dee7bdaf26..e8b624eacb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptStatusManager.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/script/ScriptStatusManager.java @@ -11,9 +11,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.Secret; import io.stackgres.common.crd.sgscript.StackGresScript; @@ -24,6 +21,8 @@ import io.stackgres.common.crd.sgscript.StackGresScriptStatus; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operatorframework.resource.ResourceUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterClusterComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterClusterComparator.java index 5289133f52..c0ee4720cc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterClusterComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterClusterComparator.java @@ -7,12 +7,11 @@ import java.util.regex.Pattern; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresShardedCluster.class, kind = "SGCluster") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterConciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterConciliator.java index 0ad0482f6c..effe517af3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterConciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterConciliator.java @@ -7,13 +7,12 @@ import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.Conciliator; import io.stackgres.operator.conciliation.ReconciliationResult; import io.stackgres.operator.conciliation.ReconciliationUtil; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterConciliator extends Conciliator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultComparator.java index 5b9eff9efb..849d44479a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.AbstractComparator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ReconciliationScope(value = StackGresShardedCluster.class, kind = "HasMetadata") diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultReconciliationHandler.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultReconciliationHandler.java index 83447440fc..421be0b6d7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultReconciliationHandler.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDefaultReconciliationHandler.java @@ -5,13 +5,12 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.AbstractReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ReconciliationScope(value = StackGresShardedCluster.class, kind = "HasMetadata") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDeployedResourceScanner.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDeployedResourceScanner.java index d19709886f..0963493971 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDeployedResourceScanner.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterDeployedResourceScanner.java @@ -8,9 +8,6 @@ import java.util.Map; import java.util.function.Function; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.KubernetesResourceList; @@ -25,6 +22,8 @@ import io.stackgres.common.labels.LabelFactoryForShardedCluster; import io.stackgres.operator.conciliation.DeployedResourcesScanner; import io.stackgres.operator.conciliation.ReconciliationOperations; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterDeployedResourceScanner diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterEndpointsComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterEndpointsComparator.java index 04543a0a43..788729314f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterEndpointsComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterEndpointsComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.EndpointsComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresShardedCluster.class, kind = "Endpoints") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterHandlerDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterHandlerDelegator.java index 136d933eee..77111baeff 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterHandlerDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterHandlerDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.HandlerDelegator; import io.stackgres.operator.conciliation.ReconciliationHandler; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterHandlerDelegator implements HandlerDelegator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterReconciliator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterReconciliator.java index 3eca5a6491..d989980dea 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterReconciliator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterReconciliator.java @@ -5,11 +5,6 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.context.Dependent; -import javax.enterprise.event.Observes; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.runtime.ShutdownEvent; import io.quarkus.runtime.StartupEvent; @@ -29,6 +24,10 @@ import io.stackgres.operator.conciliation.ReconciliationResult; import io.stackgres.operator.conciliation.StatusManager; import io.stackgres.operator.validation.cluster.PostgresConfigValidator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.Dependent; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; import org.slf4j.helpers.MessageFormatter; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecorator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecorator.java index 7a85a1627f..3c671c2e97 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecorator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecorator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.operator.conciliation.AbstractRequiredResourceDecorator; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.factory.DecoratorDiscoverer; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterRequiredResourceDecorator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourcesGenerator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourcesGenerator.java index c10545f3c5..64aca7ba2f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourcesGenerator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourcesGenerator.java @@ -17,9 +17,6 @@ import java.util.function.Supplier; import java.util.stream.IntStream; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Endpoints; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; @@ -50,6 +47,8 @@ import io.stackgres.operator.conciliation.RequiredResourceGenerator; import io.stackgres.operator.conciliation.cluster.ImmutableStackGresClusterContext; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceComparisonDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceComparisonDelegator.java index 57232fcbdd..8510a59641 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceComparisonDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceComparisonDelegator.java @@ -5,17 +5,16 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.CustomResourceComparisonDelegator; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.ReconciliationScopeLiteral; import io.stackgres.operator.conciliation.comparator.ResourceComparator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterResourceComparisonDelegator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceGenerationDiscoverer.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceGenerationDiscoverer.java index 9cc5464b0e..1cb2cfc439 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceGenerationDiscoverer.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterResourceGenerationDiscoverer.java @@ -7,16 +7,15 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.VersionInfo; import io.stackgres.operator.conciliation.KubernetesVersionBinder; import io.stackgres.operator.conciliation.ResourceDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerationDiscoverer; import io.stackgres.operator.conciliation.ResourceGenerator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterResourceGenerationDiscoverer diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterSecretComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterSecretComparator.java index fee0919495..3178adf9eb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterSecretComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterSecretComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.SecretComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresShardedCluster.class, kind = "Secret") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterServiceComparator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterServiceComparator.java index 99c19ffa6c..e8f2400600 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterServiceComparator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterServiceComparator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.conciliation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.ServiceComparator; +import jakarta.enterprise.context.ApplicationScoped; @ReconciliationScope(value = StackGresShardedCluster.class, kind = "Service") @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterStatusManager.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterStatusManager.java index 57446ba200..8c5fa4a40b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterStatusManager.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterStatusManager.java @@ -11,9 +11,6 @@ import java.util.Optional; import java.util.Set; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.StackGresContext; @@ -28,6 +25,8 @@ import io.stackgres.common.labels.LabelFactoryForShardedCluster; import io.stackgres.operator.conciliation.StatusManager; import io.stackgres.operatorframework.resource.ConditionUpdater; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/configuration/OperatorPropertyContext.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/configuration/OperatorPropertyContext.java index cd863fb23a..38d8410762 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/configuration/OperatorPropertyContext.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/configuration/OperatorPropertyContext.java @@ -5,10 +5,9 @@ package io.stackgres.operator.configuration; -import javax.inject.Singleton; - import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresPropertyContext; +import jakarta.inject.Singleton; @Singleton public class OperatorPropertyContext implements StackGresPropertyContext { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/OperatorEventEmitter.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/OperatorEventEmitter.java index d25c864e09..62444b2b24 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/OperatorEventEmitter.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/OperatorEventEmitter.java @@ -5,10 +5,9 @@ package io.stackgres.operator.controller; -import javax.enterprise.context.ApplicationScoped; - import io.fabric8.kubernetes.api.model.Service; import io.stackgres.common.event.AbstractEventEmitter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class OperatorEventEmitter extends AbstractEventEmitter { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/ResourceWatcherFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/ResourceWatcherFactory.java index a54e614051..9b8535b9bf 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/ResourceWatcherFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/controller/ResourceWatcherFactory.java @@ -5,15 +5,14 @@ package io.stackgres.operator.controller; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.client.WatcherException; import io.stackgres.common.OperatorProperty; import io.stackgres.common.event.EventEmitter; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.operatorframework.resource.AbstractResourceWatcherFactory; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ResourceWatcherFactory extends AbstractResourceWatcherFactory { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/Conversion.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/Conversion.java index 91a7904e91..7d7c7d620f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/Conversion.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/Conversion.java @@ -11,7 +11,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; -import javax.inject.Qualifier; +import jakarta.inject.Qualifier; @Qualifier @Retention(RUNTIME) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionPipeline.java index 81d605d252..82701af3e2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresBackupConfig.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionResource.java index 0d70c2c8f2..0795cd6703 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConfigConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionPipeline.java index c17984f7c7..e9d08a0830 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgbackup.StackGresBackup; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresBackup.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionResource.java index 8bc006db86..c8ec807c98 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgBackupConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgbackup.StackGresBackup; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionPipeline.java index 9fb910fdee..d135ac43bb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgcluster.StackGresCluster; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresCluster.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionResource.java index ecfb313951..c15e5c9426 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgClusterConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgcluster.StackGresCluster; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionPipeline.java index ed7b3aaa6e..4518f87c19 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgdbops.StackGresDbOps; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresDbOps.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionResource.java index 1035dec4ff..648ee60bfe 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDbOpsConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgdbops.StackGresDbOps; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionPipeline.java index 0f87139945..7c44981ca6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresDistributedLogs.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionResource.java index aeac906f19..bd51d9d8b7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgDistributedLogsConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionPipeline.java index c5dff86391..4a8f5539fb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgprofile.StackGresProfile; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresProfile.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionResource.java index cc6c375bf1..114fce205a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgInstanceProfileConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgprofile.StackGresProfile; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipeline.java index ef9dd7d6a0..2d31130426 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresPoolingConfig.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionResource.java index 8edddbc7cb..04e2ad246c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPoolingConfigConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipeline.java index ca6a068c70..5cc22d1fc2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipeline.java @@ -7,12 +7,11 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped @Conversion(StackGresPostgresConfig.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionResource.java index 3fc6c3aa8c..d64f9bad4f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/SgPostgresConfigConversionResource.java @@ -5,16 +5,15 @@ package io.stackgres.operator.conversion; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertBackupPathPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertBackupPathPostVersion1.java index 64ae400e5b..728ea4134d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertBackupPathPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertBackupPathPostVersion1.java @@ -9,12 +9,11 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.node.ObjectNode; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresCluster.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertFromBackupPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertFromBackupPostVersion1.java index 7a06f21d99..3ce026f54f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertFromBackupPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertFromBackupPostVersion1.java @@ -9,12 +9,11 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.node.ObjectNode; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresCluster.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertMetadataPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertMetadataPostVersion1.java index c7d8ceece4..4ade21617e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertMetadataPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertMetadataPostVersion1.java @@ -9,13 +9,12 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresCluster.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertPostgresVersionPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertPostgresVersionPostVersion1.java index 90bbb0dc76..a6285ff795 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertPostgresVersionPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertPostgresVersionPostVersion1.java @@ -9,12 +9,11 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.node.ObjectNode; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresCluster.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertReplicationPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertReplicationPostVersion1.java index 5565bc6680..aab635d64a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertReplicationPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgcluster/ConvertReplicationPostVersion1.java @@ -9,14 +9,13 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.node.ObjectNode; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresReplicationMode; import io.stackgres.common.crd.sgcluster.StackGresReplicationRole; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresCluster.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpgconfig/ConvertDefaultParametersPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpgconfig/ConvertDefaultParametersPostVersion1.java index 402aa95874..250401d7d3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpgconfig/ConvertDefaultParametersPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpgconfig/ConvertDefaultParametersPostVersion1.java @@ -9,8 +9,6 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -18,6 +16,7 @@ import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresDefaultValues; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresPostgresConfig.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/ConvertDefaultParametersPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/ConvertDefaultParametersPostVersion1.java index a22631cc8e..a3ae44bdfe 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/ConvertDefaultParametersPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/ConvertDefaultParametersPostVersion1.java @@ -9,14 +9,13 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerDefaultValues; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresPoolingConfig.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/PgBouncerSpecMigrationPostVersion1.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/PgBouncerSpecMigrationPostVersion1.java index 2a8afa5fec..f650e71b28 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/PgBouncerSpecMigrationPostVersion1.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/conversion/sgpoolconfig/PgBouncerSpecMigrationPostVersion1.java @@ -9,12 +9,11 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import com.fasterxml.jackson.databind.node.ObjectNode; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.conversion.Conversion; import io.stackgres.operator.conversion.Converter; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @Conversion(StackGresPoolingConfig.KIND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/BackupConfigFactoryProvider.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/BackupConfigFactoryProvider.java index c61c71825c..7f7e7abaff 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/BackupConfigFactoryProvider.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/BackupConfigFactoryProvider.java @@ -7,11 +7,10 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupConfigFactoryProvider diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultBackupFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultBackupFactory.java index 4a1f7d7cb8..31353afa44 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultBackupFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultBackupFactory.java @@ -7,15 +7,14 @@ import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresPropertyContext; import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigSpec; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultBackupFactory extends AbstractCustomResourceFactory { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultClusterRestoreFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultClusterRestoreFactory.java index e1ae4ff7e8..af8ed0921e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultClusterRestoreFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultClusterRestoreFactory.java @@ -7,14 +7,13 @@ import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresPropertyContext; import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgcluster.StackGresClusterRestore; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultClusterRestoreFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultObjectStorageFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultObjectStorageFactory.java index ddb2332032..3b11a57957 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultObjectStorageFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultObjectStorageFactory.java @@ -7,15 +7,14 @@ import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresPropertyContext; import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.common.crd.storages.BackupStorage; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultObjectStorageFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPoolingFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPoolingFactory.java index cbe3ec632e..1a0baa115b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPoolingFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPoolingFactory.java @@ -10,10 +10,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresPropertyContext; @@ -21,6 +17,9 @@ import io.stackgres.common.crd.sgpooling.StackGresPoolingConfigBuilder; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerBlocklist; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerDefaultValues; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultPoolingFactory diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPostgresFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPostgresFactory.java index be8c962299..7bd6665446 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPostgresFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultPostgresFactory.java @@ -10,10 +10,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.enterprise.context.Dependent; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresComponent; @@ -22,6 +18,9 @@ import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigBuilder; import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresBlocklist; import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresDefaultValues; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.Dependent; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @Dependent diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultProfileFactory.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultProfileFactory.java index 235ec21982..ddd10ce1ea 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultProfileFactory.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/DefaultProfileFactory.java @@ -7,15 +7,14 @@ import java.util.Properties; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresPropertyContext; import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultProfileFactory extends AbstractCustomResourceFactory { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ObjectStorageFactoryProvider.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ObjectStorageFactoryProvider.java index c46fb34b47..234c28225d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ObjectStorageFactoryProvider.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ObjectStorageFactoryProvider.java @@ -7,10 +7,9 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ObjectStorageFactoryProvider diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PoolingFactoryProvider.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PoolingFactoryProvider.java index e980b53ae4..009ad02b40 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PoolingFactoryProvider.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PoolingFactoryProvider.java @@ -7,11 +7,10 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PoolingFactoryProvider diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PostgresDefaultFactoriesProvider.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PostgresDefaultFactoriesProvider.java index 491fdf6ecc..3aac65ad30 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PostgresDefaultFactoriesProvider.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/PostgresDefaultFactoriesProvider.java @@ -7,14 +7,13 @@ import java.util.List; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.StackGresComponent; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ProfileFactoryProvider.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ProfileFactoryProvider.java index bc472335ae..b643350543 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ProfileFactoryProvider.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/initialization/ProfileFactoryProvider.java @@ -7,11 +7,10 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.crd.sgprofile.StackGresProfile; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ProfileFactoryProvider diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/AbstractMutationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/AbstractMutationPipeline.java index 5df9de4fb4..6b292eeeaa 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/AbstractMutationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/AbstractMutationPipeline.java @@ -5,13 +5,12 @@ package io.stackgres.operator.mutation; -import javax.enterprise.inject.Instance; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.stackgres.common.CdiUtil; import io.stackgres.operatorframework.admissionwebhook.AdmissionReview; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.Mutator; +import jakarta.enterprise.inject.Instance; public abstract class AbstractMutationPipeline> extends MutationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupConfigMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupConfigMutationResource.java index 869806ff73..335fc5e7a5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupConfigMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupConfigMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.BACKUPCONFIG_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupMutationResource.java index 07b4f3fad3..e597a428e6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/BackupMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.BACKUP_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ClusterMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ClusterMutationResource.java index 243cae8dfe..4e465b76f1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ClusterMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ClusterMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.CLUSTER_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DbOpsMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DbOpsMutationResource.java index 4def2713eb..2887b9ae7d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DbOpsMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DbOpsMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.DBOPS_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DistributedLogsMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DistributedLogsMutationResource.java index 1ec7656ab5..2da51b8336 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DistributedLogsMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/DistributedLogsMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.DISTRIBUTED_LOGS_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ObjectStorageMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ObjectStorageMutationResource.java index 00d66f9495..53f54f350f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ObjectStorageMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ObjectStorageMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.OBJECT_STORAGE_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/PgConfigMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/PgConfigMutationResource.java index 16d2f1f561..af7b6ca9d3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/PgConfigMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/PgConfigMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.PGCONFIG_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ScriptMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ScriptMutationResource.java index 0939059629..e4699002b6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ScriptMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ScriptMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgPgBouncerMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgPgBouncerMutationResource.java index b0b09d8443..e737c345d4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgPgBouncerMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgPgBouncerMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.CONNPOOLCONFIG_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgProfileMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgProfileMutationResource.java index f769e39ec7..96736c0061 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgProfileMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/SgProfileMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.PROFILE_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ShardedClusterMutationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ShardedClusterMutationResource.java index 32a11cbf1a..da812f272f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ShardedClusterMutationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/ShardedClusterMutationResource.java @@ -5,14 +5,6 @@ package io.stackgres.operator.mutation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; @@ -21,6 +13,13 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationPipeline; import io.stackgres.operatorframework.admissionwebhook.mutating.MutationResource; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; @Path(MutationUtil.SHARDED_CLUSTER_MUTATION_PATH) @Produces(MediaType.APPLICATION_JSON) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupAnnotationMutator.java index d21bd24741..087669c858 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupAnnotationMutator.java @@ -7,13 +7,12 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.StackGresVersion; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.common.BackupReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPerformanceMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPerformanceMutator.java index ebe40de8de..f033c157c9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPerformanceMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPerformanceMutator.java @@ -7,14 +7,13 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupStatus; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigSpec; import io.stackgres.common.crd.sgbackupconfig.StackGresBaseBackupConfig; import io.stackgres.operator.common.BackupReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupPerformanceMutator implements BackupMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPipeline.java index a8e227d35d..e10847554d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backup/BackupPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.backup; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.common.BackupReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class BackupPipeline extends AbstractMutationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupAnnotationMutator.java index 3bce9b7b5a..e099a763cb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.backupconfig; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigDefaultValuesMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigDefaultValuesMutator.java index c64bd03582..17eb8c9e2f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigDefaultValuesMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigDefaultValuesMutator.java @@ -5,15 +5,14 @@ package io.stackgres.operator.mutation.backupconfig; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractValuesMutator; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class BackupConfigDefaultValuesMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigPipeline.java index 93710748e6..af4b3a63b8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupConfigPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.backupconfig; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class BackupConfigPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupPerformanceMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupPerformanceMutator.java index 15a79d061d..aa596caefc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupPerformanceMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/backupconfig/BackupPerformanceMutator.java @@ -7,13 +7,12 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfigSpec; import io.stackgres.common.crd.sgbackupconfig.StackGresBaseBackupConfig; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupPerformanceMutator implements BackupConfigMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/BackupPerformanceMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/BackupPerformanceMutator.java index 1fa5c39454..1f230c3916 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/BackupPerformanceMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/BackupPerformanceMutator.java @@ -8,14 +8,13 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterBackupConfiguration; import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; import io.stackgres.common.crd.sgcluster.StackGresClusterSpec; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupPerformanceMutator implements ClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterAnnotationMutator.java index 1b51e5975a..412a3ea288 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ClusterAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterPipeline.java index 349af5986a..3b51d2fa4d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ClusterPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupPathMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupPathMutator.java index e60b90e0c4..5dc37b2503 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupPathMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupPathMutator.java @@ -9,13 +9,12 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.BackupStorageUtil; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupStorageMigratorMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupStorageMigratorMutator.java index 25043065cc..e57354affd 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupStorageMigratorMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultBackupStorageMigratorMutator.java @@ -9,9 +9,6 @@ import java.util.List; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ObjectMetaBuilder; import io.stackgres.common.BackupStorageUtil; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; @@ -26,6 +23,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.mutating.MutatorWeight; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped @MutatorWeight(10) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPoolingMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPoolingMutator.java index 02b78e05e5..de2454d035 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPoolingMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPoolingMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; @@ -16,6 +13,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractDefaultResourceMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultPoolingMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresDelegator.java index ba3d50fe67..28ea3865c5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresDelegator.java @@ -12,9 +12,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterPostgres; import io.stackgres.common.crd.sgcluster.StackGresClusterSpec; @@ -24,6 +21,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.initialization.PostgresConfigurationFactory; import io.stackgres.operator.initialization.PostgresDefaultFactoriesProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Unchecked; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresServicesMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresServicesMutator.java index ea347229b8..33df3882ed 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresServicesMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresServicesMutator.java @@ -5,8 +5,6 @@ package io.stackgres.operator.mutation.cluster; -import javax.enterprise.context.ApplicationScoped; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.stackgres.common.crd.postgres.service.StackGresPostgresServiceType; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -14,6 +12,7 @@ import io.stackgres.common.crd.sgcluster.StackGresClusterPostgresServices; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultPostgresServicesMutator implements ClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresVersionMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresVersionMutator.java index 5e31c3c68b..136df97902 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresVersionMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultPostgresVersionMutator.java @@ -10,12 +10,11 @@ import java.util.Objects; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresComponent; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultPostgresVersionMutator implements ClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultProfileMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultProfileMutator.java index ccd17bd271..f76716fc0a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultProfileMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultProfileMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.resource.CustomResourceFinder; @@ -15,6 +12,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractDefaultResourceMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultProfileMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultReplicationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultReplicationMutator.java index 236ad8c0fc..edbe6d4ce3 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultReplicationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultReplicationMutator.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterReplication; import io.stackgres.common.crd.sgcluster.StackGresMainReplicationRole; import io.stackgres.common.crd.sgcluster.StackGresReplicationMode; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultRestoreMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultRestoreMutator.java index 5f67156ddc..b001cec45b 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultRestoreMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/DefaultRestoreMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -15,6 +12,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultRestoreMutator implements ClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ExtensionsMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ExtensionsMutator.java index 581677cf0a..cf6783edc2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ExtensionsMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ExtensionsMutator.java @@ -11,9 +11,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.StackGresComponent; import io.stackgres.common.StackGresUtil; @@ -29,6 +26,8 @@ import io.stackgres.operator.mutation.AbstractExtensionsMutator; import io.stackgres.operator.validation.ValidationUtil; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ScriptsConfigMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ScriptsConfigMutator.java index f6ff765ca0..4f1bd6141a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ScriptsConfigMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/cluster/ScriptsConfigMutator.java @@ -10,8 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.ManagedSqlUtil; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedScriptEntry; @@ -22,6 +20,7 @@ import io.stackgres.common.crd.sgcluster.StackGresClusterStatus; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsAnnotationMutator.java index 53bb2c92ee..39a5a755ee 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsAnnotationMutator.java @@ -7,13 +7,12 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.StackGresVersion; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DbOpsAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsMajorVersionUpgradeMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsMajorVersionUpgradeMutator.java index f112b80a42..d14b263405 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsMajorVersionUpgradeMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsMajorVersionUpgradeMutator.java @@ -10,9 +10,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.base.Predicates; import io.stackgres.common.BackupStorageUtil; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -22,6 +19,8 @@ import io.stackgres.common.resource.CustomResourceFinder; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsMajorVersionUpgradeMutator implements DbOpsMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsPipeline.java index 3d93bec08c..34490236b5 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsPipeline extends AbstractMutationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsStatusResetMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsStatusResetMutator.java index 6d7663522f..ad2e4b6403 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsStatusResetMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/dbops/DbOpsStatusResetMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.dbops; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DbOpsStatusResetMutator implements DbOpsMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresDelegator.java index 76d3d828b7..59a6cdb5e6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresDelegator.java @@ -12,9 +12,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresDistributedLogsUtil; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; @@ -23,6 +20,8 @@ import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.initialization.PostgresConfigurationFactory; import io.stackgres.operator.initialization.PostgresDefaultFactoriesProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Unchecked; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresServicesMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresServicesMutator.java index 20b3265719..a5f91bb427 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresServicesMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultPostgresServicesMutator.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.postgres.service.StackGresPostgresService; import io.stackgres.common.crd.postgres.service.StackGresPostgresServiceType; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogsPostgresServices; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultPostgresServicesMutator implements DistributedLogsMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultProfileMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultProfileMutator.java index 9e4adef165..3f421af998 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultProfileMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DefaultProfileMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.CdiUtil; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgprofile.StackGresProfile; @@ -16,6 +13,8 @@ import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractDefaultResourceMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultProfileMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsAnnotationMutator.java index 334c8f0eaa..d008f55d32 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DistributedLogsAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsPipeline.java index 8bf441bf28..f2243e8ef1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/DistributedLogsPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/ExtensionsMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/ExtensionsMutator.java index 689a6a82e2..0bf7551507 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/ExtensionsMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/distributedlogs/ExtensionsMutator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.collect.ImmutableList; import io.stackgres.common.StackGresDistributedLogsUtil; import io.stackgres.common.StackGresUtil; @@ -22,6 +19,8 @@ import io.stackgres.operator.common.OperatorExtensionMetadataManager; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.mutation.AbstractExtensionsMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageAnnotationMutator.java index f80837803a..8e7992731e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.objectstorage; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ObjectStorageAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageDefaultValuesMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageDefaultValuesMutator.java index 285e4e7f2f..e97fb6e5bc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageDefaultValuesMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStorageDefaultValuesMutator.java @@ -5,15 +5,14 @@ package io.stackgres.operator.mutation.objectstorage; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractValuesMutator; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class ObjectStorageDefaultValuesMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStoragePipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStoragePipeline.java index 797cb9ee04..58f5460100 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStoragePipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/objectstorage/ObjectStoragePipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.objectstorage; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ObjectStoragePipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerAnnotationMutator.java index 1bb735e1e0..755d8410c0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.pgbouncer; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PgBouncerAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerDefaultValuesMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerDefaultValuesMutator.java index 99a376c4d5..31f30f2a90 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerDefaultValuesMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerDefaultValuesMutator.java @@ -5,15 +5,14 @@ package io.stackgres.operator.mutation.pgbouncer; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractValuesMutator; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PgBouncerDefaultValuesMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerPipeline.java index db0d6d7878..d9b36303ba 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgbouncer/PgBouncerPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.pgbouncer; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class PgBouncerPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigAnnotationMutator.java index 7c1caa48df..cac2723f7f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.pgconfig; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PgConfigAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigDefaultValuesDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigDefaultValuesDelegator.java index 804d31f0cd..4586316381 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigDefaultValuesDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigDefaultValuesDelegator.java @@ -10,15 +10,14 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfigSpec; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.initialization.PostgresConfigurationFactory; import io.stackgres.operator.initialization.PostgresDefaultFactoriesProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PgConfigDefaultValuesDelegator implements PgConfigMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigPipeline.java index 254143d5cc..97012d15c4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/pgconfig/PgConfigPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.pgconfig; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class PgConfigPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/DefaultContainersProfileMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/DefaultContainersProfileMutator.java index a7c4e5c494..62c0d03df4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/DefaultContainersProfileMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/DefaultContainersProfileMutator.java @@ -13,10 +13,6 @@ import java.util.Optional; import java.util.stream.Stream; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.google.common.base.Predicates; import io.fabric8.kubernetes.api.model.Quantity; import io.stackgres.common.StackGresContainer; @@ -29,6 +25,9 @@ import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultContainersProfileMutator implements ProfileMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfileAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfileAnnotationMutator.java index 6f91eadcd8..d65ce1dc5c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfileAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfileAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.profile; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ProfileAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfilePipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfilePipeline.java index 19728ab317..ce804f5f11 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfilePipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/ProfilePipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.profile; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ProfilePipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/SgProfileDefaultValuesMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/SgProfileDefaultValuesMutator.java index 0814a450de..5850c55dc9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/SgProfileDefaultValuesMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/profile/SgProfileDefaultValuesMutator.java @@ -5,15 +5,14 @@ package io.stackgres.operator.mutation.profile; -import javax.annotation.PostConstruct; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractValuesMutator; +import jakarta.annotation.PostConstruct; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class SgProfileDefaultValuesMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptAnnotationMutator.java index ea43f52c7a..dc122c0a58 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptAnnotationMutator.java @@ -7,13 +7,12 @@ import java.util.Map; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresContext; import io.stackgres.common.StackGresVersion; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ScriptAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptPipeline.java index 7e06029f79..8ffb25928e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.script; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ScriptPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptsConfigMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptsConfigMutator.java index 2c42e3b215..c2bd9f9dcf 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptsConfigMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/script/ScriptsConfigMutator.java @@ -10,8 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.common.crd.sgscript.StackGresScriptEntry; import io.stackgres.common.crd.sgscript.StackGresScriptEntryStatus; @@ -19,6 +17,7 @@ import io.stackgres.common.crd.sgscript.StackGresScriptStatus; import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/CoordinatorScriptsConfigMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/CoordinatorScriptsConfigMutator.java index 2e24febdbe..9eaf33ddf1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/CoordinatorScriptsConfigMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/CoordinatorScriptsConfigMutator.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresClusterManagedScriptEntry; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedSql; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -17,6 +15,7 @@ import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterSpec; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class CoordinatorScriptsConfigMutator implements ShardedClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultBackupPathsMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultBackupPathsMutator.java index d2760e4d13..5d05372043 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultBackupPathsMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultBackupPathsMutator.java @@ -10,14 +10,13 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.BackupStorageUtil; import io.stackgres.common.StackGresShardedClusterForCitusUtil; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterConfiguration; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; import org.jooq.lambda.Seq; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPoolingMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPoolingMutator.java index 386dab20e2..6727ce5699 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPoolingMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPoolingMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -17,6 +14,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractDefaultResourceMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultCoordinatorPoolingMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPostgresDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPostgresDelegator.java index f77e601f49..564932e9ea 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPostgresDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorPostgresDelegator.java @@ -12,9 +12,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresClusterPostgres; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -24,6 +21,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.initialization.PostgresConfigurationFactory; import io.stackgres.operator.initialization.PostgresDefaultFactoriesProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Unchecked; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorProfileMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorProfileMutator.java index 391f4043c7..d11c786409 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorProfileMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorProfileMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterCoordinator; @@ -16,6 +13,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractDefaultResourceMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultCoordinatorProfileMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorReplicationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorReplicationMutator.java index 215104ca96..c880774daf 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorReplicationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultCoordinatorReplicationMutator.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresReplicationMode; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterCoordinator; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterReplication; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultCoordinatorReplicationMutator implements ShardedClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresServicesMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresServicesMutator.java index 62531a4db8..b6f2542d4f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresServicesMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresServicesMutator.java @@ -5,8 +5,6 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.stackgres.common.crd.postgres.service.StackGresPostgresService; import io.stackgres.common.crd.postgres.service.StackGresPostgresServiceType; @@ -16,6 +14,7 @@ import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterPostgresShardsServices; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultPostgresServicesMutator implements ShardedClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresSslMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresSslMutator.java index 52ab860651..372013a645 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresSslMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresSslMutator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresClusterSsl; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultPostgresSslMutator implements ShardedClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresVersionMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresVersionMutator.java index cbcfff540b..7a9e32b704 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresVersionMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultPostgresVersionMutator.java @@ -10,12 +10,11 @@ import java.util.Objects; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.StackGresComponent; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultPostgresVersionMutator implements ShardedClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultReplicationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultReplicationMutator.java index 7265828c62..24dc3651e4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultReplicationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultReplicationMutator.java @@ -5,13 +5,12 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresReplicationMode; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterReplication; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class DefaultReplicationMutator implements ShardedClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPoolingMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPoolingMutator.java index f2be294de1..859a3140d1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPoolingMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPoolingMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -17,6 +14,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractDefaultResourceMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultShardsPoolingMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPostgresDelegator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPostgresDelegator.java index 90f6915a9c..c82037e193 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPostgresDelegator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsPostgresDelegator.java @@ -12,9 +12,6 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresClusterPostgres; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -24,6 +21,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.initialization.PostgresConfigurationFactory; import io.stackgres.operator.initialization.PostgresDefaultFactoriesProvider; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Unchecked; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsProfileMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsProfileMutator.java index d07b3bbd1b..5c5224de39 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsProfileMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/DefaultShardsProfileMutator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterShards; @@ -16,6 +13,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.initialization.DefaultCustomResourceFactory; import io.stackgres.operator.mutation.AbstractDefaultResourceMutator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class DefaultShardsProfileMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ExtensionsMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ExtensionsMutator.java index f4c6a5a4b4..bd2c85c29f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ExtensionsMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ExtensionsMutator.java @@ -12,9 +12,6 @@ import java.util.Map; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.stackgres.common.StackGresComponent; import io.stackgres.common.StackGresShardedClusterForCitusUtil; import io.stackgres.common.StackGresUtil; @@ -32,6 +29,8 @@ import io.stackgres.operator.mutation.AbstractExtensionsMutator; import io.stackgres.operator.validation.ValidationUtil; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterAnnotationMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterAnnotationMutator.java index 1c449715e8..00b94ef4d0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterAnnotationMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterAnnotationMutator.java @@ -5,11 +5,10 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.mutation.AbstractAnnotationMutator; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ShardedClusterAnnotationMutator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterPipeline.java index e1b0113c6a..461cb554e0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardedClusterPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.mutation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.mutation.AbstractMutationPipeline; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardsScriptsConfigMutator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardsScriptsConfigMutator.java index b230941ffe..a0e43adebf 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardsScriptsConfigMutator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/mutation/shardedcluster/ShardsScriptsConfigMutator.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgcluster.StackGresClusterManagedScriptEntry; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedSql; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -17,6 +15,7 @@ import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterSpec; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.Operation; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ShardsScriptsConfigMutator implements ShardedClusterMutator { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/PrometheusScanner.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/PrometheusScanner.java index 20bc6f5416..ee54ade3ee 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/PrometheusScanner.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/PrometheusScanner.java @@ -5,13 +5,12 @@ package io.stackgres.operator.resource; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.prometheus.PrometheusConfig; import io.stackgres.common.prometheus.PrometheusConfigList; import io.stackgres.common.resource.AbstractCustomResourceScanner; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; @ApplicationScoped public class PrometheusScanner diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/ServiceAccountFinder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/ServiceAccountFinder.java index b72c79dc42..40e36c0367 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/ServiceAccountFinder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/resource/ServiceAccountFinder.java @@ -7,13 +7,12 @@ import java.util.Optional; -import javax.enterprise.context.ApplicationScoped; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.ServiceAccount; import io.fabric8.kubernetes.client.KubernetesClient; import io.stackgres.common.resource.ResourceFinder; import io.stackgres.common.resource.ResourceWriter; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.inject.Inject; import org.jetbrains.annotations.NotNull; @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/AbstractGenericExceptionMapper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/AbstractGenericExceptionMapper.java index 9ba8e83d1b..71482bb8c0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/AbstractGenericExceptionMapper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/AbstractGenericExceptionMapper.java @@ -5,17 +5,16 @@ package io.stackgres.operator.rest; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; -import javax.ws.rs.ext.ExceptionMapper; - import com.google.common.base.Throwables; import io.quarkus.resteasy.runtime.UnauthorizedExceptionMapper; import io.quarkus.security.UnauthorizedException; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.UriInfo; +import jakarta.ws.rs.ext.ExceptionMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ApplicationExceptionMapper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ApplicationExceptionMapper.java index d527783aab..94e6a5f07d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ApplicationExceptionMapper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ApplicationExceptionMapper.java @@ -5,8 +5,7 @@ package io.stackgres.operator.rest; -import javax.ws.rs.ext.Provider; - +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.ApplicationException; @Provider diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/GenericExceptionMapper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/GenericExceptionMapper.java index 1304a9630a..0a72b14315 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/GenericExceptionMapper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/GenericExceptionMapper.java @@ -5,7 +5,7 @@ package io.stackgres.operator.rest; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.ext.Provider; @Provider public class GenericExceptionMapper extends AbstractGenericExceptionMapper { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ReaderExceptionMapper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ReaderExceptionMapper.java index e1f35784f8..3476a1116e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ReaderExceptionMapper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/ReaderExceptionMapper.java @@ -5,8 +5,7 @@ package io.stackgres.operator.rest; -import javax.ws.rs.ext.Provider; - +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.ReaderException; @Provider diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/WriterExceptionMapper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/WriterExceptionMapper.java index 6e53e1c268..3c1b1429c8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/WriterExceptionMapper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/rest/WriterExceptionMapper.java @@ -5,8 +5,7 @@ package io.stackgres.operator.rest; -import javax.ws.rs.ext.Provider; - +import jakarta.ws.rs.ext.Provider; import org.jboss.resteasy.spi.WriterException; @Provider diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractDefaultConfigKeeper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractDefaultConfigKeeper.java index d5e523ec15..d404fcf4ac 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractDefaultConfigKeeper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractDefaultConfigKeeper.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation; -import javax.inject.Inject; - import io.fabric8.kubernetes.client.CustomResource; import io.stackgres.common.ErrorType; import io.stackgres.operatorframework.admissionwebhook.AdmissionRequest; import io.stackgres.operatorframework.admissionwebhook.AdmissionReview; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.inject.Inject; public abstract class AbstractDefaultConfigKeeper , T extends AdmissionReview> diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractValidationPipeline.java index a66f2cefea..04851bb8ce 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/AbstractValidationPipeline.java @@ -8,13 +8,12 @@ import java.util.Comparator; import java.util.Objects; -import javax.enterprise.inject.Instance; - import io.stackgres.common.CdiUtil; import io.stackgres.operatorframework.admissionwebhook.AdmissionReview; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.inject.Instance; public abstract class AbstractValidationPipeline> extends io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupConfigValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupConfigValidationResource.java index c3028065a1..f6ad9152b8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupConfigValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupConfigValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupValidationResource.java index 82afe9e225..79133e5006 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/BackupValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.BackupReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ClusterValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ClusterValidationResource.java index 76c77c737d..eeeae51e51 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ClusterValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ClusterValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ConstraintValidator.java index d136d147b4..cc03375f14 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ConstraintValidator.java @@ -12,10 +12,6 @@ import java.util.Optional; import java.util.Set; -import javax.annotation.PostConstruct; -import javax.inject.Inject; -import javax.validation.ConstraintViolation; - import com.fasterxml.jackson.annotation.JsonProperty; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Status; @@ -28,6 +24,9 @@ import io.stackgres.operatorframework.admissionwebhook.AdmissionReview; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Inject; +import jakarta.validation.ConstraintViolation; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; @@ -38,7 +37,7 @@ public abstract class ConstraintValidator> implemen private final Logger log = LoggerFactory.getLogger(getClass()); - private javax.validation.Validator constraintValidator; + private jakarta.validation.Validator constraintValidator; private String constraintViolationDocumentationUri; @@ -164,7 +163,7 @@ private Tuple2> replacePropertyPathWithJsonProperties( } @Inject - public void setConstraintValidator(javax.validation.Validator constraintValidator) { + public void setConstraintValidator(jakarta.validation.Validator constraintValidator) { this.constraintValidator = constraintValidator; } } diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DbOpsValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DbOpsValidationResource.java index ffaf3f3b40..9688ae9bbb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DbOpsValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DbOpsValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DependenciesValidator.java index 3f66e2dafc..13f60b63ff 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DependenciesValidator.java @@ -8,8 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.Status; import io.fabric8.kubernetes.api.model.StatusBuilder; import io.fabric8.kubernetes.client.CustomResource; @@ -20,6 +18,7 @@ import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.inject.Inject; public abstract class DependenciesValidator, R extends CustomResource> diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DistributedLogsValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DistributedLogsValidationResource.java index 5ecc3b87ad..5537010265 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DistributedLogsValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/DistributedLogsValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ObjectStorageValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ObjectStorageValidationResource.java index 42a593e3aa..9a556784db 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ObjectStorageValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ObjectStorageValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PgBouncerValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PgBouncerValidationResource.java index a9d5d2f64c..7acab03dfd 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PgBouncerValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PgBouncerValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PostgresConfigValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PostgresConfigValidationResource.java index a20de26f51..3d8c6520a0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PostgresConfigValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/PostgresConfigValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ScriptValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ScriptValidationResource.java index be593c4422..0de7e3ea44 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ScriptValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ScriptValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/SgProfileValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/SgProfileValidationResource.java index 6ac0811333..4c87107721 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/SgProfileValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/SgProfileValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ShardedClusterValidationResource.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ShardedClusterValidationResource.java index 764f51e83b..4b6528e875 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ShardedClusterValidationResource.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ShardedClusterValidationResource.java @@ -5,19 +5,18 @@ package io.stackgres.operator.validation; -import javax.enterprise.event.Observes; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - import io.quarkus.runtime.StartupEvent; import io.stackgres.common.CdiUtil; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operatorframework.admissionwebhook.AdmissionReviewResponse; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.enterprise.event.Observes; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ValidationType.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ValidationType.java index 8dfaa8905a..954be18b61 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ValidationType.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/ValidationType.java @@ -11,10 +11,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.inject.Qualifier; - import io.quarkus.runtime.annotations.RegisterForReflection; import io.stackgres.common.ErrorType; +import jakarta.inject.Qualifier; @Qualifier @Target({ElementType.TYPE}) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupConstraintValidation.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupConstraintValidation.java index 06aece7b08..24e86e5e81 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupConstraintValidation.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupConstraintValidation.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.backup; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.BackupReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupStatusValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupStatusValidator.java index d3ebcfec0a..4962a92037 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupStatusValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupStatusValidator.java @@ -8,9 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupInformation; @@ -20,6 +17,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_UPDATE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupValidationPipeline.java index 296f89f4d3..ea34fee088 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/BackupValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.backup; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.BackupReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class BackupValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/ClusterValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/ClusterValidator.java index f87957381a..b354f3f8fb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/ClusterValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backup/ClusterValidator.java @@ -9,9 +9,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupStatus; @@ -21,6 +18,8 @@ import io.stackgres.operator.resource.NamedResource; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigConstraintValidation.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigConstraintValidation.java index 950a3f70fd..0de8c75ac8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigConstraintValidation.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigConstraintValidation.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.backupconfig; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDefaultCustomResourceHolder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDefaultCustomResourceHolder.java index 525e729de5..bd4de601d0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDefaultCustomResourceHolder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDefaultCustomResourceHolder.java @@ -5,10 +5,9 @@ package io.stackgres.operator.validation.backupconfig; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.operator.validation.AbstractDefaultCustomResourceHolder; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class BackupConfigDefaultCustomResourceHolder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDenyCreationValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDenyCreationValidator.java index 38a7f9caa7..58c90d80c2 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDenyCreationValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDenyCreationValidator.java @@ -5,8 +5,6 @@ package io.stackgres.operator.validation.backupconfig; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; @@ -14,6 +12,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_CREATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDependenciesValidator.java index eedfede80d..16a35705d6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigDependenciesValidator.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageTypeValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageTypeValidator.java index 6f7ef6f1a0..14c3adf973 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageTypeValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageTypeValidator.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.backupconfig; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableList; import io.stackgres.common.ErrorType; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageValidator.java index 78b0a9fad9..792e535bf7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigStorageValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.stackgres.common.ErrorType; @@ -23,6 +20,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigValidationPipeline.java index dd9bd97c0a..b8c30cd1e8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/BackupConfigValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.backupconfig; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class BackupConfigValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/DefaultBackupConfigKeeper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/DefaultBackupConfigKeeper.java index 8788d78733..1d782122fc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/DefaultBackupConfigKeeper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/backupconfig/DefaultBackupConfigKeeper.java @@ -5,13 +5,12 @@ package io.stackgres.operator.validation.backupconfig; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgbackupconfig.StackGresBackupConfig; import io.stackgres.operator.common.BackupConfigReview; import io.stackgres.operator.validation.AbstractDefaultConfigKeeper; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.DEFAULT_CONFIGURATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BabelfishFlavorValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BabelfishFlavorValidator.java index 35f316f991..b495ab5eba 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BabelfishFlavorValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BabelfishFlavorValidator.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterNonProduction; @@ -20,6 +18,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.AdmissionRequest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BackupConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BackupConfigValidator.java index 7d5d226e5a..b1952c10ba 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BackupConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/BackupConfigValidator.java @@ -5,8 +5,6 @@ package io.stackgres.operator.validation.cluster; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; @@ -15,6 +13,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidator.java index 9d3645c6b9..093e55ba87 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.cluster; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterPersistentVolumeSizeExpansionValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterPersistentVolumeSizeExpansionValidator.java index 6063a1c6cc..c1e72a4bc4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterPersistentVolumeSizeExpansionValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterPersistentVolumeSizeExpansionValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; @@ -26,6 +23,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterValidationPipeline.java index dd9a688c15..69984f4a82 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ClusterValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.cluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ClusterValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/DistributedLogsValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/DistributedLogsValidator.java index d20ed35f69..701d18baeb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/DistributedLogsValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/DistributedLogsValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -19,6 +16,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ExtensionsValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ExtensionsValidator.java index 8f07e10d64..7d4de4ccef 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ExtensionsValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ExtensionsValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ExtensionTuple; import io.stackgres.common.StackGresComponent; import io.stackgres.common.StackGresUtil; @@ -27,6 +24,8 @@ import io.stackgres.operator.validation.ExtensionReview; import io.stackgres.operator.validation.ImmutableExtensionReview; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class ExtensionsValidator extends AbstractExtensionsValidator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/LockValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/LockValidator.java index e5bb9a3b9b..cca4a9924c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/LockValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/LockValidator.java @@ -10,9 +10,6 @@ import java.util.Objects; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.fasterxml.jackson.databind.ObjectMapper; import io.stackgres.common.ErrorType; import io.stackgres.common.OperatorProperty; @@ -22,6 +19,8 @@ import io.stackgres.operator.configuration.OperatorPropertyContext; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CLUSTER_UPDATE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ObjectStorageValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ObjectStorageValidator.java index 6b46f8025f..2143e7c587 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ObjectStorageValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ObjectStorageValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterBackupConfiguration; @@ -20,6 +17,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PatroniInitialConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PatroniInitialConfigValidator.java index 9853efda6b..83f9a6b681 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PatroniInitialConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PatroniInitialConfigValidator.java @@ -8,8 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; @@ -20,6 +18,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PoolingConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PoolingConfigValidator.java index daeefc038b..9f122e25c9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PoolingConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PoolingConfigValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; @@ -17,6 +14,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PostgresConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PostgresConfigValidator.java index 638f404d67..57e6e85e25 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PostgresConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/PostgresConfigValidator.java @@ -14,9 +14,6 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresComponent; @@ -33,6 +30,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operator.validation.ValidationUtil; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ProfileReferenceValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ProfileReferenceValidator.java index 21fa8241db..4bf86cc885 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ProfileReferenceValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ProfileReferenceValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgprofile.StackGresProfile; @@ -17,6 +14,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/RestoreConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/RestoreConfigValidator.java index aeb565f2ba..9b9382cd8e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/RestoreConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/RestoreConfigValidator.java @@ -10,9 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.common.crd.sgbackup.StackGresBackupProcess; @@ -25,6 +22,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ScriptsConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ScriptsConfigValidator.java index e23854abfb..b4d370756f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ScriptsConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/ScriptsConfigValidator.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedScriptEntry; @@ -23,6 +21,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/SslValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/SslValidator.java index b7c8082c92..35234a89d9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/SslValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/SslValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.stackgres.common.ErrorType; import io.stackgres.common.crd.SecretKeySelector; @@ -21,6 +18,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/StorageClassValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/StorageClassValidator.java index 898dd11c57..32ad73c7fe 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/StorageClassValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/cluster/StorageClassValidator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.validation.cluster; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -15,6 +12,8 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_STORAGE_CLASS) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/ClusterValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/ClusterValidator.java index 9453f27871..d373b00e3a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/ClusterValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/ClusterValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.resource.CustomResourceFinder; @@ -17,6 +14,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidator.java index f95e5551dd..33019ee434 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.dbops; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsImmutableSpecValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsImmutableSpecValidator.java index 44249a3ec0..6090d710a1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsImmutableSpecValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsImmutableSpecValidator.java @@ -5,13 +5,12 @@ package io.stackgres.operator.validation.dbops; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_UPDATE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMajorVersionUpgradeValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMajorVersionUpgradeValidator.java index c831c1b339..ea2ca47d4d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMajorVersionUpgradeValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMajorVersionUpgradeValidator.java @@ -11,9 +11,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.OwnerReference; import io.stackgres.common.ErrorType; @@ -31,6 +28,8 @@ import io.stackgres.operator.validation.ValidationUtil; import io.stackgres.operator.validation.cluster.PostgresConfigValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMinorVersionUpgradeValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMinorVersionUpgradeValidator.java index c5b48bb997..e6ebfc1a4a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMinorVersionUpgradeValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsMinorVersionUpgradeValidator.java @@ -11,9 +11,6 @@ import java.util.Map; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.fabric8.kubernetes.api.model.OwnerReference; import io.stackgres.common.ErrorType; @@ -27,6 +24,8 @@ import io.stackgres.operator.validation.ValidationUtil; import io.stackgres.operator.validation.cluster.PostgresConfigValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsRepackExtensionValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsRepackExtensionValidator.java index 337be810c9..fb02fdf98a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsRepackExtensionValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsRepackExtensionValidator.java @@ -9,9 +9,6 @@ import java.util.Optional; import java.util.TreeSet; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterSpec; @@ -22,6 +19,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.EXTENSION_NOT_FOUND) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsSecurityUpgradeValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsSecurityUpgradeValidator.java index 0480c61333..65e2d1d1dc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsSecurityUpgradeValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsSecurityUpgradeValidator.java @@ -9,9 +9,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.StackGresDbOps; @@ -19,6 +16,8 @@ import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_UPDATE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsValidationPipeline.java index 9754e30d60..7ed08c01da 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/dbops/DbOpsValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.dbops; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DbOpsValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsConstraintValidator.java index c7097396f5..91fdd310c4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.distributedlogs; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsDependenciesValidator.java index 0f85be83d2..ad41e74806 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsDependenciesValidator.java @@ -7,14 +7,13 @@ import java.util.Optional; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsPersistentVolumeSizeExpansionValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsPersistentVolumeSizeExpansionValidator.java index a343f7d200..9069d521ee 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsPersistentVolumeSizeExpansionValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsPersistentVolumeSizeExpansionValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; @@ -25,6 +22,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipeline.java index c90fac664f..6e4ab571cb 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.distributedlogs; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class DistributedLogsValidationPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ExtensionsValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ExtensionsValidator.java index 2d4a1bf840..a36fb97a25 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ExtensionsValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ExtensionsValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ExtensionTuple; import io.stackgres.common.StackGresComponent; import io.stackgres.common.StackGresDistributedLogsUtil; @@ -26,6 +23,8 @@ import io.stackgres.operator.validation.ExtensionReview; import io.stackgres.operator.validation.ImmutableExtensionReview; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class ExtensionsValidator extends AbstractExtensionsValidator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/PostgresConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/PostgresConfigValidator.java index f482370376..251a8de249 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/PostgresConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/PostgresConfigValidator.java @@ -10,9 +10,6 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.StackGresDistributedLogsUtil; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; @@ -22,6 +19,8 @@ import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ProfileReferenceValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ProfileReferenceValidator.java index 1bdeb90084..45a5446575 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ProfileReferenceValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/ProfileReferenceValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.common.crd.sgprofile.StackGresProfile; @@ -17,6 +14,8 @@ import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/StorageClassValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/StorageClassValidator.java index 2dfcea5078..b976685903 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/StorageClassValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/distributedlogs/StorageClassValidator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.validation.distributedlogs; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; @@ -15,6 +12,8 @@ import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_STORAGE_CLASS) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/DefaultObjectStorageConfigKeeper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/DefaultObjectStorageConfigKeeper.java index 679d28bf2c..90c90d3f75 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/DefaultObjectStorageConfigKeeper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/DefaultObjectStorageConfigKeeper.java @@ -5,13 +5,12 @@ package io.stackgres.operator.validation.objectstorage; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operator.validation.AbstractDefaultConfigKeeper; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.DEFAULT_CONFIGURATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageConstraintValidator.java index 676a871310..d7ff31e48e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.objectstorage; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDefaultCustomResourceHolder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDefaultCustomResourceHolder.java index 3eafe8a381..c184f4f35f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDefaultCustomResourceHolder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDefaultCustomResourceHolder.java @@ -5,10 +5,9 @@ package io.stackgres.operator.validation.objectstorage; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgobjectstorage.StackGresObjectStorage; import io.stackgres.operator.validation.AbstractDefaultCustomResourceHolder; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ObjectStorageDefaultCustomResourceHolder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDependenciesValidator.java index f1938349e8..3671a28b64 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageDependenciesValidator.java @@ -8,8 +8,6 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgcluster.StackGresClusterConfiguration; @@ -18,6 +16,7 @@ import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageReferencesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageReferencesValidator.java index e01b7ae715..572d09b69d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageReferencesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageReferencesValidator.java @@ -7,9 +7,6 @@ import java.util.Map; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.stackgres.common.ErrorType; @@ -22,6 +19,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_SECRET) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageTypeValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageTypeValidator.java index 4f66f880c6..866f079308 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageTypeValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageTypeValidator.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.objectstorage; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.storages.BackupStorage; import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipeline.java index 506d975895..2af54604a7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.objectstorage; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.ObjectStorageReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ObjectStorageValidationPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/DefaultPgConfigKeeper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/DefaultPgConfigKeeper.java index 967dc67c6a..b02e73b145 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/DefaultPgConfigKeeper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/DefaultPgConfigKeeper.java @@ -5,13 +5,12 @@ package io.stackgres.operator.validation.pgconfig; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.validation.AbstractDefaultConfigKeeper; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.DEFAULT_CONFIGURATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigBlocklistValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigBlocklistValidator.java index 4bbb60e6a0..a43edd3f24 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigBlocklistValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigBlocklistValidator.java @@ -7,8 +7,6 @@ import java.util.Set; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.operator.common.PgConfigReview; @@ -16,6 +14,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.PG_CONFIG_BLOCKLIST) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigConstraintValidator.java index 76fe35738f..831e17b351 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.pgconfig; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDefaultCustomResourceHolder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDefaultCustomResourceHolder.java index ce3cb174b4..f34efcbfc7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDefaultCustomResourceHolder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDefaultCustomResourceHolder.java @@ -5,10 +5,9 @@ package io.stackgres.operator.validation.pgconfig; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.operator.validation.AbstractDefaultCustomResourceHolder; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PgConfigDefaultCustomResourceHolder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDependenciesValidator.java index 4fe7072839..5d789d3d4c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigDependenciesValidator.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigLogsDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigLogsDependenciesValidator.java index bb5f1b7a25..441f7655ec 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigLogsDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigLogsDependenciesValidator.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigParametersValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigParametersValidator.java index 4757490bc4..381865ed5f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigParametersValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigParametersValidator.java @@ -7,8 +7,6 @@ import java.util.Map; -import javax.inject.Singleton; - import com.ongres.pgconfig.validator.GucValidator; import com.ongres.pgconfig.validator.PgParameter; import io.fabric8.kubernetes.api.model.Status; @@ -22,6 +20,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.PG_CONFIG_PARAMETER) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigUpdateValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigUpdateValidator.java index c4460d38d1..384943143e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigUpdateValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigUpdateValidator.java @@ -5,9 +5,6 @@ package io.stackgres.operator.validation.pgconfig; -import javax.annotation.PostConstruct; -import javax.inject.Singleton; - import com.fasterxml.jackson.annotation.JsonProperty; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Status; @@ -21,6 +18,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.annotation.PostConstruct; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_UPDATE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipeline.java index d27fd798a3..0160639308 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.pgconfig; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class PgConfigValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/DefaultPoolingConfigKeeper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/DefaultPoolingConfigKeeper.java index b5a6c0969e..5c0a1dd123 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/DefaultPoolingConfigKeeper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/DefaultPoolingConfigKeeper.java @@ -5,13 +5,12 @@ package io.stackgres.operator.validation.pooling; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.validation.AbstractDefaultConfigKeeper; import io.stackgres.operator.validation.ValidationType; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ValidationType(ErrorType.DEFAULT_CONFIGURATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PgBouncerBlocklistValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PgBouncerBlocklistValidator.java index 55d7c75f02..8d9ed6e4e8 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PgBouncerBlocklistValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PgBouncerBlocklistValidator.java @@ -9,14 +9,13 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerBlocklist; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.POOL_CONFIG_BLOCKLIST) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingConstraintValidator.java index bae8c7abe1..96e1081f31 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.pooling; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDefaultCustomResourceHolder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDefaultCustomResourceHolder.java index e524cb0ebd..35e5c8812d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDefaultCustomResourceHolder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDefaultCustomResourceHolder.java @@ -5,10 +5,9 @@ package io.stackgres.operator.validation.pooling; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.validation.AbstractDefaultCustomResourceHolder; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class PoolingDefaultCustomResourceHolder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDependenciesValidator.java index aaf16c2ce3..c19588b7a1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingDependenciesValidator.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingValidationPipeline.java index 69705e18d7..c2f232dcb0 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/pooling/PoolingValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.pooling; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class PoolingValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/DefaultProfileConfigKeeper.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/DefaultProfileConfigKeeper.java index 5ac209e6d1..001a653a5a 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/DefaultProfileConfigKeeper.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/DefaultProfileConfigKeeper.java @@ -5,13 +5,12 @@ package io.stackgres.operator.validation.profile; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.validation.AbstractDefaultConfigKeeper; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.DEFAULT_CONFIGURATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileConstraintValidator.java index df4e149344..b82caaa031 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.profile; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileDefaultCustomResourceHolder.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileDefaultCustomResourceHolder.java index b2d43f6acc..7555fe1bf4 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileDefaultCustomResourceHolder.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/ProfileDefaultCustomResourceHolder.java @@ -5,10 +5,9 @@ package io.stackgres.operator.validation.profile; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.operator.validation.AbstractDefaultCustomResourceHolder; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class ProfileDefaultCustomResourceHolder diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileDependenciesValidator.java index 8df600a586..8ac99d3194 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileDependenciesValidator.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileLogsDependenciesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileLogsDependenciesValidator.java index ef081a6fe3..b23a67871c 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileLogsDependenciesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileLogsDependenciesValidator.java @@ -7,14 +7,13 @@ import java.util.Objects; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.validation.DependenciesValidator; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_DELETION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileValidationPipeline.java index 5f4663f961..62d45af196 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/profile/SgProfileValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.profile; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class SgProfileValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/DefaultForbiddenValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/DefaultForbiddenValidator.java index 534557cb7d..e714858776 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/DefaultForbiddenValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/DefaultForbiddenValidator.java @@ -12,9 +12,6 @@ import java.util.Objects; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.ObjectMeta; import io.stackgres.common.ErrorType; import io.stackgres.common.OperatorProperty; @@ -24,6 +21,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.FORBIDDEN_CR_UPDATE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptConstraintValidator.java index 3ed39971f4..e98f07d74f 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.script; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptValidationPipeline.java index 32989739ae..858e43f280 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.script; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ScriptValidationPipeline extends AbstractValidationPipeline { diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptsConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptsConfigValidator.java index 174b2a3c23..65be799ec1 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptsConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/script/ScriptsConfigValidator.java @@ -12,9 +12,6 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import com.google.common.collect.ImmutableSet; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapKeySelector; @@ -32,6 +29,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/BabelfishFlavorValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/BabelfishFlavorValidator.java index bea9ea46c7..6515bae838 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/BabelfishFlavorValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/BabelfishFlavorValidator.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresClusterNonProduction; import io.stackgres.common.crd.sgcluster.StackGresClusterPostgres; @@ -20,6 +18,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.AdmissionRequest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorPersistentVolumeSizeExpansionValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorPersistentVolumeSizeExpansionValidator.java index 59af778e1f..3825d39bcc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorPersistentVolumeSizeExpansionValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorPersistentVolumeSizeExpansionValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; @@ -30,6 +27,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorScriptsConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorScriptsConfigValidator.java index 6faec96afa..069b840d36 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorScriptsConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/CoordinatorScriptsConfigValidator.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedScriptEntry; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedSql; @@ -21,6 +19,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/DistributedLogsValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/DistributedLogsValidator.java index 50c64413ed..4e599f61c6 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/DistributedLogsValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/DistributedLogsValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.StackGresUtil; import io.stackgres.common.crd.sgcluster.StackGresClusterDistributedLogs; @@ -19,6 +16,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ExtensionsValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ExtensionsValidator.java index a512bd07e3..ba3aacd664 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ExtensionsValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ExtensionsValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ExtensionTuple; import io.stackgres.common.StackGresComponent; import io.stackgres.common.StackGresUtil; @@ -31,6 +28,8 @@ import io.stackgres.operator.validation.ExtensionReview; import io.stackgres.operator.validation.ImmutableExtensionReview; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton public class ExtensionsValidator extends AbstractExtensionsValidator diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsPersistentVolumeSizeExpansionValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsPersistentVolumeSizeExpansionValidator.java index c18061a1dc..e8bfba48d9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsPersistentVolumeSizeExpansionValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsPersistentVolumeSizeExpansionValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; @@ -32,6 +29,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsScriptsConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsScriptsConfigValidator.java index f25e822047..d491bee82d 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsScriptsConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/OverridesShardsScriptsConfigValidator.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedScriptEntry; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedSql; @@ -22,6 +20,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PoolingConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PoolingConfigValidator.java index f826d3fc59..45d04416b7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PoolingConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PoolingConfigValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -21,6 +18,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PostgresConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PostgresConfigValidator.java index c733b45159..1f4459c77e 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PostgresConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/PostgresConfigValidator.java @@ -16,9 +16,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.OperatorProperty; import io.stackgres.common.StackGresComponent; @@ -39,6 +36,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operator.validation.ValidationUtil; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ProfileReferenceValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ProfileReferenceValidator.java index a01829f95d..34c7cbd8c7 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ProfileReferenceValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ProfileReferenceValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -20,6 +17,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidator.java index 1b036dce20..274e7ea878 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidator.java @@ -5,12 +5,11 @@ package io.stackgres.operator.validation.shardedcluster; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operator.validation.ValidationType; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipeline.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipeline.java index a922ce1a56..d3867e9ccc 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipeline.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipeline.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Any; -import javax.enterprise.inject.Instance; -import javax.inject.Inject; - import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.validation.AbstractValidationPipeline; import io.stackgres.operatorframework.admissionwebhook.validating.Validator; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Any; +import jakarta.enterprise.inject.Instance; +import jakarta.inject.Inject; @ApplicationScoped public class ShardedClusterValidationPipeline diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsOverridesValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsOverridesValidator.java index ef660e5a89..700fc5d299 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsOverridesValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsOverridesValidator.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedClusterShard; @@ -20,6 +18,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsPersistentVolumeSizeExpansionValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsPersistentVolumeSizeExpansionValidator.java index 7083ee5196..d6a8e34ab9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsPersistentVolumeSizeExpansionValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsPersistentVolumeSizeExpansionValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.PersistentVolumeClaim; import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; @@ -30,6 +27,8 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.jetbrains.annotations.NotNull; @Singleton diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsScriptsConfigValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsScriptsConfigValidator.java index 6f2c680e50..5621c155b9 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsScriptsConfigValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/ShardsScriptsConfigValidator.java @@ -9,8 +9,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.inject.Singleton; - import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedScriptEntry; import io.stackgres.common.crd.sgcluster.StackGresClusterManagedSql; @@ -21,6 +19,7 @@ import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.Operation; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.CONSTRAINT_VIOLATION) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/SslValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/SslValidator.java index 42be6fb2f1..5e4e637b52 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/SslValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/SslValidator.java @@ -7,9 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.Secret; import io.stackgres.common.ErrorType; import io.stackgres.common.crd.SecretKeySelector; @@ -21,6 +18,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_CR_REFERENCE) diff --git a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/StorageClassValidator.java b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/StorageClassValidator.java index a7f897e871..84d6721189 100644 --- a/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/StorageClassValidator.java +++ b/stackgres-k8s/src/operator/src/main/java/io/stackgres/operator/validation/shardedcluster/StorageClassValidator.java @@ -8,9 +8,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; -import javax.inject.Singleton; - import io.fabric8.kubernetes.api.model.storage.StorageClass; import io.stackgres.common.ErrorType; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; @@ -19,6 +16,8 @@ import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.validation.ValidationType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.inject.Inject; +import jakarta.inject.Singleton; @Singleton @ValidationType(ErrorType.INVALID_STORAGE_CLASS) diff --git a/stackgres-k8s/src/operator/src/main/resources/templates/create-backup.sh b/stackgres-k8s/src/operator/src/main/resources/templates/create-backup.sh index a123a261b7..6890820fe9 100644 --- a/stackgres-k8s/src/operator/src/main/resources/templates/create-backup.sh +++ b/stackgres-k8s/src/operator/src/main/resources/templates/create-backup.sh @@ -30,7 +30,7 @@ run() { then kill_with_childs "$PID" kubectl patch "$BACKUP_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_NAME" --type json --patch '[ - {"op":"replace","path":"/status/process/failure","value":'"Lock lost:$(printf '\n')$(cat /tmp/try-lock | to_json_string)"'} + {"op":"replace","path":"/status/process/failure","value":'"$({ printf 'Lock lost:\n'; cat /tmp/try-lock; } | to_json_string)"'} ]' cat /tmp/try-lock echo "Lock lost" @@ -106,7 +106,7 @@ reconcile_backups() { if [ "$?" != 0 ] then kubectl patch "$BACKUP_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_NAME" --type json --patch '[ - {"op":"replace","path":"/status/process/failure","value":'"Backup can not be listed after creation $(cat /tmp/backup-list | to_json_string)"'} + {"op":"replace","path":"/status/process/failure","value":'"$({ printf 'Backup can not be listed after creation\n'; cat /tmp/backup-list; } | to_json_string)"'} ]' cat /tmp/backup-list echo "Backups can not be listed after creation" @@ -117,7 +117,7 @@ reconcile_backups() { if [ "$BACKUP_CONFIG_RESOURCE_VERSION" != "$(kubectl get "$BACKUP_CONFIG_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_CONFIG" --template='{{ .metadata.resourceVersion }}')" ] then kubectl patch "$BACKUP_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_NAME" --type json --patch '[ - {"op":"replace","path":"/status/process/failure","value":"Backup configuration '"$BACKUP_CONFIG"' changed during backup"} + {"op":"replace","path":"/status/process/failure","value":'"$(printf 'Backup configuration %s changed during backup' "$BACKUP_CONFIG" | to_json_string)"'} ]' cat /tmp/backup-list echo "Backup configuration '$BACKUP_CONFIG' changed during backup" @@ -126,7 +126,7 @@ reconcile_backups() { --template="{{ if .spec.configurations.backupPath }}{{ .spec.configurations.backupPath }}{{ else }}{{ (index .spec.configurations.backups 0).path }}{{ end }}")" ] then kubectl patch "$BACKUP_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_NAME" --type json --patch '[ - {"op":"replace","path":"/status/process/failure","value":"Backup path '"$CLUSTER_BACKUP_PATH"' changed during backup"} + {"op":"replace","path":"/status/process/failure","value":'"$(printf 'Backup path %s changed during backup' "$CLUSTER_BACKUP_PATH" | to_json_string)"'} ]' cat /tmp/backup-list echo "Backup path '$CLUSTER_BACKUP_PATH' changed during backup" @@ -134,7 +134,7 @@ reconcile_backups() { elif ! grep -q "^backup_name:${CURRENT_BACKUP_NAME}$" /tmp/current-backup then kubectl patch "$BACKUP_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_NAME" --type json --patch '[ - {"op":"replace","path":"/status/process/failure","value":"Backup '"$CURRENT_BACKUP_NAME"' was not found after creation"} + {"op":"replace","path":"/status/process/failure","value":'"$(printf 'Backup %s was not found after creation' "$CURRENT_BACKUP_NAME" | to_json_string)"'} ]' cat /tmp/backup-list echo "Backup '$CURRENT_BACKUP_NAME' was not found after creation" @@ -323,7 +323,7 @@ EOF if [ "$?" != 0 ] then kubectl patch "$BACKUP_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_NAME" --type json --patch '[ - {"op":"replace","path":"/status/process/failure","value":'"Backup failed:$(printf '\n\n')$(cat /tmp/backup-push | to_json_string)"'} + {"op":"replace","path":"/status/process/failure","value":'"$({ printf 'Backup failed:\n'; cat /tmp/backup-push; } | to_json_string)"'} ]' exit 1 fi @@ -335,7 +335,7 @@ EOF if [ -z "$CURRENT_BACKUP_NAME" ] then kubectl patch "$BACKUP_CRD_NAME" -n "$CLUSTER_NAMESPACE" "$BACKUP_NAME" --type json --patch '[ - {"op":"replace","path":"/status/process/failure","value":'"Backup name not found in backup-push log:$(printf '\n')$(cat /tmp/backup-push | to_json_string)"'} + {"op":"replace","path":"/status/process/failure","value":'"$({ printf 'Backup name not found in backup-push log:\n'; cat /tmp/backup-push; } | to_json_string)"'} ]' cat /tmp/backup-push echo "Backup name not found in backup-push log" diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/AbstractStackGresOperatorIt.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/AbstractStackGresOperatorIt.java index 5ba31351c2..040adf4bb9 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/AbstractStackGresOperatorIt.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/AbstractStackGresOperatorIt.java @@ -13,11 +13,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; - import com.ongres.junit.docker.Container; import com.ongres.junit.docker.ContainerParam; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ItHelper.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ItHelper.java index 9b7d3588ef..80f02bb189 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ItHelper.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ItHelper.java @@ -28,14 +28,13 @@ import java.util.function.Supplier; import java.util.stream.Collectors; -import javax.ws.rs.ProcessingException; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; - import com.github.dockerjava.api.exception.DockerException; import com.google.common.collect.ImmutableList; import com.ongres.junit.docker.Container; +import jakarta.ws.rs.ProcessingException; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.FileUtils; import org.jooq.lambda.Seq; import org.jooq.lambda.Unchecked; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ResourcesSerializationTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ResourcesSerializationTest.java index 41faff1bd6..b470fddfeb 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ResourcesSerializationTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/ResourcesSerializationTest.java @@ -14,19 +14,18 @@ import java.util.Collection; import java.util.stream.Stream; -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.HEAD; -import javax.ws.rs.OPTIONS; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; - import com.google.common.reflect.ClassPath; import com.google.common.reflect.TypeToken; import io.quarkus.runtime.annotations.RegisterForReflection; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HEAD; +import jakarta.ws.rs.OPTIONS; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; import org.junit.jupiter.api.BeforeAll; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockKubernetesClientFactory.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockKubernetesClientFactory.java index 93bdfe137b..9573a38b63 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockKubernetesClientFactory.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockKubernetesClientFactory.java @@ -14,11 +14,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; -import javax.annotation.PostConstruct; -import javax.annotation.PreDestroy; -import javax.enterprise.context.ApplicationScoped; -import javax.enterprise.inject.Produces; - import io.fabric8.kubernetes.client.ConfigBuilder; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientBuilder; @@ -28,6 +23,10 @@ import io.stackgres.common.YamlMapperProvider; import io.stackgres.operator.AbstractStackGresOperatorIt; import io.stackgres.testutil.KubernetesServerSupplier; +import jakarta.annotation.PostConstruct; +import jakarta.annotation.PreDestroy; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.enterprise.inject.Produces; import org.jooq.lambda.Unchecked; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockOperatorBootstrap.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockOperatorBootstrap.java index 2fd8e83c73..96811b48a4 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockOperatorBootstrap.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockOperatorBootstrap.java @@ -5,9 +5,8 @@ package io.stackgres.operator.app; -import javax.enterprise.context.ApplicationScoped; - import io.quarkus.test.Mock; +import jakarta.enterprise.context.ApplicationScoped; @Mock @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockWatcherHandler.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockWatcherHandler.java index 7ab6fdd195..904c62317d 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockWatcherHandler.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/app/MockWatcherHandler.java @@ -5,9 +5,8 @@ package io.stackgres.operator.app; -import javax.enterprise.context.ApplicationScoped; - import io.quarkus.test.Mock; +import jakarta.enterprise.context.ApplicationScoped; @Mock @ApplicationScoped diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/GeneratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/GeneratorTest.java index d26231a24f..92c496f835 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/GeneratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/GeneratorTest.java @@ -9,8 +9,6 @@ import java.util.List; import java.util.UUID; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.ObjectMeta; import io.stackgres.common.StackGresComponent; @@ -31,6 +29,7 @@ import io.stackgres.operator.conciliation.cluster.ImmutableStackGresClusterContext; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; public abstract class GeneratorTest { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecoratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecoratorTest.java index 149b0cb7ae..8993dbb069 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecoratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourceDecoratorTest.java @@ -5,8 +5,6 @@ package io.stackgres.operator.conciliation.backup; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgbackup.StackGresBackup; @@ -17,6 +15,7 @@ import io.stackgres.common.resource.ResourceUtil; import io.stackgres.operator.conciliation.AbstractRequiredResourceDecoratorTest; import io.stackgres.operator.conciliation.RequiredResourceDecorator; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGeneratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGeneratorTest.java index 9739d5b0ed..6cec46ee03 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGeneratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/backup/BackupRequiredResourcesGeneratorTest.java @@ -19,8 +19,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; @@ -39,6 +37,7 @@ import io.stackgres.common.resource.ClusterFinder; import io.stackgres.common.resource.ObjectStorageFinder; import io.stackgres.common.resource.ProfileConfigFinder; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/AbstractClusterRequiredResourcesGeneratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/AbstractClusterRequiredResourcesGeneratorTest.java index 0cd598b2eb..4254b955c7 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/AbstractClusterRequiredResourcesGeneratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/AbstractClusterRequiredResourcesGeneratorTest.java @@ -11,8 +11,6 @@ import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Secret; import io.quarkus.test.junit.mockito.InjectMock; @@ -40,6 +38,7 @@ import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresDefaultValues; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerDefaultValues; import io.stackgres.operator.resource.PrometheusScanner; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; abstract class AbstractClusterRequiredResourcesGeneratorTest { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecoratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecoratorTest.java index 5950c449f3..073f7dcc5d 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecoratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/cluster/ClusterRequiredResourceDecoratorTest.java @@ -9,8 +9,6 @@ import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Secret; import io.quarkus.test.junit.QuarkusTest; @@ -24,6 +22,7 @@ import io.stackgres.operator.common.Prometheus; import io.stackgres.operator.conciliation.AbstractRequiredResourceDecoratorTest; import io.stackgres.operator.conciliation.RequiredResourceDecorator; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecoratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecoratorTest.java index 5b0cc69b26..8bb22f7ad3 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecoratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourceDecoratorTest.java @@ -7,8 +7,6 @@ import java.io.IOException; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -19,6 +17,7 @@ import io.stackgres.common.resource.ResourceUtil; import io.stackgres.operator.conciliation.AbstractRequiredResourceDecoratorTest; import io.stackgres.operator.conciliation.RequiredResourceDecorator; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGeneratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGeneratorTest.java index 76cc1bb112..60d7f139ab 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGeneratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/dbops/DbOpsRequiredResourcesGeneratorTest.java @@ -19,8 +19,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; @@ -31,6 +29,7 @@ import io.stackgres.common.fixture.Fixtures; import io.stackgres.common.resource.ClusterFinder; import io.stackgres.common.resource.ProfileConfigFinder; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecoratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecoratorTest.java index 8ed26d82ae..4edc751477 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecoratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequireResourceDecoratorTest.java @@ -11,8 +11,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Secret; import io.quarkus.test.junit.QuarkusTest; @@ -23,6 +21,7 @@ import io.stackgres.common.fixture.Fixtures; import io.stackgres.operator.conciliation.AbstractRequiredResourceDecoratorTest; import io.stackgres.operator.conciliation.RequiredResourceDecorator; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGeneratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGeneratorTest.java index 9f17fd024b..acd9035a9c 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGeneratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/distributedlogs/DistributedLogsRequiredResourcesGeneratorTest.java @@ -17,8 +17,6 @@ import java.util.Optional; import java.util.UUID; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.stackgres.common.StackGresComponent; @@ -34,6 +32,7 @@ import io.stackgres.operator.conciliation.ReconciliationScope; import io.stackgres.operator.conciliation.comparator.DefaultComparator; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporterTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporterTest.java index 8da620c454..14704dc799 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporterTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/cluster/sidecars/pgexporter/PostgresExporterTest.java @@ -8,8 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import javax.inject.Inject; - import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.crd.sgprofile.StackGresProfile; @@ -21,6 +19,7 @@ import io.stackgres.operator.conciliation.factory.ScriptTemplatesVolumeMounts; import io.stackgres.operator.conciliation.factory.cluster.ClusterContainerContext; import io.stackgres.operator.conciliation.factory.cluster.ImmutableClusterContainerContext; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobTestCase.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobTestCase.java index dfe3d44f57..cadddc6346 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobTestCase.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/factory/dbops/DbOpsJobTestCase.java @@ -10,8 +10,6 @@ import java.time.Instant; import java.util.stream.Collectors; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.batch.v1.Job; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.crd.sgdbops.StackGresDbOps; @@ -20,6 +18,7 @@ import io.stackgres.operator.conciliation.OperatorVersionBinder; import io.stackgres.operator.conciliation.dbops.ImmutableStackGresDbOpsContext; import io.stackgres.operator.conciliation.dbops.StackGresDbOpsContext; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/AbstractShardedClusterRequiredResourcesGeneratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/AbstractShardedClusterRequiredResourcesGeneratorTest.java index f55d022a89..3649089ec7 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/AbstractShardedClusterRequiredResourcesGeneratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/AbstractShardedClusterRequiredResourcesGeneratorTest.java @@ -11,8 +11,6 @@ import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.quarkus.test.junit.mockito.InjectMock; import io.stackgres.common.StackGresComponent; @@ -33,6 +31,7 @@ import io.stackgres.common.resource.SecretFinder; import io.stackgres.operator.conciliation.factory.cluster.patroni.parameters.PostgresDefaultValues; import io.stackgres.operator.conciliation.factory.cluster.sidecars.pooling.parameters.PgBouncerDefaultValues; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; abstract class AbstractShardedClusterRequiredResourcesGeneratorTest { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecoratorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecoratorTest.java index b0b292d75c..b3a4f9a342 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecoratorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conciliation/shardedcluster/ShardedClusterRequiredResourceDecoratorTest.java @@ -10,8 +10,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.HasMetadata; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; @@ -26,6 +24,7 @@ import io.stackgres.operator.conciliation.RequiredResourceDecorator; import io.stackgres.operator.conciliation.cluster.ImmutableStackGresClusterContext; import io.stackgres.operator.conciliation.cluster.StackGresClusterContext; +import jakarta.inject.Inject; import org.jooq.lambda.Seq; import org.junit.jupiter.api.BeforeEach; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgClusterConversionPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgClusterConversionPipelineTest.java index 3b67667556..b3aa2475e3 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgClusterConversionPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgClusterConversionPipelineTest.java @@ -7,8 +7,6 @@ import java.util.Optional; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -17,6 +15,7 @@ import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.common.fixture.Fixtures; import io.stackgres.testutil.JsonUtil; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipelineTest.java index eac0a6c5d7..54b95f0245 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPoolingConfigConversionPipelineTest.java @@ -7,13 +7,12 @@ import java.util.List; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.node.ObjectNode; import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.common.fixture.Fixtures; import io.stackgres.testutil.JsonUtil; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipelineTest.java index 96d365918c..f730fc5613 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/conversion/SgPostgresConfigConversionPipelineTest.java @@ -5,14 +5,13 @@ package io.stackgres.operator.conversion; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.ImmutableList; import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.common.fixture.Fixtures; import io.stackgres.testutil.JsonUtil; +import jakarta.inject.Inject; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/cluster/ClusterMutatorPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/cluster/ClusterMutatorPipelineTest.java index 7233c90e65..34c98ac56b 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/cluster/ClusterMutatorPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/mutation/cluster/ClusterMutatorPipelineTest.java @@ -12,8 +12,6 @@ import java.util.List; import java.util.Optional; -import javax.inject.Inject; - import com.fasterxml.jackson.databind.ObjectMapper; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; @@ -29,6 +27,7 @@ import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.testutil.JsonUtil; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/utils/ValidationUtils.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/utils/ValidationUtils.java index 479da490dc..c56e8fafa1 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/utils/ValidationUtils.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/utils/ValidationUtils.java @@ -18,11 +18,6 @@ import java.util.Optional; import java.util.stream.Collectors; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Positive; - import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.CaseFormat; import io.fabric8.kubernetes.api.model.Status; @@ -31,6 +26,10 @@ import io.stackgres.common.ClassUtil; import io.stackgres.common.ErrorType; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; import org.jooq.lambda.Seq; import org.jooq.lambda.tuple.Tuple; import org.jooq.lambda.tuple.Tuple2; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ConstraintValidationTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ConstraintValidationTest.java index 80d29b69f4..716b184d42 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ConstraintValidationTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ConstraintValidationTest.java @@ -12,16 +12,15 @@ import java.lang.annotation.Annotation; import java.util.Locale; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; - import io.fabric8.kubernetes.api.model.Status; import io.stackgres.common.ErrorType; import io.stackgres.operator.utils.ValidationUtils; import io.stackgres.operatorframework.admissionwebhook.AdmissionReview; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; import org.hibernate.validator.HibernateValidator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ObjectStorageValidationResourceTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ObjectStorageValidationResourceTest.java index 6a8fa3442a..e79c50b18a 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ObjectStorageValidationResourceTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/ObjectStorageValidationResourceTest.java @@ -11,8 +11,6 @@ import java.util.Arrays; import java.util.Map; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.SecretBuilder; import io.fabric8.kubernetes.api.model.SecretKeySelector; import io.quarkus.test.junit.QuarkusTest; @@ -25,6 +23,7 @@ import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.testutil.RandomObjectUtils; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/backup/BackupValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/backup/BackupValidationPipelineTest.java index 8e3174c428..41cebedb82 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/backup/BackupValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/backup/BackupValidationPipelineTest.java @@ -5,13 +5,12 @@ package io.stackgres.operator.validation.backup; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgbackup.StackGresBackup; import io.stackgres.operator.common.BackupReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/AlwaysSuccess.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/AlwaysSuccess.java index 76f617024e..37172df88c 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/AlwaysSuccess.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/AlwaysSuccess.java @@ -5,9 +5,8 @@ package io.stackgres.operator.validation.cluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.operator.common.StackGresClusterReview; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class AlwaysSuccess implements ClusterValidator { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorCredentialsTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorCredentialsTest.java index ef8f1b2564..b5c13884f2 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorCredentialsTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorCredentialsTest.java @@ -5,8 +5,6 @@ package io.stackgres.operator.validation.cluster; -import javax.validation.constraints.AssertTrue; - import io.stackgres.common.crd.SecretKeySelector; import io.stackgres.common.crd.sgcluster.StackGresClusterCredentials; import io.stackgres.common.crd.sgcluster.StackGresClusterPatroniCredentials; @@ -17,6 +15,7 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; import org.junit.jupiter.api.Test; class ClusterConstraintValidatorCredentialsTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorReplicateFromTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorReplicateFromTest.java index 473dabfaf8..0a313a4bea 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorReplicateFromTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorReplicateFromTest.java @@ -5,8 +5,6 @@ package io.stackgres.operator.validation.cluster; -import javax.validation.constraints.AssertTrue; - import io.stackgres.common.crd.SecretKeySelector; import io.stackgres.common.crd.sgcluster.StackGresClusterReplicateFrom; import io.stackgres.common.crd.sgcluster.StackGresClusterReplicateFromExternal; @@ -19,6 +17,7 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; import org.junit.jupiter.api.Test; class ClusterConstraintValidatorReplicateFromTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorTest.java index 8e12a271e8..794d3069f7 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterConstraintValidatorTest.java @@ -12,13 +12,6 @@ import java.util.function.Consumer; import java.util.function.Predicate; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Positive; - import io.stackgres.common.crd.SecretKeySelector; import io.stackgres.common.crd.Toleration; import io.stackgres.common.crd.sgcluster.StackGresCluster; @@ -47,6 +40,12 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Null; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Positive; import org.gradle.internal.impldep.com.google.common.collect.Lists; import org.jooq.lambda.tuple.Tuple; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationPipelineTest.java index eeba286295..3eb52ba9b3 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationPipelineTest.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.cluster; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgcluster.StackGresCluster; import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationQuarkusTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationQuarkusTest.java index 9dc9daf536..cd2f8045e1 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationQuarkusTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/cluster/ClusterValidationQuarkusTest.java @@ -11,8 +11,6 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.storage.StorageClassList; import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.test.junit.QuarkusTest; @@ -34,6 +32,7 @@ import io.stackgres.operator.common.StackGresClusterReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationUtil; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidatorTest.java index fcc8712c97..3f1435dbd2 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidatorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsConstraintValidatorTest.java @@ -15,11 +15,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; - import io.stackgres.common.crd.sgdbops.DbOpsOperation; import io.stackgres.common.crd.sgdbops.StackGresDbOps; import io.stackgres.common.crd.sgdbops.StackGresDbOpsBenchmark; @@ -38,6 +33,10 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsPgbenchConstraintValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsPgbenchConstraintValidatorTest.java index 0d4408e92f..05b8f0907e 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsPgbenchConstraintValidatorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsPgbenchConstraintValidatorTest.java @@ -5,10 +5,6 @@ package io.stackgres.operator.validation.dbops; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotEmpty; - import io.stackgres.common.crd.sgdbops.StackGresDbOpsBenchmark; import io.stackgres.common.crd.sgdbops.StackGresDbOpsPgbench; import io.stackgres.common.crd.sgdbops.StackGresDbOpsSpec; @@ -16,6 +12,9 @@ import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotEmpty; import org.junit.jupiter.api.Test; class DbOpsPgbenchConstraintValidatorTest extends ConstraintValidationTest { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsRepackConstraintValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsRepackConstraintValidatorTest.java index 0cce73c9e5..906b2c5ac5 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsRepackConstraintValidatorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/dbops/DbOpsRepackConstraintValidatorTest.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.dbops; -import javax.validation.constraints.AssertTrue; - import io.stackgres.common.crd.sgdbops.StackGresDbOpsRepack; import io.stackgres.operator.common.DbOpsReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; import org.junit.jupiter.api.Test; class DbOpsRepackConstraintValidatorTest extends ConstraintValidationTest { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipelineTest.java index 7b7b9f9f2d..87658ec702 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/distributedlogs/DistributedLogsValidationPipelineTest.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.distributedlogs; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgdistributedlogs.StackGresDistributedLogs; import io.stackgres.operator.common.StackGresDistributedLogsReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipelineTest.java index 668eab72ad..64f23a729e 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/objectstorage/ObjectStorageValidationPipelineTest.java @@ -7,8 +7,6 @@ import java.util.Map; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.SecretBuilder; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.kubernetes.client.WithKubernetesTestServer; @@ -22,6 +20,7 @@ import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; import io.stackgres.testutil.RandomObjectUtils; import io.stackgres.testutil.StringUtils; +import jakarta.inject.Inject; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipelineTest.java index e858b528c0..fd2c5fb5da 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pgconfig/PgConfigValidationPipelineTest.java @@ -7,14 +7,13 @@ import java.util.HashMap; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgpgconfig.StackGresPostgresConfig; import io.stackgres.operator.common.PgConfigReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pooling/PoolingValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pooling/PoolingValidationPipelineTest.java index bd95bdd24d..aa0486df2c 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pooling/PoolingValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/pooling/PoolingValidationPipelineTest.java @@ -7,14 +7,13 @@ import java.util.Map; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgpooling.StackGresPoolingConfig; import io.stackgres.operator.common.PoolingReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/ProfileConstraintValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/ProfileConstraintValidatorTest.java index 06edff428f..abc97fc11b 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/ProfileConstraintValidatorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/ProfileConstraintValidatorTest.java @@ -5,8 +5,6 @@ package io.stackgres.operator.validation.profile; -import javax.validation.constraints.AssertTrue; - import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.common.crd.sgprofile.StackGresProfileHugePages; import io.stackgres.common.crd.sgprofile.StackGresProfileSpec; @@ -15,6 +13,7 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/SgProfileValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/SgProfileValidationPipelineTest.java index 3d58ac1a57..680667ae94 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/SgProfileValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/profile/SgProfileValidationPipelineTest.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.profile; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgprofile.StackGresProfile; import io.stackgres.operator.common.SgProfileReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptConstraintValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptConstraintValidatorTest.java index aed4f65a79..8032eb3120 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptConstraintValidatorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptConstraintValidatorTest.java @@ -7,9 +7,6 @@ import java.util.ArrayList; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.NotNull; - import io.stackgres.common.crd.ConfigMapKeySelector; import io.stackgres.common.crd.SecretKeySelector; import io.stackgres.common.crd.sgscript.StackGresScript; @@ -21,6 +18,8 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.NotNull; import org.junit.jupiter.api.Test; class ScriptConstraintValidatorTest extends ConstraintValidationTest { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationPipelineTest.java index 47cf985fbe..7beec16fa4 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationPipelineTest.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.script; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgscript.StackGresScript; import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationQuarkusTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationQuarkusTest.java index d25a94a660..e5a00c106e 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationQuarkusTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/script/ScriptValidationQuarkusTest.java @@ -7,8 +7,6 @@ import static org.hamcrest.Matchers.is; -import javax.inject.Inject; - import com.google.common.collect.ImmutableMap; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; @@ -21,6 +19,7 @@ import io.stackgres.operator.common.StackGresScriptReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationUtil; +import jakarta.inject.Inject; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/AlwaysSuccess.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/AlwaysSuccess.java index 77c942add5..ffb0bb30a9 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/AlwaysSuccess.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/AlwaysSuccess.java @@ -5,9 +5,8 @@ package io.stackgres.operator.validation.shardedcluster; -import javax.enterprise.context.ApplicationScoped; - import io.stackgres.operator.common.StackGresShardedClusterReview; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class AlwaysSuccess implements ShardedClusterValidator { diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorCredentialsTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorCredentialsTest.java index 8aa0b73349..228c4e5bc5 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorCredentialsTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorCredentialsTest.java @@ -5,8 +5,6 @@ package io.stackgres.operator.validation.shardedcluster; -import javax.validation.constraints.AssertTrue; - import io.stackgres.common.crd.SecretKeySelector; import io.stackgres.common.crd.sgcluster.StackGresClusterCredentials; import io.stackgres.common.crd.sgcluster.StackGresClusterPatroniCredentials; @@ -18,6 +16,7 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; import org.junit.jupiter.api.Test; class ShardedClusterConstraintValidatorCredentialsTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorTest.java index a36d51b67e..8a6f32a191 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterConstraintValidatorTest.java @@ -10,11 +10,6 @@ import java.util.List; import java.util.Random; -import javax.validation.constraints.AssertTrue; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; - import com.google.common.collect.Lists; import io.stackgres.common.crd.SecretKeySelector; import io.stackgres.common.crd.Toleration; @@ -44,6 +39,10 @@ import io.stackgres.operator.validation.ConstraintValidationTest; import io.stackgres.operator.validation.ConstraintValidator; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationFailed; +import jakarta.validation.constraints.AssertTrue; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; import org.junit.jupiter.api.Test; class ShardedClusterConstraintValidatorTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipelineTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipelineTest.java index 4965b3136d..b7b7e93cf0 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipelineTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationPipelineTest.java @@ -5,14 +5,13 @@ package io.stackgres.operator.validation.shardedcluster; -import javax.inject.Inject; - import io.quarkus.test.junit.QuarkusTest; import io.stackgres.common.crd.sgshardedcluster.StackGresShardedCluster; import io.stackgres.operator.common.StackGresShardedClusterReview; import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationPipelineTest; import io.stackgres.operatorframework.admissionwebhook.validating.ValidationPipeline; +import jakarta.inject.Inject; import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable; @QuarkusTest diff --git a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationQuarkusTest.java b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationQuarkusTest.java index f82091c88b..3d3aeded9a 100644 --- a/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationQuarkusTest.java +++ b/stackgres-k8s/src/operator/src/test/java/io/stackgres/operator/validation/shardedcluster/ShardedClusterValidationQuarkusTest.java @@ -13,8 +13,6 @@ import java.util.ArrayList; import java.util.List; -import javax.inject.Inject; - import io.fabric8.kubernetes.api.model.storage.StorageClassList; import io.fabric8.kubernetes.client.KubernetesClient; import io.quarkus.test.junit.QuarkusTest; @@ -37,6 +35,7 @@ import io.stackgres.operator.common.fixture.AdmissionReviewFixtures; import io.stackgres.operator.validation.ValidationUtil; import io.stackgres.testutil.JsonUtil; +import jakarta.inject.Inject; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; diff --git a/stackgres-k8s/src/pom.xml b/stackgres-k8s/src/pom.xml index 3b2f40aa36..06c13cc7ec 100644 --- a/stackgres-k8s/src/pom.xml +++ b/stackgres-k8s/src/pom.xml @@ -77,7 +77,7 @@ ${java.version} ${java.version} - 2.15.3.Final + 3.2.0.Final 0.9.15 2.9.3 10.11.0 @@ -85,10 +85,10 @@ 6.49.0 1.2.15 1.0.1 - 3.13.4 + 2.0.0 24.0.1 3.0.0 - 2.1.13 + 2.2.15 0.94.0 0.10.2 1.1.3 @@ -115,7 +115,7 @@ 0.43.0 3.1.1 3.4.0 - 2.1.6 + 2.2.15 ${maven.multiModuleProjectDirectory}/checks ${checks.location}/checkstyle.xml @@ -144,20 +144,14 @@ test - org.jooq - jooq - ${jooq.version} - - - javax.xml.bind - jaxb-api - - + io.quarkiverse.jooq + quarkus-jooq + ${quarkus-jooq.version} io.swagger.core.v3 - swagger-annotations - ${swagger-annotations.version} + swagger-annotations-jakarta + ${swagger-annotations-jakarta.version} provided @@ -394,9 +388,9 @@ - io.openapitools.swagger - swagger-maven-plugin - ${swagger-maven-plugin.version} + io.swagger.core.v3 + swagger-maven-plugin-jakarta + ${swagger-maven-plugin-jakarta.version} true