try

Author: Gerald Unterrainer

src/main/java/info/unterrainer/commons/httpserver/daos/BasicJpqlDao.java

@@ -103,15 +103,31 @@ public UpsertResult<P> upsert(final TypedQuery<P> query, final P entity) {
 		return Transactions.withNewTransactionReturning(emf, em -> upsert(em, query, entity));
 	}
 
-	private P getFirst(final EntityManager em, final TypedQuery<P> query) {
-		List<P> r = getList(em, query, 0, 1);
+	private <T> T getFirst(final EntityManager em, final TypedQuery<T> query) {
+		List<T> r = getList(em, query, 0, 1);
 		if (r.size() == 1) {
-			P jpa = r.get(0);
+			T jpa = r.get(0);
 			return jpa;
 		}
 		return null;
 	}
 
+	public <T> UpsertResult<P> _upsert(final EntityManager em, final TypedQuery<T> query, final P entity) {
+		boolean wasInserted = false;
+		boolean wasUpdated = false;
+		T e = getFirst(em, query);
+		if (e == null) {
+			e = create(em, entity);
+			wasInserted = true;
+		} else {
+			entity.setId(e.getId());
+			entity.setCreatedOn(e.getCreatedOn());
+			e = update(em, entity);
+			wasUpdated = true;
+		}
+		return UpsertResult.<P>builder().wasInserted(wasInserted).wasUpdated(wasUpdated).jpa(e).build();
+	}
+
 	@Override
 	public UpsertResult<P> upsert(final EntityManager em, final TypedQuery<P> query, final P entity) {
 		boolean wasInserted = false;

src/main/java/info/unterrainer/commons/httpserver/daos/ListQuery.java

@@ -132,4 +132,8 @@ public List<T> getListReversed() {
 		Collections.reverse(l);
 		return l;
 	}
+
+	public UpsertResult<P> upsert(final P entity) {
+		return withEntityManager(em -> builder.getDao()._upsert(em, builder.getTypedQuery(em), entity));
+	}
 }

src/main/java/info/unterrainer/commons/httpserver/daos/UpsertResult.java

@@ -1,14 +1,13 @@
 package info.unterrainer.commons.httpserver.daos;
 
-import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 @Data
 @NoArgsConstructor
 @SuperBuilder(toBuilder = true)
-public class UpsertResult<T extends BasicJpa> {
+public class UpsertResult<T> {
 
 	private T jpa;
 	private boolean wasInserted;