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 2023/02/06 15:02:10 UTC
[myfaces] branch main updated: cosmetics
This is an automated email from the ASF dual-hosted git repository.
tandraschko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/myfaces.git
The following commit(s) were added to refs/heads/main by this push:
new 80cb2af09 cosmetics
80cb2af09 is described below
commit 80cb2af09e602c748f3f39512c0d4f060fcf16d4
Author: Thomas Andraschko <ta...@apache.org>
AuthorDate: Mon Feb 6 16:01:31 2023 +0100
cosmetics
---
api/src/main/java/jakarta/faces/FactoryFinder.java | 4 +-
.../faces/_FactoryFinderProviderFactory.java | 4 +-
.../jakarta/faces/application/NavigationCase.java | 4 +-
.../jakarta/faces/component/UIComponentBase.java | 6 +-
.../main/java/jakarta/faces/component/UIData.java | 2 +-
.../main/java/jakarta/faces/component/UIInput.java | 2 +-
.../java/jakarta/faces/component/UIOutput.java | 2 +-
.../java/jakarta/faces/component/UISelectMany.java | 2 +-
.../java/jakarta/faces/component/UISelectOne.java | 3 +-
.../java/jakarta/faces/component/UIViewRoot.java | 12 +--
.../faces/component/_ComponentAttributesMap.java | 10 +-
.../faces/component/_ComponentFacetMap.java | 6 +-
.../faces/component/_EventListenerWrapper.java | 2 +-
.../java/jakarta/faces/component/_UIWebsocket.java | 2 +-
.../jakarta/faces/component/_ViewAttributeMap.java | 2 +-
.../faces/component/behavior/AjaxBehavior.java | 2 +-
.../faces/component/behavior/BehaviorBase.java | 2 +-
.../component/behavior/ClientBehaviorBase.java | 2 +-
.../component/behavior/ClientBehaviorHint.java | 2 +-
.../jakarta/faces/convert/BigDecimalConverter.java | 2 +-
.../jakarta/faces/convert/BigIntegerConverter.java | 2 +-
.../faces/event/ExceptionQueuedEventContext.java | 2 +-
.../main/java/jakarta/faces/model/DataModel.java | 2 +-
.../faces/view/facelets/FaceletContext.java | 2 +-
.../core/api/shared/SelectItemsIterator.java | 2 +-
.../myfaces/core/api/shared/lang/ClassUtils.java | 2 +-
.../quarkus/deployment/MyFacesProcessor.java | 2 +-
.../runtime/spi/QuarkusFactoryFinderProvider.java | 2 +-
.../myfaces/application/ApplicationImpl.java | 10 +-
.../myfaces/application/NavigationHandlerImpl.java | 2 +-
.../myfaces/application/ResourceHandlerImpl.java | 2 +-
.../apache/myfaces/application/ViewIdSupport.java | 6 +-
.../myfaces/application/ViewResourceIterator.java | 2 +-
.../viewstate/SerializedViewCollection.java | 8 +-
.../viewstate/StateCacheServerSide.java | 2 +-
.../viewstate/StateTokenProcessorClientSide.java | 2 +-
.../myfaces/application/viewstate/StateUtils.java | 8 +-
.../myfaces/cdi/config/FacesConfigExtension.java | 2 +-
.../myfaces/cdi/model/FacesDataModelExtension.java | 2 +-
.../cdi/wrapper/FacesBehaviorCDIWrapper.java | 2 +-
.../cdi/wrapper/FacesClientBehaviorCDIWrapper.java | 2 +-
.../cdi/wrapper/FacesConverterCDIWrapper.java | 8 +-
.../cdi/wrapper/FacesValidatorCDIWrapper.java | 4 +-
.../search/SearchExpressionHandlerImpl.java | 5 +-
.../config/DefaultFacesConfigurationMerger.java | 10 +-
.../config/DefaultFacesConfigurationProvider.java | 2 +-
.../apache/myfaces/config/FacesConfigurator.java | 4 +-
.../org/apache/myfaces/config/RuntimeConfig.java | 3 +-
.../config/annotation/AnnotationConfigurator.java | 14 +--
.../myfaces/context/AjaxExceptionHandlerImpl.java | 4 +-
.../myfaces/context/ExceptionHandlerImpl.java | 4 +-
.../MyFacesExceptionHandlerWrapperImpl.java | 4 +-
.../apache/myfaces/context/flash/FlashImpl.java | 4 +-
.../myfaces/context/servlet/FacesContextImpl.java | 4 +-
.../el/resolver/CompositeComponentELResolver.java | 2 +-
.../myfaces/el/resolver/LambdaBeanELResolver.java | 2 +-
.../org/apache/myfaces/flow/FlowCallNodeImpl.java | 4 +-
.../org/apache/myfaces/flow/FlowHandlerImpl.java | 4 +-
.../apache/myfaces/flow/NavigationCaseImpl.java | 4 +-
.../org/apache/myfaces/flow/ReturnNodeImpl.java | 2 +-
.../org/apache/myfaces/flow/SwitchNodeImpl.java | 2 +-
.../myfaces/lifecycle/RestoreViewExecutor.java | 2 +-
.../myfaces/lifecycle/RestoreViewSupport.java | 2 +-
.../clientwindow/CODIClientSideWindow.java | 2 +-
.../lifecycle/clientwindow/ClientConfig.java | 2 +-
.../apache/myfaces/renderkit/ContentTypeUtils.java | 4 +-
.../apache/myfaces/renderkit/ErrorPageWriter.java | 8 +-
.../renderkit/html/HtmlCommandScriptRenderer.java | 2 +-
.../html/HtmlCompositeComponentRenderer.java | 2 +-
.../renderkit/html/HtmlCompositeFacetRenderer.java | 2 +-
.../myfaces/renderkit/html/HtmlRenderKitImpl.java | 2 +-
.../renderkit/html/HtmlResponseStateManager.java | 2 +-
.../renderkit/html/HtmlResponseWriterImpl.java | 2 +-
.../html/base/HtmlButtonRendererBase.java | 8 +-
.../html/base/HtmlCheckboxRendererBase.java | 4 +-
.../renderkit/html/base/HtmlLinkRendererBase.java | 6 +-
.../html/base/HtmlListboxRendererBase.java | 4 +-
.../renderkit/html/base/HtmlMenuRendererBase.java | 2 +-
.../html/base/HtmlMessageRendererBase.java | 4 +-
.../renderkit/html/base/HtmlRadioRendererBase.java | 6 +-
.../renderkit/html/base/HtmlTableRendererBase.java | 10 +-
.../renderkit/html/util/HtmlRendererUtils.java | 11 +-
.../renderkit/html/util/JavascriptUtils.java | 112 ++++++++++-----------
.../renderkit/html/util/UnicodeEncoder.java | 8 +-
.../ClassLoaderResourceLoaderIterator.java | 2 +-
.../resource/ValueExpressionFilterInputStream.java | 4 +-
.../spi/impl/DefaultFacesFlowProviderFactory.java | 2 +-
.../NoInjectionAnnotationInjectionProvider.java | 4 +-
.../impl/ResourceAnnotationInjectionProvider.java | 2 +-
.../util/IllegalXmlCharacterFilterWriter.java | 2 +-
.../java/org/apache/myfaces/util/MessageUtils.java | 4 +-
.../org/apache/myfaces/util/lang/ClassUtils.java | 14 +--
.../myfaces/util/lang/ConcurrentLRUCache.java | 2 +-
.../apache/myfaces/util/lang/PriorityQueue.java | 2 +-
.../myfaces/util/lang/StringCharArrayAccessor.java | 2 +-
.../facelets/FaceletViewDeclarationLanguage.java | 12 +--
.../facelets/PartialStateManagementStrategy.java | 6 +-
.../view/facelets/compiler/CompilationManager.java | 4 +-
.../view/facelets/compiler/CompilationUnit.java | 4 +-
.../myfaces/view/facelets/compiler/Compiler.java | 4 +-
.../view/facelets/compiler/NamespaceHandler.java | 2 +-
.../view/facelets/compiler/NamespaceManager.java | 4 +-
.../compiler/RefreshDynamicComponentListener.java | 2 +-
.../myfaces/view/facelets/compiler/TextUnit.java | 6 +-
.../view/facelets/el/DefaultFunctionMapper.java | 2 +-
.../apache/myfaces/view/facelets/el/ELText.java | 10 +-
.../facelets/el/FaceletStateValueExpression.java | 4 +-
.../view/facelets/el/VariableMapperWrapper.java | 2 +-
.../myfaces/view/facelets/impl/DefaultFacelet.java | 6 +-
.../view/facelets/impl/DefaultFaceletFactory.java | 6 +-
.../view/facelets/pool/impl/ViewPoolImpl.java | 6 +-
.../view/facelets/tag/AbstractTagLibrary.java | 10 +-
.../view/facelets/tag/BeanPropertyTagRule.java | 2 +-
.../tag/ComponentTagDeclarationLibrary.java | 2 +-
.../myfaces/view/facelets/tag/MetaRulesetImpl.java | 5 +-
.../myfaces/view/facelets/tag/MethodRule.java | 2 +-
.../myfaces/view/facelets/tag/TagHandlerUtils.java | 8 +-
.../myfaces/view/facelets/tag/UserTagHandler.java | 2 +-
.../tag/composite/AttachedObjectTargetImpl.java | 4 +-
.../ClientBehaviorAttachedObjectTargetImpl.java | 6 +-
.../CompositeComponentResourceTagHandler.java | 4 +-
.../tag/composite/CompositeMetaRulesetImpl.java | 2 +-
.../CreateDynamicCompositeComponentListener.java | 2 +-
.../tag/faces/BehaviorTagHandlerDelegate.java | 2 +-
.../view/facelets/tag/faces/ComponentSupport.java | 2 +-
.../tag/faces/ComponentTagHandlerDelegate.java | 6 +-
.../tag/faces/ConverterTagHandlerDelegate.java | 2 +-
.../tag/faces/ValidatorTagHandlerDelegate.java | 2 +-
.../tag/faces/core/ActionListenerHandler.java | 2 +-
.../view/facelets/tag/faces/core/AjaxHandler.java | 4 +-
.../view/facelets/tag/faces/core/EventHandler.java | 10 +-
.../tag/faces/core/PhaseListenerHandler.java | 2 +-
.../tag/faces/core/ValueChangeListenerHandler.java | 2 +-
.../view/facelets/tag/jstl/core/ChooseHandler.java | 2 +-
.../view/facelets/tag/jstl/fn/JstlFnLibrary.java | 2 +-
.../view/facelets/tag/ui/CompositionHandler.java | 2 +-
.../view/facelets/tag/ui/DecorateHandler.java | 2 +-
.../view/facelets/tag/ui/IncludeHandler.java | 2 +-
.../facelets/tag/ui/LegacyCompositionHandler.java | 2 +-
.../facelets/tag/ui/LegacyDecorateHandler.java | 2 +-
.../view/facelets/tag/ui/LegacyIncludeHandler.java | 2 +-
.../myfaces/view/facelets/tag/ui/UIDebug.java | 2 +-
.../myfaces/view/facelets/util/Classpath.java | 2 +-
.../myfaces/webapp/FacesInitializerImpl.java | 4 +-
.../java/jakarta/faces/FacesExceptionTest.java | 1 -
.../test/java/jakarta/faces/FactoryFinderTest.java | 1 -
.../jakarta/faces/application/MockApplication.java | 4 -
.../jakarta/faces/application/ViewHandlerTest.java | 17 ++--
.../component/AbstractUIComponentBaseTest.java | 3 +-
.../component/AbstractUIComponentPropertyTest.java | 1 -
.../faces/component/InvokeOnComponentTest.java | 6 --
.../component/UIComponentBaseGetClientIdTest.java | 7 --
...UIComponentBaseProcessSaveRestoreStateTest.java | 8 +-
.../faces/component/UIComponentBaseTest.java | 5 +-
.../faces/component/UIComponentEncodeAllTest.java | 11 +-
.../component/UIComponentFindComponentTest.java | 9 --
.../UIComponentInvokeOnComponentTest.java | 6 +-
.../jakarta/faces/component/UIComponentMock.java | 2 -
.../jakarta/faces/component/UIComponentTest.java | 4 +-
.../component/UIComponentValueExpressionTest.java | 1 -
.../faces/component/UIDataRowStateTest.java | 5 -
.../java/jakarta/faces/component/UIDataTest.java | 16 +--
.../java/jakarta/faces/component/UIInputTest.java | 2 -
.../jakarta/faces/component/UIOutputPSSTest.java | 3 -
.../jakarta/faces/component/UISelectItemsTest.java | 1 -
.../jakarta/faces/component/UISelectManyTest.java | 5 +-
.../jakarta/faces/component/UISelectOneTest.java | 2 -
.../faces/component/UIViewParameterTest.java | 1 -
.../jakarta/faces/component/UIViewRootTest.java | 13 +--
.../faces/component/_Delta2StateHelperTest.java | 9 +-
.../component/_DeltaFacesListenerListTest.java | 3 -
.../jakarta/faces/component/_DeltaListTest.java | 7 +-
.../faces/component/_SharedRendererUtilsTest.java | 2 -
.../faces/convert/DateTimeConverterTest.java | 2 -
.../jakarta/faces/convert/DoubleConverterTest.java | 2 -
.../jakarta/faces/convert/EnumConverterTest.java | 5 +-
.../jakarta/faces/convert/NumberConverterTest.java | 2 -
.../MethodExpressionValueChangeListenerTest.java | 2 -
.../application/ApplicationImplAnnotationTest.java | 2 +-
.../myfaces/application/ApplicationImplTest.java | 8 +-
.../viewstate/AbstractStateUtilsTest.java | 3 +-
.../viewstate/CachedStateUtilsAES_CBCTest.java | 1 -
.../CachedStateUtilsBlowfish_ECBTest.java | 1 -
.../viewstate/CachedStateUtilsDefaultTest.java | 1 -
.../application/viewstate/SecretKeyCacheTest.java | 1 -
.../viewstate/StateUtilsAES_CBCTest.java | 1 -
.../viewstate/StateUtilsBlowfish_ECBTest.java | 1 -
.../viewstate/StateUtilsDefaultTest.java | 1 -
.../viewstate/StateUtilsTripleDES_ECBTest.java | 1 -
.../myfaces/config/OrderingFacesConfigTest.java | 6 +-
.../myfaces/context/flash/FlashImplTest.java | 58 +++++------
.../myfaces/renderkit/ContentTypeUtilsTest.java | 1 -
.../myfaces/renderkit/RendererUtilsTest.java | 1 -
.../renderkit/html/HtmlLabelRendererTest.java | 2 +-
.../renderkit/html/HtmlTextRendererTest.java | 2 +-
.../renderkit/html/util/HTMLEncoderTest.java | 1 -
.../myfaces/resource/ResourceLoaderUtilsTest.java | 1 -
.../resource/ResourceValidationUtilsTest.java | 1 -
.../myfaces/test/core/AbstractMyFacesTestCase.java | 9 +-
.../myfaces/test/core/mock/DefaultContext.java | 2 +-
.../myfaces/test/core/mock/MockMyFacesClient.java | 2 +-
.../org/apache/myfaces/util/MessageUtilsTest.java | 1 -
.../util/lang/AbstractAttributeMapTest.java | 3 +-
.../myfaces/util/lang/XorShiftRandomTest.java | 2 -
.../myfaces/view/facelets/ExceptionTestCase.java | 2 +-
.../facelets/FaceletMultipleRequestsTestCase.java | 4 +-
.../view/facelets/component/UIRepeatTest.java | 2 +-
.../pss/acid/component/UIAddSimpleCCVDL2.java | 2 +-
.../pss/acid/component/UIAddSimpleCCVDL5.java | 2 +-
.../pss/acid/component/UIAddSimpleCCVDL6.java | 2 +-
.../pss/acid/managed/ComponentBindingVDLBean2.java | 2 +-
.../pss/acid/managed/ComponentBindingVDLBean5.java | 2 +-
.../pss/acid/managed/ComponentBindingVDLBean6.java | 2 +-
.../tag/faces/html/SelectOneItemGroupTestBean.java | 2 +-
.../UpdateHeadDynamicViewTestCase.java | 6 +-
.../ajax/test1Protocol/ResponseMockup.java | 40 ++++----
.../ajax/test1Protocol/ResponseMockup22.java | 2 +-
.../responseWriter/MockupResponseWriter.java | 2 +-
.../test/base/junit/AbstractHtmlUnitTestCase.java | 6 +-
.../junit/AbstractJsfConfigurableMockTestCase.java | 2 +-
...actJsfConfigurableMultipleRequestsTestCase.java | 7 +-
.../myfaces/test/el/MockExpressionFactory.java | 16 +--
.../myfaces/test/mock/MockApplication12.java | 2 +-
.../myfaces/test/mock/MockApplication20.java | 2 +-
.../myfaces/test/mock/MockExceptionHandler.java | 4 +-
.../myfaces/test/mock/MockExternalContext10.java | 2 +-
.../myfaces/test/mock/MockExternalContext20.java | 2 +-
.../myfaces/test/mock/MockExternalContext23.java | 2 +-
.../myfaces/test/mock/MockFacesContext20.java | 4 +-
.../org/apache/myfaces/test/mock/MockFlash.java | 2 +-
.../myfaces/test/mock/MockHttpServletRequest.java | 2 +-
.../myfaces/test/mock/MockHttpServletResponse.java | 2 +-
.../myfaces/test/mock/MockPortletContext.java | 5 +-
.../myfaces/test/mock/MockPortletRequest.java | 5 +-
.../myfaces/test/mock/MockPortletSession.java | 5 +-
.../apache/myfaces/test/mock/MockSubKeyMap.java | 2 +-
.../java/org/apache/myfaces/test/mock/_ELText.java | 6 +-
.../test/mock/lifecycle/PhaseListenerManager.java | 2 +-
238 files changed, 479 insertions(+), 617 deletions(-)
diff --git a/api/src/main/java/jakarta/faces/FactoryFinder.java b/api/src/main/java/jakarta/faces/FactoryFinder.java
index c9a0b3a11..863909840 100755
--- a/api/src/main/java/jakarta/faces/FactoryFinder.java
+++ b/api/src/main/java/jakarta/faces/FactoryFinder.java
@@ -489,12 +489,12 @@ public final class FactoryFinder
// let's check if class supports the decorator pattern
try
{
- Constructor<?> delegationConstructor = implClass.getConstructor(new Class[] { interfaceClass });
+ Constructor<?> delegationConstructor = implClass.getConstructor(interfaceClass);
// impl class supports decorator pattern,
try
{
// create new decorator wrapping current
- current = delegationConstructor.newInstance(new Object[] { current });
+ current = delegationConstructor.newInstance(current);
injectAndPostConstruct(injectionProvider, current, injectedBeanStorage);
}
catch (InstantiationException | IllegalAccessException | InvocationTargetException e)
diff --git a/api/src/main/java/jakarta/faces/_FactoryFinderProviderFactory.java b/api/src/main/java/jakarta/faces/_FactoryFinderProviderFactory.java
index 1b637e13d..635174312 100644
--- a/api/src/main/java/jakarta/faces/_FactoryFinderProviderFactory.java
+++ b/api/src/main/java/jakarta/faces/_FactoryFinderProviderFactory.java
@@ -94,9 +94,9 @@ class _FactoryFinderProviderFactory
if (factoryFinderProviderClass != null)
{
factoryFinderProviderGetFactoryMethod = factoryFinderProviderClass.getMethod("getFactory",
- new Class[]{String.class});
+ String.class);
factoryFinderProviderSetFactoryMethod = factoryFinderProviderClass.getMethod("setFactory",
- new Class[]{String.class, String.class});
+ String.class, String.class);
factoryFinderProviderReleaseFactoriesMethod = factoryFinderProviderClass.getMethod
("releaseFactories", null);
}
diff --git a/api/src/main/java/jakarta/faces/application/NavigationCase.java b/api/src/main/java/jakarta/faces/application/NavigationCase.java
index 84803d11b..33108275f 100644
--- a/api/src/main/java/jakarta/faces/application/NavigationCase.java
+++ b/api/src/main/java/jakarta/faces/application/NavigationCase.java
@@ -191,8 +191,8 @@ public class NavigationCase
ValueExpression expression = _getToViewIdExpression(context);
- return (String)( (expression.isLiteralText()) ?
- expression.getExpressionString() : expression.getValue(context.getELContext()) );
+ return (expression.isLiteralText()) ?
+ expression.getExpressionString() : expression.getValue(context.getELContext());
}
public boolean hasCondition()
diff --git a/api/src/main/java/jakarta/faces/component/UIComponentBase.java b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
index 6d3fac26e..523b3cde4 100755
--- a/api/src/main/java/jakarta/faces/component/UIComponentBase.java
+++ b/api/src/main/java/jakarta/faces/component/UIComponentBase.java
@@ -1009,7 +1009,7 @@ public abstract class UIComponentBase extends UIComponent
{
if (getChildCount() == 0)
{
- return Collections.<UIComponent>emptyIterator();
+ return Collections.emptyIterator();
}
return getChildren().iterator();
@@ -1057,7 +1057,7 @@ public abstract class UIComponentBase extends UIComponent
ValueExpression expression = getValueExpression("rendererType");
if (expression != null)
{
- return (String) expression.getValue(getFacesContext().getELContext());
+ return expression.getValue(getFacesContext().getELContext());
}
return null;
}
@@ -1999,7 +1999,7 @@ public abstract class UIComponentBase extends UIComponent
private Object saveFacesListenersList(FacesContext facesContext)
{
- PartialStateHolder holder = (PartialStateHolder) _facesListeners;
+ PartialStateHolder holder = _facesListeners;
if (initialStateMarked() && _facesListeners != null && holder.initialStateMarked())
{
Object attachedState = holder.saveState(facesContext);
diff --git a/api/src/main/java/jakarta/faces/component/UIData.java b/api/src/main/java/jakarta/faces/component/UIData.java
index add3f6091..deee7af8c 100644
--- a/api/src/main/java/jakarta/faces/component/UIData.java
+++ b/api/src/main/java/jakarta/faces/component/UIData.java
@@ -143,7 +143,7 @@ public class UIData extends UIComponentBase implements NamingContainer, UniqueId
if (dataModelBuilderClass != null)
{
createDataModelMethod = dataModelBuilderClass.getMethod("createDataModel",
- new Class[]{FacesContext.class, Class.class, Object.class});
+ FacesContext.class, Class.class, Object.class);
}
}
catch(Exception e)
diff --git a/api/src/main/java/jakarta/faces/component/UIInput.java b/api/src/main/java/jakarta/faces/component/UIInput.java
index 2eacd9375..b824984a3 100644
--- a/api/src/main/java/jakarta/faces/component/UIInput.java
+++ b/api/src/main/java/jakarta/faces/component/UIInput.java
@@ -1172,7 +1172,7 @@ public class UIInput extends UIOutput implements EditableValueHolder
private Object saveValidatorList(FacesContext facesContext)
{
- PartialStateHolder holder = (PartialStateHolder) _validatorList;
+ PartialStateHolder holder = _validatorList;
if (initialStateMarked() && _validatorList != null && holder.initialStateMarked())
{
Object attachedState = holder.saveState(facesContext);
diff --git a/api/src/main/java/jakarta/faces/component/UIOutput.java b/api/src/main/java/jakarta/faces/component/UIOutput.java
index 336732ca5..2ab9b8de8 100644
--- a/api/src/main/java/jakarta/faces/component/UIOutput.java
+++ b/api/src/main/java/jakarta/faces/component/UIOutput.java
@@ -106,7 +106,7 @@ public class UIOutput extends UIComponentBase implements ValueHolder
ValueExpression expression = getValueExpression("converter");
if (expression != null)
{
- return (Converter) expression.getValue(getFacesContext().getELContext());
+ return expression.getValue(getFacesContext().getELContext());
}
return null;
}
diff --git a/api/src/main/java/jakarta/faces/component/UISelectMany.java b/api/src/main/java/jakarta/faces/component/UISelectMany.java
index 9daaeaffd..6356b6cc4 100644
--- a/api/src/main/java/jakarta/faces/component/UISelectMany.java
+++ b/api/src/main/java/jakarta/faces/component/UISelectMany.java
@@ -368,7 +368,7 @@ public class UISelectMany extends UIInput
{
if (convertedValue == null)
{
- return Collections.emptyList().iterator();
+ return Collections.emptyIterator();
}
else
{
diff --git a/api/src/main/java/jakarta/faces/component/UISelectOne.java b/api/src/main/java/jakarta/faces/component/UISelectOne.java
index 397665c4f..b090d0e13 100644
--- a/api/src/main/java/jakarta/faces/component/UISelectOne.java
+++ b/api/src/main/java/jakarta/faces/component/UISelectOne.java
@@ -29,7 +29,6 @@ import jakarta.faces.component.visit.VisitResult;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
import jakarta.faces.model.SelectItem;
-import jakarta.faces.component.UISelectItem;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFComponent;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFJspProperty;
import org.apache.myfaces.core.api.shared.MessageUtils;
@@ -96,7 +95,7 @@ public class UISelectOne extends UIInput
{
// check if the is empty (see ) or if it's not valid (means this path has been taken already)
// See conditions listed under spec: uiselectone#processValidators
- if(isEmpty(submittedValue) && isSubmittedAlready((UIInput)target)){
+ if(isEmpty(submittedValue) && isSubmittedAlready(target)){
previouslySubmittedOrValidated = true;
return VisitResult.COMPLETE;
}
diff --git a/api/src/main/java/jakarta/faces/component/UIViewRoot.java b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
index 3d440cf0c..7531f54df 100644
--- a/api/src/main/java/jakarta/faces/component/UIViewRoot.java
+++ b/api/src/main/java/jakarta/faces/component/UIViewRoot.java
@@ -130,9 +130,9 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
REQUEST_VIEW_CONTEXT_CLASS
= ClassUtils.classForName("org.apache.myfaces.context.RequestViewContext");
REQUEST_VIEW_CONTEXT_GET_INSTANCE = REQUEST_VIEW_CONTEXT_CLASS.getMethod("getCurrentInstance",
- new Class[] { FacesContext.class });
+ FacesContext.class);
REQUEST_VIEW_CONTEXT_SET_RENDER_TARGET = REQUEST_VIEW_CONTEXT_CLASS.getMethod("setRenderTarget",
- new Class[] { String.class, boolean.class, UIComponent.class });
+ String.class, boolean.class, UIComponent.class);
}
catch (Exception e)
{
@@ -704,10 +704,10 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
}
else
{
- return Collections.<UIComponent>emptyList();
+ return Collections.emptyList();
}
}
- return Collections.<UIComponent>emptyList();
+ return Collections.emptyList();
}
private List<UIComponent> _getComponentResources(FacesContext context, String target)
@@ -802,7 +802,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
}
else
{
- return (Locale) LocaleUtils.toLocale(veLocale.toString());
+ return LocaleUtils.toLocale(veLocale.toString());
}
}
else
@@ -1448,7 +1448,7 @@ public class UIViewRoot extends UIComponentBase implements UniqueIdVendor
*/
public void resetValues(FacesContext context, java.util.Collection<java.lang.String> clientIds)
{
- VisitContext visitContext = (VisitContext) VisitContext.createVisitContext(context, clientIds, null);
+ VisitContext visitContext = VisitContext.createVisitContext(context, clientIds, null);
this.visitTree(visitContext, ResetValuesCallback.INSTANCE);
}
diff --git a/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java b/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
index e3af4c372..b4e7947cd 100755
--- a/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
+++ b/api/src/main/java/jakarta/faces/component/_ComponentAttributesMap.java
@@ -173,7 +173,7 @@ class _ComponentAttributesMap implements Map<String, Object>, Serializable
if (MARK_CREATED.length() == keyLength &&
MARK_CREATED.equals(key))
{
- return ((UIComponentBase) _component).getOamVfMarkCreated() != null;
+ return _component.getOamVfMarkCreated() != null;
}
else if (FACET_NAME_KEY.length() == keyLength &&
FACET_NAME_KEY.equals(key))
@@ -366,7 +366,7 @@ class _ComponentAttributesMap implements Map<String, Object>, Serializable
// Check if the value expression holds a method signature
// Note that it could be null, so in that case we don't have to
// do anything
- methodSignature = (String) methodSignatureExpression.getValue(
+ methodSignature = methodSignatureExpression.getValue(
_component.getFacesContext().getELContext());
}
@@ -406,7 +406,7 @@ class _ComponentAttributesMap implements Map<String, Object>, Serializable
// Check if the value expression holds a method signature
// Note that it could be null, so in that case we don't have to
// do anything
- methodSignature = (String) methodSignatureExpression.getValue(
+ methodSignature = methodSignatureExpression.getValue(
_component.getFacesContext().getELContext());
}
@@ -535,7 +535,7 @@ class _ComponentAttributesMap implements Map<String, Object>, Serializable
{
Assert.notNull(key, "key");
- int keyLength = ((String)key).length();
+ int keyLength = key.length();
if (keyLength >= MIN_LENGHT_CHECK)
{
if (MARK_CREATED.length() == keyLength &&
@@ -698,7 +698,7 @@ class _ComponentAttributesMap implements Map<String, Object>, Serializable
}
else
{
- writeMethod.invoke(_component, new Object[]{value});
+ writeMethod.invoke(_component, value);
}
}
catch (Exception e)
diff --git a/api/src/main/java/jakarta/faces/component/_ComponentFacetMap.java b/api/src/main/java/jakarta/faces/component/_ComponentFacetMap.java
index bd6cf1080..9d04abcba 100755
--- a/api/src/main/java/jakarta/faces/component/_ComponentFacetMap.java
+++ b/api/src/main/java/jakarta/faces/component/_ComponentFacetMap.java
@@ -420,7 +420,7 @@ class _ComponentFacetMap<V extends UIComponent> implements Map<String, V>, Seria
@Override
public boolean contains(Object o)
{
- return _map.keySet().contains(o);
+ return _map.containsKey(o);
}
@Override
@@ -459,7 +459,7 @@ class _ComponentFacetMap<V extends UIComponent> implements Map<String, V>, Seria
{
if (previousValue != null)
{
- ((UIComponent) previousValue).setParent(null);
+ previousValue.setParent(null);
}
return true;
}
@@ -557,7 +557,7 @@ class _ComponentFacetMap<V extends UIComponent> implements Map<String, V>, Seria
@Override
public boolean contains(Object o)
{
- return _map.values().contains(o);
+ return _map.containsValue(o);
}
@Override
diff --git a/api/src/main/java/jakarta/faces/component/_EventListenerWrapper.java b/api/src/main/java/jakarta/faces/component/_EventListenerWrapper.java
index 333e861fc..5063911b6 100644
--- a/api/src/main/java/jakarta/faces/component/_EventListenerWrapper.java
+++ b/api/src/main/java/jakarta/faces/component/_EventListenerWrapper.java
@@ -287,7 +287,7 @@ class _EventListenerWrapper implements SystemEventListener, PartialStateHolder
state[1] = null;
}
}
- state[2] = (Integer) listenerCapability;
+ state[2] = listenerCapability;
return state;
}
else
diff --git a/api/src/main/java/jakarta/faces/component/_UIWebsocket.java b/api/src/main/java/jakarta/faces/component/_UIWebsocket.java
index 33a6a289b..f1276ee2a 100644
--- a/api/src/main/java/jakarta/faces/component/_UIWebsocket.java
+++ b/api/src/main/java/jakarta/faces/component/_UIWebsocket.java
@@ -92,6 +92,6 @@ abstract class _UIWebsocket extends UIComponentBase
enum PropertyKeys
{
- channel, scope, user, onopen, onmessage, onclose, connected;
+ channel, scope, user, onopen, onmessage, onclose, connected
}
}
diff --git a/api/src/main/java/jakarta/faces/component/_ViewAttributeMap.java b/api/src/main/java/jakarta/faces/component/_ViewAttributeMap.java
index 8f5b15eb5..53635d2fd 100644
--- a/api/src/main/java/jakarta/faces/component/_ViewAttributeMap.java
+++ b/api/src/main/java/jakarta/faces/component/_ViewAttributeMap.java
@@ -101,7 +101,7 @@ class _ViewAttributeMap implements Map<String, Object>, Serializable
@Override
public Object put(String key, Object value)
{
- int keyLength = ((String)key).length();
+ int keyLength = key.length();
if (RESET_SAVE_STATE_MODE_KEY.length() == keyLength
&& RESET_SAVE_STATE_MODE_KEY.equals(key))
diff --git a/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java b/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java
index 64622b74a..fde058abd 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/AjaxBehavior.java
@@ -333,7 +333,7 @@ public class AjaxBehavior extends ClientBehaviorBase
Object value = getStateHelper().eval(attributeName);
if (value == null)
{
- return Collections.<String>emptyList();
+ return Collections.emptyList();
}
else if (value instanceof Collection)
{
diff --git a/api/src/main/java/jakarta/faces/component/behavior/BehaviorBase.java b/api/src/main/java/jakarta/faces/component/behavior/BehaviorBase.java
index 8a9d02632..73ab86b51 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/BehaviorBase.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/BehaviorBase.java
@@ -130,7 +130,7 @@ public class BehaviorBase implements Behavior, PartialStateHolder
private Object saveBehaviorListenersList(FacesContext facesContext)
{
- PartialStateHolder holder = (PartialStateHolder) _behaviorListeners;
+ PartialStateHolder holder = _behaviorListeners;
if (initialStateMarked() && _behaviorListeners != null && holder.initialStateMarked())
{
Object attachedState = holder.saveState(facesContext);
diff --git a/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorBase.java b/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorBase.java
index bd32c0d5a..d239b3e69 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorBase.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorBase.java
@@ -65,7 +65,7 @@ public class ClientBehaviorBase extends BehaviorBase implements ClientBehavior
@Override
public Set<ClientBehaviorHint> getHints()
{
- return Collections.<ClientBehaviorHint>emptySet();
+ return Collections.emptySet();
}
public String getRendererType()
diff --git a/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorHint.java b/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorHint.java
index 35ff2d0dd..42463f78f 100644
--- a/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorHint.java
+++ b/api/src/main/java/jakarta/faces/component/behavior/ClientBehaviorHint.java
@@ -23,5 +23,5 @@ package jakarta.faces.component.behavior;
*/
public enum ClientBehaviorHint
{
- SUBMITTING;
+ SUBMITTING
}
diff --git a/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java b/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java
index 5abb1a2b3..38de09062 100755
--- a/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/BigDecimalConverter.java
@@ -93,7 +93,7 @@ public class BigDecimalConverter
try
{
- return ((BigDecimal)value).toString();
+ return value.toString();
}
catch (Exception e)
{
diff --git a/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java b/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java
index 488c0da90..b84f0d449 100755
--- a/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java
+++ b/api/src/main/java/jakarta/faces/convert/BigIntegerConverter.java
@@ -88,7 +88,7 @@ public class BigIntegerConverter implements Converter
try
{
- return ((BigInteger)value).toString();
+ return value.toString();
}
catch (Exception e)
{
diff --git a/api/src/main/java/jakarta/faces/event/ExceptionQueuedEventContext.java b/api/src/main/java/jakarta/faces/event/ExceptionQueuedEventContext.java
index edfd378b9..9b08de0ca 100644
--- a/api/src/main/java/jakarta/faces/event/ExceptionQueuedEventContext.java
+++ b/api/src/main/java/jakarta/faces/event/ExceptionQueuedEventContext.java
@@ -89,7 +89,7 @@ public class ExceptionQueuedEventContext implements SystemEventListenerHolder
@Override
public List<SystemEventListener> getListenersForEventClass(Class<? extends SystemEvent> facesEventClass)
{
- return Collections.singletonList((SystemEventListener)getContext().getExceptionHandler());
+ return Collections.singletonList(getContext().getExceptionHandler());
}
public PhaseId getPhaseId()
diff --git a/api/src/main/java/jakarta/faces/model/DataModel.java b/api/src/main/java/jakarta/faces/model/DataModel.java
index 52d3d638c..f8db9642e 100644
--- a/api/src/main/java/jakarta/faces/model/DataModel.java
+++ b/api/src/main/java/jakarta/faces/model/DataModel.java
@@ -194,7 +194,7 @@ public abstract class DataModel<E> implements Iterable<E>
throw new NoSuchElementException("Couldn't find any element in DataModel at index " + nextRowIndex);
}
- E data = (E) getRowData();
+ E data = getRowData();
nextRowIndex++;
setRowIndex(nextRowIndex);
return data;
diff --git a/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java b/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
index b4ca63998..cc8984240 100644
--- a/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
+++ b/api/src/main/java/jakarta/faces/view/facelets/FaceletContext.java
@@ -37,7 +37,7 @@ import jakarta.faces.context.FacesContext;
*/
public abstract class FaceletContext extends ELContext
{
- public static final String FACELET_CONTEXT_KEY = "jakarta.faces.FACELET_CONTEXT".intern();
+ public static final String FACELET_CONTEXT_KEY = "jakarta.faces.FACELET_CONTEXT";
/**
* Generate a unique ID for the passed String
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/SelectItemsIterator.java b/api/src/main/java/org/apache/myfaces/core/api/shared/SelectItemsIterator.java
index 009a295cb..75b7f06b2 100644
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/SelectItemsIterator.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/SelectItemsIterator.java
@@ -52,7 +52,7 @@ public class SelectItemsIterator implements Iterator<SelectItem>
{
_children = selectItemsParent.getChildCount() > 0
? selectItemsParent.getChildren().iterator()
- : Collections.<UIComponent>emptyIterator();
+ : Collections.emptyIterator();
_facesContext = facesContext;
}
diff --git a/api/src/main/java/org/apache/myfaces/core/api/shared/lang/ClassUtils.java b/api/src/main/java/org/apache/myfaces/core/api/shared/lang/ClassUtils.java
index bc28c63f7..2d04a5144 100755
--- a/api/src/main/java/org/apache/myfaces/core/api/shared/lang/ClassUtils.java
+++ b/api/src/main/java/org/apache/myfaces/core/api/shared/lang/ClassUtils.java
@@ -263,7 +263,7 @@ public class ClassUtils
Assert.notNull(type, "type");
// try common types and arrays of common types first
- Class clazz = (Class) COMMON_TYPES.get(type);
+ Class clazz = COMMON_TYPES.get(type);
if (clazz != null)
{
return clazz;
diff --git a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
index 7a6237bf1..9467c8496 100644
--- a/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
+++ b/extensions/quarkus/deployment/src/main/java/org/apache/myfaces/core/extensions/quarkus/deployment/MyFacesProcessor.java
@@ -727,7 +727,7 @@ class MyFacesProcessor
return;
}
- ClassInfo ci = (ClassInfo) type;
+ ClassInfo ci = type;
for (MethodInfo mi : ci.methods())
{
if (Modifier.isPublic(mi.flags()) && mi.name().startsWith("get"))
diff --git a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusFactoryFinderProvider.java b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusFactoryFinderProvider.java
index c6c670826..ba228923b 100644
--- a/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusFactoryFinderProvider.java
+++ b/extensions/quarkus/runtime/src/main/java/org/apache/myfaces/core/extensions/quarkus/runtime/spi/QuarkusFactoryFinderProvider.java
@@ -59,7 +59,7 @@ public class QuarkusFactoryFinderProvider implements FactoryFinderProvider
{
if (constructor.getParameterTypes().length == 1)
{
- instance = constructor.newInstance(new Object[] { instance });
+ instance = constructor.newInstance(instance);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
index 848aa332b..176c284f7 100755
--- a/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
@@ -267,7 +267,7 @@ public class ApplicationImpl extends Application
String configParam = getFacesContext().getExternalContext().
getInitParameter(Converter.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE_PARAM_NAME);
- if (configParam != null && configParam.toLowerCase().equals("true"))
+ if (configParam != null && configParam.equalsIgnoreCase("true"))
{
_dateTimeConverterDefaultTimeZoneIsSystemTimeZone = true;
}
@@ -489,7 +489,7 @@ public class ApplicationImpl extends Application
ExpressionFactory factory = getExpressionFactory();
- return (T) factory.createValueExpression(elContext, expression, expectedType).getValue(elContext);
+ return factory.createValueExpression(elContext, expression, expectedType).getValue(elContext);
}
@Override
@@ -1090,7 +1090,7 @@ public class ApplicationImpl extends Application
boolean annotationsApplied = false;
if (componentType != null)
{
- component = application.createComponent((String) componentType.getValue(context.getELContext()));
+ component = application.createComponent(componentType.getValue(context.getELContext()));
annotationsApplied = true;
}
else
@@ -1481,9 +1481,9 @@ public class ApplicationImpl extends Application
// look for a constructor that takes a single Class object
// See Faces 1.2 javadoc for Converter
Constructor<? extends Converter> constructor = converterClass
- .getConstructor(new Class[] { Class.class });
+ .getConstructor(Class.class);
- converter = constructor.newInstance(new Object[] { targetClass });
+ converter = constructor.newInstance(targetClass);
}
catch (Exception e)
{
diff --git a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
index bfd6ea2f2..635c739dc 100755
--- a/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
@@ -898,7 +898,7 @@ public class NavigationHandlerImpl extends ConfigurableNavigationHandler
}
else if (methodCallNode.getOutcome() != null)
{
- vdlViewIdentifier = (String) methodCallNode.getOutcome().getValue(
+ vdlViewIdentifier = methodCallNode.getOutcome().getValue(
facesContext.getELContext());
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
index ccc339ae3..19d82e94c 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ResourceHandlerImpl.java
@@ -1763,7 +1763,7 @@ public class ResourceHandlerImpl extends ResourceHandler
@Override
protected boolean match(String value)
{
- String viewId = (String) value;
+ String viewId = value;
ViewDeclarationLanguage vdl = facesContext.getApplication().getViewHandler()
.getViewDeclarationLanguage(facesContext, viewId);
if (vdl != null && vdl.viewExists(facesContext, viewId))
diff --git a/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java b/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java
index a0aa28700..5c595a226 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ViewIdSupport.java
@@ -253,7 +253,7 @@ public class ViewIdSupport
{
if (viewId.endsWith(contextSuffix))
{
- builder.append(viewId.substring(0, viewId.indexOf(contextSuffix)));
+ builder.append(viewId, 0, viewId.indexOf(contextSuffix));
builder.append(mapping.getExtension());
founded = true;
break;
@@ -278,7 +278,7 @@ public class ViewIdSupport
}
else if(viewId.lastIndexOf('.') != -1 )
{
- builder.append(viewId.substring(0, viewId.lastIndexOf('.')));
+ builder.append(viewId, 0, viewId.lastIndexOf('.'));
builder.append(config.getViewSuffix()[0]);
}
else
@@ -573,7 +573,7 @@ public class ViewIdSupport
String viewId = null;
if (ExternalContextUtils.isPortlet(externalContext))
{
- viewId = (String) externalContext.getRequestPathInfo();
+ viewId = externalContext.getRequestPathInfo();
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java b/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java
index 3350f4db2..7cac5463a 100644
--- a/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java
+++ b/impl/src/main/java/org/apache/myfaces/application/ViewResourceIterator.java
@@ -112,7 +112,7 @@ public class ViewResourceIterator implements Iterator<String>
{
do
{
- loader = (ResourceLoader) stack.pop();
+ loader = stack.pop();
basePath = basePathStack.pop();
if (loader != null)
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java b/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
index ba1cf54bd..c0bdf0103 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/SerializedViewCollection.java
@@ -109,7 +109,7 @@ class SerializedViewCollection implements Serializable
{
if (!_serializedViews.isEmpty())
{
- _precedence.put((SerializedViewKey) key, previousRestoredKey);
+ _precedence.put(key, previousRestoredKey);
}
else
{
@@ -149,7 +149,7 @@ class SerializedViewCollection implements Serializable
if (previousRestoredKey != null && maxCount != null && maxCount > 0)
{
int count = 0;
- SerializedViewKey previousKey = (SerializedViewKey) key;
+ SerializedViewKey previousKey = key;
do
{
previousKey = _precedence.get(previousKey);
@@ -159,7 +159,7 @@ class SerializedViewCollection implements Serializable
if (previousKey != null)
{
- SerializedViewKey keyToRemove = (SerializedViewKey) previousKey;
+ SerializedViewKey keyToRemove = previousKey;
// In theory it should be only one key but just to be sure
// do it in a loop, but in this case if cache old views is on,
// put on that map.
@@ -202,7 +202,7 @@ class SerializedViewCollection implements Serializable
key = _keys.remove(0);
if (maxCount != null && maxCount > 0)
{
- SerializedViewKey keyToRemove = (SerializedViewKey) key;
+ SerializedViewKey keyToRemove = key;
// Note in this case the key to delete is the oldest one,
// so it could be at least one precedence, but to be safe
// do it with a loop.
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheServerSide.java b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheServerSide.java
index 76f196dbe..6a4956697 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheServerSide.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateCacheServerSide.java
@@ -159,7 +159,7 @@ class StateCacheServerSide extends StateCache<Object, Object>
ClientWindow clientWindow = context.getExternalContext().getClientWindow();
if (clientWindow != null)
{
- key = (SerializedViewKey) viewCollection.getLastWindowKey(context, clientWindow.getId());
+ key = viewCollection.getLastWindowKey(context, clientWindow.getId());
}
else if (useFlashScopePurgeViewsInSession && Boolean.TRUE.equals(
context.getExternalContext().getRequestMap().get(FlashImpl.FLASH_PREVIOUS_REQUEST_REDIRECT)))
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateTokenProcessorClientSide.java b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateTokenProcessorClientSide.java
index a2f89eefa..690811c74 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateTokenProcessorClientSide.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateTokenProcessorClientSide.java
@@ -35,7 +35,7 @@ public class StateTokenProcessorClientSide extends StateTokenProcessor
// catch it first
return null;
}
- Object savedStateObject = StateUtils.reconstruct((String)token, facesContext.getExternalContext());
+ Object savedStateObject = StateUtils.reconstruct(token, facesContext.getExternalContext());
return savedStateObject;
}
diff --git a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
index 048dc060b..9df82caf5 100644
--- a/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/application/viewstate/StateUtils.java
@@ -203,7 +203,7 @@ public final class StateUtils
public static Cipher createCipher(ExternalContext externalContext, int mode) throws Exception
{
- SecretKey secretKey = (SecretKey) getSecret(externalContext);
+ SecretKey secretKey = getSecret(externalContext);
String algorithm = findAlgorithm(externalContext);
String algorithmParams = findAlgorithmParams(externalContext);
byte[] iv = findInitializationVector(externalContext);
@@ -229,7 +229,7 @@ public final class StateUtils
public static Mac createMac(ExternalContext externalContext) throws Exception
{
- SecretKey macSecretKey = (SecretKey) getMacSecret(externalContext);
+ SecretKey macSecretKey = getMacSecret(externalContext);
String macAlgorithm = findMacAlgorithm(externalContext);
Mac mac = Mac.getInstance(macAlgorithm);
@@ -611,7 +611,7 @@ public final class StateUtils
private static SecretKey getSecret(ExternalContext ctx)
{
- Object secretKey = (SecretKey) ctx.getApplicationMap().get(INIT_SECRET_KEY_CACHE);
+ Object secretKey = ctx.getApplicationMap().get(INIT_SECRET_KEY_CACHE);
if (secretKey == null)
{
@@ -727,7 +727,7 @@ public final class StateUtils
private static SecretKey getMacSecret(ExternalContext ctx)
{
- Object secretKey = (SecretKey) ctx.getApplicationMap().get(INIT_MAC_SECRET_KEY_CACHE);
+ Object secretKey = ctx.getApplicationMap().get(INIT_MAC_SECRET_KEY_CACHE);
if (secretKey == null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
index 7c16d426f..6c790b3a1 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/config/FacesConfigExtension.java
@@ -46,7 +46,7 @@ public class FacesConfigExtension implements Extension
{
Annotated annotated = event.getAnnotatedBeanClass();
- facesConfig = (FacesConfig) annotated.getAnnotation(FacesConfig.class);
+ facesConfig = annotated.getAnnotation(FacesConfig.class);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java
index 69ba4e1db..0f28262bf 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/model/FacesDataModelExtension.java
@@ -48,7 +48,7 @@ public class FacesDataModelExtension implements Extension
Annotated annotated = event.getAnnotatedBeanClass();
if (annotated.isAnnotationPresent(FacesDataModel.class))
{
- FacesDataModel model = (FacesDataModel) annotated.getAnnotation(FacesDataModel.class);
+ FacesDataModel model = annotated.getAnnotation(FacesDataModel.class);
boolean hasValue = model.forClass() != null;
if (hasValue)
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java
index 787f734bb..793584a81 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesBehaviorCDIWrapper.java
@@ -55,7 +55,7 @@ public class FacesBehaviorCDIWrapper implements PartialStateHolder, Behavior, Fa
{
if (delegate == null)
{
- delegate = (Behavior) CDIUtils.get(CDIUtils.getBeanManager(FacesContext.getCurrentInstance()),
+ delegate = CDIUtils.get(CDIUtils.getBeanManager(FacesContext.getCurrentInstance()),
Behavior.class, true, FacesBehavior.Literal.of(behaviorId, true));
}
return delegate;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java
index 0b7b2f138..ab8e0c630 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesClientBehaviorCDIWrapper.java
@@ -77,7 +77,7 @@ public class FacesClientBehaviorCDIWrapper implements PartialStateHolder, Client
{
if (delegate == null)
{
- delegate = (ClientBehavior) CDIUtils.get(CDIUtils.getBeanManager(FacesContext.getCurrentInstance()),
+ delegate = CDIUtils.get(CDIUtils.getBeanManager(FacesContext.getCurrentInstance()),
ClientBehavior.class, true, FacesBehavior.Literal.of(behaviorId, true));
}
return delegate;
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java
index 5c69a4201..05c4f811b 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesConverterCDIWrapper.java
@@ -79,21 +79,21 @@ public class FacesConverterCDIWrapper implements PartialStateHolder, Converter,
if (converterId != null)
{
FacesConverter.Literal literal = FacesConverter.Literal.of(converterId, Object.class, true);
- delegate = (Converter) CDIUtils.get(bm, CONVERTER_TYPE, true, literal);
+ delegate = CDIUtils.get(bm, CONVERTER_TYPE, true, literal);
if (delegate == null)
{
- delegate = (Converter) CDIUtils.get(bm, Converter.class, true, literal);
+ delegate = CDIUtils.get(bm, Converter.class, true, literal);
}
}
else if (forClass != null)
{
FacesConverter.Literal literal = FacesConverter.Literal.of("", forClass, true);
- delegate = (Converter) CDIUtils.get(bm, CONVERTER_TYPE, true, literal);
+ delegate = CDIUtils.get(bm, CONVERTER_TYPE, true, literal);
if (delegate == null)
{
- delegate = (Converter) CDIUtils.get(bm, Converter.class, true, literal);
+ delegate = CDIUtils.get(bm, Converter.class, true, literal);
}
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java
index 46c99cec3..465e907ea 100644
--- a/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/cdi/wrapper/FacesValidatorCDIWrapper.java
@@ -66,11 +66,11 @@ public class FacesValidatorCDIWrapper implements PartialStateHolder, Validator,
{
BeanManager bm = CDIUtils.getBeanManager(FacesContext.getCurrentInstance());
FacesValidator.Literal literal = FacesValidator.Literal.of(validatorId, false, true);
- delegate = (Validator) CDIUtils.get(bm, VALIDATOR_TYPE, true, literal);
+ delegate = CDIUtils.get(bm, VALIDATOR_TYPE, true, literal);
if (delegate == null)
{
- delegate = (Validator) CDIUtils.get(bm, Validator.class, true, literal);
+ delegate = CDIUtils.get(bm, Validator.class, true, literal);
}
}
return delegate;
diff --git a/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java
index 5229b8461..feb834e31 100644
--- a/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/component/search/SearchExpressionHandlerImpl.java
@@ -47,10 +47,7 @@ public class SearchExpressionHandlerImpl extends SearchExpressionHandler
protected void addHint(SearchExpressionContext searchExpressionContext, SearchExpressionHint hint)
{
// already available
- if (!searchExpressionContext.getExpressionHints().contains(hint))
- {
- searchExpressionContext.getExpressionHints().add(hint);
- }
+ searchExpressionContext.getExpressionHints().add(hint);
}
protected boolean isHintSet(SearchExpressionContext searchExpressionContext, SearchExpressionHint hint)
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
index 3ac7f9dd8..05a1593b4 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationMerger.java
@@ -268,7 +268,7 @@ public class DefaultFacesConfigurationMerger extends FacesConfigurationMerger
for (int i = 0; i < vertexList.size(); i++)
{
Vertex<FacesConfig> v = vertexList.get(i);
- FacesConfig f = (FacesConfig) v.getNode();
+ FacesConfig f = v.getNode();
if (f.getOrdering() != null)
{
@@ -315,7 +315,7 @@ public class DefaultFacesConfigurationMerger extends FacesConfigurationMerger
if (!referencedVertex[i])
{
Vertex<FacesConfig> v = vertexList.get(i);
- FacesConfig f = (FacesConfig) v.getNode();
+ FacesConfig f = v.getNode();
boolean added = false;
if (f.getOrdering() != null)
{
@@ -355,19 +355,19 @@ public class DefaultFacesConfigurationMerger extends FacesConfigurationMerger
List<FacesConfig> sortedList = new ArrayList<>();
for (Vertex<FacesConfig> v : referencedList)
{
- sortedList.add((FacesConfig)v.getNode());
+ sortedList.add(v.getNode());
}
//5. add nodes without instructions at the end
for (Vertex<FacesConfig> v : othersList)
{
- sortedList.add((FacesConfig)v.getNode());
+ sortedList.add(v.getNode());
}
//6. add before/after nodes
for (Vertex<FacesConfig> v : beforeAfterOthersList)
{
- FacesConfig f = (FacesConfig) v.getNode();
+ FacesConfig f = v.getNode();
boolean added = false;
if (f.getOrdering() != null && !f.getOrdering().getBeforeList().isEmpty())
{
diff --git a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
index 77af454ec..d32c45780 100644
--- a/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/config/DefaultFacesConfigurationProvider.java
@@ -370,7 +370,7 @@ public class DefaultFacesConfigurationProvider extends FacesConfigurationProvide
}
out.flush();
- String content = new String(out.toByteArray());
+ String content = out.toString();
if (content.trim().isEmpty())
{
return new FacesConfigImpl();
diff --git a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
index 075978436..097023c16 100755
--- a/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
@@ -740,7 +740,7 @@ public class FacesConfigurator
String beanValidatorDisabled = _externalContext.getInitParameter(
BeanValidator.DISABLE_DEFAULT_BEAN_VALIDATOR_PARAM_NAME);
final boolean defaultBeanValidatorDisabled = (beanValidatorDisabled != null
- && beanValidatorDisabled.toLowerCase().equals("true"));
+ && beanValidatorDisabled.equalsIgnoreCase("true"));
boolean beanValidatorInstalledProgrammatically = false;
if (!defaultBeanValidatorDisabled
&& ExternalSpecifications.isBeanValidationAvailable())
@@ -1093,7 +1093,7 @@ public class FacesConfigurator
renderKitClass.add(DEFAULT_RENDER_KIT_CLASS);
}
- RenderKit renderKit = (RenderKit) ClassUtils.buildApplicationObject(RenderKit.class, renderKitClass, null);
+ RenderKit renderKit = ClassUtils.buildApplicationObject(RenderKit.class, renderKitClass, null);
// If the default html RenderKit instance is wrapped, the top level object will not implement
// LazyRenderKit and all renderers will be added using the standard form.
boolean lazyRenderKit = renderKit instanceof LazyRenderKit;
diff --git a/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java b/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
index ea9009c9f..20d2a3068 100755
--- a/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/config/RuntimeConfig.java
@@ -215,8 +215,7 @@ public class RuntimeConfig
public org.apache.myfaces.config.element.Converter getConverterConfiguration(String converterClassName)
{
- return (org.apache.myfaces.config.element.Converter)
- _converterClassNameToConfigurationMap.get(converterClassName);
+ return _converterClassNameToConfigurationMap.get(converterClassName);
}
/**
diff --git a/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java b/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
index 262298612..57584c405 100644
--- a/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
+++ b/impl/src/main/java/org/apache/myfaces/config/annotation/AnnotationConfigurator.java
@@ -103,7 +103,7 @@ public class AnnotationConfigurator
{
for (Class<?> clazz : classes)
{
- FacesComponent comp = (FacesComponent) clazz.getAnnotation(FacesComponent.class);
+ FacesComponent comp = clazz.getAnnotation(FacesComponent.class);
if (comp != null)
{
if (log.isLoggable(Level.FINEST))
@@ -142,7 +142,7 @@ public class AnnotationConfigurator
{
for (Class<?> clazz : classes)
{
- FacesConverter conv = (FacesConverter) clazz.getAnnotation(FacesConverter.class);
+ FacesConverter conv = clazz.getAnnotation(FacesConverter.class);
if (conv != null)
{
if (log.isLoggable(Level.FINEST))
@@ -182,7 +182,7 @@ public class AnnotationConfigurator
{
for (Class<?> clazz : classes)
{
- FacesValidator val = (FacesValidator) clazz.getAnnotation(FacesValidator.class);
+ FacesValidator val = clazz.getAnnotation(FacesValidator.class);
if (val != null)
{
if (log.isLoggable(Level.FINEST))
@@ -219,7 +219,7 @@ public class AnnotationConfigurator
{
for (Class<?> clazz : classes)
{
- FacesRenderer rend = (FacesRenderer) clazz.getAnnotation(FacesRenderer.class);
+ FacesRenderer rend = clazz.getAnnotation(FacesRenderer.class);
if (rend != null)
{
String renderKitId = rend.renderKitId();
@@ -279,7 +279,7 @@ public class AnnotationConfigurator
{
for (Class<?> clazz : classes)
{
- NamedEvent namedEvent = (NamedEvent) clazz.getAnnotation(NamedEvent.class);
+ NamedEvent namedEvent = clazz.getAnnotation(NamedEvent.class);
if (namedEvent != null)
{
@@ -309,7 +309,7 @@ public class AnnotationConfigurator
{
for (Class<?> clazz : classes)
{
- FacesBehavior facesBehavior = (FacesBehavior) clazz.getAnnotation(FacesBehavior.class);
+ FacesBehavior facesBehavior = clazz.getAnnotation(FacesBehavior.class);
if (facesBehavior != null)
{
@@ -344,7 +344,7 @@ public class AnnotationConfigurator
for (Class<?> clazz : classes)
{
FacesBehaviorRenderer facesBehaviorRenderer
- = (FacesBehaviorRenderer) clazz.getAnnotation(FacesBehaviorRenderer.class);
+ = clazz.getAnnotation(FacesBehaviorRenderer.class);
if (facesBehaviorRenderer != null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java
index 45c339217..9d243d2d4 100644
--- a/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/AjaxExceptionHandlerImpl.java
@@ -92,7 +92,7 @@ public class AjaxExceptionHandlerImpl extends ExceptionHandler
@Override
public Iterable<ExceptionQueuedEvent> getHandledExceptionQueuedEvents()
{
- return handled == null ? Collections.<ExceptionQueuedEvent>emptyList() : handled;
+ return handled == null ? Collections.emptyList() : handled;
}
/**
@@ -123,7 +123,7 @@ public class AjaxExceptionHandlerImpl extends ExceptionHandler
@Override
public Iterable<ExceptionQueuedEvent> getUnhandledExceptionQueuedEvents()
{
- return unhandled == null ? Collections.<ExceptionQueuedEvent>emptyList() : unhandled;
+ return unhandled == null ? Collections.emptyList() : unhandled;
}
/**
diff --git a/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerImpl.java
index 331fa7e8a..ccac6784c 100644
--- a/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/ExceptionHandlerImpl.java
@@ -64,7 +64,7 @@ public class ExceptionHandlerImpl extends ExceptionHandler
@Override
public Iterable<ExceptionQueuedEvent> getHandledExceptionQueuedEvents()
{
- return handled == null ? Collections.<ExceptionQueuedEvent>emptyList() : handled;
+ return handled == null ? Collections.emptyList() : handled;
}
/**
@@ -95,7 +95,7 @@ public class ExceptionHandlerImpl extends ExceptionHandler
@Override
public Iterable<ExceptionQueuedEvent> getUnhandledExceptionQueuedEvents()
{
- return unhandled == null ? Collections.<ExceptionQueuedEvent>emptyList() : unhandled;
+ return unhandled == null ? Collections.emptyList() : unhandled;
}
/**
diff --git a/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java b/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
index ffbd1e1a6..e36be1422 100644
--- a/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/MyFacesExceptionHandlerWrapperImpl.java
@@ -157,7 +157,7 @@ public class MyFacesExceptionHandlerWrapperImpl extends ExceptionHandlerWrapper
}
else
{
- return handled == null ? Collections.<ExceptionQueuedEvent>emptyList() : handled;
+ return handled == null ? Collections.emptyList() : handled;
}
}
@@ -174,7 +174,7 @@ public class MyFacesExceptionHandlerWrapperImpl extends ExceptionHandlerWrapper
}
else
{
- return unhandled == null ? Collections.<ExceptionQueuedEvent>emptyList() : unhandled;
+ return unhandled == null ? Collections.emptyList() : unhandled;
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java b/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
index e97d514c8..e0055cc10 100644
--- a/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/flash/FlashImpl.java
@@ -692,7 +692,7 @@ public class FlashImpl extends Flash implements ReleasableFlash
Iterator<String> iterClientIds = facesContext.getClientIdsWithMessages();
while (iterClientIds.hasNext())
{
- String clientId = (String) iterClientIds.next();
+ String clientId = iterClientIds.next();
Iterator<FacesMessage> iterMessages = facesContext.getMessages(clientId);
while (iterMessages.hasNext())
@@ -814,7 +814,7 @@ public class FlashImpl extends Flash implements ReleasableFlash
FlashClientWindowTokenCollection lruMap = getFlashClientWindowTokenCollection(externalContext, false);
if (lruMap != null)
{
- tokenValue = (String) lruMap.get(clientWindow.getId());
+ tokenValue = lruMap.get(clientWindow.getId());
}
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
index 46f76743b..76d3e1996 100755
--- a/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
@@ -210,7 +210,7 @@ public class FacesContextImpl extends FacesContextImplBase
if (_messages == null)
{
- return Collections.unmodifiableList(Collections.<FacesMessage>emptyList());
+ return Collections.unmodifiableList(Collections.emptyList());
}
return Collections.unmodifiableList(_orderedMessages);
@@ -223,7 +223,7 @@ public class FacesContextImpl extends FacesContextImplBase
if (_messages == null || !_messages.containsKey(clientId))
{
- return Collections.unmodifiableList(Collections.<FacesMessage>emptyList());
+ return Collections.unmodifiableList(Collections.emptyList());
}
return _messages.get(clientId);
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java
index e0d715845..b95af165f 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/CompositeComponentELResolver.java
@@ -208,7 +208,7 @@ public final class CompositeComponentELResolver extends ELResolver
private Map<String, Object> _getCompositeComponentAttributesMapWrapper(
UIComponent baseComponent, ELContext elContext)
{
- Map<Object, Object> contextMap = (Map<Object, Object>) facesContext(elContext).getAttributes();
+ Map<Object, Object> contextMap = facesContext(elContext).getAttributes();
// We use a WeakHashMap<UIComponent, WeakReference<Map<String, Object>>> to
// hold attribute map wrappers by two reasons:
diff --git a/impl/src/main/java/org/apache/myfaces/el/resolver/LambdaBeanELResolver.java b/impl/src/main/java/org/apache/myfaces/el/resolver/LambdaBeanELResolver.java
index 4e62238e8..06c18ac07 100644
--- a/impl/src/main/java/org/apache/myfaces/el/resolver/LambdaBeanELResolver.java
+++ b/impl/src/main/java/org/apache/myfaces/el/resolver/LambdaBeanELResolver.java
@@ -114,7 +114,7 @@ public class LambdaBeanELResolver extends BeanELResolver
PropertyDescriptorWrapper pd = getPropertyDescriptor(base, property);
if (pd.getWrapped().getWriteMethod()== null)
{
- throw new PropertyNotWritableException("Property \"" + (String) property
+ throw new PropertyNotWritableException("Property \"" + property
+ "\" in \"" + base.getClass().getName() + "\" is not writable!");
}
diff --git a/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java b/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java
index 0c8470adc..505f06cdf 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/FlowCallNodeImpl.java
@@ -68,7 +68,7 @@ public class FlowCallNodeImpl extends FlowCallNode implements Freezable
{
if (_calledFlowDocumentIdEL != null)
{
- return (String) _calledFlowDocumentIdEL.getValue(context.getELContext());
+ return _calledFlowDocumentIdEL.getValue(context.getELContext());
}
return _calledFlowDocumentId;
}
@@ -78,7 +78,7 @@ public class FlowCallNodeImpl extends FlowCallNode implements Freezable
{
if (_calledFlowIdEL != null)
{
- return (String) _calledFlowIdEL.getValue(context.getELContext());
+ return _calledFlowIdEL.getValue(context.getELContext());
}
return _calledFlowId;
}
diff --git a/impl/src/main/java/org/apache/myfaces/flow/FlowHandlerImpl.java b/impl/src/main/java/org/apache/myfaces/flow/FlowHandlerImpl.java
index c4d8a7796..a8578953b 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/FlowHandlerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/FlowHandlerImpl.java
@@ -497,12 +497,12 @@ public class FlowHandlerImpl extends FlowHandler implements SystemEventListener
@Override
public void clientWindowTransition(FacesContext context)
{
- String flowDocumentIdRequestParam = (String) context.getExternalContext().
+ String flowDocumentIdRequestParam = context.getExternalContext().
getRequestParameterMap().get(FlowHandler.TO_FLOW_DOCUMENT_ID_REQUEST_PARAM_NAME);
if (flowDocumentIdRequestParam != null)
{
- String flowIdRequestParam = (String) context.getExternalContext().
+ String flowIdRequestParam = context.getExternalContext().
getRequestParameterMap().get(FlowHandler.FLOW_ID_REQUEST_PARAM_NAME);
if (flowIdRequestParam == null)
diff --git a/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java b/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java
index 2e0f4bce9..3282fd527 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/NavigationCaseImpl.java
@@ -249,8 +249,8 @@ public class NavigationCaseImpl extends NavigationCase implements Freezable
ValueExpression expression = _getToViewIdExpression(context);
- return (String) ((expression.isLiteralText())
- ? expression.getExpressionString() : expression.getValue(context.getELContext()));
+ return (expression.isLiteralText())
+ ? expression.getExpressionString() : expression.getValue(context.getELContext());
}
private ValueExpression _getToViewIdExpression(FacesContext context)
diff --git a/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java b/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java
index 1ebc1ff90..65dbeced1 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/ReturnNodeImpl.java
@@ -45,7 +45,7 @@ public class ReturnNodeImpl extends ReturnNode implements Freezable
{
if (_fromOutcomeEL != null)
{
- return (String) _fromOutcomeEL.getValue(context.getELContext());
+ return _fromOutcomeEL.getValue(context.getELContext());
}
return _fromOutcome;
}
diff --git a/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java b/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java
index 7c803e7b9..31c4160d9 100644
--- a/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/flow/SwitchNodeImpl.java
@@ -66,7 +66,7 @@ public class SwitchNodeImpl extends SwitchNode implements Freezable
{
if (_defaultOutcomeEL != null)
{
- return (String) _defaultOutcomeEL.getValue(context.getELContext());
+ return _defaultOutcomeEL.getValue(context.getELContext());
}
return _defaultOutcome;
}
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
index dbe72c1f2..617cb8434 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewExecutor.java
@@ -344,7 +344,7 @@ class RestoreViewExecutor extends PhaseExecutor
// "... Obtain the value of the value of the request parameter whose
// name is given by the value of ResponseStateManager.NON_POSTBACK_VIEW_TOKEN_PARAM.
// If there is no value, throw ProtectedViewException ..."
- String token = (String) facesContext.getExternalContext().getRequestParameterMap().get(
+ String token = facesContext.getExternalContext().getRequestParameterMap().get(
ResponseStateManager.NON_POSTBACK_VIEW_TOKEN_PARAM);
if (token != null && token.length() > 0)
{
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
index 979768f2f..68e339914 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/RestoreViewSupport.java
@@ -62,7 +62,7 @@ public class RestoreViewSupport
{
facesContext.getAttributes().put(MyFacesVisitHints.SKIP_ITERATION_HINT, Boolean.TRUE);
- VisitContext visitContext = (VisitContext) visitContextFactory.getVisitContext(facesContext,
+ VisitContext visitContext = visitContextFactory.getVisitContext(facesContext,
null, MyFacesVisitHints.SET_SKIP_ITERATION);
component.visitTree(visitContext, new RestoreStateCallback());
}
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/CODIClientSideWindow.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/CODIClientSideWindow.java
index d22bff83f..5bad622c1 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/CODIClientSideWindow.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/CODIClientSideWindow.java
@@ -295,7 +295,7 @@ public class CODIClientSideWindow extends ClientWindow
// like e.g. ?"></a><a href%3D"http://hacker.org/attack.html?a
// DO NOT REMOVE THE FOLLOWING LINES!
url = url.replace("\"", "");
- url = url.replace("\'", "");
+ url = url.replace("'", "");
return url;
}
diff --git a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
index 231c7346d..1b2d506f8 100644
--- a/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
+++ b/impl/src/main/java/org/apache/myfaces/lifecycle/clientwindow/ClientConfig.java
@@ -78,7 +78,7 @@ public class ClientConfig implements Serializable
getRequestCookieMap().get(COOKIE_NAME_NOSCRIPT_ENABLED);
if (cookie!= null)
{
- javaScriptEnabled = Boolean.parseBoolean((String) cookie.getValue());
+ javaScriptEnabled = Boolean.parseBoolean(cookie.getValue());
}
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ContentTypeUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/ContentTypeUtils.java
index 8e91bdd98..4f0e6ac42 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ContentTypeUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ContentTypeUtils.java
@@ -79,7 +79,7 @@ public class ContentTypeUtils
for (int j = 0; j < contentTypeList.length; j++)
{
- String contentType = (String) contentTypeList[j];
+ String contentType = contentTypeList[j];
if (contentType.contains(supportedContentType))
{
if (containsContentType(contentType, htmlContentTypes))
@@ -117,7 +117,7 @@ public class ContentTypeUtils
public static String getContentTypeFromAcceptHeader(FacesContext context)
{
- String contentTypeListString = (String) context.getExternalContext()
+ String contentTypeListString = context.getExternalContext()
.getRequestHeaderMap().get("Accept");
// There is a windows mobile IE client (6.12) sending
// "application/vnd.wap.mms-message;*/*"
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
index d8bf877e2..4350b63f6 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/ErrorPageWriter.java
@@ -144,7 +144,7 @@ public final class ErrorPageWriter
try
{
int endIndex = head.indexOf("</style>", startIndex) + "</style>".length();
- builder.append(head.substring(head.indexOf("<style", startIndex), endIndex));
+ builder.append(head, head.indexOf("<style", startIndex), endIndex);
startIndex = endIndex;
}
catch (Exception e)
@@ -160,7 +160,7 @@ public final class ErrorPageWriter
try
{
int endIndex = head.indexOf("</script>", startIndex) + "</script>".length();
- builder.append(head.substring(head.indexOf("<script", startIndex), endIndex));
+ builder.append(head, head.indexOf("<script", startIndex), endIndex);
startIndex = endIndex;
}
catch (Exception e)
@@ -1327,8 +1327,8 @@ public final class ErrorPageWriter
try
{
- Method m = Throwable.class.getMethod("initCause", new Class[] { Throwable.class });
- m.invoke(th, new Object[] { cause });
+ Method m = Throwable.class.getMethod("initCause", Throwable.class);
+ m.invoke(th, cause);
return true;
}
catch (Exception e)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCommandScriptRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCommandScriptRenderer.java
index 6f9d03d6b..1e3c0713d 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCommandScriptRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCommandScriptRenderer.java
@@ -161,7 +161,7 @@ public class HtmlCommandScriptRenderer extends HtmlRenderer
boolean activateActionEvent = false;
if (form != null && !disabled)
{
- String reqValue = (String) facesContext.getExternalContext().getRequestParameterMap().get(
+ String reqValue = facesContext.getExternalContext().getRequestParameterMap().get(
HtmlRendererUtils.getHiddenCommandLinkFieldName(form, facesContext));
activateActionEvent = reqValue != null && reqValue.equals(clientId)
|| HtmlRendererUtils.isPartialOrBehaviorSubmit(facesContext, clientId);
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
index 90b56bada..4878d4265 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeComponentRenderer.java
@@ -52,7 +52,7 @@ public class HtmlCompositeComponentRenderer extends HtmlRenderer
@Override
public void encodeChildren(FacesContext context, UIComponent component) throws IOException
{
- UIComponent compositeFacet = (UIComponent) component.getFacet(UIComponent.COMPOSITE_FACET_NAME);
+ UIComponent compositeFacet = component.getFacet(UIComponent.COMPOSITE_FACET_NAME);
if (compositeFacet == null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
index 981620655..8a440796c 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlCompositeFacetRenderer.java
@@ -66,7 +66,7 @@ public class HtmlCompositeFacetRenderer extends HtmlRenderer
component.getClientId(context));
}
- UIComponent compositeFacet = (UIComponent) compositeComponent.getFacet(facetName);
+ UIComponent compositeFacet = compositeComponent.getFacet(facetName);
if (compositeFacet != null)
{
compositeFacet.encodeAll(context);
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
index 31aa483dc..154ec5e72 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlRenderKitImpl.java
@@ -212,7 +212,7 @@ public class HtmlRenderKitImpl extends RenderKit implements LazyRenderKit
}
//If the specified componentFamily is not known to this RenderKit implementation, return an empty Iterator
- return Collections.<String>emptySet().iterator();
+ return Collections.emptyIterator();
}
@Override
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
index 7a2c6e5a5..47fa1ac17 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseStateManager.java
@@ -233,7 +233,7 @@ public class HtmlResponseStateManager extends MyfacesResponseStateManager
{
String encodedState =
context.getExternalContext().getRequestParameterMap().get(ResponseStateManager.VIEW_STATE_PARAM);
- if (encodedState == null || ((String) encodedState).length() == 0)
+ if (encodedState == null || encodedState.length() == 0)
{
return false;
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
index 6d5a4aa2b..b5dc4e4d8 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlResponseWriterImpl.java
@@ -347,7 +347,7 @@ public class HtmlResponseWriterImpl extends ResponseWriter
_startedChangedElements.add(elementName);
_startedElementsCount.add(0);
}
- _currentWriter.write((String) elementName);
+ _currentWriter.write(elementName);
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java
index ec08b2a60..5041426f3 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlButtonRendererBase.java
@@ -85,12 +85,12 @@ public class HtmlButtonRendererBase extends HtmlRenderer
private static boolean isReset(UIComponent uiComponent)
{
- return "reset".equals((String) uiComponent.getAttributes().get(HTML.TYPE_ATTR));
+ return "reset".equals(uiComponent.getAttributes().get(HTML.TYPE_ATTR));
}
private static boolean isButton(UIComponent uiComponent)
{
- return "button".equals((String) uiComponent.getAttributes().get(HTML.TYPE_ATTR));
+ return "button".equals(uiComponent.getAttributes().get(HTML.TYPE_ATTR));
}
private static boolean isSubmitted(FacesContext facesContext, UIComponent uiComponent)
@@ -102,7 +102,7 @@ public class HtmlButtonRendererBase extends HtmlRenderer
UIForm form = ComponentUtils.findClosest(UIForm.class, uiComponent);
if (form != null)
{
- hiddenLink = (String) facesContext.getExternalContext().getRequestParameterMap().get(
+ hiddenLink = facesContext.getExternalContext().getRequestParameterMap().get(
HtmlRendererUtils.getHiddenCommandLinkFieldName(form, facesContext));
}
return paramMap.containsKey(clientId) || paramMap.containsKey(clientId + IMAGE_BUTTON_SUFFIX_X)
@@ -377,7 +377,7 @@ public class HtmlButtonRendererBase extends HtmlRenderer
if (buff == null)
{
buff = new StringBuilder();
- buff.append(strParamValue.substring(0,j));
+ buff.append(strParamValue, 0, j);
}
buff.append('\\');
buff.append(c);
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java
index 13cdcc976..b194e8923 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlCheckboxRendererBase.java
@@ -187,7 +187,7 @@ public class HtmlCheckboxRendererBase extends HtmlRenderer
for (int i = 0; i < selectItemList.size(); i++)
{
- SelectItem selectItem = (SelectItem) selectItemList.get(i);
+ SelectItem selectItem = selectItemList.get(i);
itemNum = renderGroupOrItemCheckbox(facesContext, selectMany,
selectItem, useSubmittedValues, lookupSet,
@@ -568,7 +568,7 @@ public class HtmlCheckboxRendererBase extends HtmlRenderer
{
if (component instanceof UISelectMany)
{
- return HtmlRendererUtils.findUISelectManyConverterFailsafe(facesContext, (UISelectMany) component);
+ return HtmlRendererUtils.findUISelectManyConverterFailsafe(facesContext, component);
}
else if (component instanceof UISelectOne)
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java
index 31de3c8d6..3e553549c 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlLinkRendererBase.java
@@ -94,7 +94,7 @@ public abstract class HtmlLinkRendererBase extends HtmlRenderer
boolean activateActionEvent = false;
if (form != null && !disabled)
{
- String reqValue = (String) facesContext.getExternalContext().getRequestParameterMap().get(
+ String reqValue = facesContext.getExternalContext().getRequestParameterMap().get(
HtmlRendererUtils.getHiddenCommandLinkFieldName(form, facesContext));
activateActionEvent = reqValue != null && reqValue.equals(clientId)
|| HtmlRendererUtils.isPartialOrBehaviorSubmit(facesContext, clientId);
@@ -664,7 +664,7 @@ public abstract class HtmlLinkRendererBase extends HtmlRenderer
if (buff == null)
{
buff = new StringBuilder();
- buff.append(strParamValue.substring(0,i));
+ buff.append(strParamValue, 0, i);
}
buff.append('\\');
buff.append(c);
@@ -803,7 +803,7 @@ public abstract class HtmlLinkRendererBase extends HtmlRenderer
if (isAnchorInHref)
{
// remove anchor element and add it again after the parameter are encoded
- anchorString = href.substring(index,href.length());
+ anchorString = href.substring(index);
href = href.substring(0,index);
}
if (getChildCount(output) > 0)
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlListboxRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlListboxRendererBase.java
index e8682aa2e..0ea13aaec 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlListboxRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlListboxRendererBase.java
@@ -173,8 +173,8 @@ public class HtmlListboxRendererBase
{
if (component instanceof UISelectMany)
{
- return HtmlRendererUtils.findUISelectManyConverterFailsafe(facesContext,
- (UISelectMany) component);
+ return HtmlRendererUtils.findUISelectManyConverterFailsafe(facesContext,
+ component);
}
else if (component instanceof UISelectOne)
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMenuRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMenuRendererBase.java
index ce3606c08..47c183391 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMenuRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMenuRendererBase.java
@@ -164,7 +164,7 @@ public class HtmlMenuRendererBase
{
if (component instanceof UISelectMany)
{
- return HtmlRendererUtils.findUISelectManyConverterFailsafe(facesContext, (UISelectMany) component);
+ return HtmlRendererUtils.findUISelectManyConverterFailsafe(facesContext, component);
}
else if (component instanceof UISelectOne)
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMessageRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMessageRendererBase.java
index 15a090595..b6bae1efd 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMessageRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlMessageRendererBase.java
@@ -132,7 +132,7 @@ public abstract class HtmlMessageRendererBase
}
// get first message
- FacesMessage facesMessage = (FacesMessage) messageIterator.next();
+ FacesMessage facesMessage = messageIterator.next();
// check for the redisplay attribute and for the messages which have already been rendered
if(!isRedisplay(message))
@@ -142,7 +142,7 @@ public abstract class HtmlMessageRendererBase
if(messageIterator.hasNext())
{
// get the next message
- facesMessage = (FacesMessage) messageIterator.next();
+ facesMessage = messageIterator.next();
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java
index 1df7914eb..109a4737b 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlRadioRendererBase.java
@@ -114,7 +114,7 @@ public class HtmlRadioRendererBase extends HtmlRenderer
}
}
- String group = selectOne instanceof HtmlSelectOneRadio ? ((HtmlSelectOneRadio) selectOne).getGroup() : null;
+ String group = selectOne instanceof HtmlSelectOneRadio ? selectOne.getGroup() : null;
if (group != null && !group.isEmpty())
{
if (!groupFirst.containsKey(group))
@@ -142,7 +142,7 @@ public class HtmlRadioRendererBase extends HtmlRenderer
currentValue = RendererUtils.getStringFromSubmittedValueOrLocalValueReturnNull(
facesContext, groupFirst.get(group));
}
- SelectItem selectItem = (SelectItem) selectItemList.get(0);
+ SelectItem selectItem = selectItemList.get(0);
renderGroupOrItemRadio(facesContext, selectOne,
selectItem, currentValue,
converter, usingTable, group, 0);
@@ -196,7 +196,7 @@ public class HtmlRadioRendererBase extends HtmlRenderer
for (int i = 0; i < selectItemList.size(); i++)
{
- SelectItem selectItem = (SelectItem) selectItemList.get(i);
+ SelectItem selectItem = selectItemList.get(i);
itemNum = renderGroupOrItemRadio(facesContext, selectOne,
selectItem, currentValue,
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java
index 24f7418a6..a0a02fab1 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/base/HtmlTableRendererBase.java
@@ -575,7 +575,7 @@ public class HtmlTableRendererBase extends HtmlRenderer
{
children = getChildren(component);
}
- UIComponent child = (UIComponent) children.get(j);
+ UIComponent child = children.get(j);
if (child.isRendered())
{
boolean columnRendering = child instanceof UIColumn;
@@ -983,8 +983,8 @@ public class HtmlTableRendererBase extends HtmlRenderer
UIComponent facet = null;
if (component.getFacetCount() > 0)
{
- facet = header ? (UIComponent) component.getFacets().get(HEADER_FACET_NAME)
- : (UIComponent) component.getFacets().get(FOOTER_FACET_NAME);
+ facet = header ? component.getFacets().get(HEADER_FACET_NAME)
+ : component.getFacets().get(FOOTER_FACET_NAME);
}
if (facet != null || hasColumnFacet)
{
@@ -1263,7 +1263,7 @@ public class HtmlTableRendererBase extends HtmlRenderer
String headerClass = (String) column.getAttributes().get("headerClass");
if (headerClass != null)
{
- styleClass = (String) headerClass;
+ styleClass = headerClass;
}
}
else
@@ -1271,7 +1271,7 @@ public class HtmlTableRendererBase extends HtmlRenderer
String footerClass = (String) column.getAttributes().get("footerClass");
if (footerClass != null)
{
- styleClass = (String) footerClass;
+ styleClass = footerClass;
}
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
index 7086b7e9d..163929e8e 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/HtmlRendererUtils.java
@@ -223,14 +223,11 @@ public final class HtmlRendererUtils
{
String result = SharedRendererUtils.getConvertedStringValue(
facesContext,component,((ValueHolder) component).getConverter(), itemInfo.getItem().getValue());
- if(reqValues.contains(result))
- {
- reqValues.remove(result);
- }
+ reqValues.remove(result);
}
}
// submitted value needs to be of type String[]
- String[] submittedValue = (String[]) reqValues.toArray(new String[reqValues.size()]);
+ String[] submittedValue = reqValues.toArray(new String[reqValues.size()]);
((EditableValueHolder) component).setSubmittedValue(submittedValue);
}
else
@@ -779,13 +776,13 @@ public final class HtmlRendererUtils
if (uiComponent instanceof UISelectMany)
{
isSelectOne = false;
- selectItemList = RendererUtils.getSelectItemList((UISelectMany) uiComponent, facesContext);
+ selectItemList = RendererUtils.getSelectItemList(uiComponent, facesContext);
converter = findUISelectManyConverterFailsafe(facesContext, uiComponent, considerValueType);
}
else if (uiComponent instanceof UISelectOne)
{
isSelectOne = true;
- selectItemList = RendererUtils.getSelectItemList((UISelectOne) uiComponent, facesContext);
+ selectItemList = RendererUtils.getSelectItemList(uiComponent, facesContext);
converter = findUIOutputConverterFailSafe(facesContext, uiComponent);
}
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
index 15dd8a86e..769a12e41 100755
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/JavascriptUtils.java
@@ -35,62 +35,60 @@ public final class JavascriptUtils
}
private static final Set RESERVED_WORDS =
- new HashSet(Arrays.asList(new String[]{
- "abstract",
- "boolean",
- "break",
- "byte",
- "case",
- "catch",
- "char",
- "class",
- "const",
- "continue",
- "default",
- "delete",
- "do",
- "double",
- "else",
- "export",
- "extends",
- "false",
- "final",
- "finally",
- "float",
- "for",
- "function",
- "goto",
- "if",
- "implements",
- "in",
- "instanceof",
- "int",
- "long",
- "native",
- "new",
- "null",
- "package",
- "private",
- "protected",
- "public",
- "return",
- "short",
- "static",
- "super",
- "switch",
- "synchronized",
- "this",
- "throw",
- "throws",
- "transient",
- "true",
- "try",
- "typeof",
- "var",
- "void",
- "while",
- "with"
- }));
+ new HashSet(Arrays.asList("abstract",
+ "boolean",
+ "break",
+ "byte",
+ "case",
+ "catch",
+ "char",
+ "class",
+ "const",
+ "continue",
+ "default",
+ "delete",
+ "do",
+ "double",
+ "else",
+ "export",
+ "extends",
+ "false",
+ "final",
+ "finally",
+ "float",
+ "for",
+ "function",
+ "goto",
+ "if",
+ "implements",
+ "in",
+ "instanceof",
+ "int",
+ "long",
+ "native",
+ "new",
+ "null",
+ "package",
+ "private",
+ "protected",
+ "public",
+ "return",
+ "short",
+ "static",
+ "super",
+ "switch",
+ "synchronized",
+ "this",
+ "throw",
+ "throws",
+ "transient",
+ "true",
+ "try",
+ "typeof",
+ "var",
+ "void",
+ "while",
+ "with"));
/**Don't use this function - except when compatibility with the RI is a must,
* as in the name for the clear form parameters script.
@@ -125,7 +123,7 @@ public final class JavascriptUtils
if (buf == null)
{
buf = new StringBuilder(s.length() + 10);
- buf.append(s.substring(0, i));
+ buf.append(s, 0, i);
}
buf.append('_');
diff --git a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoder.java b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoder.java
index 6b17e0c4b..7fd7c6177 100644
--- a/impl/src/main/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoder.java
+++ b/impl/src/main/java/org/apache/myfaces/renderkit/html/util/UnicodeEncoder.java
@@ -48,7 +48,7 @@ public abstract class UnicodeEncoder
if( sb == null )
{
sb = new StringBuilder(string.length() + 4);
- sb.append(string.substring(0,i));
+ sb.append(string, 0, i);
}
//encode all non basic latin characters
sb.append("&#");
@@ -85,7 +85,7 @@ public abstract class UnicodeEncoder
start = i+1;
//encode all non basic latin characters
writer.write("&#");
- writer.write(Integer.toString((int)c));
+ writer.write(Integer.toString(c));
writer.write(';');
}
}
@@ -121,7 +121,7 @@ public abstract class UnicodeEncoder
start = i+1;
//encode all non basic latin characters
writer.write("&#");
- writer.write(Integer.toString((int)c));
+ writer.write(Integer.toString(c));
writer.write(';');
}
}
@@ -157,7 +157,7 @@ public abstract class UnicodeEncoder
start = i+1;
//encode all non basic latin characters
writer.write("&#");
- writer.write(Integer.toString((int)c));
+ writer.write(Integer.toString(c));
writer.write(';');
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoaderIterator.java b/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoaderIterator.java
index 300915728..f752d9740 100644
--- a/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoaderIterator.java
+++ b/impl/src/main/java/org/apache/myfaces/resource/ClassLoaderResourceLoaderIterator.java
@@ -165,7 +165,7 @@ public class ClassLoaderResourceLoaderIterator implements Iterator<String>
continue;
}
- path = entryName.substring(basePath.length(), entryName.length());
+ path = entryName.substring(basePath.length());
if (path.endsWith("/"))
{
diff --git a/impl/src/main/java/org/apache/myfaces/resource/ValueExpressionFilterInputStream.java b/impl/src/main/java/org/apache/myfaces/resource/ValueExpressionFilterInputStream.java
index 625dfb211..496df2715 100644
--- a/impl/src/main/java/org/apache/myfaces/resource/ValueExpressionFilterInputStream.java
+++ b/impl/src/main/java/org/apache/myfaces/resource/ValueExpressionFilterInputStream.java
@@ -130,10 +130,10 @@ public class ValueExpressionFilterInputStream extends InputStream
"#{" + convertToExpression(expressionList) + '}',
String.class);
- String value = (String) ve.getValue(elContext);
+ String value = ve.getValue(elContext);
for (int i = value.length()-1; i >= 0 ; i--)
{
- delegate.unread((int) value.charAt(i));
+ delegate.unread(value.charAt(i));
}
}
catch(ELException e)
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
index 8c55016e3..ac04cd2ac 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/DefaultFacesFlowProviderFactory.java
@@ -65,7 +65,7 @@ public class DefaultFacesFlowProviderFactory extends FacesFlowProviderFactory
}
else
{
- returnValue = (FacesFlowProvider) new DefaultFacesFlowProvider();
+ returnValue = new DefaultFacesFlowProvider();
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java
index df851a4e8..8cfccbf52 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/NoInjectionAnnotationInjectionProvider.java
@@ -56,7 +56,7 @@ public class NoInjectionAnnotationInjectionProvider extends InjectionProvider
{
ClassLoader cl = ClassUtils.getContextClassLoader();
- Map<Class,Method[]> metadata = (Map<Class,Method[]>) declaredMethodBeans.get(cl);
+ Map<Class,Method[]> metadata = declaredMethodBeans.get(cl);
if (metadata == null)
{
@@ -74,7 +74,7 @@ public class NoInjectionAnnotationInjectionProvider extends InjectionProvider
private static Map<Class,Method[]> createDeclaredMethodBeansMap(
ClassLoader cl, Map<Class,Method[]> metadata)
{
- metadata = (Map<Class,Method[]>) declaredMethodBeans.get(cl);
+ metadata = declaredMethodBeans.get(cl);
if (metadata == null)
{
metadata = new HashMap<Class,Method[]>();
diff --git a/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java b/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java
index 8d6e6c281..f1698c056 100644
--- a/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java
+++ b/impl/src/main/java/org/apache/myfaces/spi/impl/ResourceAnnotationInjectionProvider.java
@@ -61,7 +61,7 @@ public class ResourceAnnotationInjectionProvider extends NoInjectionAnnotationIn
// per classloader to hold metadata.
synchronized (declaredFieldBeans)
{
- metadata = (Map<Class,Field[]>) declaredFieldBeans.get(cl);
+ metadata = declaredFieldBeans.get(cl);
if (metadata == null)
{
metadata = new HashMap<>();
diff --git a/impl/src/main/java/org/apache/myfaces/util/IllegalXmlCharacterFilterWriter.java b/impl/src/main/java/org/apache/myfaces/util/IllegalXmlCharacterFilterWriter.java
index 3b6f5e199..9a3f518b1 100644
--- a/impl/src/main/java/org/apache/myfaces/util/IllegalXmlCharacterFilterWriter.java
+++ b/impl/src/main/java/org/apache/myfaces/util/IllegalXmlCharacterFilterWriter.java
@@ -43,7 +43,7 @@ public class IllegalXmlCharacterFilterWriter extends FilterWriter
{
if (isInvalidChar(c))
{
- super.write((int) BLANK_CHAR);
+ super.write(BLANK_CHAR);
}
else
{
diff --git a/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java b/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
index c31f7cb0f..895881dde 100755
--- a/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/MessageUtils.java
@@ -656,12 +656,12 @@ public final class MessageUtils
*/
public static FacesMessage getMessage(FacesContext context, String messageId)
{
- return getMessage(context, messageId, ((Object []) (null)));
+ return getMessage(context, messageId, null);
}
public static FacesMessage getMessage(String bundleBaseName, FacesContext context, String messageId)
{
- return getMessage(bundleBaseName, context, messageId, ((Object []) (null)));
+ return getMessage(bundleBaseName, context, messageId, null);
}
/**
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java b/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java
index cbeba3717..083224a6a 100755
--- a/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/ClassUtils.java
@@ -88,7 +88,7 @@ public final class ClassUtils extends org.apache.myfaces.core.api.shared.lang.Cl
if (current == null)
{
// nothing to decorate
- current = (T) ClassUtils.newInstance(implClass);
+ current = ClassUtils.newInstance(implClass);
}
else
{
@@ -106,7 +106,7 @@ public final class ClassUtils extends org.apache.myfaces.core.api.shared.lang.Cl
try
{
delegationConstructor =
- implClass.getConstructor(new Class[] {extendedInterfaceClass});
+ implClass.getConstructor(extendedInterfaceClass);
}
catch (NoSuchMethodException mnfe)
{
@@ -117,13 +117,13 @@ public final class ClassUtils extends org.apache.myfaces.core.api.shared.lang.Cl
{
// try to find the constructor with the "normal" interfaceClass
delegationConstructor =
- implClass.getConstructor(new Class[] {interfaceClass});
+ implClass.getConstructor(interfaceClass);
}
// impl class supports decorator pattern at this point
try
{
// create new decorator wrapping current
- newCurrent = delegationConstructor.newInstance(new Object[] { current });
+ newCurrent = delegationConstructor.newInstance(current);
}
catch (InstantiationException | IllegalAccessException | InvocationTargetException e)
{
@@ -134,7 +134,7 @@ public final class ClassUtils extends org.apache.myfaces.core.api.shared.lang.Cl
catch (NoSuchMethodException e)
{
// no decorator pattern support
- newCurrent = (T) ClassUtils.newInstance(implClass);
+ newCurrent = ClassUtils.newInstance(implClass);
}
current = wrapBackwardCompatible(interfaceClass, extendedInterfaceClass,
@@ -175,8 +175,8 @@ public final class ClassUtils extends org.apache.myfaces.core.api.shared.lang.Cl
{
Constructor<? extends T> wrapperConstructor
= extendedInterfaceWrapperClass.getConstructor(
- new Class[] {interfaceClass, extendedInterfaceClass});
- current = wrapperConstructor.newInstance(new Object[] {newCurrent, defaultObject});
+ interfaceClass, extendedInterfaceClass);
+ current = wrapperConstructor.newInstance(newCurrent, defaultObject);
}
catch (NoSuchMethodException | InstantiationException | IllegalAccessException
| InvocationTargetException e)
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/ConcurrentLRUCache.java b/impl/src/main/java/org/apache/myfaces/util/lang/ConcurrentLRUCache.java
index 5becda407..e7937278a 100644
--- a/impl/src/main/java/org/apache/myfaces/util/lang/ConcurrentLRUCache.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/ConcurrentLRUCache.java
@@ -394,7 +394,7 @@ public class ConcurrentLRUCache<K, V>
while (queue.size() > queue.myMaxSize
&& queue.size() > 0)
{
- CacheEntry otherEntry = (CacheEntry) queue.pop();
+ CacheEntry otherEntry = queue.pop();
newOldestEntry = Math
.min(otherEntry.lastAccessedCopy,
newOldestEntry);
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/PriorityQueue.java b/impl/src/main/java/org/apache/myfaces/util/lang/PriorityQueue.java
index 9f7df8c7a..fea765eee 100644
--- a/impl/src/main/java/org/apache/myfaces/util/lang/PriorityQueue.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/PriorityQueue.java
@@ -299,6 +299,6 @@ public abstract class PriorityQueue<T>
*/
protected final Object[] getHeapArray()
{
- return (Object[]) heap;
+ return heap;
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/util/lang/StringCharArrayAccessor.java b/impl/src/main/java/org/apache/myfaces/util/lang/StringCharArrayAccessor.java
index e41af4b00..e09b6bb19 100644
--- a/impl/src/main/java/org/apache/myfaces/util/lang/StringCharArrayAccessor.java
+++ b/impl/src/main/java/org/apache/myfaces/util/lang/StringCharArrayAccessor.java
@@ -201,7 +201,7 @@ public class StringCharArrayAccessor
return createStringFallback(charBuf);
}
- String str = new String();
+ String str = "";
try
{
// try to prevent possible final field setting execution reordering in JIT
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
index 5a15fda1d..440819981 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
@@ -433,7 +433,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
//context.setProcessingEvents(true);
if (FaceletViewDeclarationLanguageBase.isDynamicComponentRefreshTransientBuildActive(context))
{
- VisitContext visitContext = (VisitContext) getVisitContextFactory().
+ VisitContext visitContext = getVisitContextFactory().
getVisitContext(context, null, MyFacesVisitHints.SET_SKIP_ITERATION);
view.visitTree(visitContext, PublishDynamicComponentRefreshTransientBuildCallback.INSTANCE);
}
@@ -965,7 +965,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
{
// Check if the value expression holds a method signature
// Note that it could be null, so in that case we don't have to do anything
- methodSignature = (String) methodSignatureExpression.getValue(elContext);
+ methodSignature = methodSignatureExpression.getValue(elContext);
}
String targetAttributeName = null;
@@ -973,7 +973,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
= (ValueExpression) propertyDescriptor.getValue("targetAttributeName");
if (targetAttributeNameVE != null)
{
- targetAttributeName = (String) targetAttributeNameVE.getValue(context.getELContext());
+ targetAttributeName = targetAttributeNameVE.getValue(context.getELContext());
if (targetAttributeName == null)
{
targetAttributeName = attributeName;
@@ -999,7 +999,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
// ValueExpression that must evaluate to String
if (targetsExpression != null)
{
- targets = (String) targetsExpression.getValue(elContext);
+ targets = targetsExpression.getValue(elContext);
}
if (targets == null)
@@ -1592,7 +1592,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
{
// Check if the value expression holds a method signature
// Note that it could be null, so in that case we don't have to do anything
- methodSignature = (String) methodSignatureExpression.getValue(elContext);
+ methodSignature = methodSignatureExpression.getValue(elContext);
}
String targetAttributeName = null;
@@ -1600,7 +1600,7 @@ public class FaceletViewDeclarationLanguage extends FaceletViewDeclarationLangua
propertyDescriptor.getValue("targetAttributeName");
if (targetAttributeNameVE != null)
{
- targetAttributeName = (String) targetAttributeNameVE.getValue(context.getELContext());
+ targetAttributeName = targetAttributeNameVE.getValue(context.getELContext());
if (targetAttributeName == null)
{
targetAttributeName = attributeName;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java b/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java
index 686bf06bb..ca0c8e533 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/PartialStateManagementStrategy.java
@@ -920,7 +920,7 @@ public class PartialStateManagementStrategy extends StateManagementStrategy
{
UIViewRoot uiViewRoot = facesContext.getViewRoot();
- List<String> clientIdsAdded = (List<String>) getClientIdsAdded(uiViewRoot);
+ List<String> clientIdsAdded = getClientIdsAdded(uiViewRoot);
if (clientIdsAdded == null)
{
//Create a set that preserve insertion order
@@ -930,7 +930,7 @@ public class PartialStateManagementStrategy extends StateManagementStrategy
setClientsIdsAdded(uiViewRoot, clientIdsAdded);
- List<String> clientIdsRemoved = (List<String>) getClientIdsRemoved(uiViewRoot);
+ List<String> clientIdsRemoved = getClientIdsRemoved(uiViewRoot);
if (clientIdsRemoved == null)
{
//Create a set that preserve insertion order
@@ -947,7 +947,7 @@ public class PartialStateManagementStrategy extends StateManagementStrategy
{
UIViewRoot uiViewRoot = facesContext.getViewRoot();
- List<String> clientIdsAdded = (List<String>) getClientIdsAdded(uiViewRoot);
+ List<String> clientIdsAdded = getClientIdsAdded(uiViewRoot);
if (clientIdsAdded == null)
{
//Create a set that preserve insertion order
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
index 97031b711..8d533edb5 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationManager.java
@@ -436,14 +436,14 @@ final class CompilationManager
public FaceletHandler createFaceletHandler()
{
- return ((CompilationUnit) this.units.get(0)).createFaceletHandler();
+ return this.units.get(0).createFaceletHandler();
}
private CompilationUnit currentUnit()
{
if (!this.units.isEmpty())
{
- return (CompilationUnit) this.units.peek();
+ return this.units.peek();
}
return null;
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java
index 3fa282ffb..0c8d0d705 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/CompilationUnit.java
@@ -80,13 +80,13 @@ class CompilationUnit
}
if (this.children.size() == 1)
{
- CompilationUnit u = (CompilationUnit) this.children.get(0);
+ CompilationUnit u = this.children.get(0);
return u.createFaceletHandler();
}
FaceletHandler[] fh = new FaceletHandler[this.children.size()];
for (int i = 0; i < fh.length; i++)
{
- fh[i] = ((CompilationUnit) this.children.get(i)).createFaceletHandler();
+ fh[i] = this.children.get(i).createFaceletHandler();
}
return new jakarta.faces.view.facelets.CompositeFaceletHandler(fh);
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
index 2f657a431..d14558bd3 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/Compiler.java
@@ -159,7 +159,7 @@ public abstract class Compiler
private Object featureInstance(String name)
{
- String type = (String) this.features.get(name);
+ String type = this.features.get(name);
if (type != null)
{
try
@@ -199,7 +199,7 @@ public abstract class Compiler
public final String getFeature(String name)
{
- return (String) this.features.get(name);
+ return this.features.get(name);
}
public final boolean isTrimmingComments()
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java
index ddb4d4359..e44fd44f6 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceHandler.java
@@ -75,7 +75,7 @@ final class NamespaceHandler extends FunctionMapper implements FaceletHandler
@Override
public Method resolveFunction(String prefix, String localName)
{
- String uri = (String) this.ns.get(prefix);
+ String uri = this.ns.get(prefix);
if (uri != null)
{
return this.library.createFunction(uri, localName);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceManager.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceManager.java
index e7fcead70..3d8863554 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceManager.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/NamespaceManager.java
@@ -69,7 +69,7 @@ final class NamespaceManager
NS ns = null;
for (int i = 0; i < this.namespaces.size(); i++)
{
- ns = (NS) this.namespaces.get(i);
+ ns = this.namespaces.get(i);
if (ns.prefix.equals(prefix))
{
return ns.namespace;
@@ -83,7 +83,7 @@ final class NamespaceManager
NS ns = null;
for (int i = 0; i < this.namespaces.size(); i++)
{
- ns = (NS) this.namespaces.get(i);
+ ns = this.namespaces.get(i);
if (ns.prefix.equals(prefix))
{
this.namespaces.remove(i);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/RefreshDynamicComponentListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/RefreshDynamicComponentListener.java
index e4098c816..01c71dd2a 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/RefreshDynamicComponentListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/RefreshDynamicComponentListener.java
@@ -219,7 +219,7 @@ public final class RefreshDynamicComponentListener implements ComponentSystemEve
ns = "";
break;
}
- taglibURI = ns + (String) ((Object[]) values[0])[1];
+ taglibURI = ns + ((Object[]) values[0])[1];
}
tagName = (String) values[1];
attributes = (Map<String, Object>) values[2];
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
index fc8ddfa40..f586253f4 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TextUnit.java
@@ -344,7 +344,7 @@ final class TextUnit extends CompilationUnit
public void endTag()
{
- Tag tag = (Tag) this.tags.pop();
+ Tag tag = this.tags.pop();
if (HTML.BODY_ELEM.equalsIgnoreCase(tag.getQName()))
{
@@ -400,7 +400,7 @@ final class TextUnit extends CompilationUnit
// spaces.
size = compressSpaces(instructionBuffer, size);
}
- Instruction[] instructions = (Instruction[]) this.instructionBuffer
+ Instruction[] instructions = this.instructionBuffer
.toArray(new Instruction[size]);
this.children.add(new UIInstructionHandler(this.alias, this.id, instructions, txt));
this.instructionBuffer.clear();
@@ -415,7 +415,7 @@ final class TextUnit extends CompilationUnit
}
else
{
- throw new TagException((Tag) this.tags.peek(), e.getMessage());
+ throw new TagException(this.tags.peek(), e.getMessage());
}
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
index 30075440d..54ba170d5 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/DefaultFunctionMapper.java
@@ -56,7 +56,7 @@ public final class DefaultFunctionMapper extends FunctionMapper implements Exter
{
if (_functions != null)
{
- Function f = (Function) _functions.get(prefix + ':' + localName);
+ Function f = _functions.get(prefix + ':' + localName);
return f.getMethod();
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
index c711684bb..bc248de5e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/ELText.java
@@ -238,7 +238,7 @@ public class ELText
Object v = this.ve.getValue(ctx);
if (v != null)
{
- out.writeText((String) v, null);
+ out.writeText(v, null);
}
}
}
@@ -384,7 +384,7 @@ public class ELText
Object v = this.ve.getValue(ctx);
if (v != null)
{
- out.writeText((String) v, null);
+ out.writeText(v, null);
}
}
}
@@ -632,11 +632,11 @@ public class ELText
}
else if (text.size() == 1)
{
- return (ELText) text.get(0);
+ return text.get(0);
}
else
{
- ELText[] ta = (ELText[]) text.toArray(new ELText[text.size()]);
+ ELText[] ta = text.toArray(new ELText[text.size()]);
return new ELTextComposite(ta);
}
}
@@ -748,7 +748,7 @@ public class ELText
}
else
{
- ELText[] ta = (ELText[]) text.toArray(new ELText[text.size()]);
+ ELText[] ta = text.toArray(new ELText[text.size()]);
return ta;
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
index 21eb454c6..9a4f9f6b7 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/FaceletStateValueExpression.java
@@ -136,8 +136,8 @@ public class FaceletStateValueExpression extends ValueExpression
@Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException
{
- uniqueId = (String) in.readUTF();
- key = (String) in.readUTF();
+ uniqueId = in.readUTF();
+ key = in.readUTF();
}
@Override
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
index 82e515c70..bc4cdfdb1 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/el/VariableMapperWrapper.java
@@ -64,7 +64,7 @@ public final class VariableMapperWrapper extends VariableMapperBase implements F
{
if (_vars != null)
{
- ve = (ValueExpression) _vars.get(variable);
+ ve = _vars.get(variable);
// Is this code in a block that wants to cache
// the resulting expression(s) and variable has been resolved?
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
index b865c00e9..bda213eec 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFacelet.java
@@ -161,7 +161,7 @@ final class DefaultFacelet extends AbstractFacelet
if (parent instanceof UIViewRoot)
{
myFaceletContext.setViewRoot((UIViewRoot) parent);
- ComponentSupport.setCachedFacesContext((UIViewRoot) parent, facesContext);
+ ComponentSupport.setCachedFacesContext(parent, facesContext);
}
}
DefaultFaceletContext ctx = new DefaultFaceletContext(facesContext, this, myFaceletContext);
@@ -227,7 +227,7 @@ final class DefaultFacelet extends AbstractFacelet
{
if (parent instanceof UIViewRoot)
{
- ComponentSupport.setCachedFacesContext((UIViewRoot) parent, null);
+ ComponentSupport.setCachedFacesContext(parent, null);
}
myFaceletContext.release(facesContext);
List<String> uniqueIdList = ((EncodingHandler)_root).getUniqueIdList();
@@ -466,7 +466,7 @@ final class DefaultFacelet extends AbstractFacelet
*/
private URL getRelativePath(FacesContext facesContext, String path) throws IOException
{
- URL url = (URL) _relativePaths.get(path);
+ URL url = _relativePaths.get(path);
if (url == null)
{
url = _factory.resolveURL(facesContext, _src, path);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
index 4ac7fc6d3..e72e0428f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletFactory.java
@@ -188,7 +188,7 @@ public final class DefaultFaceletFactory extends FaceletFactory
}
}
- URL url = (URL) _relativeLocations.get(uri);
+ URL url = _relativeLocations.get(uri);
if (url == null)
{
url = resolveURL(facesContext, getBaseUrl(), uri);
@@ -453,7 +453,7 @@ public final class DefaultFaceletFactory extends FaceletFactory
}
}
- URL url = (URL) _relativeLocations.get(uri);
+ URL url = _relativeLocations.get(uri);
if (url == null)
{
url = resolveURL(facesContext, getBaseUrl(), uri);
@@ -507,7 +507,7 @@ public final class DefaultFaceletFactory extends FaceletFactory
public Facelet getCompositeComponentMetadataFacelet(FacesContext facesContext, String uri)
throws IOException
{
- URL url = (URL) _relativeLocations.get(uri);
+ URL url = _relativeLocations.get(uri);
if (url == null)
{
url = resolveURL(facesContext, getBaseUrl(), uri);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolImpl.java
index c2313cf28..98050b39e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/pool/impl/ViewPoolImpl.java
@@ -316,7 +316,7 @@ public class ViewPoolImpl extends ViewPool
@Override
public void pushDynamicStructureView(FacesContext context, UIViewRoot root, FaceletState faceletDynamicState)
{
- DynamicViewKey key = (DynamicViewKey) generateDynamicStructureViewKey(context, root, faceletDynamicState);
+ DynamicViewKey key = generateDynamicStructureViewKey(context, root, faceletDynamicState);
MetadataViewKey ordinaryKey = deriveViewKey(context, root);
Map<DynamicViewKey, ViewStructureMetadata> map = dynamicStructureViewMetadataMap.get(ordinaryKey);
if (map != null)
@@ -405,7 +405,7 @@ public class ViewPoolImpl extends ViewPool
public void storeDynamicViewStructureMetadata(FacesContext context, UIViewRoot root,
FaceletState faceletDynamicState)
{
- DynamicViewKey key = (DynamicViewKey) generateDynamicStructureViewKey(context, root, faceletDynamicState);
+ DynamicViewKey key = generateDynamicStructureViewKey(context, root, faceletDynamicState);
MetadataViewKey ordinaryKey = deriveViewKey(context, root);
if (!dynamicStructureViewMetadataMap.containsKey(ordinaryKey))
{
@@ -426,7 +426,7 @@ public class ViewPoolImpl extends ViewPool
public ViewStructureMetadata retrieveDynamicViewStructureMetadata(FacesContext context, UIViewRoot root,
FaceletState faceletDynamicState)
{
- DynamicViewKey key = (DynamicViewKey) generateDynamicStructureViewKey(context, root, faceletDynamicState);
+ DynamicViewKey key = generateDynamicStructureViewKey(context, root, faceletDynamicState);
MetadataViewKey ordinaryKey = deriveViewKey(context, root);
Map<DynamicViewKey, ViewStructureMetadata> map = dynamicStructureViewMetadataMap.get(ordinaryKey);
if (map != null)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java
index f2b2064ed..ae40ad81f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/AbstractTagLibrary.java
@@ -434,7 +434,7 @@ public abstract class AbstractTagLibrary implements TagLibrary
{
try
{
- return handlerType.getConstructor(CONSTRUCTOR_SIG).newInstance(new Object[] { cfg });
+ return handlerType.getConstructor(CONSTRUCTOR_SIG).newInstance(cfg);
}
catch (InvocationTargetException ite)
{
@@ -592,7 +592,7 @@ public abstract class AbstractTagLibrary implements TagLibrary
try
{
ComponentConfig ccfg = new ComponentConfigWrapper(cfg, componentType, renderType);
- return constructor.newInstance(new Object[] { ccfg });
+ return constructor.newInstance(ccfg);
}
catch (InvocationTargetException e)
{
@@ -665,7 +665,7 @@ public abstract class AbstractTagLibrary implements TagLibrary
try
{
ConverterConfig ccfg = new ConverterConfigWrapper(cfg, converterId);
- return constructor.newInstance(new Object[] { ccfg });
+ return constructor.newInstance(ccfg);
}
catch (InvocationTargetException e)
{
@@ -706,7 +706,7 @@ public abstract class AbstractTagLibrary implements TagLibrary
try
{
ValidatorConfig ccfg = new ValidatorConfigWrapper(cfg, validatorId);
- return constructor.newInstance(new Object[] { ccfg });
+ return constructor.newInstance(ccfg);
}
catch (InvocationTargetException e)
{
@@ -801,7 +801,7 @@ public abstract class AbstractTagLibrary implements TagLibrary
try
{
BehaviorConfig bcfg = new BehaviorConfigWrapper(cfg,this.behaviorId);
- return constructor.newInstance(new Object[] { bcfg });
+ return constructor.newInstance(bcfg);
}
catch (InvocationTargetException e)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
index b4d71c63f..7e6231930 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/BeanPropertyTagRule.java
@@ -172,7 +172,7 @@ public final class BeanPropertyTagRule extends MetaRule
{
if (method != null)
{
- method.invoke(instance, new Object[] { attribute.getObject(ctx, propertyType) });
+ method.invoke(instance, attribute.getObject(ctx, propertyType));
}
else if (function != null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java
index 7d2b3726d..581ee1a9c 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ComponentTagDeclarationLibrary.java
@@ -255,7 +255,7 @@ public class ComponentTagDeclarationLibrary implements TagLibrary
try
{
ComponentConfig ccfg = new ComponentConfigWrapper(cfg, componentType, renderType);
- return constructor.newInstance(new Object[] { ccfg });
+ return constructor.newInstance(ccfg);
}
catch (InvocationTargetException e)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
index 90f0b7f4d..d34e383cb 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MetaRulesetImpl.java
@@ -73,8 +73,7 @@ public final class MetaRulesetImpl extends MetaRuleset
{
ClassLoader cl = ClassUtils.getContextClassLoader();
- Map<String, MetadataTarget> metadata = (Map<String, MetadataTarget>)
- MetaRulesetImpl.metadata.get(cl);
+ Map<String, MetadataTarget> metadata = MetaRulesetImpl.metadata.get(cl);
if (metadata == null)
{
@@ -202,7 +201,7 @@ public final class MetaRulesetImpl extends MetaRuleset
Assert.notNull(attribute, "attribute");
Assert.notNull(property, "property");
- TagAttribute attr = (TagAttribute) _attributes.remove(attribute);
+ TagAttribute attr = _attributes.remove(attribute);
if (attr != null)
{
_attributes.put(property, attr);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
index 57b19d986..408b8fa40 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/MethodRule.java
@@ -107,7 +107,7 @@ public final class MethodRule extends MetaRule
{
if (method != null)
{
- method.invoke(instance, new Object[] { expr });
+ method.invoke(instance, expr);
}
else if (function != null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
index 20e07a96c..cb5a431e9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/TagHandlerUtils.java
@@ -110,7 +110,7 @@ public final class TagHandlerUtils
}
if (isAssignable)
{
- found.add((FaceletHandler) nextHandler);
+ found.add(nextHandler);
}
else if (nextHandler instanceof jakarta.faces.view.facelets.CompositeFaceletHandler)
{
@@ -124,7 +124,7 @@ public final class TagHandlerUtils
}
if (isAssignable)
{
- found.add((FaceletHandler)handler);
+ found.add(handler);
}
}
}
@@ -137,7 +137,7 @@ public final class TagHandlerUtils
ArrayList<FaceletHandler> found = new ArrayList<>();
if (type1.isAssignableFrom(nextHandler.getClass()) || type2.isAssignableFrom(nextHandler.getClass()))
{
- found.add((FaceletHandler) nextHandler);
+ found.add(nextHandler);
}
else if (nextHandler instanceof jakarta.faces.view.facelets.CompositeFaceletHandler)
{
@@ -146,7 +146,7 @@ public final class TagHandlerUtils
{
if (type1.isAssignableFrom(handler.getClass()) || type2.isAssignableFrom(handler.getClass()))
{
- found.add((FaceletHandler) handler);
+ found.add(handler);
}
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
index 6676bb13e..c65bb055d 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/UserTagHandler.java
@@ -177,7 +177,7 @@ final class UserTagHandler extends TagHandler implements TemplateClient, Compone
{
return false;
}
- DefineHandler handler = (DefineHandler) this._handlers.get(name);
+ DefineHandler handler = this._handlers.get(name);
if (handler != null)
{
AbstractFaceletContext actx = (AbstractFaceletContext) ctx;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
index 3602728b5..820521692 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/AttachedObjectTargetImpl.java
@@ -51,7 +51,7 @@ public class AttachedObjectTargetImpl implements AttachedObjectTarget, Serializa
{
if (_name != null)
{
- return (String) _name.getValue(FacesContext.getCurrentInstance().getELContext());
+ return _name.getValue(FacesContext.getCurrentInstance().getELContext());
}
return null;
}
@@ -115,7 +115,7 @@ public class AttachedObjectTargetImpl implements AttachedObjectTarget, Serializa
{
if (_targets != null)
{
- return StringUtils.splitShortString((String) _targets.getValue(context.getELContext()), ' ');
+ return StringUtils.splitShortString(_targets.getValue(context.getELContext()), ' ');
}
return ArrayUtils.EMPTY_STRING_ARRAY;
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
index d190ab83f..dbd1db160 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/ClientBehaviorAttachedObjectTargetImpl.java
@@ -53,7 +53,7 @@ public class ClientBehaviorAttachedObjectTargetImpl implements ClientBehaviorAtt
{
if (_name != null)
{
- return (String) _name.getValue(FacesContext.getCurrentInstance().getELContext());
+ return _name.getValue(FacesContext.getCurrentInstance().getELContext());
}
return null;
}
@@ -133,7 +133,7 @@ public class ClientBehaviorAttachedObjectTargetImpl implements ClientBehaviorAtt
{
if (_targets != null)
{
- return StringUtils.splitShortString((String) _targets.getValue(context.getELContext()), ' ');
+ return StringUtils.splitShortString(_targets.getValue(context.getELContext()), ' ');
}
return ArrayUtils.EMPTY_STRING_ARRAY;
}
@@ -153,7 +153,7 @@ public class ClientBehaviorAttachedObjectTargetImpl implements ClientBehaviorAtt
{
if (_event != null)
{
- return (String) _event.getValue(FacesContext.getCurrentInstance().getELContext());
+ return _event.getValue(FacesContext.getCurrentInstance().getELContext());
}
return null;
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
index 868bea138..1dca9deb6 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeComponentResourceTagHandler.java
@@ -368,7 +368,7 @@ public class CompositeComponentResourceTagHandler extends ComponentHandler
ValueExpression requiredExpr = (ValueExpression) entry.getValue().getValue("required");
if (requiredExpr != null)
{
- Boolean required = (Boolean) requiredExpr.getValue(ctx.getFacesContext().getELContext());
+ Boolean required = requiredExpr.getValue(ctx.getFacesContext().getELContext());
if (Boolean.TRUE.equals(required))
{
initFacetHandlersMap(ctx);
@@ -807,7 +807,7 @@ public class CompositeComponentResourceTagHandler extends ComponentHandler
ValueExpression requiredExpr = (ValueExpression) entry.getValue().getValue("required");
if (requiredExpr != null)
{
- Boolean required = (Boolean) requiredExpr.getValue(ctx.getFacesContext().getELContext());
+ Boolean required = requiredExpr.getValue(ctx.getFacesContext().getELContext());
if (Boolean.TRUE.equals(required))
{
if (c.getFacet(entry.getKey()) == null)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
index 6942b0945..1d5b58a56 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CompositeMetaRulesetImpl.java
@@ -123,7 +123,7 @@ public class CompositeMetaRulesetImpl extends MetaRuleset
Assert.notNull(attribute, "attribute");
Assert.notNull(property, "property");
- TagAttribute attr = (TagAttribute) _attributes.remove(attribute);
+ TagAttribute attr = _attributes.remove(attribute);
if (attr != null)
{
_attributes.put(property, attr);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CreateDynamicCompositeComponentListener.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CreateDynamicCompositeComponentListener.java
index ce944db54..bd9e99267 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CreateDynamicCompositeComponentListener.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/composite/CreateDynamicCompositeComponentListener.java
@@ -251,7 +251,7 @@ public class CreateDynamicCompositeComponentListener
ns = "";
break;
}
- taglibURI = ns + (String) ((Object[]) values[0])[1];
+ taglibURI = ns + ((Object[]) values[0])[1];
}
tagName = (String)values[1];
attributes = (Map<String,Object>) values[2];
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/BehaviorTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/BehaviorTagHandlerDelegate.java
index 38443f356..3808e99a2 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/BehaviorTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/BehaviorTagHandlerDelegate.java
@@ -128,7 +128,7 @@ public class BehaviorTagHandlerDelegate extends TagHandlerDelegate implements Be
if (_delegate.getBinding() != null)
{
ve = _delegate.getBinding().getValueExpression(faceletContext, Behavior.class);
- behavior = (Behavior) ve.getValue(faceletContext);
+ behavior = ve.getValue(faceletContext);
}
if (behavior == null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java
index 8596a8e1a..081469455 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentSupport.java
@@ -377,7 +377,7 @@ public final class ComponentSupport
if (s.length() >= 7)
{
- return new Locale(s.substring(0, 2), s.substring(3, 5).toUpperCase(), s.substring(6, s.length()));
+ return new Locale(s.substring(0, 2), s.substring(3, 5).toUpperCase(), s.substring(6));
}
throw new TagAttributeException(attr, "Invalid Locale Specified: " + s);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java
index 6dca153a1..59232759b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ComponentTagHandlerDelegate.java
@@ -209,7 +209,7 @@ public class ComponentTagHandlerDelegate extends TagHandlerDelegate
String id = ctx.generateUniqueId(_delegate.getTagId());
// Cast to use UniqueIdVendor stuff
- FaceletCompositionContext mctx = (FaceletCompositionContext) FaceletCompositionContext.getCurrentInstance(ctx);
+ FaceletCompositionContext mctx = FaceletCompositionContext.getCurrentInstance(ctx);
// grab our component
UIComponent c = null;
@@ -247,7 +247,7 @@ public class ComponentTagHandlerDelegate extends TagHandlerDelegate
c.getAttributes().containsKey(
FaceletDynamicComponentRefreshTransientBuildEvent.DYNAMIC_COMPONENT_BINDING_NEEDS_REFRESH))
{
- VisitContext visitContext = (VisitContext) mctx.getVisitContextFactory().
+ VisitContext visitContext = mctx.getVisitContextFactory().
getVisitContext(facesContext, null, MyFacesVisitHints.SET_SKIP_ITERATION);
c.visitTree(visitContext, PublishFaceletDynamicComponentRefreshTransientBuildCallback.INSTANCE);
}
@@ -802,7 +802,7 @@ public class ComponentTagHandlerDelegate extends TagHandlerDelegate
boolean validatorIdAvailable = entry.getKey() != null && !entry.getKey().isEmpty();
if (validatorIdAvailable && entry.getKey().equals(validatorId))
{
- if (((ValidatorHandler) ((FacesWrapper<ValidatorHandler>) entry.getValue()).getWrapped())
+ if (((FacesWrapper<ValidatorHandler>) entry.getValue()).getWrapped()
.isDisabled(ctx))
{
return false;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ConverterTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ConverterTagHandlerDelegate.java
index e736ecae3..e572d1344 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ConverterTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ConverterTagHandlerDelegate.java
@@ -141,7 +141,7 @@ public class ConverterTagHandlerDelegate extends TagHandlerDelegate implements V
if (_delegate.getBinding() != null)
{
ve = _delegate.getBinding().getValueExpression(faceletContext, Converter.class);
- c = (Converter) ve.getValue(faceletContext);
+ c = ve.getValue(faceletContext);
}
if (c == null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ValidatorTagHandlerDelegate.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ValidatorTagHandlerDelegate.java
index 1aee47ad3..0997a318b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ValidatorTagHandlerDelegate.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/ValidatorTagHandlerDelegate.java
@@ -225,7 +225,7 @@ public class ValidatorTagHandlerDelegate extends TagHandlerDelegate
if (_delegate.getBinding() != null)
{
ve = _delegate.getBinding().getValueExpression(faceletContext, Validator.class);
- v = (Validator) ve.getValue(faceletContext);
+ v = ve.getValue(faceletContext);
}
if (v == null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ActionListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ActionListenerHandler.java
index 4f9fda97c..78d64cadb 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ActionListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ActionListenerHandler.java
@@ -83,7 +83,7 @@ public final class ActionListenerHandler extends TagHandler
}
if (this.binding != null)
{
- instance = (ActionListener) binding.getValue(facesContext.getELContext());
+ instance = binding.getValue(facesContext.getELContext());
}
if (instance == null && this.type != null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/AjaxHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/AjaxHandler.java
index 73e6a4bcf..8743acb7e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/AjaxHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/AjaxHandler.java
@@ -287,7 +287,7 @@ public class AjaxHandler extends TagHandler implements
{
FaceletContext faceletContext = (FaceletContext) FacesContext.getCurrentInstance().
getAttributes().get(FaceletContext.FACELET_CONTEXT_KEY);
- return (String) event.getValueExpression(faceletContext, String.class).getValue(faceletContext);
+ return event.getValueExpression(faceletContext, String.class).getValue(faceletContext);
}
}
}
@@ -316,7 +316,7 @@ public class AjaxHandler extends TagHandler implements
}
else
{
- eventName = (String) event.getValueExpression(faceletContext, String.class).getValue(faceletContext);
+ eventName = event.getValueExpression(faceletContext, String.class).getValue(faceletContext);
}
}
if (eventName == null)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/EventHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/EventHandler.java
index c25642034..5b354d0f9 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/EventHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/EventHandler.java
@@ -116,7 +116,7 @@ public final class EventHandler extends TagHandler
return;
}
else if (!FaceletViewDeclarationLanguage.isBuildingViewMetadata(ctx.getFacesContext()) &&
- UIViewRoot.METADATA_FACET_NAME.equals((String) parent.getAttributes().get(FacetHandler.KEY)))
+ UIViewRoot.METADATA_FACET_NAME.equals(parent.getAttributes().get(FacetHandler.KEY)))
{
// Already processed when the view metadata was created
return;
@@ -189,7 +189,7 @@ public final class EventHandler extends TagHandler
}
else
{
- value = (String) type.getValueExpression(context, String.class)
+ value = type.getValueExpression(context, String.class)
.getValue(context.getFacesContext().getELContext());
}
@@ -465,9 +465,9 @@ public final class EventHandler extends TagHandler
if (!initialStateMarked())
{
Object[] values = new Object[4];
- values[0] = (String) ( (_targetComponent != null && _targetFindComponentExpression == null) ?
- ComponentSupport.getFindComponentExpression(context, _targetComponent) :
- _targetFindComponentExpression );
+ values[0] = (_targetComponent != null && _targetFindComponentExpression == null) ?
+ ComponentSupport.getFindComponentExpression(context, _targetComponent) :
+ _targetFindComponentExpression;
values[1] = eventClass;
values[2] = methodExpZeroArg;
values[3] = methodExpOneArg;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/PhaseListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/PhaseListenerHandler.java
index f84c20445..6bb3902d2 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/PhaseListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/PhaseListenerHandler.java
@@ -72,7 +72,7 @@ public class PhaseListenerHandler extends TagHandler
if (this.binding != null)
{
- instance = (PhaseListener) binding.getValue(facesContext.getELContext());
+ instance = binding.getValue(facesContext.getELContext());
}
if (instance == null && type != null)
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ValueChangeListenerHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ValueChangeListenerHandler.java
index cd80f5ff0..b86698533 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ValueChangeListenerHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/faces/core/ValueChangeListenerHandler.java
@@ -82,7 +82,7 @@ public final class ValueChangeListenerHandler extends TagHandler
ValueChangeListener instance = null;
if (this.binding != null)
{
- instance = (ValueChangeListener) binding.getValue(facesContext.getELContext());
+ instance = binding.getValue(facesContext.getELContext());
}
if (instance == null && this.type != null)
{
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
index 3daff53d8..0057da80f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ChooseHandler.java
@@ -63,7 +63,7 @@ public final class ChooseHandler extends TagHandler implements ComponentContaine
{
throw new TagException(this.tag, "Choose Tag must have one or more When Tags");
}
- this.when = (ChooseWhenHandler[]) whenList.toArray(new ChooseWhenHandler[whenList.size()]);
+ this.when = whenList.toArray(new ChooseWhenHandler[whenList.size()]);
ArrayList<ChooseOtherwiseHandler> otherwiseList =
TagHandlerUtils.findNextByType(nextHandler, ChooseOtherwiseHandler.class);
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java
index bb398cda4..8d3bb6353 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/fn/JstlFnLibrary.java
@@ -97,7 +97,7 @@ public class JstlFnLibrary implements TagLibrary
{
if (NAMESPACE.equals(ns) || JCP_NAMESPACE.equals(ns) || SUN_NAMESPACE.equals(ns))
{
- return (Method) this.fns.get(name);
+ return this.fns.get(name);
}
return null;
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
index 0ad3413f1..43c971624 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/CompositionHandler.java
@@ -99,7 +99,7 @@ public final class CompositionHandler extends TagHandler implements TemplateClie
}
else
{
- _params = (ParamHandler[]) params.toArray(new ParamHandler[params.size()]);
+ _params = params.toArray(new ParamHandler[params.size()]);
}
}
else
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
index 84c2894cb..48dc9463b 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/DecorateHandler.java
@@ -107,7 +107,7 @@ public final class DecorateHandler extends TagHandler implements TemplateClient,
}
else
{
- _params = (ParamHandler[]) params.toArray(new ParamHandler[params.size()]);
+ _params = params.toArray(new ParamHandler[params.size()]);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
index a37b6370a..e2d26669a 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/IncludeHandler.java
@@ -91,7 +91,7 @@ public final class IncludeHandler extends TagHandler implements ComponentContain
}
else
{
- _params = (ParamHandler[]) params.toArray(new ParamHandler[params.size()]);
+ _params = params.toArray(new ParamHandler[params.size()]);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java
index 69a2ac2fc..b9539848e 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyCompositionHandler.java
@@ -95,7 +95,7 @@ public final class LegacyCompositionHandler extends TagHandler implements Templa
}
else
{
- _params = (LegacyParamHandler[]) params.toArray(new LegacyParamHandler[params.size()]);
+ _params = params.toArray(new LegacyParamHandler[params.size()]);
}
}
else
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java
index fee932959..d27268187 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyDecorateHandler.java
@@ -106,7 +106,7 @@ public final class LegacyDecorateHandler extends TagHandler implements TemplateC
}
else
{
- _params = (LegacyParamHandler[]) params.toArray(new LegacyParamHandler[params.size()]);
+ _params = params.toArray(new LegacyParamHandler[params.size()]);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java
index 85e0ae95c..63502aa8f 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/LegacyIncludeHandler.java
@@ -88,7 +88,7 @@ public final class LegacyIncludeHandler extends TagHandler implements ComponentC
}
else
{
- _params = (LegacyParamHandler[]) params.toArray(new LegacyParamHandler[params.size()]);
+ _params = params.toArray(new LegacyParamHandler[params.size()]);
}
}
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
index a4cb0a95e..31e428da2 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
@@ -187,7 +187,7 @@ public final class UIDebug extends UIComponentBase
public static boolean debugRequest(FacesContext faces)
{
- String id = (String) faces.getExternalContext().getRequestParameterMap().get(KEY);
+ String id = faces.getExternalContext().getRequestParameterMap().get(KEY);
if (id != null)
{
Object resp = faces.getExternalContext().getResponse();
diff --git a/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java b/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
index 99f4830bb..ec1bd46ed 100644
--- a/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
+++ b/impl/src/main/java/org/apache/myfaces/view/facelets/util/Classpath.java
@@ -69,7 +69,7 @@ public final class Classpath
_searchResource(all, loader, prefix, prefix, suffix);
_searchResource(all, loader, prefix + "MANIFEST.MF", prefix, suffix);
- URL[] urlArray = (URL[]) all.toArray(new URL[all.size()]);
+ URL[] urlArray = all.toArray(new URL[all.size()]);
return urlArray;
}
diff --git a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
index b3152d5e8..497c6eb19 100644
--- a/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
+++ b/impl/src/main/java/org/apache/myfaces/webapp/FacesInitializerImpl.java
@@ -801,7 +801,7 @@ public class FacesInitializerImpl implements FacesInitializer
ServiceLoader<StartupListener> loader = ServiceLoader.load(StartupListener.class,
ClassUtils.getContextClassLoader());
- Iterator<StartupListener> it = (Iterator<StartupListener>) loader.iterator();
+ Iterator<StartupListener> it = loader.iterator();
if (!it.hasNext())
{
return false;
@@ -823,7 +823,7 @@ public class FacesInitializerImpl implements FacesInitializer
*/
private void loadFacesInitViaContextParam(ServletContext servletContext)
{
- String plugins = (String) servletContext.getInitParameter(MyfacesConfig.FACES_INIT_PLUGINS);
+ String plugins = servletContext.getInitParameter(MyfacesConfig.FACES_INIT_PLUGINS);
if (plugins == null)
{
return;
diff --git a/impl/src/test/java/jakarta/faces/FacesExceptionTest.java b/impl/src/test/java/jakarta/faces/FacesExceptionTest.java
index ee58e0e77..fce2e6c3b 100644
--- a/impl/src/test/java/jakarta/faces/FacesExceptionTest.java
+++ b/impl/src/test/java/jakarta/faces/FacesExceptionTest.java
@@ -19,7 +19,6 @@
package jakarta.faces;
-import jakarta.faces.FacesException;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
diff --git a/impl/src/test/java/jakarta/faces/FactoryFinderTest.java b/impl/src/test/java/jakarta/faces/FactoryFinderTest.java
index c1254f62f..1620f9a5e 100644
--- a/impl/src/test/java/jakarta/faces/FactoryFinderTest.java
+++ b/impl/src/test/java/jakarta/faces/FactoryFinderTest.java
@@ -19,7 +19,6 @@
package jakarta.faces;
-import jakarta.faces.FactoryFinder;
import java.lang.reflect.Field;
import java.util.List;
import java.util.Map;
diff --git a/impl/src/test/java/jakarta/faces/application/MockApplication.java b/impl/src/test/java/jakarta/faces/application/MockApplication.java
index 0d309009a..491cd2768 100644
--- a/impl/src/test/java/jakarta/faces/application/MockApplication.java
+++ b/impl/src/test/java/jakarta/faces/application/MockApplication.java
@@ -18,10 +18,6 @@
*/
package jakarta.faces.application;
-import jakarta.faces.application.ViewHandler;
-import jakarta.faces.application.Application;
-import jakarta.faces.application.NavigationHandler;
-import jakarta.faces.application.StateManager;
import jakarta.faces.FacesException;
import jakarta.faces.component.UIComponent;
import jakarta.faces.convert.Converter;
diff --git a/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java b/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java
index 03f8fc00c..21040a31a 100644
--- a/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java
+++ b/impl/src/test/java/jakarta/faces/application/ViewHandlerTest.java
@@ -18,7 +18,6 @@
*/
package jakarta.faces.application;
-import jakarta.faces.application.ViewHandler;
import static org.easymock.EasyMock.*;
import java.io.IOException;
@@ -141,10 +140,10 @@ public class ViewHandlerTest
ViewHandler handler = _mocksControl
.createMock(
ViewHandler.class,
- new Method[] { ViewHandler.class
- .getMethod(
- "calculateCharacterEncoding",
- new Class[] { FacesContext.class }) });
+ ViewHandler.class
+ .getMethod(
+ "calculateCharacterEncoding",
+ FacesContext.class));
expect(handler.calculateCharacterEncoding(_facesContext)).andReturn("xxx");
_externalContext.setRequestCharacterEncoding(eq("xxx"));
_mocksControl.replay();
@@ -163,10 +162,10 @@ public class ViewHandlerTest
final ViewHandler handler = _mocksControl
.createMock(
ViewHandler.class,
- new Method[] { ViewHandler.class
- .getMethod(
- "calculateCharacterEncoding",
- new Class[] { FacesContext.class }) });
+ ViewHandler.class
+ .getMethod(
+ "calculateCharacterEncoding",
+ FacesContext.class));
expect(handler.calculateCharacterEncoding(_facesContext)).andReturn("xxx");
_externalContext.setRequestCharacterEncoding(eq("xxx"));
expectLastCall().andThrow(new UnsupportedEncodingException());
diff --git a/impl/src/test/java/jakarta/faces/component/AbstractUIComponentBaseTest.java b/impl/src/test/java/jakarta/faces/component/AbstractUIComponentBaseTest.java
index 6d38a1c28..03f138ebb 100644
--- a/impl/src/test/java/jakarta/faces/component/AbstractUIComponentBaseTest.java
+++ b/impl/src/test/java/jakarta/faces/component/AbstractUIComponentBaseTest.java
@@ -18,7 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
import java.lang.reflect.Method;
import java.util.Collection;
import java.util.ArrayList;
@@ -72,7 +71,7 @@ public abstract class AbstractUIComponentBaseTest
protected Collection<Method> getMockedMethods() throws Exception
{
Collection<Method> methods = new ArrayList<Method>();
- methods.add(UIComponentBase.class.getDeclaredMethod("getRenderer", new Class[]{FacesContext.class}));
+ methods.add(UIComponentBase.class.getDeclaredMethod("getRenderer", FacesContext.class));
methods.add(UIComponentBase.class.getDeclaredMethod("getFacesContext", (Class<?>[])null));
methods.add(UIComponentBase.class.getDeclaredMethod("getParent", (Class<?>[])null));
diff --git a/impl/src/test/java/jakarta/faces/component/AbstractUIComponentPropertyTest.java b/impl/src/test/java/jakarta/faces/component/AbstractUIComponentPropertyTest.java
index 39df945d5..1657ef838 100644
--- a/impl/src/test/java/jakarta/faces/component/AbstractUIComponentPropertyTest.java
+++ b/impl/src/test/java/jakarta/faces/component/AbstractUIComponentPropertyTest.java
@@ -18,7 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.beans.PropertyDescriptor;
diff --git a/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java b/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java
index 0a6bb3ff9..93e57934a 100644
--- a/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java
+++ b/impl/src/test/java/jakarta/faces/component/InvokeOnComponentTest.java
@@ -18,12 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIData;
-import jakarta.faces.component.UIColumn;
-import jakarta.faces.component.ContextCallback;
-import jakarta.faces.component.UIForm;
-import jakarta.faces.component.UIInput;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java
index 8230808b1..be09c3325 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentBaseGetClientIdTest.java
@@ -18,13 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UIPanel;
-import jakarta.faces.component.UINamingContainer;
-import jakarta.faces.component.NamingContainer;
import jakarta.faces.FacesException;
import jakarta.faces.context.FacesContext;
import jakarta.faces.render.Renderer;
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java
index 7beea8c43..3fd6b224f 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentBaseProcessSaveRestoreStateTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.UIComponent;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
@@ -77,9 +75,9 @@ public class UIComponentBaseProcessSaveRestoreStateTest extends AbstractUICompon
methods.add(UIComponentBase.class.getDeclaredMethod("getChildren", (Class<?>[])null));
methods.add(UIComponentBase.class.getDeclaredMethod("getFacetCount", (Class<?>[])null));
methods.add(UIComponentBase.class.getDeclaredMethod("getChildCount", (Class<?>[])null));
- methods.add(UIComponentBase.class.getDeclaredMethod("saveState", new Class[]{FacesContext.class}));
- methods.add(UIComponentBase.class.getDeclaredMethod("restoreState", new Class[]{FacesContext.class,
- Object.class}));
+ methods.add(UIComponentBase.class.getDeclaredMethod("saveState", FacesContext.class));
+ methods.add(UIComponentBase.class.getDeclaredMethod("restoreState", FacesContext.class,
+ Object.class));
return methods;
}
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentBaseTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentBaseTest.java
index 648b2b25a..31919c0f3 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentBaseTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentBaseTest.java
@@ -19,9 +19,6 @@
package jakarta.faces.component;
-import jakarta.faces.component._ComponentAttributesMap;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.UIComponent;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.same;
@@ -83,7 +80,7 @@ public class UIComponentBaseTest
try
{
Collection<Method> methods = new ArrayList<Method>();
- methods.add(UIComponentBase.class.getDeclaredMethod("getRenderer", new Class[] { FacesContext.class }));
+ methods.add(UIComponentBase.class.getDeclaredMethod("getRenderer", FacesContext.class));
methods.add(UIComponentBase.class.getDeclaredMethod("getFacesContext", (Class<?>[])null));
methods.add(UIComponentBase.class.getDeclaredMethod("getParent", (Class<?>[])null));
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentEncodeAllTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentEncodeAllTest.java
index 0784d66b9..7c73edb27 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentEncodeAllTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentEncodeAllTest.java
@@ -18,7 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
@@ -50,15 +49,15 @@ public class UIComponentEncodeAllTest extends AbstractJsfTestCase
//_facesContext = _mocksControl.createMock(FacesContext.class);
Collection<Method> mockedMethods = new ArrayList<Method>();
Class<UIComponent> clazz = UIComponent.class;
- mockedMethods.add(clazz.getDeclaredMethod("pushComponentToEL", new Class[] { FacesContext.class, UIComponent.class }));
+ mockedMethods.add(clazz.getDeclaredMethod("pushComponentToEL", FacesContext.class, UIComponent.class));
mockedMethods.add(clazz.getDeclaredMethod("isRendered", (Class<?>[])null));
- mockedMethods.add(clazz.getDeclaredMethod("popComponentFromEL", new Class[] { FacesContext.class }));
- mockedMethods.add(clazz.getDeclaredMethod("encodeBegin", new Class[] { FacesContext.class }));
+ mockedMethods.add(clazz.getDeclaredMethod("popComponentFromEL", FacesContext.class));
+ mockedMethods.add(clazz.getDeclaredMethod("encodeBegin", FacesContext.class));
mockedMethods.add(clazz.getDeclaredMethod("getRendersChildren", (Class<?>[])null));
- mockedMethods.add(clazz.getDeclaredMethod("encodeChildren", new Class[] { FacesContext.class }));
+ mockedMethods.add(clazz.getDeclaredMethod("encodeChildren", FacesContext.class));
mockedMethods.add(clazz.getDeclaredMethod("getChildren", (Class<?>[])null));
mockedMethods.add(clazz.getDeclaredMethod("getChildCount", (Class<?>[])null));
- mockedMethods.add(clazz.getDeclaredMethod("encodeEnd", new Class[] { FacesContext.class }));
+ mockedMethods.add(clazz.getDeclaredMethod("encodeEnd", FacesContext.class));
_testimpl = _mocksControl.createMock(clazz, mockedMethods.toArray(new Method[mockedMethods.size()]));
_mocksControl.checkOrder(true);
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java
index 1683dfc22..ff15e2ff0 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentFindComponentTest.java
@@ -18,15 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UICommand;
-import jakarta.faces.component.UIColumn;
-import jakarta.faces.component.UIData;
-import jakarta.faces.component.UINamingContainer;
-import jakarta.faces.component.UIPanel;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java
index 8b7140f66..024b5eebe 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentInvokeOnComponentTest.java
@@ -18,10 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.ContextCallback;
-import jakarta.faces.component.UIPanel;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Collection;
@@ -55,7 +51,7 @@ public class UIComponentInvokeOnComponentTest extends AbstractJsfTestCase
_mocksControl = EasyMock.createNiceControl();
Collection<Method> mockedMethods = new ArrayList<Method>();
Class<UIComponent> clazz = UIComponent.class;
- mockedMethods.add(clazz.getDeclaredMethod("getClientId", new Class[] { FacesContext.class }));
+ mockedMethods.add(clazz.getDeclaredMethod("getClientId", FacesContext.class));
mockedMethods.add(clazz.getDeclaredMethod("getFacetsAndChildren", (Class<?>[])null));
_testimpl = _mocksControl.createMock(clazz, mockedMethods.toArray(new Method[mockedMethods.size()]));
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentMock.java b/impl/src/test/java/jakarta/faces/component/UIComponentMock.java
index f2c567527..0ce9c187d 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentMock.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentMock.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-
public class UIComponentMock extends UIComponentBase
{
@Override
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentTest.java
index 0a3905752..1a26d057e 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UIInput;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.same;
@@ -72,7 +70,7 @@ public class UIComponentTest extends UIComponentTestBase
{
Collection<Method> mockedMethods = new ArrayList<Method>();
Class<UIComponent> clazz = UIComponent.class;
- mockedMethods.add(clazz.getDeclaredMethod("getClientId", new Class[] { FacesContext.class }));
+ mockedMethods.add(clazz.getDeclaredMethod("getClientId", FacesContext.class));
final UIComponent testimpl = _mocksControl.createMock(clazz, mockedMethods.toArray(new Method[mockedMethods
.size()]));
_mocksControl.checkOrder(true);
diff --git a/impl/src/test/java/jakarta/faces/component/UIComponentValueExpressionTest.java b/impl/src/test/java/jakarta/faces/component/UIComponentValueExpressionTest.java
index f9b8ba171..db696fa74 100644
--- a/impl/src/test/java/jakarta/faces/component/UIComponentValueExpressionTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIComponentValueExpressionTest.java
@@ -17,7 +17,6 @@
* under the License.
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
import static org.easymock.EasyMock.expect;
import java.lang.reflect.Method;
diff --git a/impl/src/test/java/jakarta/faces/component/UIDataRowStateTest.java b/impl/src/test/java/jakarta/faces/component/UIDataRowStateTest.java
index a20988278..b6f7e8094 100644
--- a/impl/src/test/java/jakarta/faces/component/UIDataRowStateTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIDataRowStateTest.java
@@ -15,11 +15,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIColumn;
-import jakarta.faces.component.UIData;
-import jakarta.faces.component.UIInput;
import java.util.ArrayList;
import java.util.List;
import jakarta.faces.component.html.HtmlColumn;
diff --git a/impl/src/test/java/jakarta/faces/component/UIDataTest.java b/impl/src/test/java/jakarta/faces/component/UIDataTest.java
index 9b08b43bc..939a9bd40 100644
--- a/impl/src/test/java/jakarta/faces/component/UIDataTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIDataTest.java
@@ -18,14 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.component.UIOutput;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UICommand;
-import jakarta.faces.component.UIColumn;
-import jakarta.faces.component.UIData;
-import jakarta.faces.component.ContextCallback;
-import jakarta.faces.component.UIInput;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -519,7 +511,7 @@ public class UIDataTest extends AbstractJsfTestCase
IMocksControl control = EasyMock.createControl();
VisitContext visitContextMock = control.createMock(VisitContext.class);
EasyMock.expect(visitContextMock.getFacesContext()).andReturn(facesContext).anyTimes();
- EasyMock.expect(visitContextMock.getHints()).andReturn(Collections.<VisitHint>emptySet()).anyTimes();
+ EasyMock.expect(visitContextMock.getHints()).andReturn(Collections.emptySet()).anyTimes();
Collection<String> subtreeIdsToVisit = new ArrayList<String>();
subtreeIdsToVisit.add("1");
EasyMock.expect(visitContextMock.getSubtreeIdsToVisit(uidata)).andReturn(subtreeIdsToVisit);
@@ -936,7 +928,7 @@ public class UIDataTest extends AbstractJsfTestCase
baos.flush();
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- Object restoredState = (Object) ois.readObject();
+ Object restoredState = ois.readObject();
oos.close();
ois.close();
@@ -1060,7 +1052,7 @@ public class UIDataTest extends AbstractJsfTestCase
baos.flush();
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- Object restoredState = (Object) ois.readObject();
+ Object restoredState = ois.readObject();
oos.close();
ois.close();
@@ -1161,7 +1153,7 @@ public class UIDataTest extends AbstractJsfTestCase
baos.flush();
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- Object restoredState = (Object) ois.readObject();
+ Object restoredState = ois.readObject();
oos.close();
ois.close();
diff --git a/impl/src/test/java/jakarta/faces/component/UIInputTest.java b/impl/src/test/java/jakarta/faces/component/UIInputTest.java
index ad48fbebb..6b966282e 100644
--- a/impl/src/test/java/jakarta/faces/component/UIInputTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIInputTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UIInput;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
diff --git a/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java b/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java
index 107f4bc8a..b38769799 100644
--- a/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIOutputPSSTest.java
@@ -15,9 +15,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.StateHolder;
-import jakarta.faces.component.PartialStateHolder;
-import jakarta.faces.component.UIOutput;
import java.io.Serializable;
import jakarta.faces.context.FacesContext;
import jakarta.faces.convert.Converter;
diff --git a/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java b/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java
index d049f9d94..1da8bd1f2 100644
--- a/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UISelectItemsTest.java
@@ -18,7 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UISelectOne;
import org.apache.myfaces.core.api.shared.SelectItemsIterator;
import java.util.ArrayList;
import java.util.List;
diff --git a/impl/src/test/java/jakarta/faces/component/UISelectManyTest.java b/impl/src/test/java/jakarta/faces/component/UISelectManyTest.java
index b49d3f260..e6153062a 100644
--- a/impl/src/test/java/jakarta/faces/component/UISelectManyTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UISelectManyTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UISelectMany;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -173,8 +171,7 @@ public class UISelectManyTest extends AbstractJsfTestCase
three.setItemValue("3");
children.add(three);
- selectMany.validateValue(facesContext, Arrays.asList(new String[] {
- "2", "3" }));
+ selectMany.validateValue(facesContext, Arrays.asList("2", "3"));
Assertions.assertTrue(selectMany.isValid());
}
diff --git a/impl/src/test/java/jakarta/faces/component/UISelectOneTest.java b/impl/src/test/java/jakarta/faces/component/UISelectOneTest.java
index 8fb7f72eb..8f6de721a 100644
--- a/impl/src/test/java/jakarta/faces/component/UISelectOneTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UISelectOneTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UISelectOne;
import java.util.List;
import java.util.Locale;
diff --git a/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java b/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java
index f28ccd1c5..13f64a723 100644
--- a/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIViewParameterTest.java
@@ -18,7 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIViewParameter;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
diff --git a/impl/src/test/java/jakarta/faces/component/UIViewRootTest.java b/impl/src/test/java/jakarta/faces/component/UIViewRootTest.java
index d7aa0475c..aea5c1bd7 100644
--- a/impl/src/test/java/jakarta/faces/component/UIViewRootTest.java
+++ b/impl/src/test/java/jakarta/faces/component/UIViewRootTest.java
@@ -18,9 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.component.UICommand;
import static org.easymock.EasyMock.aryEq;
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
@@ -89,7 +86,7 @@ public class UIViewRootTest extends AbstractJsfTestCase
_mocksControl = EasyMock.createControl();
_externalContext = _mocksControl.createMock(ExternalContext.class);
- _facesContext = (MockFacesContext12) facesContext;
+ _facesContext = facesContext;
_application = _mocksControl.createMock(Application.class);
_lifecycleFactory = _mocksControl.createMock(LifecycleFactory.class);
_testimpl = new UIViewRoot();
@@ -442,8 +439,8 @@ public class UIViewRootTest extends AbstractJsfTestCase
if (expectSuperCall)
{
- _testimpl = _mocksControl.createMock(UIViewRoot.class, new Method[]{UIViewRoot.class.getMethod(
- "isRendered", new Class[0])});
+ _testimpl = _mocksControl.createMock(UIViewRoot.class, UIViewRoot.class.getMethod(
+ "isRendered"));
}
MethodExpression beforeListener = _mocksControl.createMock(MethodExpression.class);
@@ -453,8 +450,8 @@ public class UIViewRootTest extends AbstractJsfTestCase
_testimpl.setAfterPhaseListener(afterListener);
Method[] mockedMethods = new Method[] {
- PhaseListener.class.getMethod("beforePhase", new Class[] { PhaseEvent.class }),
- PhaseListener.class.getMethod("afterPhase", new Class[] { PhaseEvent.class }) };
+ PhaseListener.class.getMethod("beforePhase", PhaseEvent.class),
+ PhaseListener.class.getMethod("afterPhase", PhaseEvent.class) };
PhaseListener phaseListener = _mocksControl.createMock(phaseListenerClasses.get(phaseId), mockedMethods);
_testimpl.addPhaseListener(phaseListener);
diff --git a/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java b/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java
index ef743fd9c..963373449 100644
--- a/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_Delta2StateHelperTest.java
@@ -18,9 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.UIViewRoot;
-import jakarta.faces.component.StateHelper;
import java.util.List;
import java.util.Map;
@@ -127,7 +124,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
UITestComponent a = new UITestComponent();
UITestComponent b = new UITestComponent();
- Object state1 = (Object) a.saveState(facesContext);
+ Object state1 = a.saveState(facesContext);
b.restoreState(facesContext, state1);
@@ -145,7 +142,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
a.setTestProperty1("testProperty1");
a.setTestProperty2(null);
- Object state1 = (Object) a.saveState(facesContext);
+ Object state1 = a.saveState(facesContext);
b.restoreState(facesContext, state1);
@@ -174,7 +171,7 @@ public class _Delta2StateHelperTest extends AbstractComponentTest
a.setTestProperty2("testProperty2");
a.setTestProperty1(null);
- Object state1 = (Object) a.saveState(facesContext);
+ Object state1 = a.saveState(facesContext);
b.restoreState(facesContext, state1);
diff --git a/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java b/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java
index 007f48d1e..f522a807f 100644
--- a/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_DeltaFacesListenerListTest.java
@@ -18,9 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.StateHolder;
-import jakarta.faces.component.PartialStateHolder;
import java.util.Arrays;
import jakarta.faces.context.FacesContext;
import jakarta.faces.event.FacesListener;
diff --git a/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java b/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java
index d5b445b08..71447b72f 100644
--- a/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_DeltaListTest.java
@@ -18,11 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponentBase;
-import jakarta.faces.component.StateHolder;
-import jakarta.faces.component.PartialStateHolder;
-import jakarta.faces.component._AttachedDeltaWrapper;
-import jakarta.faces.component._DeltaList;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Iterator;
@@ -163,7 +158,7 @@ public class _DeltaListTest extends AbstractComponentTest
private Object saveFacesListenersList(FacesContext facesContext)
{
- PartialStateHolder holder = (PartialStateHolder) _facesListeners;
+ PartialStateHolder holder = _facesListeners;
if (initialStateMarked() && _facesListeners != null && holder.initialStateMarked())
{
Object attachedState = holder.saveState(facesContext);
diff --git a/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java b/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java
index 9030303db..dd7a1c037 100644
--- a/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java
+++ b/impl/src/test/java/jakarta/faces/component/_SharedRendererUtilsTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.component;
-import jakarta.faces.component.UIComponent;
-import jakarta.faces.component.UISelectMany;
import org.apache.myfaces.core.api.shared.SharedRendererUtils;
import java.util.Arrays;
import java.util.Collection;
diff --git a/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java b/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java
index b2670b422..7022eeb38 100644
--- a/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/DateTimeConverterTest.java
@@ -19,8 +19,6 @@
package jakarta.faces.convert;
-import jakarta.faces.convert.DateTimeConverter;
-import jakarta.faces.convert.ConverterException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Locale;
diff --git a/impl/src/test/java/jakarta/faces/convert/DoubleConverterTest.java b/impl/src/test/java/jakarta/faces/convert/DoubleConverterTest.java
index 43c7929ea..dbcdbd618 100644
--- a/impl/src/test/java/jakarta/faces/convert/DoubleConverterTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/DoubleConverterTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.convert;
-import jakarta.faces.convert.ConverterException;
-import jakarta.faces.convert.DoubleConverter;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.jupiter.api.Test;
diff --git a/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java b/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java
index 017445289..f66f21da1 100644
--- a/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/EnumConverterTest.java
@@ -19,9 +19,6 @@
package jakarta.faces.convert;
-import jakarta.faces.convert.Converter;
-import jakarta.faces.convert.ConverterException;
-import jakarta.faces.convert.EnumConverter;
import jakarta.faces.component.UIInput;
import jakarta.faces.context.FacesContext;
@@ -48,7 +45,7 @@ public class EnumConverterTest extends AbstractJsfTestCase
return "enum value";
}
- };
+ }
private EnumConverter converter;
diff --git a/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java b/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java
index 5afaece80..ba03c4968 100644
--- a/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java
+++ b/impl/src/test/java/jakarta/faces/convert/NumberConverterTest.java
@@ -19,8 +19,6 @@
package jakarta.faces.convert;
-import jakarta.faces.convert.NumberConverter;
-import jakarta.faces.convert.ConverterException;
import java.math.BigInteger;
import java.util.Locale;
import jakarta.el.ValueExpression;
diff --git a/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java b/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
index 1ec6acc63..c8c2f2644 100644
--- a/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
+++ b/impl/src/test/java/jakarta/faces/event/MethodExpressionValueChangeListenerTest.java
@@ -18,8 +18,6 @@
*/
package jakarta.faces.event;
-import jakarta.faces.event.ValueChangeEvent;
-import jakarta.faces.event.MethodExpressionValueChangeListener;
import java.lang.reflect.Field;
import java.util.Arrays;
diff --git a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplAnnotationTest.java b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplAnnotationTest.java
index 85e95b2d5..2179000e8 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplAnnotationTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplAnnotationTest.java
@@ -64,7 +64,7 @@ public class ApplicationImplAnnotationTest extends AbstractJsfConfigurableMockTe
@Override
protected void setFactories() throws Exception
{
- ((MockServletContext)servletContext).addInitParameter(
+ servletContext.addInitParameter(
"jakarta.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE", "true");
super.setFactories();
FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY,
diff --git a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
index a0ef6e905..0bc884472 100644
--- a/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/ApplicationImplTest.java
@@ -213,7 +213,7 @@ public class ApplicationImplTest
Assertions.assertSame(bundle, myapp.getResourceBundle(facesContext, var));
}
- private enum MyEnum {VALUE1, VALUE2};
+ private enum MyEnum {VALUE1, VALUE2}
/**
* Test method for
@@ -234,9 +234,9 @@ public class ApplicationImplTest
private enum AnotherEnum implements EnumCoded {
VALUE1, VALUE2;
public int getCode() {return 0;}
- };
-
- public static class EnumCodedTestConverter implements Converter
+ }
+
+ public static class EnumCodedTestConverter implements Converter
{
public EnumCodedTestConverter()
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
index c0e81e1ad..334e219e7 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/AbstractStateUtilsTest.java
@@ -20,7 +20,6 @@ package org.apache.myfaces.application.viewstate;
* Running this TestCase directly will blow up.
*/
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.apache.myfaces.spi.impl.DefaultSerialFactory;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
@@ -132,7 +131,7 @@ public abstract class AbstractStateUtilsTest extends AbstractJsfTestCase impleme
public void testConstructionNegative()
{
String constructed = StateUtils.construct(TEST_DATA, externalContext);
- constructed = constructed.substring(1, constructed.length());
+ constructed = constructed.substring(1);
try
{
Object object = StateUtils.reconstruct(constructed, externalContext);
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
index 0063987e6..51e2290f7 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsAES_CBCTest.java
@@ -20,7 +20,6 @@
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.junit.jupiter.api.BeforeEach;
/**
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
index 4055fddd8..e57eb0979 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsBlowfish_ECBTest.java
@@ -20,7 +20,6 @@
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.junit.jupiter.api.BeforeEach;
public class CachedStateUtilsBlowfish_ECBTest extends AbstractStateUtilsTest
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
index b93fa35bd..03726289c 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/CachedStateUtilsDefaultTest.java
@@ -20,7 +20,6 @@
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.junit.jupiter.api.BeforeEach;
public class CachedStateUtilsDefaultTest extends AbstractStateUtilsTest
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
index 6d186d2cb..4f86851af 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/SecretKeyCacheTest.java
@@ -17,7 +17,6 @@
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import javax.crypto.SecretKey;
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
index f32da79c0..3ff5136ea 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsAES_CBCTest.java
@@ -15,7 +15,6 @@
*/
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.junit.jupiter.api.BeforeEach;
/**
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
index b7b5ad1b3..b8fc167c3 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsBlowfish_ECBTest.java
@@ -15,7 +15,6 @@
*/
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.junit.jupiter.api.BeforeEach;
/**
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
index 346c555f2..5c4a0fe0f 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsDefaultTest.java
@@ -15,7 +15,6 @@
*/
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.junit.jupiter.api.BeforeEach;
/**
diff --git a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
index bdf2e1e88..89860a1fa 100644
--- a/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
+++ b/impl/src/test/java/org/apache/myfaces/application/viewstate/StateUtilsTripleDES_ECBTest.java
@@ -15,7 +15,6 @@
*/
package org.apache.myfaces.application.viewstate;
-import org.apache.myfaces.application.viewstate.StateUtils;
import org.junit.jupiter.api.BeforeEach;
/**
diff --git a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
index bb93bd3c4..8631054a8 100644
--- a/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
+++ b/impl/src/test/java/org/apache/myfaces/config/OrderingFacesConfigTest.java
@@ -50,7 +50,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
public void printFacesConfigList(String label, List<FacesConfig> appConfigResources)
{
- System.out.println("");
+ System.out.println();
System.out.print(""+label+": [");
for (int i = 0; i < appConfigResources.size();i++)
{
@@ -536,7 +536,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
{
DefaultFacesConfigurationMerger merger = new DefaultFacesConfigurationMerger();
- System.out.println("");
+ System.out.println();
System.out.print("Start List: [");
for (int i = 0; i < appConfigResources.size();i++)
{
@@ -816,7 +816,7 @@ public class OrderingFacesConfigTest extends AbstractJsfTestCase
{
DefaultFacesConfigurationMerger merger = new DefaultFacesConfigurationMerger();
- System.out.println("");
+ System.out.println();
System.out.print("Start List: [");
for (int i = 0; i < appConfigResources.size();i++)
{
diff --git a/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java b/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java
index 1f84cf233..7be350f95 100644
--- a/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java
+++ b/impl/src/test/java/org/apache/myfaces/context/flash/FlashImplTest.java
@@ -126,7 +126,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -142,7 +142,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -165,7 +165,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -210,7 +210,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -226,7 +226,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -254,7 +254,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request is not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
// Note that doPrePhaseActions() is called on RESTORE_VIEW even
@@ -287,7 +287,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -333,7 +333,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -349,7 +349,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -383,7 +383,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assertions.assertEquals(0, facesContext.getMessageList().size());
@@ -410,7 +410,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assertions.assertEquals(0, facesContext.getMessageList().size());
@@ -444,7 +444,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -460,7 +460,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -498,7 +498,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request is not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assertions.assertEquals(0, facesContext.getMessageList().size());
@@ -528,7 +528,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assertions.assertEquals(0, facesContext.getMessageList().size());
@@ -565,7 +565,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -581,7 +581,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -619,7 +619,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request is not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assertions.assertEquals(0, facesContext.getMessageList().size());
@@ -657,7 +657,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assertions.assertEquals(0, facesContext.getMessageList().size());
@@ -684,7 +684,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// now the FacesContext must contain 0 messages (new request, new FacesContext)
Assertions.assertEquals(0, facesContext.getMessageList().size());
@@ -769,7 +769,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -785,7 +785,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -812,7 +812,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -845,7 +845,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -861,7 +861,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -886,7 +886,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -919,7 +919,7 @@ public class FlashImplTest extends AbstractJsfTestCase
// initial request ----------------------------------------------------
// this request is a normal GET request, and thus not a postback
- ((MockFacesContext20) facesContext).setPostback(false);
+ facesContext.setPostback(false);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -935,7 +935,7 @@ public class FlashImplTest extends AbstractJsfTestCase
_simulateNewRequest();
// this request should be a postback
- ((MockFacesContext20) facesContext).setPostback(true);
+ facesContext.setPostback(true);
// simulate Faces lifecycle
facesContext.setCurrentPhaseId(PhaseId.RESTORE_VIEW);
@@ -1031,7 +1031,7 @@ public class FlashImplTest extends AbstractJsfTestCase
Assertions.assertTrue(_flash.containsValue("flashvalue"));
Assertions.assertEquals(new HashSet<String>(Arrays.asList("flashkey")), _flash.keySet());
Assertions.assertEquals("flashvalue", _flash.get("flashkey"));
- Assertions.assertTrue(_flash.values().contains("flashvalue"));
+ Assertions.assertTrue(_flash.containsValue("flashvalue"));
}
/**
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/ContentTypeUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/ContentTypeUtilsTest.java
index 9e86cb6fb..79221aa97 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/ContentTypeUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/ContentTypeUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.renderkit;
-import org.apache.myfaces.renderkit.ContentTypeUtils;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
index 42ba6d87c..388ed672b 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/RendererUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.renderkit;
-import org.apache.myfaces.renderkit.RendererUtils;
import java.io.IOException;
import java.io.StringWriter;
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
index d0ec299ab..f674a370f 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlLabelRendererTest.java
@@ -137,7 +137,7 @@ public class HtmlLabelRendererTest extends AbstractJsfConfigurableMockTestCase
*/
protected String getPageContents()
{
- return ((StringWriter) writer.getWriter()).toString();
+ return writer.getWriter().toString();
}
@Test
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
index f26dea7bc..d9bad3f72 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlTextRendererTest.java
@@ -287,7 +287,7 @@ public class HtmlTextRendererTest extends AbstractJsfTestCase
@Test
public void testClientBehaviorUserCodeJavaScriptDoubleEscaping()
{
- inputText.getAttributes().put("onchange", "var test = \'a\\\'b\'; alert(test);");
+ inputText.getAttributes().put("onchange", "var test = 'a\\'b'; alert(test);");
inputText.addClientBehavior("change", new AjaxBehavior());
try
{
diff --git a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
index e10414197..e3b6b4023 100644
--- a/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
+++ b/impl/src/test/java/org/apache/myfaces/renderkit/html/util/HTMLEncoderTest.java
@@ -16,7 +16,6 @@
package org.apache.myfaces.renderkit.html.util;
-import org.apache.myfaces.renderkit.html.util.HTMLEncoder;
import java.io.CharArrayWriter;
import java.io.IOException;
diff --git a/impl/src/test/java/org/apache/myfaces/resource/ResourceLoaderUtilsTest.java b/impl/src/test/java/org/apache/myfaces/resource/ResourceLoaderUtilsTest.java
index 9400c59c2..76e3237e4 100644
--- a/impl/src/test/java/org/apache/myfaces/resource/ResourceLoaderUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/resource/ResourceLoaderUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.resource;
-import org.apache.myfaces.resource.ResourceLoaderUtils;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/resource/ResourceValidationUtilsTest.java b/impl/src/test/java/org/apache/myfaces/resource/ResourceValidationUtilsTest.java
index 1d36b36a2..f10fcf08b 100644
--- a/impl/src/test/java/org/apache/myfaces/resource/ResourceValidationUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/resource/ResourceValidationUtilsTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.resource;
-import org.apache.myfaces.resource.ResourceValidationUtils;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
index f9190d2ad..106867efe 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/AbstractMyFacesTestCase.java
@@ -765,7 +765,7 @@ public abstract class AbstractMyFacesTestCase
}
Constructor<?> plmc = PHASE_MANAGER_CLASS.getDeclaredConstructor(
- new Class[]{Lifecycle.class, FacesContext.class, PhaseListener[].class});
+ Lifecycle.class, FacesContext.class, PhaseListener[].class);
if (!plmc.isAccessible())
{
plmc.setAccessible(true);
@@ -1024,7 +1024,7 @@ public abstract class AbstractMyFacesTestCase
}
Constructor<?> plmc = PHASE_MANAGER_CLASS.getDeclaredConstructor(
- new Class[]{Lifecycle.class, FacesContext.class, PhaseListener[].class});
+ Lifecycle.class, FacesContext.class, PhaseListener[].class);
if (!plmc.isAccessible())
{
plmc.setAccessible(true);
@@ -1144,7 +1144,7 @@ public abstract class AbstractMyFacesTestCase
}
Constructor<?> plmc = PHASE_MANAGER_CLASS.getDeclaredConstructor(
- new Class[]{Lifecycle.class, FacesContext.class, PhaseListener[].class});
+ Lifecycle.class, FacesContext.class, PhaseListener[].class);
if (!plmc.isAccessible())
{
plmc.setAccessible(true);
@@ -1154,8 +1154,7 @@ public abstract class AbstractMyFacesTestCase
facesContext.getAttributes().put(PHASE_MANAGER_INSTANCE, phaseManager);
}
- executePhaseMethod = lifecycleImpl.getClass().getDeclaredMethod("executePhase", new Class[]{
- FacesContext.class, PHASE_EXECUTOR_CLASS, PHASE_MANAGER_CLASS});
+ executePhaseMethod = lifecycleImpl.getClass().getDeclaredMethod("executePhase", FacesContext.class, PHASE_EXECUTOR_CLASS, PHASE_MANAGER_CLASS);
if (!executePhaseMethod.isAccessible())
{
executePhaseMethod.setAccessible(true);
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/mock/DefaultContext.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/DefaultContext.java
index e26096cbe..dab6f2eec 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/mock/DefaultContext.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/DefaultContext.java
@@ -528,7 +528,7 @@ public class DefaultContext implements Context, Serializable
for (Iterator iterator = subBindings.entrySet().iterator(); iterator.hasNext();)
{
Map.Entry entry = (Map.Entry) iterator.next();
- String subName = segment + "/" + (String) entry.getKey();
+ String subName = segment + "/" + entry.getKey();
Object bound = entry.getValue();
treeBindings.put(subName, bound);
newBindings.put(subName, bound);
diff --git a/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
index 6008c1692..bfa9531d7 100644
--- a/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
+++ b/impl/src/test/java/org/apache/myfaces/test/core/mock/MockMyFacesClient.java
@@ -278,7 +278,7 @@ public class MockMyFacesClient
protected void applyCookiesFromPreviousRequest()
{
- MockHttpServletResponse response = (MockHttpServletResponse) testCase.getResponse();
+ MockHttpServletResponse response = testCase.getResponse();
if (response.getCookies() != null && !response.getCookies().isEmpty())
{
for (Map.Entry<String, Cookie> entry : response.getCookies().entrySet())
diff --git a/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java b/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
index 7b63f1b5e..6110480a3 100644
--- a/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/MessageUtilsTest.java
@@ -20,7 +20,6 @@ import java.util.ResourceBundle;
import jakarta.faces.application.FacesMessage;
-import org.apache.myfaces.util.MessageUtils;
import org.apache.myfaces.test.base.junit.AbstractJsfTestCase;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
diff --git a/impl/src/test/java/org/apache/myfaces/util/lang/AbstractAttributeMapTest.java b/impl/src/test/java/org/apache/myfaces/util/lang/AbstractAttributeMapTest.java
index ea47659e5..6eb95edf6 100644
--- a/impl/src/test/java/org/apache/myfaces/util/lang/AbstractAttributeMapTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/lang/AbstractAttributeMapTest.java
@@ -18,7 +18,6 @@
*/
package org.apache.myfaces.util.lang;
-import org.apache.myfaces.util.lang.AbstractAttributeMap;
import java.util.Collections;
import java.util.Enumeration;
import java.util.HashMap;
@@ -57,7 +56,7 @@ public class AbstractAttributeMapTest
public void testValues() throws Exception
{
_testimpl.put("myKey", "myValue");
- Assertions.assertTrue(_testimpl.values().contains("myValue"));
+ Assertions.assertTrue(_testimpl.containsValue("myValue"));
}
private static final class TestAttributeMap extends AbstractAttributeMap<Object>
diff --git a/impl/src/test/java/org/apache/myfaces/util/lang/XorShiftRandomTest.java b/impl/src/test/java/org/apache/myfaces/util/lang/XorShiftRandomTest.java
index ca4579dd4..93b833397 100644
--- a/impl/src/test/java/org/apache/myfaces/util/lang/XorShiftRandomTest.java
+++ b/impl/src/test/java/org/apache/myfaces/util/lang/XorShiftRandomTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.myfaces.util.lang;
-import org.apache.myfaces.util.lang.ThreadsafeXorShiftRandom;
-import org.apache.myfaces.util.lang.XorShiftRandom;
import org.junit.jupiter.api.Test;
import java.util.HashSet;
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
index cae2e3ba0..a4d83794e 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/ExceptionTestCase.java
@@ -315,7 +315,7 @@ public class ExceptionTestCase extends FaceletTestCase
{
Object submittedValue = "Hello!";
ExceptionBean bean = EasyMock.createStrictMock(ExceptionBean.class);
- bean.validateMe(facesContext,(UIComponent)target, submittedValue);
+ bean.validateMe(facesContext, target, submittedValue);
EasyMock.expectLastCall().andThrow(new ValidatorException(new FacesMessage(target.getClientId(facesContext),"not valid!")));
// Setup is finished need to activate the mock
EasyMock.replay(bean);
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
index 112c78b77..249fb7ca4 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/FaceletMultipleRequestsTestCase.java
@@ -215,11 +215,11 @@ public abstract class FaceletMultipleRequestsTestCase extends AbstractJsfConfigu
"org.apache.myfaces.test.mock.MockFacesContextFactory");
facesContextFactory = (MockFacesContextFactory) FactoryFinder
.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
- facesContext = (MockFacesContext) facesContextFactory.getFacesContext(
+ facesContext = facesContextFactory.getFacesContext(
servletContext, request, response, lifecycle);
if (facesContext.getExternalContext() != null)
{
- externalContext = (MockExternalContext) facesContext.getExternalContext();
+ externalContext = facesContext.getExternalContext();
}
super.setUpApplication();
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java b/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
index f559c1a23..e77518668 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/component/UIRepeatTest.java
@@ -136,7 +136,7 @@ public class UIRepeatTest extends AbstractJsfTestCase
baos.flush();
ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
ObjectInputStream ois = new ObjectInputStream(bais);
- Object restoredState = (Object) ois.readObject();
+ Object restoredState = ois.readObject();
oos.close();
ois.close();
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL2.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL2.java
index 2fb63b537..d961ee291 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL2.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL2.java
@@ -85,7 +85,7 @@ public class UIAddSimpleCCVDL2 extends UIComponentBase implements
"dynComp_1", attributes);
Map<String, Object> attributes2 = new HashMap<String, Object>();
- UIComponent text = (UIComponent) vdl.createComponent(facesContext,
+ UIComponent text = vdl.createComponent(facesContext,
"http://java.sun.com/jsf/composite/testComposite",
"dynComp_2", attributes2);
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL5.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL5.java
index c04326422..e96b5871a 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL5.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL5.java
@@ -85,7 +85,7 @@ public class UIAddSimpleCCVDL5 extends UIComponentBase implements
"dynComp_3", attributes);
Map<String, Object> attributes2 = new HashMap<String, Object>();
- UIComponent text = (UIComponent) vdl.createComponent(facesContext,
+ UIComponent text = vdl.createComponent(facesContext,
"http://java.sun.com/jsf/composite/testComposite",
"dynComp_2", attributes2);
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL6.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL6.java
index b9373fb1f..60139a382 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL6.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/component/UIAddSimpleCCVDL6.java
@@ -85,7 +85,7 @@ public class UIAddSimpleCCVDL6 extends UIComponentBase implements
"dynComp_4", attributes);
Map<String, Object> attributes2 = new HashMap<String, Object>();
- UIComponent text = (UIComponent) vdl.createComponent(facesContext,
+ UIComponent text = vdl.createComponent(facesContext,
"http://java.sun.com/jsf/composite/testComposite",
"dynComp_2", attributes2);
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean2.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean2.java
index 8acf92dfd..6f0dde19f 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean2.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean2.java
@@ -69,7 +69,7 @@ public class ComponentBindingVDLBean2
cc.setId("ccpanel");
Map<String, Object> attributes2 = new HashMap<String, Object>();
- UIComponent text = (UIComponent) vdl.createComponent(facesContext,
+ UIComponent text = vdl.createComponent(facesContext,
"http://java.sun.com/jsf/composite/testComposite",
"dynComp_2", attributes2);
text.setId("component");
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean5.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean5.java
index d8ee21e8b..db2199ce4 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean5.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean5.java
@@ -69,7 +69,7 @@ public class ComponentBindingVDLBean5
cc.setId("ccpanel");
Map<String, Object> attributes2 = new HashMap<String, Object>();
- UIComponent text = (UIComponent) vdl.createComponent(facesContext,
+ UIComponent text = vdl.createComponent(facesContext,
"http://java.sun.com/jsf/composite/testComposite",
"dynComp_2", attributes2);
text.setId("component");
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean6.java b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean6.java
index 490631c2e..4a7e813f7 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean6.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/pss/acid/managed/ComponentBindingVDLBean6.java
@@ -69,7 +69,7 @@ public class ComponentBindingVDLBean6
cc.setId("ccpanel");
Map<String, Object> attributes2 = new HashMap<String, Object>();
- UIComponent text = (UIComponent) vdl.createComponent(facesContext,
+ UIComponent text = vdl.createComponent(facesContext,
"http://java.sun.com/jsf/composite/testComposite",
"dynComp_2", attributes2);
text.setId("component");
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/faces/html/SelectOneItemGroupTestBean.java b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/faces/html/SelectOneItemGroupTestBean.java
index df7a3d844..b10dfb3e5 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/tag/faces/html/SelectOneItemGroupTestBean.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/tag/faces/html/SelectOneItemGroupTestBean.java
@@ -34,7 +34,7 @@ public class SelectOneItemGroupTestBean {
@PostConstruct
public void init() {
- this.animalList = Arrays.asList(new Product[] {new Product(1L, "Dog"),new Product(2L, "Cat"), new Product(3L, "Fish") });
+ this.animalList = Arrays.asList(new Product(1L, "Dog"),new Product(2L, "Cat"), new Product(3L, "Fish"));
}
diff --git a/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java b/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java
index fc7e368b3..9788124b2 100644
--- a/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java
+++ b/impl/src/test/java/org/apache/myfaces/view/facelets/updateheadres/UpdateHeadDynamicViewTestCase.java
@@ -55,7 +55,7 @@ public class UpdateHeadDynamicViewTestCase extends AbstractMyFacesCDIRequestTest
UIComponent content = facesContext.getViewRoot().findComponent("content");
UIComponent page1Button = facesContext.getViewRoot().findComponent("mainForm:page1");
- client.ajax((UICommand)page1Button, "action", page1Button.getClientId(facesContext), content.getClientId(facesContext), true);
+ client.ajax(page1Button, "action", page1Button.getClientId(facesContext), content.getClientId(facesContext), true);
processLifecycleExecuteAndRender();
String text = getRenderedContent(facesContext);
@@ -74,7 +74,7 @@ public class UpdateHeadDynamicViewTestCase extends AbstractMyFacesCDIRequestTest
UIComponent content = facesContext.getViewRoot().findComponent("content");
UIComponent page2Button = facesContext.getViewRoot().findComponent("mainForm:page2");
- client.ajax((UICommand)page2Button, "action", page2Button.getClientId(facesContext), content.getClientId(facesContext), true);
+ client.ajax(page2Button, "action", page2Button.getClientId(facesContext), content.getClientId(facesContext), true);
processLifecycleExecuteAndRender();
@@ -95,7 +95,7 @@ public class UpdateHeadDynamicViewTestCase extends AbstractMyFacesCDIRequestTest
UIComponent content = facesContext.getViewRoot().findComponent("content");
UIComponent page3Button = facesContext.getViewRoot().findComponent("mainForm:page3");
- client.ajax((UICommand)page3Button, "action", page3Button.getClientId(facesContext), content.getClientId(facesContext), true);
+ client.ajax(page3Button, "action", page3Button.getClientId(facesContext), content.getClientId(facesContext), true);
processLifecycleExecuteAndRender();
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
index 060af12c4..b176bb9c6 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup.java
@@ -136,32 +136,32 @@ public class ResponseMockup extends HttpServlet
{
resetInternalState(request, origin, out);
}
- else if (op.trim().toLowerCase().equals(EVAL_1))
+ else if (op.trim().equalsIgnoreCase(EVAL_1))
{
embeddedJavascript1(out, root);
}
- else if (op.trim().toLowerCase().equals(UPDATEINSERT_1))
+ else if (op.trim().equalsIgnoreCase(UPDATEINSERT_1))
{
updateInsert1(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(UPDATEINSERT_2))
+ else if (op.trim().equalsIgnoreCase(UPDATEINSERT_2))
{
updateInsert2(out, root);
}
- else if (op.trim().toLowerCase().equals(DELETE_1))
+ else if (op.trim().equalsIgnoreCase(DELETE_1))
{
delete1(out, root);
}
- else if (op.trim().toLowerCase().equals(VIEWSTATE))
+ else if (op.trim().equalsIgnoreCase(VIEWSTATE))
{
viewstateHandling(out, root);
}
- else if (op.trim().toLowerCase().equals(ATTRIBUTES))
+ else if (op.trim().equalsIgnoreCase(ATTRIBUTES))
{
attributeHandling(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(ERRORS_TAG))
+ else if (op.trim().equalsIgnoreCase(ERRORS_TAG))
{
errors(out, root);
}
@@ -169,23 +169,23 @@ public class ResponseMockup extends HttpServlet
{
illegalResponse(out);
}
- else if (op.trim().toLowerCase().equals(VIEW_BODY_REPLACE))
+ else if (op.trim().equalsIgnoreCase(VIEW_BODY_REPLACE))
{
//we omit our xml builder for now
viewBodyWithFullHTMLResponse(out, root);
}
- else if (op.trim().toLowerCase().equals(VIEW_BODY_REPLACE_2))
+ else if (op.trim().equalsIgnoreCase(VIEW_BODY_REPLACE_2))
{
viewBodyWithOnlyBodyData(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(VIEW_ROOT_REPLACEMENT_1))
+ else if (op.trim().equalsIgnoreCase(VIEW_ROOT_REPLACEMENT_1))
{
viewRootReplacement1(out, root);
//TODO check if still used?
}
- else if (op.trim().toLowerCase().equals("serversideresponsewriter"))
+ else if (op.trim().equalsIgnoreCase("serversideresponsewriter"))
{
DeferredScriptMockup scriptMockup = new DeferredScriptMockup();
Changes changes = new Changes(root);
@@ -198,40 +198,40 @@ public class ResponseMockup extends HttpServlet
{
illegalResponse2(out);
}
- else if (op.trim().toLowerCase().equals(TABLE_REPLACE_HEAD))
+ else if (op.trim().equalsIgnoreCase(TABLE_REPLACE_HEAD))
{
TableResponseMockups.tableReplaceHead(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(TABLE_REPLACE_BODY))
+ else if (op.trim().equalsIgnoreCase(TABLE_REPLACE_BODY))
{
TableResponseMockups.tableReplaceBody(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(TABLE_INSERT_ROW_HEAD))
+ else if (op.trim().equalsIgnoreCase(TABLE_INSERT_ROW_HEAD))
{
TableResponseMockups.tableInsertRowHead(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(TABLE_INSERT_ROW_BODY))
+ else if (op.trim().equalsIgnoreCase(TABLE_INSERT_ROW_BODY))
{
TableResponseMockups.tableInsertRowBody(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(TABLE_INSERT_COLUMN_HEAD))
+ else if (op.trim().equalsIgnoreCase(TABLE_INSERT_COLUMN_HEAD))
{
TableResponseMockups.tableInsetColumnHead(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(TABLE_INSERT_COLUMN_BODY))
+ else if (op.trim().equalsIgnoreCase(TABLE_INSERT_COLUMN_BODY))
{
TableResponseMockups.tableInsertColumnBody(viewData, out, root);
}
- else if (op.trim().toLowerCase().equals(TABLE_INSERT_FOOTER))
+ else if (op.trim().equalsIgnoreCase(TABLE_INSERT_FOOTER))
{
TableResponseMockups.tableInsertFooter(out, root);
}
- else if (op.trim().toLowerCase().equals(TABLE_INSERT_BODY))
+ else if (op.trim().equalsIgnoreCase(TABLE_INSERT_BODY))
{
TableResponseMockups.tableInsertBody(out, root);
}
- else if (op.trim().toLowerCase().equals(EXECUTE_NONE))
+ else if (op.trim().equalsIgnoreCase(EXECUTE_NONE))
{
TableResponseMockups.execteNone(request, out, root);
}
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
index bc04ccab0..bb2b5bb0b 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/ResponseMockup22.java
@@ -40,7 +40,7 @@ public class ResponseMockup22 extends ResponseMockup
{
response.setContentType("text/xml;charset=UTF-8");
PrintWriter out = response.getWriter();
- String op = (String) request.getParameter("op");
+ String op = request.getParameter("op");
PartialResponse root = new PartialResponse();
diff --git a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java
index 657b54803..8da22bc57 100644
--- a/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java
+++ b/integration-tests/ajax/src/main/java/org/apache/myfaces/core/integrationtests/ajax/test1Protocol/responseWriter/MockupResponseWriter.java
@@ -148,7 +148,7 @@ public class MockupResponseWriter extends ResponseWriter
target.append(">");
}
- target.append(arg1.toString());
+ target.append(arg1);
}
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java
index 21281ad75..538bd4990 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractHtmlUnitTestCase.java
@@ -210,7 +210,7 @@ public abstract class AbstractHtmlUnitTestCase
protected HtmlPage link(HtmlAnchor anchor) throws IOException
{
- HtmlPage page = (HtmlPage) anchor.click();
+ HtmlPage page = anchor.click();
this.page = page;
return page;
@@ -240,7 +240,7 @@ public abstract class AbstractHtmlUnitTestCase
protected HtmlPage page(String path) throws Exception
{
- HtmlPage page = (HtmlPage) webClient.getPage(url(path));
+ HtmlPage page = webClient.getPage(url(path));
this.page = page;
return (page);
@@ -272,7 +272,7 @@ public abstract class AbstractHtmlUnitTestCase
protected HtmlPage submit(HtmlSubmitInput submit) throws IOException
{
- HtmlPage page = (HtmlPage) submit.click();
+ HtmlPage page = submit.click();
this.page = page;
return page;
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java
index ecc8f5d88..302c37829 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMockTestCase.java
@@ -242,7 +242,7 @@ public abstract class AbstractJsfConfigurableMockTestCase
{
facesContextFactory = (FacesContextFactory) FactoryFinder
.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
- facesContext = (FacesContext) facesContextFactory.getFacesContext(
+ facesContext = facesContextFactory.getFacesContext(
servletContext, request, response, lifecycle);
if (facesContext.getExternalContext() != null)
{
diff --git a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java
index 3c03ab7e4..c354a906c 100644
--- a/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java
+++ b/test/src/main/java/org/apache/myfaces/test/base/junit/AbstractJsfConfigurableMultipleRequestsTestCase.java
@@ -44,7 +44,6 @@ import org.apache.myfaces.test.mock.MockHttpSession;
import org.apache.myfaces.test.mock.MockRenderKit;
import org.apache.myfaces.test.mock.MockServletConfig;
import org.apache.myfaces.test.mock.MockServletContext;
-import org.apache.myfaces.test.mock.lifecycle.MockLifecycle;
import org.apache.myfaces.test.mock.lifecycle.MockLifecycleFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
@@ -245,7 +244,7 @@ public abstract class AbstractJsfConfigurableMultipleRequestsTestCase
{
lifecycleFactory = (MockLifecycleFactory) FactoryFinder
.getFactory(FactoryFinder.LIFECYCLE_FACTORY);
- lifecycle = (MockLifecycle) lifecycleFactory
+ lifecycle = lifecycleFactory
.getLifecycle(LifecycleFactory.DEFAULT_LIFECYCLE);
}
@@ -262,11 +261,11 @@ public abstract class AbstractJsfConfigurableMultipleRequestsTestCase
{
facesContextFactory = (MockFacesContextFactory) FactoryFinder
.getFactory(FactoryFinder.FACES_CONTEXT_FACTORY);
- facesContext = (MockFacesContext) facesContextFactory.getFacesContext(
+ facesContext = facesContextFactory.getFacesContext(
servletContext, request, response, lifecycle);
if (facesContext.getExternalContext() != null)
{
- externalContext = (MockExternalContext) facesContext
+ externalContext = facesContext
.getExternalContext();
}
if (facesContext instanceof MockFacesContext)
diff --git a/test/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java b/test/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
index aaa0454c7..e4152f943 100644
--- a/test/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
+++ b/test/src/main/java/org/apache/myfaces/test/el/MockExpressionFactory.java
@@ -71,7 +71,7 @@ public class MockExpressionFactory extends ExpressionFactory
}
else if (object instanceof String)
{
- return (String) object;
+ return object;
}
else
{
@@ -116,7 +116,7 @@ public class MockExpressionFactory extends ExpressionFactory
else if ((object instanceof Boolean)
|| (object.getClass() == Boolean.TYPE))
{
- return (Boolean) object;
+ return object;
}
else if (object instanceof String)
{
@@ -149,7 +149,7 @@ public class MockExpressionFactory extends ExpressionFactory
else if ((object instanceof Character)
|| (object.getClass() == Character.TYPE))
{
- return (Character) object;
+ return object;
}
throw new IllegalArgumentException("Cannot convert " + object
+ " to Character");
@@ -163,7 +163,7 @@ public class MockExpressionFactory extends ExpressionFactory
}
if (targetType.isAssignableFrom(object.getClass()))
{
- return (Enum) object;
+ return object;
}
if (!(object instanceof String))
@@ -267,7 +267,7 @@ public class MockExpressionFactory extends ExpressionFactory
{
if (value instanceof BigDecimal)
{
- return (BigDecimal) value;
+ return value;
}
else if (value instanceof BigInteger)
{
@@ -275,14 +275,14 @@ public class MockExpressionFactory extends ExpressionFactory
}
else
{
- return new BigDecimal(((Number) value).doubleValue());
+ return new BigDecimal(value.doubleValue());
}
}
else if (type == BigInteger.class)
{
if (value instanceof BigInteger)
{
- return (BigInteger) value;
+ return value;
}
else if (value instanceof BigDecimal)
{
@@ -290,7 +290,7 @@ public class MockExpressionFactory extends ExpressionFactory
}
else
{
- return BigInteger.valueOf(((Number) value).longValue());
+ return BigInteger.valueOf(value.longValue());
}
}
throw new IllegalArgumentException("Cannot convert " + value + " to "
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
index 40601f6e5..c49e4718c 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication12.java
@@ -170,7 +170,7 @@ public abstract class MockApplication12 extends MockApplication10
UIComponent component = null;
try
{
- component = (UIComponent) expression.getValue(context
+ component = expression.getValue(context
.getELContext());
if (component == null)
{
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
index 05645d92f..745f19af5 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockApplication20.java
@@ -937,7 +937,7 @@ public abstract class MockApplication20 extends MockApplication12
boolean annotationsApplied = false;
if (componentType != null)
{
- component = application.createComponent((String) componentType.getValue(context.getELContext()));
+ component = application.createComponent(componentType.getValue(context.getELContext()));
annotationsApplied = true;
}
else
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockExceptionHandler.java b/test/src/main/java/org/apache/myfaces/test/mock/MockExceptionHandler.java
index 6eb3456cd..dca513a68 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockExceptionHandler.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockExceptionHandler.java
@@ -58,7 +58,7 @@ public class MockExceptionHandler extends ExceptionHandler
@Override
public Iterable<ExceptionQueuedEvent> getHandledExceptionQueuedEvents()
{
- return handled == null ? Collections.<ExceptionQueuedEvent> emptyList()
+ return handled == null ? Collections.emptyList()
: handled;
}
@@ -95,7 +95,7 @@ public class MockExceptionHandler extends ExceptionHandler
public Iterable<ExceptionQueuedEvent> getUnhandledExceptionQueuedEvents()
{
return unhandled == null ? Collections
- .<ExceptionQueuedEvent> emptyList() : unhandled;
+ .emptyList() : unhandled;
}
/**
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext10.java b/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext10.java
index 8f67f77d1..f9808b6b7 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext10.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext10.java
@@ -193,7 +193,7 @@ public abstract class MockExternalContext10 extends ExternalContext
// If there is no dispatcher, send NOT_FOUND
if (requestDispatcher == null)
{
- ((HttpServletResponse) response)
+ response
.sendError(HttpServletResponse.SC_NOT_FOUND);
return;
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java b/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
index a7823aa18..765109ce5 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext20.java
@@ -185,7 +185,7 @@ public abstract class MockExternalContext20 extends MockExternalContext12
@Override
public String encodePartialActionURL(String url)
{
- return ((HttpServletResponse) response).encodeURL(url);
+ return response.encodeURL(url);
}
@Override
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext23.java b/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext23.java
index 32be5e0ae..276659e91 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext23.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockExternalContext23.java
@@ -118,7 +118,7 @@ public class MockExternalContext23 extends MockExternalContext20
@Override
public String getSessionId(boolean create)
{
- HttpSession session = ((HttpServletRequest) request).getSession(create);
+ HttpSession session = request.getSession(create);
if (session != null)
{
return session.getId();
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java b/test/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
index 608c30a33..429538617 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockFacesContext20.java
@@ -143,7 +143,7 @@ public abstract class MockFacesContext20 extends MockFacesContext12
if (messages == null)
{
return Collections.unmodifiableList(Collections
- .<FacesMessage> emptyList());
+ .emptyList());
}
List<FacesMessage> lst = new ArrayList<FacesMessage>();
@@ -162,7 +162,7 @@ public abstract class MockFacesContext20 extends MockFacesContext12
if (messages == null || !messages.containsKey(clientId))
{
return Collections.unmodifiableList(Collections
- .<FacesMessage> emptyList());
+ .emptyList());
}
return ((Map<String, List<FacesMessage>>) messages).get(clientId);
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java b/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java
index 87f7bd58b..ac4c21948 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockFlash.java
@@ -409,7 +409,7 @@ public class MockFlash extends Flash
.getClientIdsWithMessages();
while (iterClientIds.hasNext())
{
- String clientId = (String) iterClientIds.next();
+ String clientId = iterClientIds.next();
Iterator<FacesMessage> iterMessages = facesContext
.getMessages(clientId);
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
index ba76d0173..fdc96c0d8 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletRequest.java
@@ -393,7 +393,7 @@ public class MockHttpServletRequest implements HttpServletRequest
return parseDate(header.substring(match.length() + 1).trim());
}
}
- return (long) -1;
+ return -1;
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
index 28d303b4e..4e1511223 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockHttpServletResponse.java
@@ -81,7 +81,7 @@ public class MockHttpServletResponse implements HttpServletResponse
public Cookie getCookie(String name)
{
- return (Cookie) cookies.get(name);
+ return cookies.get(name);
}
public Map<String, Cookie> getCookies()
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java b/test/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
index c71e8d4ba..94313817c 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockPortletContext.java
@@ -331,10 +331,7 @@ public class MockPortletContext implements PortletContext
public void removeAttribute(String name)
{
- if (attributes.containsKey(name))
- {
- attributes.remove(name);
- }
+ attributes.remove(name);
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java b/test/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
index 9b635db63..8462264e1 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockPortletRequest.java
@@ -409,10 +409,7 @@ public class MockPortletRequest implements PortletRequest
public void removeAttribute(String name)
{
- if (attributes.containsKey(name))
- {
- attributes.remove(name);
- }
+ attributes.remove(name);
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java b/test/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
index 9f28ec341..d61d887a8 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockPortletSession.java
@@ -211,10 +211,7 @@ public class MockPortletSession implements PortletSession
throw new IllegalArgumentException("Scope constant " + scope
+ " not recognized");
}
- if (attributes.containsKey(name))
- {
- attributes.remove(name);
- }
+ attributes.remove(name);
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/MockSubKeyMap.java b/test/src/main/java/org/apache/myfaces/test/mock/MockSubKeyMap.java
index 5298b5968..0bbd406c9 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/MockSubKeyMap.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/MockSubKeyMap.java
@@ -126,7 +126,7 @@ final class MockSubKeyMap<V> extends AbstractMap<String, V>
throw new NullPointerException();
}
// Yes, I want a ClassCastException if it's not a String
- return _prefix + ((String) key);
+ return _prefix + key;
}
private List<String> _gatherKeys()
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/_ELText.java b/test/src/main/java/org/apache/myfaces/test/mock/_ELText.java
index 64e1294f3..049e3c83e 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/_ELText.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/_ELText.java
@@ -213,7 +213,7 @@ class _ELText
Object v = this.ve.getValue(ctx);
if (v != null)
{
- out.writeText((String) v, null);
+ out.writeText(v, null);
}
}
}
@@ -399,11 +399,11 @@ class _ELText
}
else if (text.size() == 1)
{
- return (_ELText) text.get(0);
+ return text.get(0);
}
else
{
- _ELText[] ta = (_ELText[]) text.toArray(new _ELText[text.size()]);
+ _ELText[] ta = text.toArray(new _ELText[text.size()]);
return new ELTextComposite(ta);
}
}
diff --git a/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java b/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
index fb615dcd1..dc693a32c 100644
--- a/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
+++ b/test/src/main/java/org/apache/myfaces/test/mock/lifecycle/PhaseListenerManager.java
@@ -96,7 +96,7 @@ class PhaseListenerManager
void informPhaseListenersAfter(PhaseId phaseId)
{
- boolean[] beforePhaseSuccess = (boolean[]) listenerSuccessMap.get(phaseId);
+ boolean[] beforePhaseSuccess = listenerSuccessMap.get(phaseId);
for (int i = phaseListeners.length - 1; i >= 0; i--)
{