Skip to content

Commit 108dcf6

Browse files
committed
#30 - Address review feedback.
1 parent c645257 commit 108dcf6

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

src/main/java/org/springframework/data/r2dbc/dialect/PostgresDialect.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import java.util.Arrays;
99
import java.util.Collection;
1010
import java.util.HashSet;
11-
import java.util.List;
1211
import java.util.Set;
1312
import java.util.UUID;
1413

@@ -24,7 +23,7 @@
2423
public class PostgresDialect implements Dialect {
2524

2625
private static final Set<Class<?>> SIMPLE_TYPES = new HashSet<>(
27-
Arrays.asList(List.class, Collection.class, UUID.class, URL.class, URI.class, InetAddress.class));
26+
Arrays.asList(UUID.class, URL.class, URI.class, InetAddress.class));
2827

2928
/**
3029
* Singleton instance.

src/test/java/org/springframework/data/r2dbc/dialect/PostgresDialectUnitTests.java

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
package org.springframework.data.r2dbc.dialect;
22

33
import static org.assertj.core.api.Assertions.*;
4+
import static org.assertj.core.api.SoftAssertions.*;
5+
6+
import java.util.List;
47

5-
import org.assertj.core.api.SoftAssertions;
68
import org.junit.Test;
79
import org.springframework.data.mapping.model.SimpleTypeHolder;
810

@@ -30,7 +32,7 @@ public void shouldConsiderSimpleTypes() {
3032

3133
SimpleTypeHolder holder = PostgresDialect.INSTANCE.getSimpleTypeHolder();
3234

33-
SoftAssertions.assertSoftly(it -> {
35+
assertSoftly(it -> {
3436
it.assertThat(holder.isSimpleType(String.class)).isTrue();
3537
it.assertThat(holder.isSimpleType(int.class)).isTrue();
3638
it.assertThat(holder.isSimpleType(Integer.class)).isTrue();
@@ -50,9 +52,11 @@ public void shouldUseBoxedArrayTypesForPrimitiveTypes() {
5052

5153
ArrayColumns arrayColumns = PostgresDialect.INSTANCE.getArraySupport();
5254

53-
assertThat(arrayColumns.getArrayType(int.class)).isEqualTo(Integer.class);
54-
assertThat(arrayColumns.getArrayType(double.class)).isEqualTo(Double.class);
55-
assertThat(arrayColumns.getArrayType(String.class)).isEqualTo(String.class);
55+
assertSoftly(it -> {
56+
it.assertThat(arrayColumns.getArrayType(int.class)).isEqualTo(Integer.class);
57+
it.assertThat(arrayColumns.getArrayType(double.class)).isEqualTo(Double.class);
58+
it.assertThat(arrayColumns.getArrayType(String.class)).isEqualTo(String.class);
59+
});
5660
}
5761

5862
@Test // gh-30
@@ -62,4 +66,12 @@ public void shouldRejectNonSimpleArrayTypes() {
6266

6367
assertThatThrownBy(() -> arrayColumns.getArrayType(getClass())).isInstanceOf(IllegalArgumentException.class);
6468
}
69+
70+
@Test // gh-30
71+
public void shouldRejectNestedCollections() {
72+
73+
ArrayColumns arrayColumns = PostgresDialect.INSTANCE.getArraySupport();
74+
75+
assertThatThrownBy(() -> arrayColumns.getArrayType(List.class)).isInstanceOf(IllegalArgumentException.class);
76+
}
6577
}

0 commit comments

Comments
 (0)