(myfaces) branch 4.1.x updated: MYFACES-4743 - revert

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tandraschko pushed a commit to branch 4.1.x
in repository https://gitbox.apache.org/repos/asf/myfaces.git


The following commit(s) were added to refs/heads/4.1.x by this push:
     new 39352deea MYFACES-4743 - revert
39352deea is described below

commit 39352deead87f9a1e291a30c7d5c9e0eda6825d4
Author: tandraschko <ta...@apache.org>
AuthorDate: Fri Feb 20 17:33:43 2026 +0100

    MYFACES-4743 - revert
---
 .../quarkus/runtime/spi/QuarkusBeanELResolver.java | 61 ----------------------
 .../runtime/spi/QuarkusELResolverBuilder.java      |  7 ---
 2 files changed, 68 deletions(-)

diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusBeanELResolver.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusBeanELResolver.java
deleted file mode 100644
index da32f7f9c..000000000
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusBeanELResolver.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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 org.apache.myfaces.core.extensions.quarkus.runtime.spi;
-
-import jakarta.el.PropertyNotFoundException;
-import jakarta.faces.context.FacesContext;
-import org.apache.myfaces.core.api.shared.lang.PropertyDescriptorUtils;
-import org.apache.myfaces.core.api.shared.lang.PropertyDescriptorWrapper;
-import org.apache.myfaces.el.resolver.LambdaBeanELResolver;
-
-import java.util.Map;
-
-/**
- * Custom LambdaBeanELResolver to unwrap Quarkus proxies as this leads to errors in newer versions. See MYFACES-4743.
- * Even if USE_LAMBDA_METAFACTORY is not activated, it still uses Java introspection as fallback.
- */
-public class QuarkusBeanELResolver extends LambdaBeanELResolver
-{
-    @Override
-    protected PropertyDescriptorWrapper getPropertyDescriptor(Object base, Object property)
-    {
-        Class<?> type = base.getClass();
-        if (type.getName().endsWith("_ClientProxy"))
-        {
-            type = type.getSuperclass();
-        }
-
-        Map<String, ? extends PropertyDescriptorWrapper> beanCache = cache.get(type.getName());
-        if (beanCache == null)
-        {
-            beanCache = PropertyDescriptorUtils.getCachedPropertyDescriptors(
-                    FacesContext.getCurrentInstance().getExternalContext(),
-                    type);
-            cache.put(type.getName(), beanCache);
-        }
-
-        PropertyDescriptorWrapper pd = beanCache.get((String) property);
-        if (pd == null)
-        {
-            throw new PropertyNotFoundException("Property [" + property
-                    + "] not found on type [" + type.getName() + "]");
-        }
-        return pd;
-    }
-}
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java
index bf4f666bb..466f0b34d 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusELResolverBuilder.java
@@ -18,7 +18,6 @@
  */
 package org.apache.myfaces.core.extensions.quarkus.runtime.spi;
 
-import jakarta.el.BeanELResolver;
 import jakarta.el.ELResolver;
 
 import jakarta.faces.context.FacesContext;
@@ -44,10 +43,4 @@ protected ELResolver getCDIELResolver(FacesContext facesContext)
     {
         return new QuarkusCdiELResolver();
     }
-
-    @Override
-    protected BeanELResolver getBeanELResolver(FacesContext facesContext)
-    {
-        return new QuarkusBeanELResolver();
-    }
 }