From 48d85e0ee7dc27bdd4f0bbcc6f2fd3e88f3828bb Mon Sep 17 00:00:00 2001 From: Norman Schmidt <60552466+norman-schmidt@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:33:41 +0100 Subject: [PATCH] TSK-1946: update to Spring Boot 2.7.8 (#1999) * TSK-1946: H2 Update * TSK-1946: add new run configurations * TSK-1946: update to Spring Boot 2.7.3 Updated Spring Security Configs to new component-based configuration. See https://spring.io/blog/2022/02/21/spring-security-without-the-websecurityconfigureradapter Co-authored-by: Marcel Bagemihl * TSK-1946: wildfly now only starting postgres db * TSK-1946: drop sup 4 sys prop db.type. We only execute PSQL * TSK-1946: create new module 'taskana-rest-spring-test-lib' to simplify the Spring Security Configuration Setup for Spring Tests * TSK-1946: H2 Update * TSK-1946: add new run configurations * TSK-1946: update to Spring Boot 2.7.3 Updated Spring Security Configs to new component-based configuration. See https://spring.io/blog/2022/02/21/spring-security-without-the-websecurityconfigureradapter Co-authored-by: Marcel Bagemihl * TSK-1946: wildfly now only starting postgres db * TSK-1946: drop sup 4 sys prop db.type. We only execute PSQL * TSK-1946: create new module 'taskana-rest-spring-test-lib' to simplify the Spring Security Configuration Setup for Spring Tests * TSK-1946: update to Spring Boot 2.7.8 --------- Co-authored-by: Yakup Ensar Evli <54323073+ensarevlideveloper@users.noreply.github.com> Co-authored-by: Mustapha Zorgati <15628173+mustaphazorgati@users.noreply.github.com> Co-authored-by: Marcel Bagemihl Co-authored-by: arolfes --- .github/workflows/continuous-integration.yml | 1 + ...run.xml => All in taskana-core H2.run.xml} | 2 +- .run/All in taskana-core-test DB2.run.xml | 21 + .run/All in taskana-core-test H2.run.xml | 18 + .../All in taskana-core-test POSTGRES.run.xml | 21 + ...taskana-simplehistory-provider H2.run.xml} | 2 +- ci/taskana-sonar-test-coverage/pom.xml | 5 + .../sampledata/SampleDataGeneratorTest.java | 3 +- .../test/config/DataSourceGenerator.java | 2 +- .../taskana-simplehistory-rest-spring/pom.xml | 2 +- .../rest/HistoryWebSecurityConfigurer.java | 79 - .../TaskHistoryEventControllerIntTest.java | 6 +- ...TaskHistoryEventControllerRestDocTest.java | 2 +- ...EventRepresentationModelAssemblerTest.java | 2 +- .../src/test/resources/application.properties | 17 +- .../common/internal/TaskanaProducersTest.java | 3 +- .../src/test/resources/project-defaults.yml | 3 +- .../35173ddc-53d2-4b58-ab0f-691d31860271 | 91022 ++++++++++++++++ ...d => 382817ff-573d-4d20-9597-c425d2698970} | 0 .../41370030-045e-43fc-a125-f6ef52ca778a | 18416 ++++ .../5f454d26-156f-4740-9396-b4d75e3ecea0 | 0 ...8 => 74deb6a1-c507-47a1-b135-9308e42f4e71} | 0 ...1 => 978ec381-cf0f-43f8-81ae-72f353d6ada3} | 20168 ++-- ...1 => 9e212b8e-ebae-4b84-83eb-0b18b9f8a8f3} | 260 +- .../a815f261-afb1-41fb-8005-352ef2de7a6a | 24 + .../archunit_store/stored.rules | 10 +- .../taskana/TaskanaEngineConfiguration.java | 3 +- .../internal/WorkbasketQueryImpl.java | 11 +- .../src/main/resources/customdb.properties | 4 +- .../internal/transaction/TransactionTest.java | 6 +- .../resources/test-applicationContext.xml | 2 +- .../extensions/TestContainerExtension.java | 6 +- pom.xml | 4 +- rest/pom.xml | 1 + .../security/BootWebSecurityConfigurer.java | 96 +- .../main/resources/application-db2.properties | 2 +- .../resources/application-postgres.properties | 2 +- .../src/main/resources/application.properties | 24 +- .../pom.xml | 2 +- .../rest/ExampleWebSecurityConfig.java | 58 +- .../example/CommonWebSecurityConfigurer.java | 76 - .../example/jobs/AsyncUpdateJobIntTest.java | 6 +- .../ldap/LdapEmptySearchRootsTest.java | 2 +- .../pro/taskana/example/ldap/LdapTest.java | 2 +- .../application-emptySearchRoots.properties | 52 - .../src/test/resources/application.properties | 8 +- .../pom.xml | 58 +- .../wildfly/TaskanaWildflyConfiguration.java | 19 +- .../WildflyWebSecurityConfigurer.java | 14 +- .../common/test/rest/TestConfiguration.java | 18 + .../example/wildfly/AbstractAccTest.java | 14 +- .../test/resources/application-h2.properties | 51 - .../resources/application-postgres.properties | 52 - .../src/test/resources/application.properties | 9 +- .../src/test/resources/arquillian.xml | 27 +- .../test/resources/int-test-standalone.xml | 1669 +- .../src/test/resources/module.xml | 17 +- rest/taskana-rest-spring-test-lib/pom.xml | 109 + .../taskana/rest}/test/BaseRestDocTest.java | 5 +- .../pro/taskana/rest/test}/RestHelper.java | 2 +- .../rest/test/SpringSecurityToJaasFilter.java | 114 + .../rest/test}/TaskanaSpringBootTest.java | 2 +- .../taskana/rest/test}/TestConfiguration.java | 2 +- .../rest/test}/TestWebSecurityConfig.java | 52 +- .../templates/asciidoctor/auto-links.snippet | 0 .../asciidoctor/auto-path-parameters.snippet | 0 .../asciidoctor/auto-request-fields.snippet | 0 .../auto-request-parameters.snippet | 0 .../asciidoctor/auto-response-fields.snippet | 0 .../src/main/resources/taskana-test.ldif | 0 rest/taskana-rest-spring/pom.xml | 8 +- .../rest/ClassificationControllerIntTest.java | 6 +- .../ClassificationControllerRestDocTest.java | 2 +- ...sificationDefinitionControllerIntTest.java | 6 +- ...cationDefinitionControllerRestDocTest.java | 2 +- ...ationRepresentationModelAssemblerTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- .../rest/AccessIdControllerIntTest.java | 6 +- .../rest/AccessIdControllerRestDocTest.java | 2 +- .../rest/GeneralExceptionHandlingTest.java | 6 +- .../rest/SchemaNameCustomizableTest.java | 2 +- .../rest/TaskanaEngineControllerIntTest.java | 4 +- .../TaskanaEngineControllerRestDocTest.java | 2 +- .../common/rest/WebSecurityConfigurer.java | 74 - .../rest/MonitorControllerIntTest.java | 6 +- .../rest/MonitorControllerRestDocTest.java | 2 +- ...eaderRepresentationModelAssemblerTest.java | 2 +- ...eportRepresentationModelAssemblerTest.java | 2 +- .../rest/TaskCommentControllerIntTest.java | 6 +- .../TaskCommentControllerRestDocTest.java | 6 +- .../task/rest/TaskControllerIntTest.java | 6 +- .../task/rest/TaskControllerRestDocTest.java | 8 +- ...hmentRepresentationModelAssemblerTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- ...renceRepresentationModelAssemblerTest.java | 2 +- ...mmentRepresentationModelAssemblerTest.java | 2 +- .../TaskRepresentationModelAssemblerTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- .../user/jobs/UserInfoRefreshJobIntTest.java | 6 +- .../user/rest/UserControllerIntTest.java | 6 +- .../user/rest/UserControllerRestDocTest.java | 2 +- .../UserRepresentationModelAssemblerTest.java | 2 +- ...WorkbasketAccessItemControllerIntTest.java | 6 +- ...basketAccessItemControllerRestDocTest.java | 2 +- .../rest/WorkbasketControllerIntTest.java | 6 +- .../rest/WorkbasketControllerRestDocTest.java | 6 +- ...WorkbasketDefinitionControllerIntTest.java | 6 +- ...basketDefinitionControllerRestDocTest.java | 6 +- ...sItemRepresentationModelAssemblerTest.java | 2 +- ...itionRepresentationModelAssemblerTest.java | 2 +- ...asketRepresentationModelAssemblerTest.java | 2 +- ...mmaryRepresentationModelAssemblerTest.java | 2 +- .../src/test/resources/application.properties | 14 +- routing/taskana-routing-rest/pom.xml | 8 +- .../dmn/rest/DmnUploadControllerIntTest.java | 6 +- .../rest/DmnUploadControllerRestDocTest.java | 2 +- .../dmn/rest/WebSecurityConfigurer.java | 76 - .../src/test/resources/application.properties | 2 +- 118 files changed, 121149 insertions(+), 11879 deletions(-) rename .run/{All in taskana-core.run.xml => All in taskana-core H2.run.xml} (71%) create mode 100644 .run/All in taskana-core-test DB2.run.xml create mode 100644 .run/All in taskana-core-test H2.run.xml create mode 100644 .run/All in taskana-core-test POSTGRES.run.xml rename .run/{All in taskana-simplehistory-provider.run.xml => All in taskana-simplehistory-provider H2.run.xml} (81%) delete mode 100644 history/taskana-simplehistory-rest-spring/src/test/java/pro/taskana/simplehistory/rest/HistoryWebSecurityConfigurer.java create mode 100644 lib/taskana-core-test/archunit_store/35173ddc-53d2-4b58-ab0f-691d31860271 rename lib/taskana-core-test/archunit_store/{e480c7e3-4001-4306-9859-39636786785d => 382817ff-573d-4d20-9597-c425d2698970} (100%) create mode 100644 lib/taskana-core-test/archunit_store/41370030-045e-43fc-a125-f6ef52ca778a create mode 100644 lib/taskana-core-test/archunit_store/5f454d26-156f-4740-9396-b4d75e3ecea0 rename lib/taskana-core-test/archunit_store/{974cd44c-bceb-4997-a1c3-18cb011ca438 => 74deb6a1-c507-47a1-b135-9308e42f4e71} (100%) rename lib/taskana-core-test/archunit_store/{a54262d1-6fd5-453c-bef4-7481fef02511 => 978ec381-cf0f-43f8-81ae-72f353d6ada3} (97%) rename lib/taskana-core-test/archunit_store/{9652a208-0dfc-428f-9436-b7d5b718e2c1 => 9e212b8e-ebae-4b84-83eb-0b18b9f8a8f3} (99%) create mode 100644 lib/taskana-core-test/archunit_store/a815f261-afb1-41fb-8005-352ef2de7a6a delete mode 100644 rest/taskana-rest-spring-example-common/src/test/java/pro/taskana/example/CommonWebSecurityConfigurer.java delete mode 100644 rest/taskana-rest-spring-example-wildfly/src/test/resources/application-h2.properties delete mode 100644 rest/taskana-rest-spring-example-wildfly/src/test/resources/application-postgres.properties create mode 100644 rest/taskana-rest-spring-test-lib/pom.xml rename {common/taskana-common-test/src/main/java/pro/taskana/common => rest/taskana-rest-spring-test-lib/src/main/java/pro/taskana/rest}/test/BaseRestDocTest.java (97%) rename {common/taskana-common-test/src/main/java/pro/taskana/common/test/rest => rest/taskana-rest-spring-test-lib/src/main/java/pro/taskana/rest/test}/RestHelper.java (98%) create mode 100644 rest/taskana-rest-spring-test-lib/src/main/java/pro/taskana/rest/test/SpringSecurityToJaasFilter.java rename {common/taskana-common-test/src/main/java/pro/taskana/common/test/rest => rest/taskana-rest-spring-test-lib/src/main/java/pro/taskana/rest/test}/TaskanaSpringBootTest.java (96%) rename {common/taskana-common-test/src/main/java/pro/taskana/common/test/rest => rest/taskana-rest-spring-test-lib/src/main/java/pro/taskana/rest/test}/TestConfiguration.java (96%) rename {common/taskana-common-test/src/main/java/pro/taskana/common/test/rest => rest/taskana-rest-spring-test-lib/src/main/java/pro/taskana/rest/test}/TestWebSecurityConfig.java (64%) rename {common/taskana-common-test => rest/taskana-rest-spring-test-lib}/src/main/resources/org/springframework/restdocs/templates/asciidoctor/auto-links.snippet (100%) rename {common/taskana-common-test => rest/taskana-rest-spring-test-lib}/src/main/resources/org/springframework/restdocs/templates/asciidoctor/auto-path-parameters.snippet (100%) rename {common/taskana-common-test => rest/taskana-rest-spring-test-lib}/src/main/resources/org/springframework/restdocs/templates/asciidoctor/auto-request-fields.snippet (100%) rename {common/taskana-common-test => rest/taskana-rest-spring-test-lib}/src/main/resources/org/springframework/restdocs/templates/asciidoctor/auto-request-parameters.snippet (100%) rename {common/taskana-common-test => rest/taskana-rest-spring-test-lib}/src/main/resources/org/springframework/restdocs/templates/asciidoctor/auto-response-fields.snippet (100%) rename {common/taskana-common-test => rest/taskana-rest-spring-test-lib}/src/main/resources/taskana-test.ldif (100%) delete mode 100644 rest/taskana-rest-spring/src/test/java/pro/taskana/common/rest/WebSecurityConfigurer.java delete mode 100644 routing/taskana-routing-rest/src/test/java/pro/taskana/routing/dmn/rest/WebSecurityConfigurer.java diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 4e97386f8..779dc62c1 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -254,6 +254,7 @@ jobs: - taskana-spi-routing-dmn-router - taskana-routing-rest - taskana-rest-spring + - taskana-rest-spring-test-lib - taskana-rest-spring-example-common - taskana-loghistory-provider - taskana-simplehistory-provider diff --git a/.run/All in taskana-core.run.xml b/.run/All in taskana-core H2.run.xml similarity index 71% rename from .run/All in taskana-core.run.xml rename to .run/All in taskana-core H2.run.xml index f5b676ff6..cc6b5d5ad 100644 --- a/.run/All in taskana-core.run.xml +++ b/.run/All in taskana-core H2.run.xml @@ -1,5 +1,5 @@ - +