@@ -170,7 +170,7 @@ void count() {
170170
171171 queryCreator (ORDER ) //
172172 .forTree (Order .class , "countOrderByCountry" ) //
173- .returing (Long .class ) //
173+ .returning (Long .class ) //
174174 .withParameters ("AU" ) //
175175 .as (QueryCreatorTester ::create ) //
176176 .expectJpql ("SELECT COUNT(o) FROM %s o WHERE o.country = ?1" , DefaultJpaEntityMetadata .unqualify (Order .class )) //
@@ -182,7 +182,7 @@ void countWithJoins() {
182182
183183 queryCreator (ORDER ) //
184184 .forTree (Order .class , "countOrderByLineItemsQuantityGreaterThan" ) //
185- .returing (Long .class ) //
185+ .returning (Long .class ) //
186186 .withParameterTypes (Integer .class ) //
187187 .as (QueryCreatorTester ::create ) //
188188 .expectJpql ("SELECT COUNT(o) FROM %s o LEFT JOIN o.lineItems l WHERE l.quantity > ?1" ,
@@ -195,7 +195,7 @@ void countDistinct() {
195195
196196 queryCreator (ORDER ) //
197197 .forTree (Order .class , "countDistinctOrderByCountry" ) //
198- .returing (Long .class ) //
198+ .returning (Long .class ) //
199199 .withParameters ("AU" ) //
200200 .as (QueryCreatorTester ::create ) //
201201 .expectJpql ("SELECT COUNT(DISTINCT o) FROM %s o WHERE o.country = ?1" ,
@@ -205,47 +205,47 @@ void countDistinct() {
205205
206206 @ ParameterizedTest // GH-3588
207207 @ FieldSource ("ignoreCaseTemplates" )
208- void simplePropertyIgnoreCase (JpqlQueryTemplates ingnoreCaseTemplate ) {
208+ void simplePropertyIgnoreCase (JpqlQueryTemplates ignoreCaseTemplate ) {
209209
210210 queryCreator (ORDER ) //
211211 .forTree (Order .class , "findOrderByCountryIgnoreCase" ) //
212- .ingnoreCaseAs ( ingnoreCaseTemplate ) //
212+ .ignoreCaseAs ( ignoreCaseTemplate ) //
213213 .withParameters ("BB" ) //
214214 .as (QueryCreatorTester ::create ) //
215215 .expectJpql ("SELECT o FROM %s o WHERE %s(o.country) = %s(?1)" , DefaultJpaEntityMetadata .unqualify (Order .class ),
216- ingnoreCaseTemplate .getIgnoreCaseOperator (), ingnoreCaseTemplate .getIgnoreCaseOperator ()) //
216+ ignoreCaseTemplate .getIgnoreCaseOperator (), ignoreCaseTemplate .getIgnoreCaseOperator ()) //
217217 .validateQuery ();
218218 }
219219
220220 @ ParameterizedTest // GH-3588
221221 @ FieldSource ("ignoreCaseTemplates" )
222- void simplePropertyAllIgnoreCase (JpqlQueryTemplates ingnoreCaseTemplate ) {
222+ void simplePropertyAllIgnoreCase (JpqlQueryTemplates ignoreCaseTemplate ) {
223223
224224 queryCreator (ORDER ) //
225225 .forTree (Product .class , "findProductByNameAndProductTypeAllIgnoreCase" ) //
226- .ingnoreCaseAs ( ingnoreCaseTemplate ) //
226+ .ignoreCaseAs ( ignoreCaseTemplate ) //
227227 .withParameters ("spring" , "data" ) //
228228 .as (QueryCreatorTester ::create ) //
229229 .expectJpql ("SELECT p FROM %s p WHERE %s(p.name) = %s(?1) AND %s(p.productType) = %s(?2)" ,
230- DefaultJpaEntityMetadata .unqualify (Product .class ), ingnoreCaseTemplate .getIgnoreCaseOperator (),
231- ingnoreCaseTemplate .getIgnoreCaseOperator (), ingnoreCaseTemplate .getIgnoreCaseOperator (),
232- ingnoreCaseTemplate .getIgnoreCaseOperator ()) //
230+ DefaultJpaEntityMetadata .unqualify (Product .class ), ignoreCaseTemplate .getIgnoreCaseOperator (),
231+ ignoreCaseTemplate .getIgnoreCaseOperator (), ignoreCaseTemplate .getIgnoreCaseOperator (),
232+ ignoreCaseTemplate .getIgnoreCaseOperator ()) //
233233 .validateQuery ();
234234 }
235235
236236 @ ParameterizedTest // GH-3588
237237 @ FieldSource ("ignoreCaseTemplates" )
238- void simplePropertyMixedCase (JpqlQueryTemplates ingnoreCaseTemplate ) {
238+ void simplePropertyMixedCase (JpqlQueryTemplates ignoreCaseTemplate ) {
239239
240240 queryCreator (ORDER ) //
241241 .forTree (Product .class , "findProductByNameAndProductTypeIgnoreCase" ) //
242- .ingnoreCaseAs ( ingnoreCaseTemplate ) //
242+ .ignoreCaseAs ( ignoreCaseTemplate ) //
243243 .withParameters ("spring" , "data" ) //
244244 .as (QueryCreatorTester ::create ) //
245245 .expectJpql ("SELECT p FROM %s p WHERE p.name = ?1 AND %s(p.productType) = %s(?2)" ,
246246 DefaultJpaEntityMetadata .unqualify (Product .class ),
247- ingnoreCaseTemplate .getIgnoreCaseOperator (), ingnoreCaseTemplate .getIgnoreCaseOperator (),
248- ingnoreCaseTemplate .getIgnoreCaseOperator ()) //
247+ ignoreCaseTemplate .getIgnoreCaseOperator (), ignoreCaseTemplate .getIgnoreCaseOperator (),
248+ ignoreCaseTemplate .getIgnoreCaseOperator ()) //
249249 .validateQuery ();
250250 }
251251
@@ -426,16 +426,16 @@ void notContainingSingleEntryElementCollection() {
426426
427427 @ ParameterizedTest // GH-3588
428428 @ FieldSource ("ignoreCaseTemplates" )
429- void likeWithIgnoreCase (JpqlQueryTemplates ingnoreCaseTemplate ) {
429+ void likeWithIgnoreCase (JpqlQueryTemplates ignoreCaseTemplate ) {
430430
431431 queryCreator (ORDER ) //
432432 .forTree (Product .class , "findProductByNameLikeIgnoreCase" ) //
433- .ingnoreCaseAs ( ingnoreCaseTemplate ) //
433+ .ignoreCaseAs ( ignoreCaseTemplate ) //
434434 .withParameters ("%spring%" ) //
435435 .as (QueryCreatorTester ::create ) //
436436 .expectJpql ("SELECT p FROM %s p WHERE %s(p.name) LIKE %s(?1) ESCAPE '\\ '" ,
437437 DefaultJpaEntityMetadata .unqualify (Product .class ),
438- ingnoreCaseTemplate .getIgnoreCaseOperator (), ingnoreCaseTemplate .getIgnoreCaseOperator ()) //
438+ ignoreCaseTemplate .getIgnoreCaseOperator (), ignoreCaseTemplate .getIgnoreCaseOperator ()) //
439439 .expectPlaceholderValue ("?1" , "%spring%" ) //
440440 .validateQuery ();
441441 }
@@ -456,16 +456,16 @@ void notLike(String parameterValue) {
456456
457457 @ ParameterizedTest // GH-3588
458458 @ FieldSource ("ignoreCaseTemplates" )
459- void notLikeWithIgnoreCase (JpqlQueryTemplates ingnoreCaseTemplate ) {
459+ void notLikeWithIgnoreCase (JpqlQueryTemplates ignoreCaseTemplate ) {
460460
461461 queryCreator (ORDER ) //
462462 .forTree (Product .class , "findProductByNameNotLikeIgnoreCase" ) //
463- .ingnoreCaseAs ( ingnoreCaseTemplate ) //
463+ .ignoreCaseAs ( ignoreCaseTemplate ) //
464464 .withParameters ("%spring%" ) //
465465 .as (QueryCreatorTester ::create ) //
466466 .expectJpql ("SELECT p FROM %s p WHERE %s(p.name) NOT LIKE %s(?1) ESCAPE '\\ '" ,
467467 DefaultJpaEntityMetadata .unqualify (Product .class ),
468- ingnoreCaseTemplate .getIgnoreCaseOperator (), ingnoreCaseTemplate .getIgnoreCaseOperator ()) //
468+ ignoreCaseTemplate .getIgnoreCaseOperator (), ignoreCaseTemplate .getIgnoreCaseOperator ()) //
469469 .expectPlaceholderValue ("?1" , "%spring%" ) //
470470 .validateQuery ();
471471 }
@@ -485,16 +485,16 @@ void startingWith() {
485485
486486 @ ParameterizedTest // GH-3588
487487 @ FieldSource ("ignoreCaseTemplates" )
488- void startingWithIgnoreCase (JpqlQueryTemplates ingnoreCaseTemplate ) {
488+ void startingWithIgnoreCase (JpqlQueryTemplates ignoreCaseTemplate ) {
489489
490490 queryCreator (ORDER ) //
491491 .forTree (Product .class , "findProductByNameStartingWithIgnoreCase" ) //
492- .ingnoreCaseAs ( ingnoreCaseTemplate ) //
492+ .ignoreCaseAs ( ignoreCaseTemplate ) //
493493 .withParameters ("spring" ) //
494494 .as (QueryCreatorTester ::create ) //
495495 .expectJpql ("SELECT p FROM %s p WHERE %s(p.name) LIKE %s(?1) ESCAPE '\\ '" ,
496496 DefaultJpaEntityMetadata .unqualify (Product .class ),
497- ingnoreCaseTemplate .getIgnoreCaseOperator (), ingnoreCaseTemplate .getIgnoreCaseOperator ()) //
497+ ignoreCaseTemplate .getIgnoreCaseOperator (), ignoreCaseTemplate .getIgnoreCaseOperator ()) //
498498 .expectPlaceholderValue ("?1" , "spring%" ) //
499499 .validateQuery ();
500500 }
@@ -514,16 +514,16 @@ void endingWith() {
514514
515515 @ ParameterizedTest // GH-3588
516516 @ FieldSource ("ignoreCaseTemplates" )
517- void endingWithIgnoreCase (JpqlQueryTemplates ingnoreCaseTemplate ) {
517+ void endingWithIgnoreCase (JpqlQueryTemplates ignoreCaseTemplate ) {
518518
519519 queryCreator (ORDER ) //
520520 .forTree (Product .class , "findProductByNameEndingWithIgnoreCase" ) //
521- .ingnoreCaseAs ( ingnoreCaseTemplate ) //
521+ .ignoreCaseAs ( ignoreCaseTemplate ) //
522522 .withParameters ("spring" ) //
523523 .as (QueryCreatorTester ::create ) //
524524 .expectJpql ("SELECT p FROM %s p WHERE %s(p.name) LIKE %s(?1) ESCAPE '\\ '" ,
525525 DefaultJpaEntityMetadata .unqualify (Product .class ),
526- ingnoreCaseTemplate .getIgnoreCaseOperator (), ingnoreCaseTemplate .getIgnoreCaseOperator ()) //
526+ ignoreCaseTemplate .getIgnoreCaseOperator (), ignoreCaseTemplate .getIgnoreCaseOperator ()) //
527527 .expectPlaceholderValue ("?1" , "%spring" ) //
528528 .validateQuery ();
529529 }
@@ -607,15 +607,15 @@ void sortByMulti() {
607607 @ Disabled ("should we support this?" )
608608 @ ParameterizedTest // GH-3588
609609 @ FieldSource ("ignoreCaseTemplates" )
610- void sortBySingleIngoreCase (JpqlQueryTemplates ingoreCase ) {
610+ void sortBySingleIgnoreCase (JpqlQueryTemplates ignoreCase ) {
611611
612612 String jpql = queryCreator (ORDER ) //
613613 .forTree (Order .class , "findOrderByOrderByCountryAscAllIgnoreCase" ) //
614614 .render ();
615615
616616 assertThat (jpql ).isEqualTo ("SELECT o FROM %s o ORDER BY %s(o.date) asc" ,
617617 DefaultJpaEntityMetadata .unqualify (Order .class ),
618- ingoreCase .getIgnoreCaseOperator ());
618+ ignoreCase .getIgnoreCaseOperator ());
619619 }
620620
621621 @ Test // GH-3588
@@ -686,7 +686,7 @@ void dtoProjection() {
686686
687687 queryCreator (ORDER ) //
688688 .forTree (Product .class , "findProjectionByNameIs" ) //
689- .returing (DtoProductProjection .class ) //
689+ .returning (DtoProductProjection .class ) //
690690 .withParameters ("spring" ) //
691691 .as (QueryCreatorTester ::create ) //
692692 .expectJpql ("SELECT new %s(p.name, p.productType) FROM %s p WHERE p.name = ?1" ,
@@ -699,7 +699,7 @@ void interfaceProjection() {
699699
700700 queryCreator (ORDER ) //
701701 .forTree (Product .class , "findProjectionByNameIs" ) //
702- .returing (InterfaceProductProjection .class ) //
702+ .returning (InterfaceProductProjection .class ) //
703703 .withParameters ("spring" ) //
704704 .as (QueryCreatorTester ::create ) //
705705 .expectJpql ("SELECT p.name name, p.productType productType FROM %s p WHERE p.name = ?1" ,
@@ -713,7 +713,7 @@ void tupleProjection(Class<?> resultType) {
713713
714714 queryCreator (PERSON ) //
715715 .forTree (Person .class , "findProjectionByFirstnameIs" ) //
716- .returing (resultType ) //
716+ .returning (resultType ) //
717717 .withParameters ("chris" ) //
718718 .as (QueryCreatorTester ::create ) //
719719 .expectJpql ("SELECT p.id id, p.firstname firstname, p.lastname lastname FROM %s p WHERE p.firstname = ?1" ,
@@ -727,7 +727,7 @@ void delete(Class<?> resultType) {
727727
728728 queryCreator (PERSON ) //
729729 .forTree (Person .class , "deletePersonByFirstname" ) //
730- .returing (resultType ) //
730+ .returning (resultType ) //
731731 .withParameters ("chris" ) //
732732 .as (QueryCreatorTester ::create ) //
733733 .expectJpql ("SELECT p FROM %s p WHERE p.firstname = ?1" , DefaultJpaEntityMetadata .unqualify (Person .class )) //
@@ -739,7 +739,7 @@ void exists() {
739739
740740 queryCreator (PERSON ) //
741741 .forTree (Person .class , "existsPersonByFirstname" ) //
742- .returing (Long .class ).withParameters ("chris" ) //
742+ .returning (Long .class ).withParameters ("chris" ) //
743743 .as (QueryCreatorTester ::create ) //
744744 .expectJpql ("SELECT p.id id FROM %s p WHERE p.firstname = ?1" , DefaultJpaEntityMetadata .unqualify (Person .class )) //
745745 .validateQuery ();
@@ -905,7 +905,7 @@ QueryCreatorTester validateQuery() {
905905 return validateQuery (tmm .entityManager ());
906906 }
907907
908- throw new IllegalStateException ("No EntityManager found, plase provide one via [verify(EntityManager)]" );
908+ throw new IllegalStateException ("No EntityManager found, please provide one via [verify(EntityManager)]" );
909909 }
910910
911911 QueryCreatorTester validateQuery (EntityManager entityManager ) {
@@ -922,15 +922,15 @@ QueryCreatorTester validateQuery(EntityManager entityManager) {
922922
923923 interface QueryCreatorBuilder {
924924
925- QueryCreatorBuilder returing (ReturnedType returnedType );
925+ QueryCreatorBuilder returning (ReturnedType returnedType );
926926
927927 QueryCreatorBuilder forTree (Class <?> root , String querySource );
928928
929929 QueryCreatorBuilder withParameters (Object ... arguments );
930930
931931 QueryCreatorBuilder withParameterTypes (Class <?>... argumentTypes );
932932
933- QueryCreatorBuilder ingnoreCaseAs (JpqlQueryTemplates queryTemplate );
933+ QueryCreatorBuilder ignoreCaseAs (JpqlQueryTemplates queryTemplate );
934934
935935 default <T > T as (Function <QueryCreatorBuilder , T > transformer ) {
936936 return transformer .apply (this );
@@ -946,7 +946,7 @@ default String render() {
946946
947947 String render (@ Nullable Sort sort );
948948
949- QueryCreatorBuilder returing (Class <?> type );
949+ QueryCreatorBuilder returning (Class <?> type );
950950 }
951951
952952 private class DefaultCreatorBuilder implements QueryCreatorBuilder {
@@ -969,19 +969,19 @@ public DefaultCreatorBuilder(Metamodel metamodel) {
969969 }
970970
971971 @ Override
972- public QueryCreatorBuilder returing (ReturnedType returnedType ) {
972+ public QueryCreatorBuilder returning (ReturnedType returnedType ) {
973973 this .returnedType = returnedType ;
974974 return this ;
975975 }
976976
977977 @ Override
978- public QueryCreatorBuilder returing (Class <?> type ) {
978+ public QueryCreatorBuilder returning (Class <?> type ) {
979979
980980 if (this .returnedType != null ) {
981- return returing (ReturnedType .of (type , returnedType .getDomainType (), PROJECTION_FACTORY ));
981+ return returning (ReturnedType .of (type , returnedType .getDomainType (), PROJECTION_FACTORY ));
982982 }
983983
984- return returing (ReturnedType .of (type , type , PROJECTION_FACTORY ));
984+ return returning (ReturnedType .of (type , type , PROJECTION_FACTORY ));
985985 }
986986
987987 @ Override
@@ -1007,7 +1007,7 @@ public QueryCreatorBuilder withParameterTypes(Class<?>... argumentTypes) {
10071007 }
10081008
10091009 @ Override
1010- public QueryCreatorBuilder ingnoreCaseAs (JpqlQueryTemplates queryTemplate ) {
1010+ public QueryCreatorBuilder ignoreCaseAs (JpqlQueryTemplates queryTemplate ) {
10111011 this .queryTemplates = queryTemplate ;
10121012 return this ;
10131013 }
0 commit comments