You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2020/10/27 12:36:16 UTC
[myfaces] branch master updated: removed duplicate code
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/master by this push:
new 77b7e92 removed duplicate code
77b7e92 is described below
commit 77b7e927fedab01c22251dc617eece9a7d8a3760
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Tue Oct 27 13:36:08 2020 +0100
removed duplicate code
---
.../java/javax/faces/validator/BeanValidator.java | 158 +--------------------
.../core/api/shared}/ELContextDecorator.java | 5 +-
.../core/api/shared/FacesMessageInterpolator.java | 55 +++++++
.../core/api/shared}/ValueReferenceResolver.java | 7 +-
.../component/ComponentResourceContainer.java | 5 +-
.../component/validate/WholeBeanValidator.java | 51 +------
6 files changed, 72 insertions(+), 209 deletions(-)
diff --git a/api/src/main/java/javax/faces/validator/BeanValidator.java b/api/src/main/java/javax/faces/validator/BeanValidator.java
index 40a9461..0d0a62b 100644
--- a/api/src/main/java/javax/faces/validator/BeanValidator.java
+++ b/api/src/main/java/javax/faces/validator/BeanValidator.java
@@ -27,25 +27,19 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.logging.Logger;
import javax.el.ELContext;
-import javax.el.ELResolver;
-import javax.el.FunctionMapper;
import javax.el.ValueExpression;
import javax.el.ValueReference;
-import javax.el.VariableMapper;
import javax.faces.FacesException;
import javax.faces.application.FacesMessage;
import javax.faces.component.PartialStateHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.CompositeComponentExpressionHolder;
import javax.validation.ConstraintViolation;
-import javax.validation.MessageInterpolator;
import javax.validation.Validation;
import javax.validation.ValidatorFactory;
import javax.validation.groups.Default;
@@ -55,6 +49,8 @@ import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProp
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFValidator;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFWebConfigParam;
+import org.apache.myfaces.core.api.shared.FacesMessageInterpolator;
+import org.apache.myfaces.core.api.shared.ValueReferenceResolver;
/**
* <p>
@@ -217,7 +213,8 @@ public class BeanValidator implements Validator, PartialStateHolder
}
// Delegate to Bean Validation.
- Set constraintViolations = validator.validateValue(valueBaseClass, valueProperty, value, validationGroupsArray);
+ Set<?> constraintViolations
+ = validator.validateValue(valueBaseClass, valueProperty, value, validationGroupsArray);
if (!constraintViolations.isEmpty())
{
Set<FacesMessage> messages = new LinkedHashSet<>(constraintViolations.size());
@@ -312,7 +309,7 @@ public class BeanValidator implements Validator, PartialStateHolder
final ValueExpression valueExpression, final FacesContext context)
{
ELContext elCtx = context.getELContext();
- return _ValueReferenceResolver.resolve(valueExpression, elCtx);
+ return ValueReferenceResolver.resolve(valueExpression, elCtx);
}
/**
@@ -504,179 +501,34 @@ public class BeanValidator implements Validator, PartialStateHolder
return null;
}
- /** {@inheritDoc} */
@Override
public boolean isTransient()
{
return isTransient;
}
- /** {@inheritDoc} */
@Override
public void setTransient(final boolean isTransient)
{
this.isTransient = isTransient;
}
- /** {@inheritDoc} */
@Override
public void clearInitialState()
{
_initialStateMarked = false;
}
- /** {@inheritDoc} */
@Override
public boolean initialStateMarked()
{
return _initialStateMarked;
}
- /** {@inheritDoc} */
@Override
public void markInitialState()
{
_initialStateMarked = true;
}
-
- /**
- * Note: Before 2.1.5/2.0.11 there was another strategy for this point to minimize
- * the instances used, but after checking this with a profiler, it is more expensive to
- * call FacesContext.getCurrentInstance() than create this object for bean validation.
- *
- * Standard MessageInterpolator, as described in the JSR-314 spec.
- */
- private static class FacesMessageInterpolator implements MessageInterpolator
- {
- private final FacesContext facesContext;
- private final MessageInterpolator interpolator;
-
- public FacesMessageInterpolator(final MessageInterpolator interpolator, final FacesContext facesContext)
- {
- this.interpolator = interpolator;
- this.facesContext = facesContext;
- }
-
- @Override
- public String interpolate(final String s, final Context context)
- {
- Locale locale = facesContext.getViewRoot().getLocale();
- return interpolator.interpolate(s, context, locale);
- }
-
- @Override
- public String interpolate(final String s, final Context context, final Locale locale)
- {
- return interpolator.interpolate(s, context, locale);
- }
- }
}
-final class _ValueReferenceResolver
-{
- /**
- * This method can be used to extract the ValueReference from the given ValueExpression.
- *
- * @param valueExpression The ValueExpression to resolve.
- * @param elCtx The ELContext, needed to parse and execute the expression.
- * @return The ValueReferenceWrapper.
- */
- public static ValueReference resolve(ValueExpression valueExpression, final ELContext elCtx)
- {
- ValueReference valueReference = valueExpression.getValueReference(elCtx);
-
- while (valueReference != null && valueReference.getBase() instanceof CompositeComponentExpressionHolder)
- {
- valueExpression = ((CompositeComponentExpressionHolder) valueReference.getBase())
- .getExpression((String) valueReference.getProperty());
- if(valueExpression == null)
- {
- break;
- }
- valueReference = valueExpression.getValueReference(elCtx);
- }
-
- return valueReference;
- }
-}
-
-/**
- * This ELContext is used to hook into the EL handling, by decorating the
- * ELResolver chain with a custom ELResolver.
- */
-final class _ELContextDecorator extends ELContext
-{
- private final ELContext ctx;
- private final ELResolver interceptingResolver;
-
- /**
- * Only used by ValueExpressionResolver.
- *
- * @param elContext The standard ELContext. All method calls, except getELResolver, are delegated to it.
- * @param interceptingResolver The ELResolver to be returned by getELResolver.
- */
- _ELContextDecorator(final ELContext elContext, final ELResolver interceptingResolver)
- {
- this.ctx = elContext;
- this.interceptingResolver = interceptingResolver;
- }
-
- /**
- * This is the important one, it returns the passed ELResolver.
- * @return The ELResolver passed into the constructor.
- */
- @Override
- public ELResolver getELResolver()
- {
- return interceptingResolver;
- }
-
- // ############################ Standard delegating implementations ############################
- @Override
- public FunctionMapper getFunctionMapper()
- {
- return ctx.getFunctionMapper();
- }
-
- @Override
- public VariableMapper getVariableMapper()
- {
- return ctx.getVariableMapper();
- }
-
- @Override
- public void setPropertyResolved(final boolean resolved)
- {
- ctx.setPropertyResolved(resolved);
- }
-
- @Override
- public boolean isPropertyResolved()
- {
- return ctx.isPropertyResolved();
- }
-
- @Override
- public void putContext(final Class key, Object contextObject)
- {
- ctx.putContext(key, contextObject);
- }
-
- @Override
- public Object getContext(final Class key)
- {
- return ctx.getContext(key);
- }
-
- @Override
- public Locale getLocale()
- {
- return ctx.getLocale();
- }
-
- @Override
- public void setLocale(final Locale locale)
- {
- ctx.setLocale(locale);
- }
-}
diff --git a/impl/src/main/java/org/apache/myfaces/el/ELContextDecorator.java b/api/src/main/java/org/apache/myfaces/core/api/shared/ELContextDecorator.java
similarity index 92%
rename from impl/src/main/java/org/apache/myfaces/el/ELContextDecorator.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/ELContextDecorator.java
index c96d9b0..590f02a 100644
--- a/impl/src/main/java/org/apache/myfaces/el/ELContextDecorator.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/ELContextDecorator.java
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.myfaces.el;
+package org.apache.myfaces.core.api.shared;
import java.util.Locale;
import javax.el.ELContext;
@@ -56,7 +55,6 @@ public class ELContextDecorator extends ELContext
return interceptingResolver;
}
- // ############################ Standard delegating implementations ############################
@Override
public FunctionMapper getFunctionMapper()
{
@@ -105,3 +103,4 @@ public class ELContextDecorator extends ELContext
ctx.setLocale(locale);
}
}
+
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/FacesMessageInterpolator.java b/api/src/main/java/org/apache/myfaces/core/api/shared/FacesMessageInterpolator.java
new file mode 100644
index 0000000..ba7ecb1
--- /dev/null
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/FacesMessageInterpolator.java
@@ -0,0 +1,55 @@
+/*
+ * 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.api.shared;
+
+import java.util.Locale;
+import javax.faces.context.FacesContext;
+import javax.validation.MessageInterpolator;
+
+/**
+ * Note: Before 2.1.5/2.0.11 there was another strategy for this point to minimize
+ * the instances used, but after checking this with a profiler, it is more expensive to
+ * call FacesContext.getCurrentInstance() than create this object for bean validation.
+ *
+ * Standard MessageInterpolator, as described in the JSR-314 spec.
+ */
+public class FacesMessageInterpolator implements MessageInterpolator
+{
+ private final FacesContext facesContext;
+ private final MessageInterpolator interpolator;
+
+ public FacesMessageInterpolator(final MessageInterpolator interpolator, final FacesContext facesContext)
+ {
+ this.interpolator = interpolator;
+ this.facesContext = facesContext;
+ }
+
+ @Override
+ public String interpolate(final String s, final MessageInterpolator.Context context)
+ {
+ Locale locale = facesContext.getViewRoot().getLocale();
+ return interpolator.interpolate(s, context, locale);
+ }
+
+ @Override
+ public String interpolate(final String s, final MessageInterpolator.Context context, final Locale locale)
+ {
+ return interpolator.interpolate(s, context, locale);
+ }
+}
diff --git a/impl/src/main/java/org/apache/myfaces/el/ValueReferenceResolver.java b/api/src/main/java/org/apache/myfaces/core/api/shared/ValueReferenceResolver.java
similarity index 95%
rename from impl/src/main/java/org/apache/myfaces/el/ValueReferenceResolver.java
rename to api/src/main/java/org/apache/myfaces/core/api/shared/ValueReferenceResolver.java
index a9efa4e..1a64156 100644
--- a/impl/src/main/java/org/apache/myfaces/el/ValueReferenceResolver.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/ValueReferenceResolver.java
@@ -16,8 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-package org.apache.myfaces.el;
+package org.apache.myfaces.core.api.shared;
import javax.el.ELContext;
import javax.el.ValueExpression;
@@ -47,9 +46,7 @@ public class ValueReferenceResolver
}
valueReference = valueExpression.getValueReference(elCtx);
}
-
+
return valueReference;
}
-
}
-
diff --git a/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java b/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java
index bc4fc06..e9eab88 100644
--- a/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java
+++ b/impl/src/main/java/org/apache/myfaces/component/ComponentResourceContainer.java
@@ -42,12 +42,9 @@ public class ComponentResourceContainer extends UIPanel
static public final String COMPONENT_TYPE =
"javax.faces.ComponentResourceContainer";
- /**
- * Construct an instance of the UIPanel.
- */
public ComponentResourceContainer()
{
- setRendererType(null);
+ setRendererType(null);
}
@Override
diff --git a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
index 3ea648b..be9aff7 100644
--- a/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
+++ b/impl/src/main/java/org/apache/myfaces/component/validate/WholeBeanValidator.java
@@ -19,8 +19,6 @@
package org.apache.myfaces.component.validate;
-import org.apache.myfaces.el.ELContextDecorator;
-import org.apache.myfaces.el.ValueReferenceResolver;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
@@ -30,7 +28,6 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.LinkedHashSet;
import java.util.List;
-import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.logging.Level;
@@ -52,12 +49,14 @@ import static javax.faces.validator.BeanValidator.VALIDATOR_FACTORY_KEY;
import javax.faces.validator.Validator;
import javax.faces.validator.ValidatorException;
import javax.validation.ConstraintViolation;
-import javax.validation.MessageInterpolator;
import javax.validation.Validation;
import javax.validation.ValidatorFactory;
import javax.validation.groups.Default;
import javax.validation.metadata.BeanDescriptor;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+import org.apache.myfaces.core.api.shared.ELContextDecorator;
+import org.apache.myfaces.core.api.shared.FacesMessageInterpolator;
+import org.apache.myfaces.core.api.shared.ValueReferenceResolver;
import org.apache.myfaces.util.lang.Assert;
import org.apache.myfaces.util.lang.ClassUtils;
import org.apache.myfaces.util.MessageUtils;
@@ -65,9 +64,6 @@ import org.apache.myfaces.util.MyFacesObjectInputStream;
import org.apache.myfaces.util.ExternalSpecifications;
import org.apache.myfaces.util.lang.FastByteArrayOutputStream;
-/**
- *
- */
public class WholeBeanValidator implements Validator
{
private static final Logger log = Logger.getLogger(WholeBeanValidator.class.getName());
@@ -141,13 +137,12 @@ public class WholeBeanValidator implements Validator
VisitContext.createVisitContext(context, candidatesMap.keySet(), null),
callback);
- Set constraintViolations = validator.validate(copy, validationGroupsArray);
+ Set<ConstraintViolation<Object>> constraintViolations = validator.validate(copy, validationGroupsArray);
if (!constraintViolations.isEmpty())
{
- Set<FacesMessage> messages = new LinkedHashSet<FacesMessage>(constraintViolations.size());
- for (Object violation: constraintViolations)
+ Set<FacesMessage> messages = new LinkedHashSet<>(constraintViolations.size());
+ for (ConstraintViolation constraintViolation : constraintViolations)
{
- ConstraintViolation constraintViolation = (ConstraintViolation) violation;
String message = constraintViolation.getMessage();
Object[] args = new Object[]{ message, MessageUtils.getLabel(context, component) };
FacesMessage msg = MessageUtils.getMessage(FacesMessage.SEVERITY_ERROR, MESSAGE_ID, args, context);
@@ -271,7 +266,7 @@ public class WholeBeanValidator implements Validator
final ValueExpression valueExpression, final FacesContext context)
{
ELContext elCtx = context.getELContext();
-
+
return ValueReferenceResolver.resolve(valueExpression, elCtx);
}
@@ -371,38 +366,6 @@ public class WholeBeanValidator implements Validator
component.setValidationGroups(validationGroups);
}
- /**
- * Note: Before 2.1.5/2.0.11 there was another strategy for this point to minimize
- * the instances used, but after checking this with a profiler, it is more expensive to
- * call FacesContext.getCurrentInstance() than create this object for bean validation.
- *
- * Standard MessageInterpolator, as described in the JSR-314 spec.
- */
- private static class FacesMessageInterpolator implements MessageInterpolator
- {
- private final FacesContext facesContext;
- private final MessageInterpolator interpolator;
-
- public FacesMessageInterpolator(final MessageInterpolator interpolator, final FacesContext facesContext)
- {
- this.interpolator = interpolator;
- this.facesContext = facesContext;
- }
-
- @Override
- public String interpolate(final String s, final MessageInterpolator.Context context)
- {
- Locale locale = facesContext.getViewRoot().getLocale();
- return interpolator.interpolate(s, context, locale);
- }
-
- @Override
- public String interpolate(final String s, final MessageInterpolator.Context context, final Locale locale)
- {
- return interpolator.interpolate(s, context, locale);
- }
- }
-
private static class UpdateBeanCopyCallback implements VisitCallback
{
private WholeBeanValidator validator;