Merge branch 'develop'

Gerald Unterrainer · Gerald Unterrainer · commit 868d6759183e · 2021-05-31T16:37:27.000+02:00
diff --git a/src/main/java/info/unterrainer/commons/httpserver/daos/JpaListQuery.java b/src/main/java/info/unterrainer/commons/httpserver/daos/JpaListQuery.java
@@ -18,7 +18,7 @@ public class JpaListQuery<P extends BasicJpa> extends ListQuery<P, P> {
 	 * you've passed by specifying an {@link EntityManager} in the query.
 	 *
 	 * @param entity the entity to update with, or create.
-	 * @return an {@link UpdateResult} that will tell you if there was an insert or
+	 * @return an {@link UpsertResult} that will tell you if there was an insert or
 	 *         update, and if it was an update, what the old values were
 	 */
 	public UpsertResult<P> upsert(final P entity) {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public class JpaListQuery<P extends BasicJpa> extends ListQuery<P, P> {`
`18`	`18`	`* you've passed by specifying an {@link EntityManager} in the query.`
`19`	`19`	`*`
`20`	`20`	`* @param entity the entity to update with, or create.`
`21`		`- * @return an {@link UpdateResult} that will tell you if there was an insert or`
	`21`	`+ * @return an {@link UpsertResult} that will tell you if there was an insert or`
`22`	`22`	`* update, and if it was an update, what the old values were`
`23`	`23`	`*/`
`24`	`24`	`public UpsertResult<P> upsert(final P entity) {`