Skip to content

Commit 3b88a89

Browse files
schauderschauder
committed
DATAJDBC-207 - Polishing.
Formatting.
1 parent fafe2af commit 3b88a89

File tree

5 files changed

+33
-26
lines changed

5 files changed

+33
-26
lines changed

‎src/test/java/org/springframework/data/jdbc/core/SqlGeneratorContextBasedNamingStrategyUnitTests.java

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ public void cascadingDeleteAllSecondLevel() {
9595

9696
String sql = sqlGenerator.createDeleteByPath(PropertyPath.from("ref.further", DummyEntity.class));
9797

98-
assertThat(sql).isEqualTo(
99-
"DELETE FROM " + user + ".second_level_referenced_entity " +
100-
"WHERE " + user + ".referenced_entity IN " +
101-
"(SELECT l1id FROM " + user + ".referenced_entity " +
102-
"WHERE " + user + ".dummy_entity = :rootId)");
98+
assertThat(sql).isEqualTo( //
99+
"DELETE FROM " + user + ".second_level_referenced_entity " //
100+
+ "WHERE " + user + ".referenced_entity IN " //
101+
+ "(SELECT l1id FROM " + user + ".referenced_entity " //
102+
+ "WHERE " + user + ".dummy_entity = :rootId)");
103103
});
104104
}
105105

@@ -125,8 +125,8 @@ public void cascadingDeleteAllFirstLevel() {
125125

126126
String sql = sqlGenerator.createDeleteAllSql(PropertyPath.from("ref", DummyEntity.class));
127127

128-
assertThat(sql).isEqualTo(
129-
"DELETE FROM " + user + ".referenced_entity WHERE " + user + ".dummy_entity IS NOT NULL");
128+
assertThat(sql).isEqualTo( //
129+
"DELETE FROM " + user + ".referenced_entity WHERE " + user + ".dummy_entity IS NOT NULL");
130130
});
131131
}
132132

@@ -139,11 +139,11 @@ public void cascadingDeleteSecondLevel() {
139139

140140
String sql = sqlGenerator.createDeleteAllSql(PropertyPath.from("ref.further", DummyEntity.class));
141141

142-
assertThat(sql).isEqualTo(
143-
"DELETE FROM " + user + ".second_level_referenced_entity " +
144-
"WHERE " + user + ".referenced_entity IN " +
145-
"(SELECT l1id FROM " + user + ".referenced_entity " +
146-
"WHERE " + user + ".dummy_entity IS NOT NULL)");
142+
assertThat(sql).isEqualTo( //
143+
"DELETE FROM " + user + ".second_level_referenced_entity " //
144+
+ "WHERE " + user + ".referenced_entity IN " //
145+
+ "(SELECT l1id FROM " + user + ".referenced_entity " //
146+
+ "WHERE " + user + ".dummy_entity IS NOT NULL)");
147147
});
148148
}
149149

@@ -159,7 +159,7 @@ private void testAgainstMultipleUsers(Consumer<String> testAssertions) {
159159
threadedTest("User2", latch, testAssertions, exception);
160160

161161
try {
162-
if (!latch.await(10L, TimeUnit.SECONDS)){
162+
if (!latch.await(10L, TimeUnit.SECONDS)) {
163163
fail("Test failed due to a time out.");
164164
}
165165
} catch (InterruptedException e) {
@@ -176,7 +176,8 @@ private void testAgainstMultipleUsers(Consumer<String> testAssertions) {
176176
* Inside a {@link Runnable}, fetch the {@link ThreadLocal}-based username and execute the provided set of assertions.
177177
* Then signal through the provided {@link CountDownLatch}.
178178
*/
179-
private void threadedTest(String user, CountDownLatch latch, Consumer<String> testAssertions, AtomicReference<Error> exception) {
179+
private void threadedTest(String user, CountDownLatch latch, Consumer<String> testAssertions,
180+
AtomicReference<Error> exception) {
180181

181182
new Thread(() -> {
182183

‎src/test/java/org/springframework/data/jdbc/core/SqlGeneratorUnitTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ public void findAllByPropertyWithKey() {
126126
// this would get called when DummyEntity is th element type of a Map
127127
String sql = sqlGenerator.getFindAllByProperty("back-ref", "key-column", false);
128128

129-
assertThat(sql).isEqualTo("SELECT dummy_entity.x_id AS x_id, dummy_entity.x_name AS x_name, "
130-
+ "ref.x_l1id AS ref_x_l1id, ref.x_content AS ref_x_content, ref.x_further AS ref_x_further, "
131-
+ "dummy_entity.key-column AS key-column "
132-
+ "FROM dummy_entity LEFT OUTER JOIN referenced_entity AS ref ON ref.dummy_entity = dummy_entity.x_id "
129+
assertThat(sql).isEqualTo("SELECT dummy_entity.x_id AS x_id, dummy_entity.x_name AS x_name, " //
130+
+ "ref.x_l1id AS ref_x_l1id, ref.x_content AS ref_x_content, ref.x_further AS ref_x_further, " //
131+
+ "dummy_entity.key-column AS key-column " //
132+
+ "FROM dummy_entity LEFT OUTER JOIN referenced_entity AS ref ON ref.dummy_entity = dummy_entity.x_id " //
133133
+ "WHERE back-ref = :back-ref");
134134
}
135135

‎src/test/java/org/springframework/data/jdbc/core/conversion/JdbcEntityWriterUnitTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public void newEntityWithFullMapResultsInAdditionalInsertPerElement() {
237237
tuple(Insert.class, Element.class, "0", "elements"), //
238238
tuple(Insert.class, Element.class, "a", "elements"), //
239239
tuple(Insert.class, Element.class, "b", "elements") //
240-
);
240+
);
241241
}
242242

243243
@Test // DATAJDBC-130
@@ -294,7 +294,7 @@ public void mapTriggersDeletePlusInsert() {
294294
tuple(Delete.class, Element.class, null, "elements"), //
295295
tuple(Update.class, MapContainer.class, null, ""), //
296296
tuple(Insert.class, Element.class, "one", "elements") //
297-
);
297+
);
298298
}
299299

300300
@Test // DATAJDBC-130
@@ -313,7 +313,7 @@ public void listTriggersDeletePlusInsert() {
313313
tuple(Delete.class, Element.class, null, "elements"), //
314314
tuple(Update.class, ListContainer.class, null, ""), //
315315
tuple(Insert.class, Element.class, 0, "elements") //
316-
);
316+
);
317317
}
318318

319319
private CascadingReferenceMiddleElement createMiddleElement(Element first, Element second) {

‎src/test/java/org/springframework/data/jdbc/mapping/model/NamingStrategyUnitTests.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,12 @@ public void getTableName() {
5050

5151
@Test // DATAJDBC-184
5252
public void getColumnName() {
53-
assertThat(target.getColumnName(persistentEntity.getPersistentProperty("id"))).isEqualTo("id");
54-
assertThat(target.getColumnName(persistentEntity.getPersistentProperty("createdAt"))).isEqualTo("created_at");
55-
assertThat(target.getColumnName(persistentEntity.getPersistentProperty("dummySubEntities")))
53+
54+
assertThat(target.getColumnName(persistentEntity.getPersistentProperty("id"))) //
55+
.isEqualTo("id");
56+
assertThat(target.getColumnName(persistentEntity.getPersistentProperty("createdAt"))) //
57+
.isEqualTo("created_at");
58+
assertThat(target.getColumnName(persistentEntity.getPersistentProperty("dummySubEntities"))) //
5659
.isEqualTo("dummy_sub_entities");
5760
}
5861

@@ -64,7 +67,8 @@ public void getReverseColumnName() {
6467

6568
@Test // DATAJDBC-184
6669
public void getKeyColumn() {
67-
assertThat(target.getKeyColumn(persistentEntity.getPersistentProperty("dummySubEntities")))
70+
71+
assertThat(target.getKeyColumn(persistentEntity.getPersistentProperty("dummySubEntities"))) //
6872
.isEqualTo("dummy_entity_key");
6973
}
7074

@@ -75,18 +79,21 @@ public void getSchema() {
7579

7680
@Test // DATAJDBC-184
7781
public void getQualifiedTableName() {
82+
7883
assertThat(target.getQualifiedTableName(persistentEntity.getType())).isEqualTo("dummy_entity");
7984
}
8085

8186
@Data
8287
private static class DummyEntity {
88+
8389
@Id private int id;
8490
private LocalDateTime createdAt;
8591
private List<DummySubEntity> dummySubEntities;
8692
}
8793

8894
@Data
8995
private static class DummySubEntity {
96+
9097
@Id private int id;
9198
private LocalDateTime createdAt;
9299
}

‎src/test/java/org/springframework/data/jdbc/repository/JdbcRepositoryIntegrationTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ DummyEntityRepository dummyEntityRepository() {
6666

6767
}
6868

69-
7069
@ClassRule public static final SpringClassRule classRule = new SpringClassRule();
7170
@Rule public SpringMethodRule methodRule = new SpringMethodRule();
7271

0 commit comments

Comments
 (0)