jomu/shared
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases 7 Activity

feature/jakrtaee10 (#1)

Browse Source 
Co-authored-by: Joern Muehlencord <joern.muehlencord@vitroconnect.com>
Reviewed-on: https://jomu.timelord.de/git/jomu/shared/pulls/1
This commit is contained in:
Joern Muehlencord
2023-12-10 21:24:45 +00:00
parent b9482de3b1
commit c4a5f12511
66 changed files with 375 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
db/pom.xml
View File

@ -15,21 +15,64 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>de.muehlencord.shared</groupId>
<artifactId>shared-db</artifactId>
<packaging>ejb</packaging>
<packaging>jar</packaging>
<parent>
<artifactId>shared</artifactId>
<groupId>de.muehlencord</groupId>
<version>1.3.2-SNAPSHOT</version>
<version>2.0.0-SNAPSHOT</version>
</parent>
<name>shared-db</name>
<dependencies>
<dependency>
<groupId>org.hibernate.orm</groupId>
<artifactId>hibernate-core</artifactId>
</dependency>
<!-- CDI and annotations -->
<dependency>
<groupId>jakarta.inject</groupId>
<artifactId>jakarta.inject-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
</dependency>
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<!-- Testing -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<!-- Dev Tools -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
<!-- unsorted -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@ -47,50 +90,7 @@ limitations under the License.
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-jsr310</artifactId>
</dependency>
<!-- Testing -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<!-- Logging -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-web-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<!-- Dev Tools -->
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<!-- create EJB version 3.1 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ejb-plugin</artifactId>
<configuration>
<ejbVersion>3.1</ejbVersion>
<excludes>
<exclude>**/persistence.xml</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>

25
db/src/main/java/de/muehlencord/shared/db/AbstractController.java
View File

@ -15,22 +15,20 @@
*/
package de.muehlencord.shared.db;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.Query;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Order;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.persistence.EntityGraph;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
/**
*
@ -52,7 +50,6 @@ public abstract class AbstractController<T extends Serializable> extends CommonA
* @param id the primary key of the entity to search for.
* @return the found entity instance or null if the entity does not exist
*/
@Lock(LockType.READ)
public T find(Object id) {
return em.find(entityClass, id);
}
@ -66,7 +63,6 @@ public abstract class AbstractController<T extends Serializable> extends CommonA
* Typically this is the name of the 1:n set or list.
* @return the found entity instance or null if the entity does not exist
*/
@Lock(LockType.READ)
public T find(Object id, String... subGraphItems) {
EntityGraph<T> graph = this.em.createEntityGraph(entityClass);
for (String subGraphItem : subGraphItems) {
@ -79,7 +75,6 @@ public abstract class AbstractController<T extends Serializable> extends CommonA
return em.find(entityClass, id, hints);
}
@Lock(LockType.READ)
public List<T> find(String queryName, Map<String, Object> parameterMap) {
Query query = em.createNamedQuery(queryName);
parameterMap.entrySet().forEach(entry -> query.setParameter(entry.getKey(), entry.getValue()));
@ -91,7 +86,6 @@ public abstract class AbstractController<T extends Serializable> extends CommonA
*
* @return a list of all entities.
*/
@Lock(LockType.READ)
public List<T> findAll() throws ControllerException {
return findAll(new ArrayList<>());
}
@ -102,7 +96,6 @@ public abstract class AbstractController<T extends Serializable> extends CommonA
* @param orderFields the list of field names to order the result by.
* @return a list of all entities.
*/
@Lock(LockType.READ)
public List<T> findAll(String... orderFields) throws ControllerException {
return findAll(Arrays.asList(orderFields));
}
@ -112,7 +105,6 @@ public abstract class AbstractController<T extends Serializable> extends CommonA
* @param orderFields the list of field names to order the result by.
* @return a list of all entities.
*/
@Lock(LockType.READ)
public List<T> findAll(List<String> orderFields) throws ControllerException {
return findAll(entityClass, orderFields);
}
@ -125,7 +117,6 @@ public abstract class AbstractController<T extends Serializable> extends CommonA
* @param orderFields the fields to order the result by.
* @return a list of found entities.
*/
@Lock(LockType.READ)
public List<T> find(Map<String, Object> filters, List<String> orderFields) {
final CriteriaBuilder cb = em.getCriteriaBuilder();
final CriteriaQuery<T> criteria = cb.createQuery(entityClass);

5
db/src/main/java/de/muehlencord/shared/db/ApplicationPU.java
View File

@ -19,10 +19,11 @@ import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.ElementType.PARAMETER;
import static java.lang.annotation.ElementType.TYPE;
import java.lang.annotation.Retention;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
import jakarta.inject.Qualifier;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
import javax.inject.Qualifier;
/**
*

17
db/src/main/java/de/muehlencord/shared/db/ApplicationTransactionJoinInterceptor.java
View File

@ -15,14 +15,15 @@
*/
package de.muehlencord.shared.db;
import javax.annotation.Priority;
import javax.inject.Inject;
import javax.interceptor.AroundInvoke;
import javax.interceptor.Interceptor;
import javax.interceptor.InvocationContext;
import javax.persistence.EntityManager;
import javax.transaction.Transactional;
import static javax.transaction.Transactional.TxType.REQUIRED;
import static jakarta.transaction.Transactional.TxType.REQUIRED;
import jakarta.annotation.Priority;
import jakarta.inject.Inject;
import jakarta.interceptor.AroundInvoke;
import jakarta.interceptor.Interceptor;
import jakarta.interceptor.InvocationContext;
import jakarta.persistence.EntityManager;
import jakarta.transaction.Transactional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

8
db/src/main/java/de/muehlencord/shared/db/Audit.java
View File

@ -19,13 +19,13 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.validation.constraints.NotNull;
import lombok.Getter;
import lombok.Setter;

53
db/src/main/java/de/muehlencord/shared/db/CommonAbstractController.java
View File

@ -16,9 +16,20 @@
package de.muehlencord.shared.db;
import de.muehlencord.shared.util.DateUtil;
import jakarta.inject.Inject;
import jakarta.persistence.EntityGraph;
import jakarta.persistence.EntityManager;
import jakarta.persistence.TypedQuery;
import jakarta.persistence.criteria.CriteriaBuilder;
import jakarta.persistence.criteria.CriteriaQuery;
import jakarta.persistence.criteria.Order;
import jakarta.persistence.criteria.Path;
import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root;
import jakarta.transaction.Transactional;
import jakarta.transaction.Transactional.TxType;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
import java.util.ArrayList;
import java.util.Arrays;
@ -28,21 +39,6 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.UUID;
import javax.ejb.Lock;
import javax.ejb.LockType;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
import javax.inject.Inject;
import javax.persistence.EntityGraph;
import javax.persistence.EntityManager;
import javax.persistence.TypedQuery;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Order;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.transaction.Transactional;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
@ -64,7 +60,6 @@ public abstract class CommonAbstractController {
this.em = em;
}
@Lock(LockType.READ)
public <T extends Serializable> T find(Class<T> clazz, Object id) {
return em.find(clazz, id);
}
@ -79,7 +74,6 @@ public abstract class CommonAbstractController {
return graph;
}
@Lock(LockType.READ)
public <T extends Serializable> T find(Class<T> clazz, Object id, String... subGraphItems) {
EntityGraph graph = getEntityGraph(clazz, subGraphItems);
Map hints = new HashMap<>();
@ -89,12 +83,10 @@ public abstract class CommonAbstractController {
return entity;
}
@Lock(LockType.READ)
public <T extends Serializable> List<T> find(Class<T> clazz, Map<String, Object> filters, List<String> orderFields, String... subGraphItems) {
return find(clazz, filters, orderFields, 0, 0, subGraphItems);
}
@Lock(LockType.READ)
public <T extends Serializable> List<T> find(Class<T> clazz, Map<String, Object> filters, List<String> orderFields, int limit, int offset, String... subGraphItems) {
final CriteriaBuilder cb = em.getCriteriaBuilder();
final CriteriaQuery<T> criteria = cb.createQuery(clazz);
@ -118,12 +110,10 @@ public abstract class CommonAbstractController {
return query.getResultList();
}
@Lock(LockType.READ)
public <T extends Serializable> List<T> find(Class<T> clazz, List<SearchFilter> filters, List<String> orderFields, String... subGraphItems) throws ControllerException {
return find(clazz, filters, orderFields, 0, 0);
}
@Lock(LockType.READ)
public <T extends Serializable> List<T> find(Class<T> clazz, List<SearchFilter> filters, List<String> orderFields, int limit, int offset, String... subGraphItems) throws ControllerException {
final CriteriaBuilder cb = em.getCriteriaBuilder();
final CriteriaQuery<T> criteria = cb.createQuery(clazz);
@ -157,7 +147,6 @@ public abstract class CommonAbstractController {
* @return a list of all entities found
* @throws ControllerException if the search cannot be executed.
*/
@Lock(LockType.READ)
public <T extends Serializable> List<T> findAll(Class<T> entityClass) throws ControllerException {
return findAll(entityClass, new ArrayList<>());
}
@ -170,7 +159,6 @@ public abstract class CommonAbstractController {
* @return a list of all entities found
* @throws ControllerException if the search cannot be executed.
*/
@Lock(LockType.READ)
public <T extends Serializable> List<T> findAll(Class<T> entityClass, String... orderFields) throws ControllerException {
return findAll(entityClass, Arrays.asList(orderFields));
}
@ -183,7 +171,6 @@ public abstract class CommonAbstractController {
* @return a list of all entities found
* @throws ControllerException if the search cannot be executed.
*/
@Lock(LockType.READ)
public <T extends Serializable> List<T> findAll(Class<T> entityClass, List<String> orderFields) throws ControllerException {
final CriteriaBuilder cb = em.getCriteriaBuilder();
final CriteriaQuery<T> criteria = cb.createQuery(entityClass);
@ -239,9 +226,7 @@ public abstract class CommonAbstractController {
* @return the entity after it has been written to the database.
* @throws ControllerException if the the creation or update of the entity fails.
*/
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@Transactional
@Lock(LockType.WRITE)
@Transactional(TxType.REQUIRED)
public <T extends IdentifiableEntity> T createOrUpdate(T entity, String createdBy) throws ControllerException {
if (entity.getId() == null) {
create(entity, createdBy);
@ -260,9 +245,7 @@ public abstract class CommonAbstractController {
* @return the entity after it has been written to the database.
* @throws ControllerException if the the creation fails
*/
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@Transactional
@Lock(LockType.WRITE)
@Transactional(TxType.REQUIRED)
public <T> T create(T entity, String createdBy) throws ControllerException {
if (Auditable.class.isAssignableFrom(entity.getClass())) {
Audit audit = ((Auditable) entity).getAudit();
@ -324,9 +307,7 @@ public abstract class CommonAbstractController {
* @return the entity after it has been written to the database.
* @throws ControllerException if the the updates fails
*/
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@Transactional
@Lock(LockType.WRITE)
@Transactional(TxType.REQUIRED)
public <T extends Serializable> T update(T entity, String updatedBy) throws ControllerException {
T currentEntity = executeUpdate(entity, updatedBy);
if (EndDateable.class.isAssignableFrom(entity.getClass())) {
@ -348,9 +329,7 @@ public abstract class CommonAbstractController {
* @param deletedBy the username to apply write into the audit history
* @throws ControllerException if the deletion fails.
*/
@TransactionAttribute(TransactionAttributeType.REQUIRED)
@Transactional
@Lock(LockType.WRITE)
@Transactional(TxType.REQUIRED)
public <T extends Serializable> void delete(T entity, String deletedBy) throws ControllerException {
// if the entity is endDateable just set the validToDate to now intead of executing the deletion
if (EndDateable.class.isAssignableFrom(entity.getClass())) {

14
db/src/main/java/de/muehlencord/shared/db/ControllerException.java
View File

@ -15,17 +15,19 @@
*/
package de.muehlencord.shared.db;
import javax.ejb.ApplicationException;
import lombok.Getter;
/**
* Generic exception if an exception inside a Controller class occurs
*
* @author Joern Muehlencord (joern@muehlencord.de)
*/
@ApplicationException(rollback = true)
@Getter
public class ControllerException extends Exception {
private static final long serialVersionUID = 5190280225284514859L;
public static final int INTERNAL_ERROR = 0;
public static final int CAUSE_ALREADY_EXISTS = 1;
public static final int CAUSE_NOT_FOUND = 2;
@ -60,12 +62,4 @@ public class ControllerException extends Exception {
this.causeCode = causeCode;
}
/**
* returns the cause code
*
* @return the cause code
*/
public int getCauseCode() {
return causeCode;
}
}

9
db/src/main/java/de/muehlencord/shared/db/EntityUtil.java
View File

@ -16,14 +16,15 @@
package de.muehlencord.shared.db;
import de.muehlencord.shared.util.DateUtil;
import jakarta.persistence.Id;
import java.beans.IntrospectionException;
import java.beans.PropertyDescriptor;
import java.io.Serializable;
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import javax.persistence.Id;
import org.apache.commons.lang3.SerializationUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
@ -32,7 +33,7 @@ import org.slf4j.LoggerFactory;
*/
public class EntityUtil {
private static final org.slf4j.Logger LOGGER = LoggerFactory.getLogger(EntityUtil.class);
private static final Logger logger = LoggerFactory.getLogger(EntityUtil.class);
public static Field getIdField(Class<?> entity) {
if (entity == null) {
@ -63,8 +64,8 @@ public class EntityUtil {
if (field == null) {
return entity;
}
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("id column of {} is {}", entity.getClass().getSimpleName(), field.getName());
if (logger.isDebugEnabled()) {
logger.debug("id column of {} is {}", entity.getClass().getSimpleName(), field.getName());
}
try {

10
db/src/main/java/de/muehlencord/shared/db/NumericallyIdentifiedEntity.java
View File

@ -1,11 +1,11 @@
package de.muehlencord.shared.db;
import jakarta.persistence.Basic;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.MappedSuperclass;
import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.MappedSuperclass;
@MappedSuperclass
public abstract class NumericallyIdentifiedEntity implements Serializable {

29
db/src/main/java/de/muehlencord/shared/db/StandardController.java
View File

@ -1,29 +0,0 @@
/*
* Copyright 2019 Joern Muehlencord (joern@muehlencord.de).
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.muehlencord.shared.db;
import javax.ejb.Stateless;
/**
*
* @author Joern Muehlencord (joern@muehlencord.de)
*/
@Stateless
public class StandardController extends CommonAbstractController {
}

12
db/src/main/java/de/muehlencord/shared/db/Validity.java
View File

@ -15,14 +15,14 @@
*/
package de.muehlencord.shared.db;
import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Embeddable;
import jakarta.persistence.Temporal;
import jakarta.persistence.TemporalType;
import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Embeddable;
import javax.persistence.Temporal;
import javax.persistence.TemporalType;
import javax.validation.constraints.NotNull;
/**
*

18
db/src/test/java/de/muehlencord/shared/db/CounterEntity.java
View File

@ -15,16 +15,16 @@
*/
package de.muehlencord.shared.db;
import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.io.Serializable;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
*

26
db/src/test/java/de/muehlencord/shared/db/TestEntity.java
View File

@ -15,21 +15,21 @@
*/
package de.muehlencord.shared.db;
import jakarta.persistence.Basic;
import jakarta.persistence.Column;
import jakarta.persistence.Embedded;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.Id;
import jakarta.persistence.NamedQueries;
import jakarta.persistence.NamedQuery;
import jakarta.persistence.Table;
import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.io.Serializable;
import java.util.UUID;
import javax.persistence.Basic;
import javax.persistence.Column;
import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery;
import javax.persistence.Table;
import javax.validation.constraints.Max;
import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
/**
*