refactoring

Author: Gerald Unterrainer

pom.xml

@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.11</version>
+	<version>0.2.12</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 

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

@@ -7,9 +7,7 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.TypedQuery;
 
-import info.unterrainer.commons.httpserver.jsons.ListJson;
 import info.unterrainer.commons.jreutils.DateUtils;
-import info.unterrainer.commons.rdbutils.Transactions;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import lombok.Getter;
 
@@ -27,33 +25,6 @@ public BasicJpqlDao(final EntityManagerFactory emf, final Class<P> type) {
 		coreDao = new JpqlCoreDao<>(emf, type);
 	}
 
-	P _getById(final Long id) {
-		return Transactions.withNewTransactionReturning(emf, em -> coreDao.getById(em, id));
-	}
-
-	ListJson<P> getList(final EntityManager em, final long offset, final long size, final String selectClause,
-			final String joinClause, final String whereClause, final ParamMap params, final String orderByClause) {
-		ListJson<P> r = new ListJson<>();
-		r.setEntries(getList(em,
-				coreDao.getQuery(em, selectClause, joinClause, whereClause,
-						params == null ? null : params.getParameters(), type, orderByClause, false, null),
-				offset, size));
-		r.setCount(
-				(Long) coreDao
-						.getCountQuery(em, selectClause, joinClause, whereClause,
-								params == null ? null : params.getParameters(), null)
-						.getSingleResult());
-		return r;
-	}
-
-	P create(final P entity) {
-		return Transactions.withNewTransactionReturning(emf, em -> coreDao.create(em, entity));
-	}
-
-	P _update(final P entity) {
-		return Transactions.withNewTransactionReturning(emf, em -> update(em, entity));
-	}
-
 	P update(final EntityManager em, final P entity) {
 		LocalDateTime time = DateUtils.nowUtc();
 		entity.setEditedOn(time);
@@ -81,7 +52,7 @@ private <T> T getFirst(final EntityManager em, final TypedQuery<T> query) {
 		return null;
 	}
 
-	UpsertResult<P> _upsert(final EntityManager em, final TypedQuery<P> query, final P entity) {
+	UpsertResult<P> upsert(final EntityManager em, final TypedQuery<P> query, final P entity) {
 		boolean wasInserted = false;
 		boolean wasUpdated = false;
 		P e = getFirst(em, query);
@@ -96,10 +67,4 @@ UpsertResult<P> _upsert(final EntityManager em, final TypedQuery<P> query, final
 		}
 		return UpsertResult.<P>builder().wasInserted(wasInserted).wasUpdated(wasUpdated).jpa(e).build();
 	}
-
-	void _delete(final Long id) {
-		Transactions.withNewTransaction(emf, em -> {
-			coreDao.delete(em, id);
-		});
-	}
 }

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

@@ -22,6 +22,6 @@ public class JpaListQuery<P extends BasicJpa> extends ListQuery<P, P> {
 	 *         update, and if it was an update, what the old values were
 	 */
 	public UpsertResult<P> upsert(final P entity) {
-		return withEntityManager(em -> builder.getDao()._upsert(em, builder.getTypedQuery(em), entity));
+		return withEntityManager(em -> builder.getDao().upsert(em, builder.getTypedQuery(em), entity));
 	}
 }

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

@@ -170,18 +170,16 @@ <T> List<T> getList(final EntityManager em, final TypedQuery<T> query, final lon
 		return query.getResultList();
 	}
 
-	private boolean isAllowed(final info.unterrainer.commons.httpserver.daos.ListQueryBuilder query,
-			final EntityManager em) {
-		String tenantReferenceField = "testId";
-		String tenantIdField = "tenantId";
-		Long tenantId = 55L;
-		BasicJpa tenantJpa = null;
-		getQuery(em, "o",
-				"RIGHT JOIN " + tenantJpa.getClass().getSimpleName() + " tenantTable on o.id = tenantTable."
-						+ tenantReferenceField,
-				"tenantTable." + tenantReferenceField + " IS NULL OR tenantTable." + tenantIdField + " = :tenantId",
-				null, type, null, false, null);
-		return true;
+	private boolean isAllowed(final EntityManager em, final TenantData tenantData) {
+		TypedQuery<Long> query = getQuery(em, "o.id",
+				"RIGHT JOIN " + tenantData.getJpa().getClass().getSimpleName() + " tenantTable on o.id = tenantTable."
+						+ tenantData.getReferenceField(),
+				"tenantTable." + tenantData.getReferenceField() + " IS NULL OR tenantTable." + tenantData.getIdField()
+						+ " = :tenantId",
+				null, Long.class, null, false, null);
+		query.setMaxResults(1);
+		List<Long> list = query.getResultList();
+		return list != null && list.size() > 0;
 	}
 
 	private boolean isSet(final String str) {

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

@@ -0,0 +1,17 @@
+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 TenantData {
+
+	private BasicJpa jpa;
+	private String referenceField;
+	private String idField;
+	private Long id;
+}