Bump Micronaut to version 4.4.1 (#20)

Author: gjong

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/camunda/MicronautBeanResolver.java

@@ -30,14 +30,14 @@ public MicronautBeanResolver(ApplicationContext applicationContext) {
 
     @Override
     public boolean containsKey(Object key) {
-        log.trace("Looking up key {} in {}", key, getKeySet());
+        log.debug("Looking up key {} in {}", key, getKeySet());
         return key instanceof String && getKeySet().contains(key);
     }
 
     @Override
     public Object get(Object key) {
         if (key instanceof String) {
-            log.trace("Looking up bean {} in {}", key, getKeySet());
+            log.debug("Looking up bean {} in {}", key, getKeySet());
             Qualifier<Object> qualifier = Qualifiers.byName((String) key);
             if (applicationContext.containsBean(Object.class, qualifier)) {
                 return applicationContext.getBean(Object.class, qualifier);

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/camunda/MicronautElResolver.java

@@ -1,19 +1,28 @@
 package com.jongsoft.finance.bpmn.camunda;
 
+import com.jongsoft.finance.core.JavaBean;
 import io.micronaut.context.ApplicationContext;
+import io.micronaut.core.type.Argument;
 import io.micronaut.inject.qualifiers.Qualifiers;
 import org.camunda.bpm.engine.ProcessEngineException;
 import org.camunda.bpm.impl.juel.jakarta.el.ELContext;
 import org.camunda.bpm.impl.juel.jakarta.el.ELResolver;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
+import java.util.Optional;
 
 /**
  * This ELResolver implementation allows to resolve beans from the Micronaut application-context.
  */
 public class MicronautElResolver extends ELResolver {
 
+    private static final Argument<JavaBean> TYPE = Argument.of(JavaBean.class);
+
+    private static final Logger log = LoggerFactory.getLogger(MicronautElResolver.class);
+
     protected final ApplicationContext applicationContext;
 
     public MicronautElResolver(ApplicationContext applicationContext) {
@@ -23,13 +32,11 @@ public MicronautElResolver(ApplicationContext applicationContext) {
     @Override
     public Object getValue(ELContext context, Object base, Object property) {
         if (base == null) {
-            // according to javadoc, can only be a String
-            var key = (String) property;
-
-            var qualifier = Qualifiers.byName(key);
-            if (applicationContext.containsBean(Object.class, qualifier)) {
+            log.debug("Looking up bean '{}' in Micronaut application-context", property);
+            var resolvedBean = getBeanForKey(property.toString());
+            if (resolvedBean.isPresent()) {
                 context.setPropertyResolved(true);
-                return applicationContext.getBean(Object.class, qualifier);
+                return resolvedBean.get();
             }
         }
 
@@ -43,12 +50,10 @@ public boolean isReadOnly(ELContext context, Object base, Object property) {
 
     @Override
     public void setValue(ELContext context, Object base, Object property, Object value) {
-        if (base == null) {
-            var key = (String) property;
-            if (applicationContext.containsBean(Object.class, Qualifiers.byName(key))) {
-                throw new ProcessEngineException("Cannot set value of '" + property +
-                        "', it resolves to a bean defined in the Micronaut application-context.");
-            }
+        if (base == null && !applicationContext.containsBean(TYPE, Qualifiers.byName(property.toString()))) {
+            throw new ProcessEngineException("Cannot set value of '"
+                    + property +
+                    "', it resolves to a bean defined in the Micronaut application-context.");
         }
     }
 
@@ -67,4 +72,12 @@ public Class<?> getType(ELContext context, Object arg1, Object arg2) {
         return Object.class;
     }
 
+    private Optional<?> getBeanForKey(String key) {
+        if (applicationContext.containsBean(TYPE, Qualifiers.byName(key))) {
+            return Optional.of(applicationContext.getBean(TYPE, Qualifiers.byName(key)));
+        }
+
+        return Optional.empty();
+    }
+
 }

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/ComputeBalanceDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.core.EntityRef;
 import com.jongsoft.finance.factory.FilterFactory;
 import com.jongsoft.finance.providers.TransactionProvider;
@@ -17,7 +18,7 @@
 
 @Slf4j
 @Singleton
-public class ComputeBalanceDelegate implements JavaDelegate {
+public class ComputeBalanceDelegate implements JavaDelegate, JavaBean {
 
     private final FilterFactory filterFactory;
     private final TransactionProvider transactionProvider;

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/PropertyConversionDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate;
 
+import com.jongsoft.finance.core.JavaBean;
 import jakarta.inject.Singleton;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
@@ -10,7 +11,7 @@
 import static org.slf4j.LoggerFactory.getLogger;
 
 @Singleton
-public class PropertyConversionDelegate implements JavaDelegate {
+public class PropertyConversionDelegate implements JavaDelegate, JavaBean {
 
     private static final Logger log = getLogger(PropertyConversionDelegate.class);
 

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/account/AccountSynonymLookupDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.account;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.account.Account;
 import com.jongsoft.finance.providers.AccountProvider;
 import jakarta.inject.Singleton;
@@ -26,7 +27,7 @@
  */
 @Slf4j
 @Singleton
-public class AccountSynonymLookupDelegate implements JavaDelegate {
+public class AccountSynonymLookupDelegate implements JavaDelegate, JavaBean {
 
     private final AccountProvider accountProvider;
 

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/account/ProcessAccountCreationDelegate.java

@@ -2,6 +2,7 @@
 
 import com.jongsoft.finance.ProcessMapper;
 import com.jongsoft.finance.StorageService;
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.account.Account;
 import com.jongsoft.finance.providers.AccountProvider;
 import com.jongsoft.finance.security.CurrentUserProvider;
@@ -26,7 +27,7 @@
  */
 @Slf4j
 @Singleton
-public class ProcessAccountCreationDelegate implements JavaDelegate {
+public class ProcessAccountCreationDelegate implements JavaDelegate, JavaBean {
 
     private final CurrentUserProvider userProvider;
     private final AccountProvider accountProvider;
@@ -79,7 +80,6 @@ public void execute(DelegateExecution execution) {
 
                                 if (accountJson.getIcon() != null) {
                                     account.registerIcon(storageService.store(Hex.decode(accountJson.getIcon())));
-                                    ;
                                 }
                             });
                 });

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/account/ProcessAccountLookupDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.account;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.account.Account;
 import com.jongsoft.finance.factory.FilterFactory;
 import com.jongsoft.finance.providers.AccountProvider;
@@ -26,7 +27,7 @@
  */
 @Slf4j
 @Singleton
-public class ProcessAccountLookupDelegate implements JavaDelegate {
+public class ProcessAccountLookupDelegate implements JavaDelegate, JavaBean {
 
     private final AccountProvider accountProvider;
     private final FilterFactory accountFilterFactory;

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/account/ReconcileAccountDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.account;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.core.SystemAccountTypes;
 import com.jongsoft.finance.core.exception.StatusException;
 import com.jongsoft.finance.domain.account.Account;
@@ -32,7 +33,7 @@
  */
 @Slf4j
 @Singleton
-public class ReconcileAccountDelegate implements JavaDelegate {
+public class ReconcileAccountDelegate implements JavaDelegate, JavaBean {
 
     private final AccountProvider accountProvider;
     private final TransactionCreationHandler creationHandler;

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/budget/ProcessBudgetAnalysisDelegate.java

@@ -1,6 +1,7 @@
 package com.jongsoft.finance.bpmn.delegate.budget;
 
 import com.jongsoft.finance.core.DateUtils;
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.core.EntityRef;
 import com.jongsoft.finance.domain.user.Budget;
 import com.jongsoft.finance.factory.FilterFactory;
@@ -28,7 +29,7 @@
  */
 @Slf4j
 @Singleton
-public class ProcessBudgetAnalysisDelegate implements JavaDelegate {
+public class ProcessBudgetAnalysisDelegate implements JavaDelegate, JavaBean {
 
     private final TransactionProvider transactionProvider;
     private final FilterFactory filterFactory;

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/budget/ProcessBudgetCreateDelegate.java

@@ -1,6 +1,7 @@
 package com.jongsoft.finance.bpmn.delegate.budget;
 
 import com.jongsoft.finance.ProcessMapper;
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.user.Budget;
 import com.jongsoft.finance.messaging.EventBus;
 import com.jongsoft.finance.messaging.commands.budget.CloseBudgetCommand;
@@ -27,17 +28,14 @@
  */
 @Slf4j
 @Singleton
-public class ProcessBudgetCreateDelegate implements JavaDelegate {
+public class ProcessBudgetCreateDelegate implements JavaDelegate, JavaBean {
 
-    private final CurrentUserProvider currentUserProvider;
     private final BudgetProvider budgetProvider;
     private final ProcessMapper mapper;
 
     ProcessBudgetCreateDelegate(
-            CurrentUserProvider currentUserProvider,
             BudgetProvider budgetProvider,
             ProcessMapper mapper) {
-        this.currentUserProvider = currentUserProvider;
         this.budgetProvider = budgetProvider;
         this.mapper = mapper;
     }

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/budget/ProcessBudgetLookupDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.budget;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.user.Budget;
 import com.jongsoft.finance.factory.FilterFactory;
 import com.jongsoft.finance.providers.ExpenseProvider;
@@ -21,7 +22,7 @@
  */
 @Slf4j
 @Singleton
-public class ProcessBudgetLookupDelegate implements JavaDelegate {
+public class ProcessBudgetLookupDelegate implements JavaDelegate, JavaBean {
 
     private final FilterFactory filterFactory;
     private final ExpenseProvider expenseProvider;

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/budget/ProcessBudgetMonthSelect.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.budget;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.providers.BudgetProvider;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
@@ -9,7 +10,7 @@
 
 @Slf4j
 @Singleton
-public class ProcessBudgetMonthSelect implements JavaDelegate {
+public class ProcessBudgetMonthSelect implements JavaDelegate, JavaBean {
 
     private final BudgetProvider budgetProvider;
 

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/category/ProcessCategoryLookupDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.category;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.user.Category;
 import com.jongsoft.finance.providers.CategoryProvider;
 import jakarta.inject.Singleton;
@@ -27,7 +28,7 @@
  */
 @Slf4j
 @Singleton
-public class ProcessCategoryLookupDelegate implements JavaDelegate {
+public class ProcessCategoryLookupDelegate implements JavaDelegate, JavaBean {
 
     private final CategoryProvider categoryProvider;
 

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/category/ProcessCreateCategoryDelegate.java

@@ -1,6 +1,7 @@
 package com.jongsoft.finance.bpmn.delegate.category;
 
 import com.jongsoft.finance.ProcessMapper;
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.user.Category;
 import com.jongsoft.finance.providers.CategoryProvider;
 import com.jongsoft.finance.security.CurrentUserProvider;
@@ -24,7 +25,7 @@
  */
 @Slf4j
 @Singleton
-public class ProcessCreateCategoryDelegate implements JavaDelegate {
+public class ProcessCreateCategoryDelegate implements JavaDelegate, JavaBean {
 
     private final CurrentUserProvider currentUserProvider;
     private final CategoryProvider categoryProvider;

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/contract/ProcessContractCreateDelegate.java

@@ -2,6 +2,7 @@
 
 import com.jongsoft.finance.ProcessMapper;
 import com.jongsoft.finance.StorageService;
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.providers.AccountProvider;
 import com.jongsoft.finance.providers.ContractProvider;
 import com.jongsoft.finance.serialized.ContractJson;
@@ -14,7 +15,7 @@
 
 @Slf4j
 @Singleton
-public class ProcessContractCreateDelegate implements JavaDelegate {
+public class ProcessContractCreateDelegate implements JavaDelegate, JavaBean {
 
     private final AccountProvider accountProvider;
     private final ContractProvider contractProvider;

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/contract/ProcessContractLookupDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.contract;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.domain.account.Contract;
 import com.jongsoft.finance.providers.ContractProvider;
 import jakarta.inject.Singleton;
@@ -9,7 +10,7 @@
 
 @Slf4j
 @Singleton
-public class ProcessContractLookupDelegate implements JavaDelegate {
+public class ProcessContractLookupDelegate implements JavaDelegate, JavaBean {
 
     private final ContractProvider contractProvider;
 

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/importer/AccountRuleDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.importer;
 
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.core.RuleColumn;
 import com.jongsoft.finance.domain.account.Account;
 import com.jongsoft.finance.rule.RuleDataSet;
@@ -12,7 +13,7 @@
 
 @Slf4j
 @Singleton
-public class AccountRuleDelegate implements JavaDelegate {
+public class AccountRuleDelegate implements JavaDelegate, JavaBean {
 
     private final RuleEngine ruleEngine;
 

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/importer/ImportAccountExtractorDelegate.java

@@ -1,5 +1,6 @@
 package com.jongsoft.finance.bpmn.delegate.importer;
 
+import com.jongsoft.finance.core.JavaBean;
 import lombok.extern.slf4j.Slf4j;
 import org.camunda.bpm.engine.delegate.DelegateExecution;
 import org.camunda.bpm.engine.delegate.JavaDelegate;
@@ -17,7 +18,7 @@
  * <p>
  */
 @Slf4j
-public class ImportAccountExtractorDelegate implements JavaDelegate {
+public class ImportAccountExtractorDelegate implements JavaDelegate, JavaBean {
 
     @Override
     public void execute(DelegateExecution execution) throws Exception {

bpmn-process/src/main/java/com/jongsoft/finance/bpmn/delegate/importer/ImportFinishedDelegate.java

@@ -1,6 +1,7 @@
 package com.jongsoft.finance.bpmn.delegate.importer;
 
 import com.jongsoft.finance.StorageService;
+import com.jongsoft.finance.core.JavaBean;
 import com.jongsoft.finance.providers.ImportProvider;
 import jakarta.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
@@ -13,7 +14,7 @@
 
 @Slf4j
 @Singleton
-public class ImportFinishedDelegate implements JavaDelegate {
+public class ImportFinishedDelegate implements JavaDelegate, JavaBean {
 
     private final StorageService storageService;
     private final ImportProvider importProvider;