Move BaseEntityService#getCurrentInstance() into

JPA#getCurrentBaseEntityService() because WildFly complains that EJBs
shouldn't have static methods

Author: BalusC

.github/workflows/jakartified.maven.yml

@@ -37,4 +37,4 @@ jobs:
         distribution: 'adopt'
         cache: maven
     - name: Test with Maven
-      run: mvn verify -Dmaven.javadoc.skip=true -P ${{matrix.server}}
+      run: mvn -B verify -Dmaven.javadoc.skip=true -P ${{matrix.server}}

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>org.omnifaces</groupId>
     <artifactId>omnipersistence</artifactId>
-    <version>0.21.J1</version>
+    <version>0.21.J2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>OmniPersistence</name>

src/main/java/org/omnifaces/persistence/Database.java

@@ -16,15 +16,13 @@
 import static java.util.logging.Level.WARNING;
 import static java.util.stream.Collectors.toList;
 import static java.util.stream.Stream.concat;
+import static org.omnifaces.persistence.JPA.getCurrentBaseEntityService;
 import static org.omnifaces.utils.Lang.startsWithOneOf;
 
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.EntityManagerFactory;
-
-import org.omnifaces.persistence.service.BaseEntityService;
 
 /**
  * Enumeration of all supported databases.
@@ -43,16 +41,16 @@ public enum Database {
 
     private String[] names;
 
-    private Database(String... aliases) {
+    Database(String... aliases) {
         this.names = concat(Stream.of(name()), stream(aliases)).collect(toList()).toArray(new String[0]);
     }
 
     public static Database of(EntityManager entityManager) {
-        Provider provider = Provider.of(entityManager);
-        EntityManagerFactory entityManagerFactory = entityManager.getEntityManagerFactory();
+        var provider = Provider.of(entityManager);
+        var entityManagerFactory = entityManager.getEntityManagerFactory();
 
         try {
-            String uppercasedDialectName = provider.getDialectName(entityManagerFactory).toUpperCase();
+            var uppercasedDialectName = provider.getDialectName(entityManagerFactory).toUpperCase();
 
             for (Database database : values()) {
                 if (startsWithOneOf(uppercasedDialectName, database.names)) {
@@ -68,7 +66,7 @@ public static Database of(EntityManager entityManager) {
     }
 
     public static boolean is(Database database) {
-        return BaseEntityService.getCurrentInstance().getDatabase() == database;
+        return getCurrentBaseEntityService().getDatabase() == database;
     }
 
 }

src/main/java/org/omnifaces/persistence/JPA.java

@@ -20,7 +20,6 @@
 import static org.omnifaces.utils.stream.Streams.stream;
 
 import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Member;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -33,6 +32,9 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import javax.naming.InitialContext;
+
+import jakarta.ejb.SessionContext;
 import jakarta.enterprise.inject.Typed;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.EnumType;
@@ -54,12 +56,12 @@
 import jakarta.persistence.metamodel.EntityType;
 import jakarta.persistence.metamodel.ListAttribute;
 import jakarta.persistence.metamodel.MapAttribute;
-import jakarta.persistence.metamodel.Metamodel;
 import jakarta.persistence.metamodel.PluralAttribute;
 import jakarta.persistence.metamodel.SetAttribute;
 import jakarta.persistence.metamodel.SingularAttribute;
 
 import org.omnifaces.persistence.criteria.Numeric;
+import org.omnifaces.persistence.service.BaseEntityService;
 
 /**
  * JPA utilities.
@@ -92,7 +94,7 @@ private JPA() {
      * @return The currently configured bean validation mode.
      */
     public static ValidationMode getValidationMode(EntityManager entityManager) {
-        Object validationMode = entityManager.getEntityManagerFactory().getProperties().get(PROPERTY_VALIDATION_MODE);
+        var validationMode = entityManager.getEntityManagerFactory().getProperties().get(PROPERTY_VALIDATION_MODE);
         return validationMode != null ? ValidationMode.valueOf(validationMode.toString().toUpperCase()) : ValidationMode.AUTO;
     }
 
@@ -235,6 +237,23 @@ public static <K, T, V> Map<K, V> getResultMap(TypedQuery<T> typedQuery, Functio
 
     // Entity utils -----------------------------------------------------------------------------------------------------------------------
 
+    /**
+     * Returns the currently active {@link BaseEntityService} from the {@link SessionContext}.
+     * @return The currently active {@link BaseEntityService} from the {@link SessionContext}.
+     * @throws IllegalStateException if there is none, which can happen if this method is called outside EJB context,
+     * or when currently invoked EJB service is not an instance of {@link BaseEntityService}.
+     */
+    @SuppressWarnings("unchecked")
+    public static BaseEntityService<?, ?> getCurrentBaseEntityService() {
+        try {
+            var ejbContext = (SessionContext) new InitialContext().lookup("java:comp/EJBContext");
+            return (BaseEntityService<?, ?>) ejbContext.getBusinessObject(ejbContext.getInvokedBusinessInterface());
+        }
+        catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
     /**
      * Returns count of all foreign key references to entity of given entity type with given ID of given identifier type.
      * This is particularly useful in case you intend to check if the given entity is still referenced elsewhere in database.
@@ -247,7 +266,7 @@ public static <K, T, V> Map<K, V> getResultMap(TypedQuery<T> typedQuery, Functio
      * @return Count of all foreign key references to entity of given entity type with given ID of given identifier type.
      */
     public static <T, I> long countForeignKeyReferences(EntityManager entityManager, Class<T> entityType, Class<I> identifierType, I id) {
-        Metamodel metamodel = entityManager.getMetamodel();
+        var metamodel = entityManager.getMetamodel();
         SingularAttribute<? super T, I> idAttribute = metamodel.entity(entityType).getId(identifierType);
         return metamodel.getEntities().stream()
             .flatMap(entity -> getAttributesOfType(entity, entityType))
@@ -263,14 +282,14 @@ public static <T, I> long countForeignKeyReferences(EntityManager entityManager,
     }
 
     private static <E> Class<?> getJavaType(Attribute<? super E, ?> attribute) {
-        return (attribute instanceof PluralAttribute)
+        return attribute instanceof PluralAttribute
             ? ((PluralAttribute<?, ?, ?>) attribute).getElementType().getJavaType()
             : attribute.getJavaType();
     }
 
     @SuppressWarnings("unchecked")
     private static <E, T, I> Long countReferencesTo(EntityManager entityManager, Attribute<E, ?> attribute, SingularAttribute<? super T, I> idAttribute, I id) {
-        CriteriaBuilder criteriaBuilder = entityManager.getCriteriaBuilder();
+        var criteriaBuilder = entityManager.getCriteriaBuilder();
         CriteriaQuery<Long> query = criteriaBuilder.createQuery(Long.class);
         Root<E> root = query.from(attribute.getDeclaringType().getJavaType());
         Join<E, T> join;
@@ -381,10 +400,10 @@ public static boolean isEnumeratedByOrdinal(Path<?> path) {
         Bindable<?> model = path.getModel();
 
         if (model instanceof Attribute) {
-            Member member = ((Attribute<?, ?>) model).getJavaMember();
+            var member = ((Attribute<?, ?>) model).getJavaMember();
 
             if (member instanceof AnnotatedElement) {
-                Enumerated enumerated = ((AnnotatedElement) member).getAnnotation(Enumerated.class);
+                var enumerated = ((AnnotatedElement) member).getAnnotation(Enumerated.class);
 
                 if (enumerated != null) {
                     return enumerated.value() == EnumType.ORDINAL;

src/main/java/org/omnifaces/persistence/Provider.java

@@ -16,6 +16,7 @@
 import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.MANY_TO_ONE;
 import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ONE_TO_MANY;
 import static jakarta.persistence.metamodel.Attribute.PersistentAttributeType.ONE_TO_ONE;
+import static org.omnifaces.persistence.JPA.getCurrentBaseEntityService;
 import static org.omnifaces.utils.Collections.unmodifiableSet;
 import static org.omnifaces.utils.Lang.isOneOf;
 import static org.omnifaces.utils.reflect.Reflections.findClass;
@@ -38,7 +39,6 @@
 import jakarta.persistence.metamodel.Attribute;
 
 import org.omnifaces.persistence.model.BaseEntity;
-import org.omnifaces.persistence.service.BaseEntityService;
 
 /**
  * Enumeration of all supported JPA providers.
@@ -193,7 +193,7 @@ else if (packageName.startsWith("org.apache.openjpa.")) {
     }
 
     public static boolean is(Provider provider) {
-        return BaseEntityService.getCurrentInstance().getProvider() == provider;
+        return getCurrentBaseEntityService().getProvider() == provider;
     }
 
     public String getDialectName(EntityManagerFactory entityManagerFactory) {

src/main/java/org/omnifaces/persistence/audit/AuditListener.java

@@ -16,6 +16,7 @@
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toConcurrentMap;
 import static java.util.stream.Collectors.toSet;
+import static org.omnifaces.persistence.JPA.getCurrentBaseEntityService;
 import static org.omnifaces.utils.reflect.Reflections.invokeMethod;
 import static org.omnifaces.utils.stream.Streams.stream;
 
@@ -70,7 +71,7 @@ public void afterUpdate(BaseEntity<I> entity) {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private Map<PropertyDescriptor, Map<I, Object>> getAuditableProperties(BaseEntity<I> entity) {
         Map auditableProperties = AUDITABLE_PROPERTIES.computeIfAbsent(entity.getClass(), k -> {
-            BaseEntityService<?, ?> baseEntityService = BaseEntityService.getCurrentInstance();
+            BaseEntityService<?, ?> baseEntityService = getCurrentBaseEntityService();
             Set<String> auditablePropertyNames = baseEntityService.getMetamodel(entity).getDeclaredAttributes().stream()
                 .filter(a -> a.getJavaMember() instanceof Field && ((Field) a.getJavaMember()).isAnnotationPresent(Audit.class))
                 .map(Attribute::getName)

src/main/java/org/omnifaces/persistence/service/BaseEntityService.java

@@ -75,10 +75,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.naming.InitialContext;
-
 import jakarta.annotation.PostConstruct;
-import jakarta.ejb.SessionContext;
 import jakarta.ejb.Stateless;
 import jakarta.enterprise.inject.spi.CDI;
 import jakarta.persistence.CacheRetrieveMode;
@@ -2134,23 +2131,6 @@ private static Criteria<?> createElementCollectionCriteria(Class<?> type, Object
 
     // Helpers --------------------------------------------------------------------------------------------------------
 
-    /**
-     * Returns the currently active {@link BaseEntityService} from the {@link SessionContext}.
-     * @return The currently active {@link BaseEntityService} from the {@link SessionContext}.
-     * @throws IllegalStateException if there is none, which can happen if this method is called outside EJB context,
-     * or when currently invoked EJB service is not an instance of {@link BaseEntityService}.
-     */
-    @SuppressWarnings("unchecked")
-    public static BaseEntityService<?, ?> getCurrentInstance() {
-        try {
-            var ejbContext = (SessionContext) new InitialContext().lookup("java:comp/EJBContext");
-            return (BaseEntityService<?, ?>) ejbContext.getBusinessObject(ejbContext.getInvokedBusinessInterface());
-        }
-        catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
     private static Predicate[] toArray(List<Predicate> predicates) {
         return predicates.toArray(new Predicate[predicates.size()]);
     }