Skip to content

Commit f2e4930

Browse files
mp911demp911de
committed
Polishing.
Reformat code. See #4135 Original pull request: #4136
1 parent 12b9ebe commit f2e4930

File tree

1 file changed

+32
-30
lines changed

1 file changed

+32
-30
lines changed

‎spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/JpaQueryCreatorTests.java‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import jakarta.persistence.ElementCollection;
2222
import jakarta.persistence.Embeddable;
2323
import jakarta.persistence.Embedded;
24+
import jakarta.persistence.Entity;
2425
import jakarta.persistence.EntityManager;
2526
import jakarta.persistence.Id;
2627
import jakarta.persistence.ManyToOne;
@@ -77,8 +78,8 @@ class JpaQueryCreatorTests {
7778

7879
static List<JpqlQueryTemplates> ignoreCaseTemplates = List.of(JpqlQueryTemplates.LOWER, JpqlQueryTemplates.UPPER);
7980

80-
private static final TestMetaModel ORDER_WITH_RELATIONS = TestMetaModel.hibernateModel(
81-
OrderWithRelations.class, Customer.class, Supplier.class);
81+
private static final TestMetaModel ORDER_WITH_RELATIONS = TestMetaModel.hibernateModel(OrderWithRelations.class,
82+
Customer.class, Supplier.class);
8283

8384
@Test // GH-3588
8485
void simpleProperty() {
@@ -249,9 +250,8 @@ void simplePropertyMixedCase(JpqlQueryTemplates ignoreCaseTemplate) {
249250
.withParameters("spring", "data") //
250251
.as(QueryCreatorTester::create) //
251252
.expectJpql("SELECT p FROM %s p WHERE p.name = ?1 AND %s(p.productType) = %s(?2)",
252-
DefaultJpaEntityMetadata.unqualify(Product.class),
253-
ignoreCaseTemplate.getIgnoreCaseOperator(), ignoreCaseTemplate.getIgnoreCaseOperator(),
254-
ignoreCaseTemplate.getIgnoreCaseOperator()) //
253+
DefaultJpaEntityMetadata.unqualify(Product.class), ignoreCaseTemplate.getIgnoreCaseOperator(),
254+
ignoreCaseTemplate.getIgnoreCaseOperator(), ignoreCaseTemplate.getIgnoreCaseOperator()) //
255255
.validateQuery();
256256
}
257257

@@ -440,8 +440,8 @@ void likeWithIgnoreCase(JpqlQueryTemplates ignoreCaseTemplate) {
440440
.withParameters("%spring%") //
441441
.as(QueryCreatorTester::create) //
442442
.expectJpql("SELECT p FROM %s p WHERE %s(p.name) LIKE %s(?1) ESCAPE '\\'",
443-
DefaultJpaEntityMetadata.unqualify(Product.class),
444-
ignoreCaseTemplate.getIgnoreCaseOperator(), ignoreCaseTemplate.getIgnoreCaseOperator()) //
443+
DefaultJpaEntityMetadata.unqualify(Product.class), ignoreCaseTemplate.getIgnoreCaseOperator(),
444+
ignoreCaseTemplate.getIgnoreCaseOperator()) //
445445
.expectPlaceholderValue("?1", "%spring%") //
446446
.validateQuery();
447447
}
@@ -470,8 +470,8 @@ void notLikeWithIgnoreCase(JpqlQueryTemplates ignoreCaseTemplate) {
470470
.withParameters("%spring%") //
471471
.as(QueryCreatorTester::create) //
472472
.expectJpql("SELECT p FROM %s p WHERE %s(p.name) NOT LIKE %s(?1) ESCAPE '\\'",
473-
DefaultJpaEntityMetadata.unqualify(Product.class),
474-
ignoreCaseTemplate.getIgnoreCaseOperator(), ignoreCaseTemplate.getIgnoreCaseOperator()) //
473+
DefaultJpaEntityMetadata.unqualify(Product.class), ignoreCaseTemplate.getIgnoreCaseOperator(),
474+
ignoreCaseTemplate.getIgnoreCaseOperator()) //
475475
.expectPlaceholderValue("?1", "%spring%") //
476476
.validateQuery();
477477
}
@@ -499,8 +499,8 @@ void startingWithIgnoreCase(JpqlQueryTemplates ignoreCaseTemplate) {
499499
.withParameters("spring") //
500500
.as(QueryCreatorTester::create) //
501501
.expectJpql("SELECT p FROM %s p WHERE %s(p.name) LIKE %s(?1) ESCAPE '\\'",
502-
DefaultJpaEntityMetadata.unqualify(Product.class),
503-
ignoreCaseTemplate.getIgnoreCaseOperator(), ignoreCaseTemplate.getIgnoreCaseOperator()) //
502+
DefaultJpaEntityMetadata.unqualify(Product.class), ignoreCaseTemplate.getIgnoreCaseOperator(),
503+
ignoreCaseTemplate.getIgnoreCaseOperator()) //
504504
.expectPlaceholderValue("?1", "spring%") //
505505
.validateQuery();
506506
}
@@ -528,8 +528,8 @@ void endingWithIgnoreCase(JpqlQueryTemplates ignoreCaseTemplate) {
528528
.withParameters("spring") //
529529
.as(QueryCreatorTester::create) //
530530
.expectJpql("SELECT p FROM %s p WHERE %s(p.name) LIKE %s(?1) ESCAPE '\\'",
531-
DefaultJpaEntityMetadata.unqualify(Product.class),
532-
ignoreCaseTemplate.getIgnoreCaseOperator(), ignoreCaseTemplate.getIgnoreCaseOperator()) //
531+
DefaultJpaEntityMetadata.unqualify(Product.class), ignoreCaseTemplate.getIgnoreCaseOperator(),
532+
ignoreCaseTemplate.getIgnoreCaseOperator()) //
533533
.expectPlaceholderValue("?1", "%spring") //
534534
.validateQuery();
535535
}
@@ -620,8 +620,7 @@ void sortBySingleIgnoreCase(JpqlQueryTemplates ignoreCase) {
620620
.render();
621621

622622
assertThat(jpql).isEqualTo("SELECT o FROM %s o ORDER BY %s(o.date) asc",
623-
DefaultJpaEntityMetadata.unqualify(Order.class),
624-
ignoreCase.getIgnoreCaseOperator());
623+
DefaultJpaEntityMetadata.unqualify(Order.class), ignoreCase.getIgnoreCaseOperator());
625624
}
626625

627626
@Test // GH-3588
@@ -759,8 +758,7 @@ void doesNotCreateJoinForRelationshipEmbeddedId() {
759758
.forTree(ReferencingEmbeddedIdExampleEmployee.class, "findByEmployee_EmployeePk_EmployeeId") //
760759
.withParameters(1L) //
761760
.as(QueryCreatorTester::create) //
762-
.expectJpql(
763-
"SELECT r FROM ReferencingEmbeddedIdExampleEmployee r WHERE r.employee.employeePk.employeeId = ?1") //
761+
.expectJpql("SELECT r FROM ReferencingEmbeddedIdExampleEmployee r WHERE r.employee.employeePk.employeeId = ?1") //
764762
.validateQuery();
765763
}
766764

@@ -1137,43 +1135,47 @@ JpaQueryCreator initJpaQueryCreator() {
11371135
}
11381136

11391137
@Test // GH-4135
1140-
void interfaceProjectionWithMultipleJoinsShouldGenerateUniqueAliases() {
1138+
void interfaceProjectionShouldGenerateUniqueSelectionAliases() {
11411139

1142-
queryCreator(ORDER_WITH_RELATIONS)
1143-
.forTree(OrderWithRelations.class, "findProjectionById")
1144-
.returning(OrderSummaryProjection.class)
1145-
.withParameters(1L)
1146-
.as(QueryCreatorTester::create)
1140+
queryCreator(ORDER_WITH_RELATIONS).forTree(OrderWithRelations.class, "findProjectionById")
1141+
.returning(OrderSummaryProjection.class) //
1142+
.withParameters(1L) //
1143+
.as(QueryCreatorTester::create) //
11471144
.expectJpql(
11481145
"SELECT o.id id, c.id customerId, s.id supplierId, c.name customerName, s.name supplierName FROM %s o LEFT JOIN o.customer c LEFT JOIN o.supplier s WHERE o.id = ?1",
11491146
DefaultJpaEntityMetadata.unqualify(OrderWithRelations.class))
11501147
.validateQuery();
11511148
}
11521149

1153-
@jakarta.persistence.Entity
1150+
@Entity
11541151
static class OrderWithRelations {
11551152
@Id Long id;
11561153
@ManyToOne Customer customer;
11571154
@ManyToOne Supplier supplier;
11581155
}
11591156

1160-
@jakarta.persistence.Entity
1157+
@Entity
11611158
static class Customer {
11621159
@Id Long id;
11631160
String name;
11641161
}
11651162

1166-
@jakarta.persistence.Entity
1163+
@Entity
11671164
static class Supplier {
11681165
@Id Long id;
11691166
String name;
11701167
}
11711168

11721169
interface OrderSummaryProjection {
1170+
11731171
Long getId();
1174-
Long getCustomerId(); // → customer.id
1175-
Long getSupplierId(); // → supplier.id
1176-
String getCustomerName(); // → customer.name
1177-
String getSupplierName(); // → supplier.name
1172+
1173+
Long getCustomerId(); // customer.id
1174+
1175+
Long getSupplierId(); // supplier.id
1176+
1177+
String getCustomerName(); // customer.name
1178+
1179+
String getSupplierName(); // supplier.name
11781180
}
11791181
}

0 commit comments

Comments
 (0)