#220 - Introduce R2dbcEntityTemplate #287

mp911de · 2020-01-24T13:48:35Z

We now provide an R2dbcEntityTemplate that allows entity-centric interaction. Entities can be loaded, inserted, updated and deleted. Additional Query and Update methods allow fine-grained changes to entities. It features a fluent API that is similar to DatabaseClient.

The main difference is that DatabaseClient is intended for simple mapped objects while R2dbcEntityTemplate has an entity-centric focus that could expand into the usage with aggregate roots.

R2dbcEntityTemplate template = new R2dbcEntityTemplate(databaseClient);

Mono<Person> saved = template.insert(new Person(…));

Mono<Integer> affectedRows = template.update(Query.query(Criteria.where("name").is("Walter")), Update.update("name", "Heisenberg"), Person.class);

Mono<Person> loaded = template.select(Person.class)
		.from("another_table)
		.as(PersonProjection.class)
		.matching(query(where("name").is("Walter")).limit(10).offset(20))
		.first();

Open issues:

Kotlin extensions (separate issue, Add Kotlin extensions for R2dbcEntityTemplate #290)
Needs to be rebased onto https://jira.spring.io/browse/DATAJDBC-479 changes.

schauder

I don't seem to be able to rebase this onto master due to the introduction of SqlIdentifier.
One ends up with SqlIdentifier on one side (SelectSpec) and expecting String values on the other side (Table and Column). I'm not sure where you want to make the conversion.

Do you mind rebasing this?

mp911de · 2020-02-11T09:24:32Z

This PR depends on spring-projects/spring-data-relational#187. Otherwise, we would be required to do the rebase twice.

We now provide a Template API that exposes entity-centric methods. It complements DatabaseClient's simple object mapper methods.

Use limit/offset instead of Page and accept Expression objects to declare a select list. Use SqlIdentifier in Update, Query, Criteria and fluent API.

Formatting. Fix warnings. JavaDoc.

schauder

I have a couple of complains but nothing serious.
Let's discuss in Slack.

src/main/java/org/springframework/data/r2dbc/core/R2dbcEntityTemplate.java

src/main/java/org/springframework/data/r2dbc/query/Query.java

schauder · 2020-02-12T11:01:09Z

src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java

+	 * @return the mapped {@link Expression}.
+	 * @since 1.1
+	 */
+	public Expression getMappedObject(Expression expression, @Nullable RelationalPersistentEntity<?> entity) {


Since this method is quite complex I'd love to have some unit tests.
Cases that should be covered IMHO:

entity =/!= null

column w/wo alias

demonstrating what the column-> field+table -> column roundtrip does.

SimpleFunction w/wo recursion

Aliased or not

Error case.

schauder · 2020-02-12T11:28:48Z

src/main/java/org/springframework/data/r2dbc/repository/support/SimpleR2dbcRepository.java

+
+		this.entity = entity;
+		this.entityOperations = entityOperations;
+		this.idProperty = Lazy.of(() -> converter //


Is the Lazy worth it?

The lazy init was required for deferred interaction with the mapping context.

schauder · 2020-02-12T12:36:27Z

src/main/java/org/springframework/data/r2dbc/query/QueryMapper.java

+			Column column = (Column) expression;
+			Field field = createPropertyField(entity, column.getName());
+			Table table = column.getTable();
+


table might be null which would cause a NPE.
I can't tell if this prevented by construction, but an assert statement might be a good idea.

I think the NPE originates from @Nullable on Column.getTable. In Spring Data Relational, we made the Table mandatory, so we should fix the nullability annotations there.

schauder · 2020-02-12T12:53:40Z

src/main/java/org/springframework/data/r2dbc/core/StatementMapper.java

@@ -212,17 +219,49 @@ public static SelectSpec create(String table) {
 		 * @since 1.1
 		 */
 		public static SelectSpec create(SqlIdentifier table) {


StatementMapper contains lots of public stuff although the class it self is package private.
Is that intentional?

The class is public as it is declared within an interface.

Reverted removal of null check that is marked as superfluous and adjusted nullability annotations instead.

We now provide a Template API that exposes entity-centric methods. It complements DatabaseClient's simple object mapper methods. Original pull request: #287.

Original pull request: #287.

Use limit/offset instead of Page and accept Expression objects to declare a select list. Use SqlIdentifier in Update, Query, Criteria and fluent API. Original pull request: #287.

Formatting. Fix warnings. JavaDoc. Adjusted nullability annotations. Original pull request: #287.

mp911de · 2020-02-12T13:29:27Z

That's merged and polished now.

mp911de requested a review from schauder January 24, 2020 13:48

mp911de mentioned this pull request Jan 27, 2020

Add Kotlin extensions for R2dbcEntityTemplate #290

Closed

schauder self-assigned this Feb 11, 2020

schauder requested changes Feb 11, 2020

View reviewed changes

mp911de added 2 commits February 12, 2020 09:43

#220 - Prepare issue branch.

3b518f4

#220 - Introduce R2dbcEntityTemplate.

603cec1

We now provide a Template API that exposes entity-centric methods. It complements DatabaseClient's simple object mapper methods.

mp911de force-pushed the issue/gh-220 branch from c6fcbfb to a8d46de Compare February 12, 2020 08:44

mp911de added 3 commits February 12, 2020 10:06

#220 - Use EntityOperations in SimpleR2dbcRepository.

1cfc367

#220 - Add Fluent API for EntityOperations.

9b6c2f0

#220 - Refactor StatementMapper.

9669497

Use limit/offset instead of Page and accept Expression objects to declare a select list. Use SqlIdentifier in Update, Query, Criteria and fluent API.

mp911de force-pushed the issue/gh-220 branch from a8d46de to 9669497 Compare February 12, 2020 09:07

#220 - Polishing.

8a5fe30

Formatting. Fix warnings. JavaDoc.

schauder reviewed Feb 12, 2020

View reviewed changes

#220 - Polishing.

ab19499

Reverted removal of null check that is marked as superfluous and adjusted nullability annotations instead.

mp911de added this to the 1.1 M3 (Neumann) milestone Feb 12, 2020

mp911de added a commit that referenced this pull request Feb 12, 2020

#220 - Introduce R2dbcEntityTemplate.

b5445b8

We now provide a Template API that exposes entity-centric methods. It complements DatabaseClient's simple object mapper methods. Original pull request: #287.

mp911de added a commit that referenced this pull request Feb 12, 2020

#220 - Use EntityOperations in SimpleR2dbcRepository.

8313630

Original pull request: #287.

mp911de added a commit that referenced this pull request Feb 12, 2020

#220 - Add Fluent API for EntityOperations.

64387d1

Original pull request: #287.

mp911de added a commit that referenced this pull request Feb 12, 2020

#220 - Refactor StatementMapper.

01eccbb

Use limit/offset instead of Page and accept Expression objects to declare a select list. Use SqlIdentifier in Update, Query, Criteria and fluent API. Original pull request: #287.

mp911de pushed a commit that referenced this pull request Feb 12, 2020

#220 - Polishing.

49a4ff3

Formatting. Fix warnings. JavaDoc. Adjusted nullability annotations. Original pull request: #287.

mp911de closed this Feb 12, 2020

mp911de deleted the issue/gh-220 branch February 12, 2020 13:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#220 - Introduce R2dbcEntityTemplate #287

#220 - Introduce R2dbcEntityTemplate #287

mp911de commented Jan 24, 2020 •

edited

Loading

schauder left a comment

mp911de commented Feb 11, 2020

schauder left a comment

schauder Feb 12, 2020

schauder Feb 12, 2020

mp911de Feb 12, 2020

schauder Feb 12, 2020

mp911de Feb 12, 2020

schauder Feb 12, 2020

mp911de Feb 12, 2020

mp911de commented Feb 12, 2020

#220 - Introduce R2dbcEntityTemplate #287

#220 - Introduce R2dbcEntityTemplate #287

Conversation

mp911de commented Jan 24, 2020 • edited Loading

schauder left a comment

Choose a reason for hiding this comment

mp911de commented Feb 11, 2020

schauder left a comment

Choose a reason for hiding this comment

schauder Feb 12, 2020

Choose a reason for hiding this comment

schauder Feb 12, 2020

Choose a reason for hiding this comment

mp911de Feb 12, 2020

Choose a reason for hiding this comment

schauder Feb 12, 2020

Choose a reason for hiding this comment

mp911de Feb 12, 2020

Choose a reason for hiding this comment

schauder Feb 12, 2020

Choose a reason for hiding this comment

mp911de Feb 12, 2020

Choose a reason for hiding this comment

mp911de commented Feb 12, 2020

mp911de commented Jan 24, 2020 •

edited

Loading