Major 14 - Upgrade to Operaton 2.0

backend/app/gzac/build.gradle

@@ -23,6 +23,8 @@ dependencies {
     implementation(project(":backend:process-link-url"))
 
     implementation("io.github.oshai:kotlin-logging")
+    implementation "org.springframework.boot:spring-boot-starter-classic"
+    implementation "org.springframework.boot:spring-boot-jackson2"
     implementation "org.springframework.boot:spring-boot-starter-webflux"
     implementation "org.springframework.boot:spring-boot-starter-security"
 

backend/app/gzac/src/dev/kotlin/com/ritense/gzac/security/TestImplHttpSecurityConfigurer.kt

@@ -22,7 +22,7 @@ import com.ritense.valtimo.contract.security.config.HttpSecurityConfigurer
 import org.springframework.core.annotation.Order
 import org.springframework.http.HttpMethod.POST
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern
 import org.springframework.stereotype.Component
 
 @Order(0)
@@ -33,7 +33,7 @@ class TestImplHttpSecurityConfigurer : HttpSecurityConfigurer {
         try {
             http.authorizeHttpRequests { requests ->
                 requests
-                    .requestMatchers(antMatcher(POST, "/api/test-impl/notification")).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(POST, "/api/test-impl/notification")).hasAuthority(ADMIN)
             }
         } catch (e: Exception) {
             throw HttpConfigurerConfigurationException(e)

backend/audit/build.gradle

@@ -64,9 +64,9 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-autoconfigure"
 
     implementation "org.liquibase:liquibase-core:${liquibaseVersion}"
-    implementation "org.liquibase.ext:liquibase-hibernate6:${liquibaseVersion}"
+    implementation "org.liquibase.ext:liquibase-hibernate7:${liquibaseHibernateVersion}"
 
-    implementation "io.hypersistence:hypersistence-utils-hibernate-62:${hypersistenceUtilsVersion}"
+    implementation "io.hypersistence:hypersistence-utils-hibernate-71:${hypersistenceUtilsVersion}"
 
     implementation "org.hibernate.orm:hibernate-core:${hibernateCoreVersion}"
 

backend/audit/src/main/java/com/ritense/audit/autoconfigure/AuditAutoConfiguration.java

@@ -39,7 +39,7 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.boot.persistence.autoconfigure.EntityScan;
 import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean;

backend/audit/src/test/java/com/ritense/audit/domain/event/AuditEventJsonSerializingTest.java

@@ -43,7 +43,7 @@ public class AuditEventJsonSerializingTest extends AbstractTestHelper {
 
     @BeforeEach
     public void setUp() throws IOException {
-        JacksonTester.initFields(this, objectMapper);
+        JacksonTester.initFields(this, tools.jackson.databind.json.JsonMapper.builder().build());
         jsonString = TestHelper.getResourceAsString("json/event/TestEvent.json");
     }
 

backend/audit/src/test/java/com/ritense/audit/domain/event/TaskCompletedJsonSerializingTest.java

@@ -44,7 +44,7 @@ public class TaskCompletedJsonSerializingTest extends AbstractTestHelper {
 
     @BeforeEach
     public void setUp() throws IOException {
-        JacksonTester.initFields(this, objectMapper);
+        JacksonTester.initFields(this, tools.jackson.databind.json.JsonMapper.builder().build());
         jsonString = TestHelper.getResourceAsString("json/event/TaskCompletedEvent.json");
     }
 

backend/audit/src/test/resources/json/event/TaskCompletedEvent.json

@@ -3,10 +3,10 @@
     "id": "edb1a672-4ba1-4e79-a5ee-b9658c55fe52",
     "businessKey": null,
     "origin": "somewhere",
-    "occurredOn": "2019-03-18T14:17:11.639Z",
+    "occurredOn": "2019-03-18T14:17:11.639",
     "user": "somebody",
     "assignee": "test@test.com",
-    "createdOn": "2019-03-18T14:17:11.639Z",
+    "createdOn": "2019-03-18T14:17:11.639",
     "taskId": "taskId",
     "taskName": "aTaskName",
     "processDefinitionId": "aProcessDefinitionId",

backend/audit/src/test/resources/json/event/TestEvent.json

@@ -2,7 +2,7 @@
     "className": "com.ritense.audit.domain.event.TestEvent",
     "id": "edb1a672-4ba1-4e79-a5ee-b9658c55fe52",
     "origin": "somewhere",
-    "occurredOn": "2019-03-18T14:17:11.639Z",
+    "occurredOn": "2019-03-18T14:17:11.639",
     "user": "somebody",
     "name": "John Doe",
     "age": 21,

backend/authorization/src/main/kotlin/com/ritense/authorization/autoconfigure/AuthorizationAutoConfiguration.kt

@@ -46,7 +46,7 @@ import com.ritense.valtimo.contract.authorization.UserManagementServiceHolder
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.AutoConfiguration
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
-import org.springframework.boot.autoconfigure.domain.EntityScan
+import org.springframework.boot.persistence.autoconfigure.EntityScan
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Lazy
 import org.springframework.core.Ordered.HIGHEST_PRECEDENCE

backend/authorization/src/main/kotlin/com/ritense/authorization/permission/condition/PermissionCondition.kt

@@ -17,6 +17,7 @@
 package com.ritense.authorization.permission.condition
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder
+import com.fasterxml.jackson.annotation.JsonSubTypes
 import com.fasterxml.jackson.annotation.JsonTypeInfo
 import com.fasterxml.jackson.annotation.JsonView
 import com.ritense.authorization.permission.PermissionView
@@ -34,6 +35,11 @@ import java.lang.reflect.Field
     property = "type",
     visible = true
 )
+@JsonSubTypes(
+    JsonSubTypes.Type(value = FieldPermissionCondition::class, name = "field"),
+    JsonSubTypes.Type(value = ContainerPermissionCondition::class, name = "container"),
+    JsonSubTypes.Type(value = ExpressionPermissionCondition::class, name = "expression")
+)
 @JsonPropertyOrder("type")
 abstract class PermissionCondition(
     @field:JsonView(value = [PermissionView.RoleManagement::class, PermissionView.PermissionManagement::class])

backend/authorization/src/main/kotlin/com/ritense/authorization/specification/AuthorizationSpecification.kt

@@ -252,12 +252,10 @@ abstract class AuthorizationSpecification<T : Any>(
      */
     override fun toPredicate(
         root: Root<T>,
-        query: CriteriaQuery<*>?,
+        query: CriteriaQuery<*>,
         criteriaBuilder: CriteriaBuilder
     ): Predicate? {
-        return query?.let {
-            toPredicate(root, it as AbstractQuery<*>, criteriaBuilder)
-        }
+        return toPredicate(root, query as AbstractQuery<*>, criteriaBuilder)
     }
 
     /**

backend/authorization/src/main/kotlin/com/ritense/authorization/web/security/ValtimoAuthorizationHttpSecurityConfigurer.kt

@@ -24,20 +24,20 @@ import org.springframework.http.HttpMethod.GET
 import org.springframework.http.HttpMethod.POST
 import org.springframework.http.HttpMethod.PUT
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
-import org.springframework.security.web.util.matcher.AntPathRequestMatcher.antMatcher
+import org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.pathPattern
 
 class ValtimoAuthorizationHttpSecurityConfigurer : HttpSecurityConfigurer {
     override fun configure(http: HttpSecurity) {
         try {
             http.authorizeHttpRequests { requests ->
-                requests.requestMatchers(antMatcher(GET, ROLES_URL)).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(POST, ROLES_URL)).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(PUT, "$ROLES_URL/{oldRoleKey}")).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(DELETE, ROLES_URL)).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(GET, "$ROLES_URL/{roleKey}/permissions")).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(PUT, "$ROLES_URL/{roleKey}/permissions")).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(POST, "/api/management/v1/permissions/search")).hasAuthority(ADMIN)
-                    .requestMatchers(antMatcher(POST, "/api/v1/permissions")).authenticated()
+                requests.requestMatchers(pathPattern(GET, ROLES_URL)).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(POST, ROLES_URL)).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(PUT, "$ROLES_URL/{oldRoleKey}")).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(DELETE, ROLES_URL)).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(GET, "$ROLES_URL/{roleKey}/permissions")).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(PUT, "$ROLES_URL/{roleKey}/permissions")).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(POST, "/api/management/v1/permissions/search")).hasAuthority(ADMIN)
+                    .requestMatchers(pathPattern(POST, "/api/v1/permissions")).authenticated()
             }
 
         } catch (e: Exception) {

backend/authorization/src/test/kotlin/com/ritense/authorization/HibernateJsonMapperConfiguration.kt

@@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import org.hibernate.cfg.AvailableSettings
 import org.hibernate.type.format.jackson.JacksonJsonFormatMapper
 import org.springframework.boot.autoconfigure.AutoConfiguration
-import org.springframework.boot.autoconfigure.orm.jpa.HibernatePropertiesCustomizer
+import org.springframework.boot.hibernate.autoconfigure.HibernatePropertiesCustomizer
 import org.springframework.context.annotation.Bean
 
 
@@ -28,7 +28,7 @@ class HibernateJsonMapperConfiguration {
 
     @Bean
     fun jsonFormatMapperCustomizer(objectMapper: ObjectMapper): HibernatePropertiesCustomizer {
-        return HibernatePropertiesCustomizer { properties: MutableMap<String?, Any?> ->
+        return HibernatePropertiesCustomizer { properties: MutableMap<String, Any> ->
             properties[AvailableSettings.JSON_FORMAT_MAPPER] = JacksonJsonFormatMapper(objectMapper)
         }
     }

backend/authorization/src/test/kotlin/com/ritense/authorization/TestApplication.kt

@@ -23,7 +23,7 @@ import javax.sql.DataSource
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
-import org.springframework.boot.autoconfigure.domain.EntityScan
+import org.springframework.boot.persistence.autoconfigure.EntityScan
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Import

backend/building-block/build.gradle

@@ -80,15 +80,15 @@ dependencies {
     implementation "org.springframework.boot:spring-boot-autoconfigure"
 
     implementation "org.liquibase:liquibase-core:${liquibaseVersion}"
-    implementation "org.liquibase.ext:liquibase-hibernate6:${liquibaseVersion}"
+    implementation "org.liquibase.ext:liquibase-hibernate7:${liquibaseHibernateVersion}"
 
     implementation "io.github.oshai:kotlin-logging:${kotlinLoggingVersion}"
     implementation "com.github.erosb:everit-json-schema:${everitJsonSchemaVersion}"
     implementation "com.flipkart.zjsonpatch:zjsonpatch:${zjsonpatchVersion}"
     implementation "com.jayway.jsonpath:json-path:${jaywayJsonpathVersion}"
     implementation "com.fasterxml.jackson.module:jackson-module-kotlin"
 
-    implementation "io.hypersistence:hypersistence-utils-hibernate-62:${hypersistenceUtilsVersion}"
+    implementation "io.hypersistence:hypersistence-utils-hibernate-71:${hypersistenceUtilsVersion}"
     implementation "org.hibernate.orm:hibernate-core:${hibernateCoreVersion}"
 
     implementation "org.apache.commons:commons-lang3:${commonsLangVersion}"

backend/building-block/src/main/kotlin/com/ritense/buildingblock/configuration/BuildingBlockAutoConfiguration.kt

@@ -113,7 +113,7 @@ import org.operaton.bpm.engine.RepositoryService
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.AutoConfiguration
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
-import org.springframework.boot.autoconfigure.domain.EntityScan
+import org.springframework.boot.persistence.autoconfigure.EntityScan
 import org.springframework.context.ApplicationEventPublisher
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.DependsOn

backend/building-block/src/main/kotlin/com/ritense/buildingblock/processlink/domain/BuildingBlockProcessLink.kt

@@ -149,7 +149,7 @@ class BuildingBlockProcessLink(
 data class BuildingBlockInputMapping(
     val source: String,
     val target: String
-)
+) : java.io.Serializable
 
 enum class BuildingBlockSyncTiming {
     CONTINUOUS,
@@ -160,4 +160,4 @@ data class BuildingBlockOutputMapping(
     val source: String,
     val target: String,
     val syncTiming: BuildingBlockSyncTiming = BuildingBlockSyncTiming.END
-)
+) : java.io.Serializable