early returns

Author: schauder

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorEmbeddedUnitTests.java

@@ -34,7 +34,6 @@
 import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
 import org.springframework.data.relational.core.mapping.Table;
 import org.springframework.data.relational.core.sql.Aliased;
-import org.springframework.data.relational.core.sql.Conditions;
 import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.lang.Nullable;
 
@@ -446,18 +445,8 @@ void joinForEmbeddedWithReference() {
 
 		assertSoftly(softly -> {
 			softly.assertThat(join.joinTable().getName()).isEqualTo(SqlIdentifier.unquoted("other_entity"));
-//			softly.assertThat(join.columns()).extracting( //
-//					pair -> pair.getFirst().getTable(), //
-//					pair -> pair.getFirst().getName(), //
-//					pair -> pair.getSecond().getTable().getName(), //
-//					pair -> pair.getSecond().getName() //
-//			).contains(tuple( //
-//					join.joinTable(), //
-//					SqlIdentifier.unquoted("dummy_entity2"), //
-//					SqlIdentifier.unquoted("dummy_entity2"), //
-//					SqlIdentifier.unquoted("id") //
-//			));
-			softly.assertThat(join.condition()).isEqualTo(org.springframework.data.relational.core.sql.Column.create("dummy_entity2", join.joinTable()).isEqualTo(org.springframework.data.relational.core.sql.Column.create("id", org.springframework.data.relational.core.sql.Table.create("dummy_entity2"))));
+			softly.assertThat(join.condition())
+					.isEqualTo(SqlGeneratorUnitTests.equalsCondition("dummy_entity2", "id", join.joinTable(), "dummy_entity2"));
 		});
 	}
 

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/SqlGeneratorUnitTests.java

@@ -50,6 +50,7 @@
 import org.springframework.data.relational.core.query.Criteria;
 import org.springframework.data.relational.core.query.Query;
 import org.springframework.data.relational.core.sql.Aliased;
+import org.springframework.data.relational.core.sql.Comparison;
 import org.springframework.data.relational.core.sql.LockMode;
 import org.springframework.data.relational.core.sql.SqlIdentifier;
 import org.springframework.data.relational.core.sql.Table;
@@ -85,6 +86,22 @@ class SqlGeneratorUnitTests {
 	});
 	private SqlGenerator sqlGenerator;
 
+	static Comparison equalsCondition(Table parentTable, SqlIdentifier parentId, Table joinedTable,
+			SqlIdentifier joinedColumn) {
+		return org.springframework.data.relational.core.sql.Column.create(joinedColumn, joinedTable)
+				.isEqualTo(org.springframework.data.relational.core.sql.Column.create(parentId, parentTable));
+	}
+
+	static Comparison equalsCondition(SqlIdentifier parentTable, SqlIdentifier parentId, Table joinedTable,
+			SqlIdentifier joinedColumn) {
+		return equalsCondition(Table.create(parentTable), parentId, joinedTable, joinedColumn);
+	}
+
+	static Comparison equalsCondition(String parentTable, String parentId, Table joinedTable, String joinedColumn) {
+		return equalsCondition(SqlIdentifier.unquoted(parentTable), SqlIdentifier.unquoted(parentId), joinedTable,
+				SqlIdentifier.unquoted(joinedColumn));
+	}
+
 	@BeforeEach
 	void setUp() {
 		this.sqlGenerator = createSqlGenerator(DummyEntity.class);
@@ -716,10 +733,8 @@ void joinForSimpleReference() {
 		assertSoftly(softly -> {
 
 			softly.assertThat(join.joinTable().getName()).isEqualTo(SqlIdentifier.quoted("REFERENCED_ENTITY"));
-			softly.assertThat(join.condition())
-					.isEqualTo(org.springframework.data.relational.core.sql.Column.create(SqlIdentifier.quoted("DUMMY_ENTITY"), join.joinTable())
-							.isEqualTo(org.springframework.data.relational.core.sql.Column.create(SqlIdentifier.quoted("id1"),
-									org.springframework.data.relational.core.sql.Table.create(SqlIdentifier.quoted("DUMMY_ENTITY")))));
+			softly.assertThat(join.condition()).isEqualTo(equalsCondition(SqlIdentifier.quoted("DUMMY_ENTITY"),
+					SqlIdentifier.quoted("id1"), join.joinTable(), SqlIdentifier.quoted("DUMMY_ENTITY")));
 
 		});
 	}
@@ -749,11 +764,8 @@ void joinForSecondLevelReference() {
 		assertSoftly(softly -> {
 			softly.assertThat(join.joinTable().getName()).isEqualTo(SqlIdentifier.quoted("SECOND_LEVEL_REFERENCED_ENTITY"));
 			softly.assertThat(join.condition())
-					.isEqualTo(org.springframework.data.relational.core.sql.Column
-							.create(SqlIdentifier.quoted("REFERENCED_ENTITY"), join.joinTable())
-							.isEqualTo(org.springframework.data.relational.core.sql.Column.create(SqlIdentifier.quoted("X_L1ID"),
-									org.springframework.data.relational.core.sql.Table.create("REFERENCED_ENTITY")
-											.as(SqlIdentifier.quoted("ref")))));
+					.isEqualTo(equalsCondition(Table.create("REFERENCED_ENTITY").as(SqlIdentifier.quoted("ref")),
+							SqlIdentifier.quoted("X_L1ID"), join.joinTable(), SqlIdentifier.quoted("REFERENCED_ENTITY")));
 
 		});
 	}
@@ -769,13 +781,8 @@ void joinForOneToOneWithoutId() {
 			softly.assertThat(joinTable.getName()).isEqualTo(SqlIdentifier.quoted("NO_ID_CHILD"));
 			softly.assertThat(joinTable).isInstanceOf(Aliased.class);
 			softly.assertThat(((Aliased) joinTable).getAlias()).isEqualTo(SqlIdentifier.quoted("child"));
-			softly.assertThat(join.condition())
-					.isEqualTo(org.springframework.data.relational.core.sql.Column
-							.create(SqlIdentifier.quoted("PARENT_OF_NO_ID_CHILD"), join.joinTable())
-							.isEqualTo(org.springframework.data.relational.core.sql.Column.create(SqlIdentifier.quoted("X_ID"),
-									org.springframework.data.relational.core.sql.Table
-											.create(SqlIdentifier.quoted("PARENT_OF_NO_ID_CHILD")))));
-
+			softly.assertThat(join.condition()).isEqualTo(equalsCondition(SqlIdentifier.quoted("PARENT_OF_NO_ID_CHILD"),
+					SqlIdentifier.quoted("X_ID"), join.joinTable(), SqlIdentifier.quoted("PARENT_OF_NO_ID_CHILD")));
 		});
 	}