Browse Source

Polishing.

See #1460
Original pull request #1521
3.0.x
Jens Schauder 3 years ago
parent
commit
20e468021e
No known key found for this signature in database
GPG Key ID: 9537B67540F0A581
  1. 5
      spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java
  2. 7
      spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/BasicRelationalConverter.java

5
spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateTemplateIntegrationTests.java

@ -87,6 +87,7 @@ import org.springframework.transaction.annotation.Transactional;
* @author Milan Milanov * @author Milan Milanov
* @author Mikhail Polivakha * @author Mikhail Polivakha
* @author Chirag Tailor * @author Chirag Tailor
* @author Vincent Galloy
*/ */
@ContextConfiguration @ContextConfiguration
@Transactional @Transactional
@ -1046,11 +1047,13 @@ class JdbcAggregateTemplateIntegrationTests {
} }
@Test // GH-1460 @Test // GH-1460
@EnabledOnFeature(SUPPORTS_ARRAYS)
void readEnumArray() { void readEnumArray() {
EnumArrayOwner entity = new EnumArrayOwner(); EnumArrayOwner entity = new EnumArrayOwner();
entity.digits = new Color[]{Color.BLUE}; entity.digits = new Color[]{Color.BLUE};
assertThat(template.save(entity)).isNotNull(); template.save(entity);
assertThat(template.findById(entity.id, EnumArrayOwner.class).digits).isEqualTo(new Color[]{Color.BLUE}); assertThat(template.findById(entity.id, EnumArrayOwner.class).digits).isEqualTo(new Color[]{Color.BLUE});
} }

7
spring-data-relational/src/main/java/org/springframework/data/relational/core/conversion/BasicRelationalConverter.java

@ -54,6 +54,7 @@ import org.springframework.util.ClassUtils;
* @author Mark Paluch * @author Mark Paluch
* @author Jens Schauder * @author Jens Schauder
* @author Chirag Tailor * @author Chirag Tailor
* @author Vincent Galloy
* @see MappingContext * @see MappingContext
* @see SimpleTypeHolder * @see SimpleTypeHolder
* @see CustomConversions * @see CustomConversions
@ -175,7 +176,11 @@ public class BasicRelationalConverter implements RelationalConverter {
// TODO: We should add conversion support for arrays, however, // TODO: We should add conversion support for arrays, however,
// these should consider multi-dimensional arrays as well. // these should consider multi-dimensional arrays as well.
if (value.getClass().isArray() && !value.getClass().getComponentType().isEnum() && (TypeInformation.OBJECT.equals(type) || type.isCollectionLike())) { if (value.getClass().isArray() //
&& !value.getClass().getComponentType().isEnum() //
&& (TypeInformation.OBJECT.equals(type) //
|| type.isCollectionLike()) //
) {
return value; return value;
} }

Loading…
Cancel
Save