Skip to content

Commit

Permalink
Merge pull request #2724 from Coduz/fix-triggerCreateForChildAccounts
Browse files Browse the repository at this point in the history 
Fixed Trigger creation from child accounts
  • Loading branch information
@Coduz
Coduz authored Sep 26, 2019
2 parents e4ac695 + 85ced4d commit c325e25
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 62 deletions.
126 changes: 66 additions & 60 deletions commons/src/main/java/org/eclipse/kapua/commons/service/internal/ServiceDAO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
import org.eclipse.kapua.commons.jpa.EntityManager;
import org.eclipse.kapua.commons.model.AbstractKapuaUpdatableEntity;
import org.eclipse.kapua.commons.model.id.KapuaEid;
import org.eclipse.kapua.model.query.FieldSortCriteria;
import org.eclipse.kapua.model.query.SortOrder;
import org.eclipse.kapua.commons.security.KapuaSecurityUtils;
import org.eclipse.kapua.commons.security.KapuaSession;
import org.eclipse.kapua.commons.setting.system.SystemSetting;
Expand All @@ -32,8 +30,10 @@
import org.eclipse.kapua.model.domain.Actions;
import org.eclipse.kapua.model.domain.Domain;
import org.eclipse.kapua.model.id.KapuaId;
import org.eclipse.kapua.model.query.FieldSortCriteria;
import org.eclipse.kapua.model.query.KapuaListResult;
import org.eclipse.kapua.model.query.KapuaQuery;
import org.eclipse.kapua.model.query.SortOrder;
import org.eclipse.kapua.model.query.predicate.AndPredicate;
import org.eclipse.kapua.model.query.predicate.AttributePredicate;
import org.eclipse.kapua.model.query.predicate.OrPredicate;
Expand Down Expand Up @@ -61,6 +61,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import javax.annotation.Nullable;
import javax.persistence.Embedded;
import javax.persistence.EntityExistsException;
import javax.persistence.PersistenceException;
Expand All @@ -76,6 +77,7 @@
import javax.persistence.criteria.Root;
import javax.persistence.metamodel.Attribute;
import javax.persistence.metamodel.EntityType;
import javax.validation.constraints.NotNull;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashMap;
Expand Down Expand Up @@ -152,7 +154,7 @@ protected ServiceDAO() {
* @return The persisted {@link KapuaEntity}.
* @since 1.0.0
*/
public static <E extends KapuaEntity> E create(EntityManager em, E entity) {
public static <E extends KapuaEntity> E create(@NotNull EntityManager em, @NotNull E entity) {
try {
em.persist(entity);
em.flush();
Expand All @@ -174,20 +176,6 @@ public static <E extends KapuaEntity> E create(EntityManager em, E entity) {
return entity;
}

private static boolean isInsertConstraintViolation(PersistenceException e) {
Throwable cause = e.getCause();
while (cause != null && !(cause instanceof SQLException)) {
cause = cause.getCause();
}

if (cause == null) {
return false;
}

SQLException innerExc = (SQLException) cause;
return SQL_ERROR_CODE_CONSTRAINT_VIOLATION.equals(innerExc.getSQLState());
}

/**
* Find {@link KapuaEntity} utility method
*
Expand All @@ -197,7 +185,7 @@ private static boolean isInsertConstraintViolation(PersistenceException e) {
* @param entityId The {@link KapuaEntity} {@link KapuaId} of the entity to be found.
* @since 1.0.0
*/
public static <E extends KapuaEntity> E find(EntityManager em, Class<E> clazz, KapuaId scopeId, KapuaId entityId) {
public static <E extends KapuaEntity> E find(@NotNull EntityManager em, @NotNull Class<E> clazz, @Nullable KapuaId scopeId, @NotNull KapuaId entityId) {
//
// Checking existence
E entityToFind = em.find(clazz, entityId);
Expand Down Expand Up @@ -229,7 +217,7 @@ public static <E extends KapuaEntity> E find(EntityManager em, Class<E> clazz, K
* @throws KapuaEntityNotFoundException If the {@link KapuaEntity} does not exists.
* @since 1.0.0
*/
public static <E extends KapuaUpdatableEntity> E update(EntityManager em, Class<E> clazz, E entity) throws KapuaEntityNotFoundException {
public static <E extends KapuaUpdatableEntity> E update(@NotNull EntityManager em, @NotNull Class<E> clazz, @NotNull E entity) throws KapuaEntityNotFoundException {
//
// Checking existence
E entityToUpdate = em.find(clazz, entity.getId());
Expand Down Expand Up @@ -261,7 +249,7 @@ public static <E extends KapuaUpdatableEntity> E update(EntityManager em, Class<
* @throws KapuaEntityNotFoundException If the {@link KapuaEntity} does not exists.
* @since 1.0.0
*/
public static <E extends KapuaEntity> void delete(EntityManager em, Class<E> clazz, KapuaId scopeId, KapuaId entityId)
public static <E extends KapuaEntity> void delete(@NotNull EntityManager em, @NotNull Class<E> clazz, @NotNull KapuaId scopeId, @NotNull KapuaId entityId)
throws KapuaEntityNotFoundException {
//
// Checking existence
Expand All @@ -287,7 +275,7 @@ public static <E extends KapuaEntity> void delete(EntityManager em, Class<E> cla
* @return The {@link KapuaEntity} found, or {@code null} if not found.
* @since 1.0.0
*/
public static <E extends KapuaEntity> E findByField(EntityManager em, Class<E> clazz, String name, String value) {
public static <E extends KapuaEntity> E findByField(@NotNull EntityManager em, @NotNull Class<E> clazz, @NotNull String name, @NotNull String value) {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<E> criteriaSelectQuery = cb.createQuery(clazz);

Expand Down Expand Up @@ -329,11 +317,11 @@ public static <E extends KapuaEntity> E findByField(EntityManager em, Class<E> c
* @throws KapuaException If filter predicates in the {@link KapuaQuery} are incorrect. See {@link #handleKapuaQueryPredicates(QueryPredicate, Map, CriteriaBuilder, Root, EntityType)}.
* @since 1.0.0
*/
public static <I extends KapuaEntity, E extends I, L extends KapuaListResult<I>> L query(EntityManager em,
Class<I> interfaceClass,
Class<E> implementingClass,
L resultContainer,
KapuaQuery<I> kapuaQuery)
public static <I extends KapuaEntity, E extends I, L extends KapuaListResult<I>> L query(@NotNull EntityManager em,
@NotNull Class<I> interfaceClass,
@NotNull Class<E> implementingClass,
@NotNull L resultContainer,
@NotNull KapuaQuery<I> kapuaQuery)
throws KapuaException {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<E> criteriaSelectQuery = cb.createQuery(implementingClass);
Expand Down Expand Up @@ -444,10 +432,10 @@ public static <I extends KapuaEntity, E extends I, L extends KapuaListResult<I>>
* @throws KapuaException If filter predicates in the {@link KapuaQuery} are incorrect. See {@link #handleKapuaQueryPredicates(QueryPredicate, Map, CriteriaBuilder, Root, EntityType)}.
* @since 1.0.0
*/
public static <I extends KapuaEntity, E extends I> long count(EntityManager em,
Class<I> interfaceClass,
Class<E> implementingClass,
KapuaQuery<I> kapuaQuery)
public static <I extends KapuaEntity, E extends I> long count(@NotNull EntityManager em,
@NotNull Class<I> interfaceClass,
@NotNull Class<E> implementingClass,
@NotNull KapuaQuery<I> kapuaQuery)
throws KapuaException {
CriteriaBuilder cb = em.getCriteriaBuilder();
CriteriaQuery<Long> criteriaSelectQuery = cb.createQuery(Long.class);
Expand Down Expand Up @@ -518,15 +506,15 @@ public static <I extends KapuaEntity, E extends I> long count(EntityManager em,
* @return The handled {@link Predicate}
* @throws KapuaException If any problem occurs.
*/
private static <E> Predicate handleKapuaQueryPredicates(QueryPredicate queryPredicate,
Map<ParameterExpression, Object> binds,
CriteriaBuilder cb,
Root<E> userPermissionRoot,
EntityType<E> entityType)
private static <E> Predicate handleKapuaQueryPredicates(@NotNull QueryPredicate queryPredicate,
@NotNull Map<ParameterExpression, Object> binds,
@NotNull CriteriaBuilder cb,
@NotNull Root<E> userPermissionRoot,
@NotNull EntityType<E> entityType)
throws KapuaException {
Predicate predicate = null;
if (queryPredicate instanceof AttributePredicate) {
AttributePredicate attributePredicate = (AttributePredicate) queryPredicate;
AttributePredicate<?> attributePredicate = (AttributePredicate<?>) queryPredicate;
predicate = handleAttributePredicate(attributePredicate, binds, cb, userPermissionRoot, entityType);
} else if (queryPredicate instanceof AndPredicate) {
AndPredicate andPredicate = (AndPredicate) queryPredicate;
Expand All @@ -538,11 +526,11 @@ private static <E> Predicate handleKapuaQueryPredicates(QueryPredicate queryPred
return predicate;
}

private static <E> Predicate handleAndPredicate(AndPredicate andPredicate,
Map<ParameterExpression, Object> binds,
CriteriaBuilder cb,
Root<E> entityRoot,
EntityType<E> entityType)
private static <E> Predicate handleAndPredicate(@NotNull AndPredicate andPredicate,
@NotNull Map<ParameterExpression, Object> binds,
@NotNull CriteriaBuilder cb,
@NotNull Root<E> entityRoot,
@NotNull EntityType<E> entityType)
throws KapuaException {

Predicate[] jpaAndPredicates =
Expand All @@ -557,11 +545,11 @@ private static <E> Predicate handleAndPredicate(AndPredicate andPredicate,

}

private static <E> Predicate handleOrPredicate(OrPredicate orPredicate,
Map<ParameterExpression, Object> binds,
CriteriaBuilder cb,
Root<E> entityRoot,
EntityType<E> entityType)
private static <E> Predicate handleOrPredicate(@NotNull OrPredicate orPredicate,
@NotNull Map<ParameterExpression, Object> binds,
@NotNull CriteriaBuilder cb,
@NotNull Root<E> entityRoot,
@NotNull EntityType<E> entityType)
throws KapuaException {

Predicate[] jpaOrPredicates =
Expand All @@ -575,7 +563,11 @@ private static <E> Predicate handleOrPredicate(OrPredicate orPredicate,
return cb.or(jpaOrPredicates);
}

private static <E> Predicate[] handlePredicate(List<QueryPredicate> orPredicates, Map<ParameterExpression, Object> binds, CriteriaBuilder cb, Root<E> entityRoot, EntityType<E> entityType) throws KapuaException {
private static <E> Predicate[] handlePredicate(@NotNull List<QueryPredicate> orPredicates,
@NotNull Map<ParameterExpression, Object> binds,
@NotNull CriteriaBuilder cb,
@NotNull Root<E> entityRoot,
@NotNull EntityType<E> entityType) throws KapuaException {
Predicate[] jpaOrPredicates = new Predicate[orPredicates.size()];

for (int i = 0; i < orPredicates.size(); i++) {
Expand All @@ -585,11 +577,11 @@ private static <E> Predicate[] handlePredicate(List<QueryPredicate> orPredicates
return jpaOrPredicates;
}

private static <E> Predicate handleAttributePredicate(AttributePredicate attrPred,
Map<ParameterExpression, Object> binds,
CriteriaBuilder cb,
Root<E> entityRoot,
EntityType<E> entityType)
private static <E> Predicate handleAttributePredicate(@NotNull AttributePredicate<?> attrPred,
@NotNull Map<ParameterExpression, Object> binds,
@NotNull CriteriaBuilder cb,
@NotNull Root<E> entityRoot,
@NotNull EntityType<E> entityType)
throws KapuaException {
Predicate expr;
String attrName = attrPred.getAttributeName();
Expand All @@ -601,7 +593,7 @@ private static <E> Predicate handleAttributePredicate(AttributePredicate attrPre
}

// Fields to query properties of sub attributes of the root entity
Attribute attribute;
Attribute<?, ?> attribute;
if (attrName.contains(ATTRIBUTE_SEPARATOR)) {
attribute = entityType.getAttribute(attrName.split(ATTRIBUTE_SEPARATOR_ESCAPED)[0]);
} else {
Expand Down Expand Up @@ -655,7 +647,7 @@ private static <E> Predicate handleAttributePredicate(AttributePredicate attrPre

case GREATER_THAN:
if (attrValue instanceof Comparable && ArrayUtils.contains(attribute.getJavaType().getInterfaces(), Comparable.class)) {
Comparable comparableAttrValue = (Comparable) attrValue;
Comparable comparableAttrValue = (Comparable<?>) attrValue;
Expression<? extends Comparable> comparableExpression = extractAttribute(entityRoot, attrName);
expr = cb.greaterThan(comparableExpression, comparableAttrValue);
} else {
Expand All @@ -666,7 +658,7 @@ private static <E> Predicate handleAttributePredicate(AttributePredicate attrPre
case GREATER_THAN_OR_EQUAL:
if (attrValue instanceof Comparable && ArrayUtils.contains(attribute.getJavaType().getInterfaces(), Comparable.class)) {
Expression<? extends Comparable> comparableExpression = extractAttribute(entityRoot, attrName);
Comparable comparableAttrValue = (Comparable) attrValue;
Comparable comparableAttrValue = (Comparable<?>) attrValue;
expr = cb.greaterThanOrEqualTo(comparableExpression, comparableAttrValue);
} else {
throw new KapuaException(KapuaErrorCodes.ILLEGAL_ARGUMENT, "Trying to compare a non-comparable value");
Expand All @@ -676,7 +668,7 @@ private static <E> Predicate handleAttributePredicate(AttributePredicate attrPre
case LESS_THAN:
if (attrValue instanceof Comparable && ArrayUtils.contains(attribute.getJavaType().getInterfaces(), Comparable.class)) {
Expression<? extends Comparable> comparableExpression = extractAttribute(entityRoot, attrName);
Comparable comparableAttrValue = (Comparable) attrValue;
Comparable comparableAttrValue = (Comparable<?>) attrValue;
expr = cb.lessThan(comparableExpression, comparableAttrValue);
} else {
throw new KapuaException(KapuaErrorCodes.ILLEGAL_ARGUMENT, "Trying to compare a non-comparable value");
Expand All @@ -685,7 +677,7 @@ private static <E> Predicate handleAttributePredicate(AttributePredicate attrPre
case LESS_THAN_OR_EQUAL:
if (attrValue instanceof Comparable && ArrayUtils.contains(attribute.getJavaType().getInterfaces(), Comparable.class)) {
Expression<? extends Comparable> comparableExpression = extractAttribute(entityRoot, attrName);
Comparable comparableAttrValue = (Comparable) attrValue;
Comparable comparableAttrValue = (Comparable<?>) attrValue;
expr = cb.lessThanOrEqualTo(comparableExpression, comparableAttrValue);
} else {
throw new KapuaException(KapuaErrorCodes.ILLEGAL_ARGUMENT, "Trying to compare a non-comparable value");
Expand All @@ -711,7 +703,7 @@ private static <E> Predicate handleAttributePredicate(AttributePredicate attrPre
* @return The {@link Path} expression that matches the given {@code attributeName} parameter.
* @since 1.0.0
*/
private static <E, P> Path<P> extractAttribute(Root<E> entityRoot, String attributeName) {
private static <E, P> Path<P> extractAttribute(@NotNull Root<E> entityRoot, @NotNull String attributeName) {

Path<P> expressionPath;
if (attributeName.contains(ATTRIBUTE_SEPARATOR)) {
Expand All @@ -730,7 +722,7 @@ private static <E, P> Path<P> extractAttribute(Root<E> entityRoot, String attrib
* @param groupPredicateName The name of the {@link Group} id field.
* @since 1.0.0
*/
protected static void handleKapuaQueryGroupPredicate(KapuaQuery query, Domain domain, String groupPredicateName) throws KapuaException {
protected static void handleKapuaQueryGroupPredicate(@NotNull KapuaQuery<?> query, @NotNull Domain domain, @NotNull String groupPredicateName) throws KapuaException {

if (ACCESS_INFO_FACTORY != null) {
KapuaSession kapuaSession = KapuaSecurityUtils.getSession();
Expand Down Expand Up @@ -796,7 +788,7 @@ protected static void handleKapuaQueryGroupPredicate(KapuaQuery query, Domain do
}
}

private static boolean checkGroupPermission(Domain domain, List<Permission> groupPermissions, Permission p) {
private static boolean checkGroupPermission(@NotNull Domain domain, @NotNull List<Permission> groupPermissions, @NotNull Permission p) {
if ((p.getDomain() == null || domain.getName().equals(p.getDomain())) &&
(p.getAction() == null || Actions.read.equals(p.getAction()))) {
if (p.getGroupId() == null) {
Expand All @@ -808,4 +800,18 @@ private static boolean checkGroupPermission(Domain domain, List<Permission> grou
}
return false;
}

private static boolean isInsertConstraintViolation(@NotNull PersistenceException e) {
Throwable cause = e.getCause();
while (cause != null && !(cause instanceof SQLException)) {
cause = cause.getCause();
}

if (cause == null) {
return false;
}

SQLException innerExc = (SQLException) cause;
return SQL_ERROR_CODE_CONSTRAINT_VIOLATION.equals(innerExc.getSQLState());
}
}
Loading

0 comments on commit c325e25

Please sign in to comment.