Browse Source

Support instantiation of Kotlin class with overridden read-only property.

Closes: #4485
Original Pull Request: #4777
pull/4007/merge
Mark Paluch 1 year ago committed by Christoph Strobl
parent
commit
7d3c6eafb7
No known key found for this signature in database
GPG Key ID: E6054036D0C37A4B
  1. 3
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
  2. 42
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/MappingMongoConverterKtUnitTests.kt
  3. 26
      spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/SpecialTransaction.kt

3
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java

@ -559,7 +559,8 @@ public class MappingMongoConverter extends AbstractMongoConverter @@ -559,7 +559,8 @@ public class MappingMongoConverter extends AbstractMongoConverter
MongoDbPropertyValueProvider valueProvider = new MongoDbPropertyValueProvider(contextToUse, documentAccessor,
evaluator, spELContext);
Predicate<MongoPersistentProperty> propertyFilter = isIdentifier(entity).or(isConstructorArgument(entity)).negate();
Predicate<MongoPersistentProperty> propertyFilter = isIdentifier(entity).or(isConstructorArgument(entity))
.or(Predicates.negate(PersistentProperty::isReadable)).negate();
readProperties(contextToUse, entity, accessor, documentAccessor, valueProvider, evaluator, propertyFilter);
return accessor.getBean();

42
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/MappingMongoConverterKtUnitTests.kt

@ -0,0 +1,42 @@ @@ -0,0 +1,42 @@
/*
* Copyright 2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.mongodb.core.convert
import org.assertj.core.api.Assertions.assertThat
import org.bson.Document
import org.junit.jupiter.api.Test
import org.springframework.data.mongodb.core.mapping.MongoMappingContext
/**
* Kotlin unit tests for [MappingMongoConverter].
*
* @author Mark Paluch
*/
class MappingMongoConverterKtUnitTests {
@Test // GH-4485
fun shouldIgnoreNonReadableProperties() {
val document = Document.parse("{_id: 'baz', type: 'SOME_VALUE'}")
val converter =
MappingMongoConverter(NoOpDbRefResolver.INSTANCE, MongoMappingContext())
val tx = converter.read(SpecialTransaction::class.java, document)
assertThat(tx.id).isEqualTo("baz")
assertThat(tx.type).isEqualTo("SOME_DEFAULT_VALUE")
}
}

26
spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/SpecialTransaction.kt

@ -0,0 +1,26 @@ @@ -0,0 +1,26 @@
/*
* Copyright 2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.springframework.data.mongodb.core.convert
abstract class SomeTransaction() {
abstract val id: String
abstract val type: String
}
data class SpecialTransaction(override val id: String) : SomeTransaction() {
override val type: String = "SOME_DEFAULT_VALUE"
}
Loading…
Cancel
Save