40
40
import org .springframework .data .repository .Repository ;
41
41
import org .springframework .data .repository .core .support .DefaultRepositoryMetadata ;
42
42
import org .springframework .data .repository .core .support .PropertiesBasedNamedQueries ;
43
- import org .springframework .data .repository .query .DefaultParameters ;
44
43
import org .springframework .jdbc .core .ResultSetExtractor ;
45
44
import org .springframework .jdbc .core .RowMapper ;
46
45
import org .springframework .jdbc .core .namedparam .NamedParameterJdbcOperations ;
57
56
* @author Mark Paluch
58
57
* @author Dennis Effing
59
58
*/
60
- public class StringBasedJdbcQueryUnitTests {
61
-
59
+ class StringBasedJdbcQueryUnitTests {
62
60
63
61
RowMapper <Object > defaultRowMapper ;
64
62
NamedParameterJdbcOperations operations ;
65
63
RelationalMappingContext context ;
66
64
JdbcConverter converter ;
67
65
68
66
@ BeforeEach
69
- public void setup () throws NoSuchMethodException {
67
+ void setup () throws NoSuchMethodException {
70
68
71
69
this .defaultRowMapper = mock (RowMapper .class );
72
70
this .operations = mock (NamedParameterJdbcOperations .class );
@@ -75,17 +73,16 @@ public void setup() throws NoSuchMethodException {
75
73
}
76
74
77
75
@ Test // DATAJDBC-165
78
- public void emptyQueryThrowsException () {
76
+ void emptyQueryThrowsException () {
79
77
80
78
JdbcQueryMethod queryMethod = createMethod ("noAnnotation" );
81
79
82
80
Assertions .assertThatExceptionOfType (IllegalStateException .class ) //
83
- .isThrownBy (() -> createQuery (queryMethod )
84
- .execute (new Object [] {}));
81
+ .isThrownBy (() -> createQuery (queryMethod ).execute (new Object [] {}));
85
82
}
86
83
87
84
@ Test // DATAJDBC-165
88
- public void defaultRowMapperIsUsedByDefault () {
85
+ void defaultRowMapperIsUsedByDefault () {
89
86
90
87
JdbcQueryMethod queryMethod = createMethod ("findAll" );
91
88
StringBasedJdbcQuery query = createQuery (queryMethod );
@@ -94,7 +91,7 @@ public void defaultRowMapperIsUsedByDefault() {
94
91
}
95
92
96
93
@ Test // DATAJDBC-165, DATAJDBC-318
97
- public void customRowMapperIsUsedWhenSpecified () {
94
+ void customRowMapperIsUsedWhenSpecified () {
98
95
99
96
JdbcQueryMethod queryMethod = createMethod ("findAllWithCustomRowMapper" );
100
97
StringBasedJdbcQuery query = createQuery (queryMethod );
@@ -103,7 +100,7 @@ public void customRowMapperIsUsedWhenSpecified() {
103
100
}
104
101
105
102
@ Test // DATAJDBC-290
106
- public void customResultSetExtractorIsUsedWhenSpecified () {
103
+ void customResultSetExtractorIsUsedWhenSpecified () {
107
104
108
105
JdbcQueryMethod queryMethod = createMethod ("findAllWithCustomResultSetExtractor" );
109
106
StringBasedJdbcQuery query = createQuery (queryMethod );
@@ -117,7 +114,7 @@ public void customResultSetExtractorIsUsedWhenSpecified() {
117
114
}
118
115
119
116
@ Test // DATAJDBC-290
120
- public void customResultSetExtractorAndRowMapperGetCombined () {
117
+ void customResultSetExtractorAndRowMapperGetCombined () {
121
118
122
119
JdbcQueryMethod queryMethod = createMethod ("findAllWithCustomRowMapperAndResultSetExtractor" );
123
120
StringBasedJdbcQuery query = createQuery (queryMethod );
@@ -131,8 +128,9 @@ public void customResultSetExtractorAndRowMapperGetCombined() {
131
128
"RowMapper is not expected to be custom" );
132
129
}
133
130
134
- @ Test // DATAJDBC-356
135
- public void streamQueryCallsQueryForStreamOnOperations () {
131
+ @ Test // GH-578
132
+ void streamQueryCallsQueryForStreamOnOperations () {
133
+
136
134
JdbcQueryMethod queryMethod = createMethod ("findAllWithStreamReturnType" );
137
135
StringBasedJdbcQuery query = createQuery (queryMethod );
138
136
@@ -141,20 +139,21 @@ public void streamQueryCallsQueryForStreamOnOperations() {
141
139
verify (operations ).queryForStream (eq ("some sql statement" ), any (SqlParameterSource .class ), any (RowMapper .class ));
142
140
}
143
141
144
- @ Test // DATAJDBC-356
142
+ @ Test // GH-578
145
143
void streamQueryFallsBackToCollectionQueryWhenCustomResultSetExtractorIsSpecified () {
144
+
146
145
JdbcQueryMethod queryMethod = createMethod ("findAllWithStreamReturnTypeAndResultSetExtractor" );
147
146
StringBasedJdbcQuery query = createQuery (queryMethod );
148
147
149
148
query .execute (new Object [] {});
150
149
151
- ArgumentCaptor <ResultSetExtractor > captor = ArgumentCaptor .forClass (ResultSetExtractor .class );
150
+ ArgumentCaptor <ResultSetExtractor <?> > captor = ArgumentCaptor .forClass (ResultSetExtractor .class );
152
151
verify (operations ).query (eq ("some sql statement" ), any (SqlParameterSource .class ), captor .capture ());
153
152
assertThat (captor .getValue ()).isInstanceOf (CustomResultSetExtractor .class );
154
153
}
155
154
156
155
@ Test // GH-774
157
- public void sliceQueryNotSupported () {
156
+ void sliceQueryNotSupported () {
158
157
159
158
JdbcQueryMethod queryMethod = createMethod ("sliceAll" , Pageable .class );
160
159
@@ -164,7 +163,7 @@ public void sliceQueryNotSupported() {
164
163
}
165
164
166
165
@ Test // GH-774
167
- public void pageQueryNotSupported () {
166
+ void pageQueryNotSupported () {
168
167
169
168
JdbcQueryMethod queryMethod = createMethod ("pageAll" , Pageable .class );
170
169
0 commit comments