You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2022/02/18 08:54:34 UTC
[myfaces-tobago] branch tobago-4.x updated: style: checkstyle
This is an automated email from the ASF dual-hosted git repository.
lofwyr pushed a commit to branch tobago-4.x
in repository https://gitbox.apache.org/repos/asf/myfaces-tobago.git
The following commit(s) were added to refs/heads/tobago-4.x by this push:
new 3d7e930 style: checkstyle
3d7e930 is described below
commit 3d7e9304ececc7a26b58ac437b7fe69c519e23eb
Author: Udo Schnurpfeil <ud...@irian.eu>
AuthorDate: Fri Feb 18 09:24:51 2022 +0100
style: checkstyle
---
pom.xml | 6 ++---
.../myfaces/tobago/component/SupportFieldId.java | 2 +-
.../apache/myfaces/tobago/config/TobagoConfig.java | 2 +-
.../myfaces/tobago/context/TobagoBundle.java | 2 +-
.../apache/myfaces/tobago/facelets/Resource.java | 2 +-
.../component/AbstractUICollapsiblePanel.java | 2 +-
.../internal/component/AbstractUICommand.java | 8 +++---
.../tobago/internal/config/TobagoConfigParser.java | 2 +-
.../internal/config/TobagoConfigVersion.java | 2 +-
.../renderer/LabelLayoutRendererBase.java | 2 +-
.../renderkit/renderer/SelectManyRendererBase.java | 8 ------
.../renderkit/renderer/TreeListboxRenderer.java | 2 +-
.../taglib/component/AttributeTagDeclaration.java | 6 ++---
.../taglib/component/ConverterTagDeclaration.java | 4 +--
.../component/DataAttributeTagDeclaration.java | 4 +--
.../taglib/component/EventTagDeclaration.java | 2 +-
.../taglib/component/FlexLayoutTagDeclaration.java | 2 +-
.../GridLayoutConstraintTagDeclaration.java | 8 +++---
.../ResetInputActionListenerTagDeclaration.java | 2 +-
.../SegmentLayoutConstraintTagDeclaration.java | 30 +++++++++++-----------
.../component/SelectItemsTagDeclaration.java | 2 +-
.../taglib/component/SpanTagDeclaration.java | 4 +--
.../component/TabChangeListenerTagDeclaration.java | 4 +--
.../component/ValidateFileItemTagDeclaration.java | 4 +--
...ValidateSubmittedValueLengthTagDeclaration.java | 6 ++---
.../myfaces/tobago/internal/util/PartUtils.java | 2 +-
.../tobago/renderkit/css/FileTestUtils.java | 24 +++++++++++++++++
.../myfaces/tobago/renderkit/css/IconEncoder.java | 2 +-
.../myfaces/tobago/servlet/ResourceServlet.java | 2 +-
.../apache/myfaces/tobago/util/WebXmlUtils.java | 2 +-
.../tobago/webapp/TobagoResponseWriter.java | 4 +--
.../tobago/renderkit/css/CssClassUtils.java | 19 +++++++-------
.../renderkit/html/HtmlElementsUnitTest.java | 8 +++---
.../webapp/TobagoResponseWriterUnitTest.java | 2 +-
.../tobago/example/demo/ExceptionController.java | 4 +--
.../tobago/example/demo/NavigationTree.java | 2 +-
.../tobago/example/demo/SourceFileReader.java | 2 +-
.../demo/bestpractice/BestPracticeController.java | 2 +-
38 files changed, 104 insertions(+), 89 deletions(-)
diff --git a/pom.xml b/pom.xml
index 85a5feb..90b892f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,9 +51,9 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<required.maven.version>3.0.4</required.maven.version>
<maven-pmd-plugin.version>3.16.0</maven-pmd-plugin.version>
- <maven-checkstyle-plugin.version>3.0.0</maven-checkstyle-plugin.version>
- <!-- xxx set back to 14 after release of version 14 (expected may 30, 2021) -->
- <checkstyle-rules.version>15</checkstyle-rules.version>
+ <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
+ <!-- XXX use 16, if released -->
+ <checkstyle-rules.version>16-SNAPSHOT</checkstyle-rules.version>
</properties>
<issueManagement>
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
index 8edddd0..fbacd78 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportFieldId.java
@@ -23,5 +23,5 @@ import javax.faces.context.FacesContext;
public interface SupportFieldId {
- String getFieldId(final FacesContext facesContext);
+ String getFieldId(FacesContext facesContext);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
index f1ac254..a1b6b8f 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/config/TobagoConfig.java
@@ -42,7 +42,7 @@ public abstract class TobagoConfig {
return (TobagoConfig) servletContext.getAttribute(TOBAGO_CONFIG);
}
- public abstract Theme getTheme(final String name);
+ public abstract Theme getTheme(String name);
public abstract List<Theme> getSupportedThemes();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
index 04f86ff..bbd90ef 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/context/TobagoBundle.java
@@ -132,7 +132,7 @@ public class TobagoBundle extends ResourceBundle {
if (reload) {
connection.setUseCaches(false);
}
- try (final BufferedInputStream bis = new BufferedInputStream(connection.getInputStream())) {
+ try (BufferedInputStream bis = new BufferedInputStream(connection.getInputStream())) {
bundle = new XmlTobagoBundle(bis);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
index a8d07d5..eede7c8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/facelets/Resource.java
@@ -87,7 +87,7 @@ public final class Resource {
final Object ctx = externalContext.getContext();
if (ctx instanceof ServletContext) {
final ServletContext servletContext = (ServletContext) ctx;
- try (final InputStream stream = servletContext.getResourceAsStream(path)) {
+ try (InputStream stream = servletContext.getResourceAsStream(path)) {
return stream != null;
} catch (final IOException e) {
// Ignore here, since we donnot wanted to read from this
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
index 5a2d7ff..b524d77 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICollapsiblePanel.java
@@ -89,7 +89,7 @@ public abstract class AbstractUICollapsiblePanel extends AbstractUIPanelBase {
public abstract boolean isCollapsed();
- public abstract void setCollapsed(final boolean collapsed);
+ public abstract void setCollapsed(boolean collapsed);
public abstract CollapseMode getCollapsedMode();
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
index 08778c4..4bb832d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUICommand.java
@@ -34,7 +34,7 @@ import javax.faces.context.FacesContext;
* Base class for commands.
*/
public abstract class AbstractUICommand extends AbstractUICommandBase
- implements SupportsAccessKey, Visual, ClientBehaviorHolder, SupportFieldId {
+ implements SupportsAccessKey, Visual, ClientBehaviorHolder, SupportFieldId {
enum PropertyKeys {
disabled,
@@ -48,8 +48,8 @@ public abstract class AbstractUICommand extends AbstractUICommandBase
parentOfCommands = false;
for (final UIComponent child : getChildren()) {
if (child.isRendered()
- && !(child instanceof AbstractUIEvent)
- && (child instanceof UICommand || child instanceof UIInput)) {
+ && !(child instanceof AbstractUIEvent)
+ && (child instanceof UICommand || child instanceof UIInput)) {
parentOfCommands = true;
break;
}
@@ -63,7 +63,7 @@ public abstract class AbstractUICommand extends AbstractUICommandBase
@Override
public String getFieldId(final FacesContext facesContext) {
- if(isParentOfCommands()) {
+ if (isParentOfCommands()) {
return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "command";
} else {
return getClientId(facesContext);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
index 8821def..9cc3982 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigParser.java
@@ -134,7 +134,7 @@ public class TobagoConfigParser extends TobagoConfigEntityResolver {
validate(url, version);
}
- try (final InputStream inputStream = url.openStream()) {
+ try (InputStream inputStream = url.openStream()) {
final SAXParserFactory factory = SAXParserFactory.newInstance();
if (!version.isSchema()) {
factory.setValidating(true);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
index f4bf524..64053d2 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigVersion.java
@@ -39,7 +39,7 @@ public class TobagoConfigVersion extends TobagoConfigEntityResolver {
public TobagoConfigVersion(final URL url) throws ParserConfigurationException, SAXException, IOException {
// simple reading with no validation, at this time
- try (final InputStream inputStream = url.openStream()) {
+ try (InputStream inputStream = url.openStream()) {
final SAXParserFactory factory = SAXParserFactory.newInstance();
final SAXParser saxParser = factory.newSAXParser();
saxParser.parse(inputStream, this);
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
index 15d9178..7165c2e 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
@@ -218,5 +218,5 @@ public abstract class LabelLayoutRendererBase extends DecodingInputRendererBase
}
}
- protected abstract String getFieldId(final FacesContext facesContext, final UIComponent component);
+ protected abstract String getFieldId(FacesContext facesContext, UIComponent component);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
index 75aa62d..9114b89 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyRendererBase.java
@@ -134,11 +134,6 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
* If the considerValueType is true, this method will also consider the
* valueType attribute of Tomahawk UISelectMany components.
*
- * @param facesContext
- * @param component
- * @param submittedValue
- * @param considerValueType
- * @return
* @throws ConverterException
*/
static Object getConvertedUISelectManyValue(final FacesContext facesContext, final UISelectMany component,
@@ -325,9 +320,6 @@ public abstract class SelectManyRendererBase extends MessageLayoutRendererBase {
* be a ValueExpression (that evaluates to a String or a Class) or a
* String (that is a fully qualified Java class name) or a Class object.
*
- * @param facesContext
- * @param attribute
- * @return
* @throws FacesException if the value is a String and the represented
* class cannot be found
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
index eef1e02..eac5e18 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
@@ -140,7 +140,7 @@ public class TreeListboxRenderer extends RendererBase {
writer.endElement(HtmlElements.SELECT);
}
- for(final Integer rowIndex : thisLevel) {
+ for (Integer rowIndex : thisLevel) {
encodeSelectBox(facesContext, tree, writer, rowIndex, nextLevel, size);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
index 25f2034..5c15938 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/AttributeTagDeclaration.java
@@ -38,13 +38,13 @@ public interface AttributeTagDeclaration {
* The name of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "name", type = "java.lang.String")
- void setName(final ValueExpression name);
+ void setName(ValueExpression name);
/**
* The value of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
- void setValue(final ValueExpression value);
+ void setValue(ValueExpression value);
/**
* Warning: The mode is only available when using Facelets.
* Allowed values are "action", "actionListener", "actionFromValue", "isNotSet", "isSet", "valueIfSet".
@@ -62,6 +62,6 @@ public interface AttributeTagDeclaration {
* "valueIfSet" set the attribute only if the value is set.
*/
@TagAttribute(name = "mode")
- void setMode(final ValueExpression mode);
+ void setMode(ValueExpression mode);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
index e434e7b..d16073d 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ConverterTagDeclaration.java
@@ -38,11 +38,11 @@ public interface ConverterTagDeclaration {
* The converterId of a registered converter.
*/
@TagAttribute(name = "converterId", type = "java.lang.String")
- void setConverterId(final ValueExpression converterId);
+ void setConverterId(ValueExpression converterId);
/**
* The value binding expression to a converter.
*/
@TagAttribute(name = "binding", type = "javax.faces.convert.Converter")
- void setBinding(final ValueExpression binding);
+ void setBinding(ValueExpression binding);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
index 70b8a8e..7397bdd 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/DataAttributeTagDeclaration.java
@@ -40,11 +40,11 @@ public interface DataAttributeTagDeclaration {
* The name of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "name", type = "java.lang.String")
- void setName(final ValueExpression name);
+ void setName(ValueExpression name);
/**
* The value of the attribute in the parent component.
*/
@TagAttribute(required = true, name = "value", type = "java.lang.String")
- void setValue(final ValueExpression value);
+ void setValue(ValueExpression value);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
index 7a8a72e..9af7e25 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/EventTagDeclaration.java
@@ -82,6 +82,6 @@ public interface EventTagDeclaration
*/
@TagAttribute
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.component.ClientBehaviors")
- void setEvent(final ValueExpression event);
+ void setEvent(ValueExpression event);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
index 76fa6e9..de838d8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/FlexLayoutTagDeclaration.java
@@ -32,7 +32,7 @@ import org.apache.myfaces.tobago.layout.AlignItems;
import org.apache.myfaces.tobago.layout.JustifyContent;
/**
- * Renders a <a href=https://www.w3.org/TR/css-flexbox-1/>Flexible Box Layout</a>.
+ * Renders a <a href=https://www.w3.org/TR/css-flexbox-1/>Flexible Box Layout</a>.
*
* @since 3.0.0
*/
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
index 942123a..1eef930 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/GridLayoutConstraintTagDeclaration.java
@@ -36,23 +36,23 @@ public interface GridLayoutConstraintTagDeclaration {
* The number of horizontal cells this component should use.
*/
@TagAttribute(type = "java.lang.Integer")
- void setColumnSpan(final ValueExpression columnSpan);
+ void setColumnSpan(ValueExpression columnSpan);
/**
* The number of vertical cells this component should use.
*/
@TagAttribute(type = "java.lang.Integer")
- void setRowSpan(final ValueExpression rowSpan);
+ void setRowSpan(ValueExpression rowSpan);
/**
* The horizontal position in the grid of this component. Please use gridColumn and gridRow both or none.
*/
@TagAttribute(type = "java.lang.Integer")
- void setGridColumn(final ValueExpression gridColumn);
+ void setGridColumn(ValueExpression gridColumn);
/**
* The vertical position in the grid of this component. Please use gridColumn and gridRow both or none.
*/
@TagAttribute(type = "java.lang.Integer")
- void setGridRow(final ValueExpression gridRow);
+ void setGridRow(ValueExpression gridRow);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
index afb56e1..94b18e8 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ResetInputActionListenerTagDeclaration.java
@@ -38,6 +38,6 @@ public interface ResetInputActionListenerTagDeclaration {
* them, all containing EditableValueHolder will be reset.
*/
@TagAttribute(required = false, name = Attributes.EXECUTE, type = "java.lang.String")
- void setExecute(final javax.el.ValueExpression execute);
+ void setExecute(javax.el.ValueExpression execute);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
index 473b7ec..d11ed74 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SegmentLayoutConstraintTagDeclaration.java
@@ -39,98 +39,98 @@ public interface SegmentLayoutConstraintTagDeclaration {
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setExtraSmall(final ValueExpression extraSmall);
+ void setExtraSmall(ValueExpression extraSmall);
/**
* Overwrite the default layout for small devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setSmall(final ValueExpression small);
+ void setSmall(ValueExpression small);
/**
* Overwrite the default layout for medium devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setMedium(final ValueExpression medium);
+ void setMedium(ValueExpression medium);
/**
* Overwrite the default layout for large devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setLarge(final ValueExpression large);
+ void setLarge(ValueExpression large);
/**
* Overwrite the default layout for extra large devices.
* Possible values are: segment values between 1 and 12, 'auto' and '*'.
*/
@TagAttribute
- void setExtraLarge(final ValueExpression extraLarge);
+ void setExtraLarge(ValueExpression extraLarge);
/**
* Overwrite the default margin for extra small devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginExtraSmall(final ValueExpression overwriteMarginExtraSmall);
+ void setMarginExtraSmall(ValueExpression overwriteMarginExtraSmall);
/**
* Overwrite the default margin for small devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginSmall(final ValueExpression overwriteMarginSmall);
+ void setMarginSmall(ValueExpression overwriteMarginSmall);
/**
* Overwrite the default margin for medium devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginMedium(final ValueExpression overwriteMarginMedium);
+ void setMarginMedium(ValueExpression overwriteMarginMedium);
/**
* Overwrite the default margin for large devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginLarge(final ValueExpression overwriteMarginLarge);
+ void setMarginLarge(ValueExpression overwriteMarginLarge);
/**
* Overwrite the default margin for extra large devices.
*/
@TagAttribute
@UIComponentTagAttribute(allowedValues = {Margin.NONE, Margin.LEFT, Margin.RIGHT, Margin.BOTH})
- void setMarginExtraLarge(final ValueExpression overwriteMarginExtraLarge);
+ void setMarginExtraLarge(ValueExpression overwriteMarginExtraLarge);
/**
* The number of columns this component moves to the right for extra small devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetExtraSmall(final ValueExpression offsetExtraSmall);
+ void setOffsetExtraSmall(ValueExpression offsetExtraSmall);
/**
* The number of columns this component moves to the right for small devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetSmall(final ValueExpression offsetSmall);
+ void setOffsetSmall(ValueExpression offsetSmall);
/**
* The number of columns this component moves to the right for medium devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetMedium(final ValueExpression offsetMedium);
+ void setOffsetMedium(ValueExpression offsetMedium);
/**
* The number of columns this component moves to the right for large devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetLarge(final ValueExpression offsetLarge);
+ void setOffsetLarge(ValueExpression offsetLarge);
/**
* The number of columns this component moves to the right for extra large devices.
*/
@TagAttribute(type = "java.lang.Integer")
- void setOffsetExtraLarge(final ValueExpression offsetLarge);
+ void setOffsetExtraLarge(ValueExpression offsetLarge);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
index 8f532ac..67e504c 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectItemsTagDeclaration.java
@@ -58,7 +58,7 @@ public interface SelectItemsTagDeclaration extends HasId, HasBinding, HasItemLab
*/
@TagAttribute
@UIComponentTagAttribute(expression = DynamicExpression.PROHIBITED)
- void setVar(final String var);
+ void setVar(String var);
/**
* Flag indicating whether the option created
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java
index 023603a..74230c0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SpanTagDeclaration.java
@@ -40,11 +40,11 @@ public interface SpanTagDeclaration {
* The number of horizontal cells this component should use.
*/
@TagAttribute(type = "java.lang.Integer")
- void setColumn(final ValueExpression column);
+ void setColumn(ValueExpression column);
/**
* The number of vertical cells this component should use.
*/
@TagAttribute(type = "java.lang.Integer")
- void setRow(final ValueExpression row);
+ void setRow(ValueExpression row);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
index f28fbe0..db293fb 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/TabChangeListenerTagDeclaration.java
@@ -39,12 +39,12 @@ public interface TabChangeListenerTagDeclaration {
* created and registered.
*/
@TagAttribute(required = true, name = "type", type = "java.lang.String")
- void setType(final ValueExpression type);
+ void setType(ValueExpression type);
/**
* The value binding expression to a TabChangeListener.
*/
@TagAttribute(name = "binding", type = "org.apache.myfaces.tobago.event.TabChangeListener")
- void setBinding(final ValueExpression binding);
+ void setBinding(ValueExpression binding);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
index e2982cc..92eddfa 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateFileItemTagDeclaration.java
@@ -37,9 +37,9 @@ import javax.el.ValueExpression;
public interface ValidateFileItemTagDeclaration {
@TagAttribute(name = "maxSize", type = "java.lang.Integer")
- void setMaxSize(final ValueExpression maxSize);
+ void setMaxSize(ValueExpression maxSize);
@TagAttribute(name = "contentType", type = "java.lang.String")
- void setContentType(final ValueExpression contentType);
+ void setContentType(ValueExpression contentType);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
index 4e51c42..32c291b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/ValidateSubmittedValueLengthTagDeclaration.java
@@ -30,16 +30,16 @@ import javax.el.ValueExpression;
* Register an {@link SubmittedValueLengthValidator} instance on the UIComponent
* associated with the closest parent UIComponent custom action.
* The standard LengthValidator validate the length on the converted value.toString()
- * not on the submitted value. Sometime you need to check the length of the submitted value.
+ * not on the submitted value. Sometimes you need to check the length of the submitted value.
*/
@Tag(name = "validateSubmittedValueLength")
@ValidatorTag(validatorId = SubmittedValueLengthValidator.VALIDATOR_ID)
public interface ValidateSubmittedValueLengthTagDeclaration {
@TagAttribute(name = "minimum", type = "java.lang.Integer")
- void setMinimum(final ValueExpression minimum);
+ void setMinimum(ValueExpression minimum);
@TagAttribute(name = "maximum", type = "java.lang.Integer")
- void setMaximum(final ValueExpression maximum);
+ void setMaximum(ValueExpression maximum);
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
index f30395d..df0e003 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/PartUtils.java
@@ -185,7 +185,7 @@ public final class PartUtils {
}
String result = null;
if (i2 > i1) {
- result = new String(chars, i1, i2 - i1);
+ result = String.valueOf(chars, i1, i2 - i1);
}
return result;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FileTestUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FileTestUtils.java
new file mode 100644
index 0000000..cdb3f4d
--- /dev/null
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/FileTestUtils.java
@@ -0,0 +1,24 @@
+package org.apache.myfaces.tobago.renderkit.css;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
+
+/**
+ * Helpful for tests. Not for use in production.
+ */
+public class FileTestUtils {
+
+ public static String fileToString(final String file) throws IOException {
+
+ final StringBuilder stringBuilder = new StringBuilder();
+ try (Stream<String> lines = Files.lines(Paths.get(file), StandardCharsets.UTF_8)) {
+ lines.forEach(stringBuilder::append);
+ }
+
+ return stringBuilder.toString();
+ }
+
+}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java
index a3fe972..3180fd9 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/IconEncoder.java
@@ -29,6 +29,6 @@ import java.io.IOException;
@Deprecated
public interface IconEncoder {
- void encode(TobagoResponseWriter writer, Icons icon, final CssItem... cssItems) throws IOException;
+ void encode(TobagoResponseWriter writer, Icons icon, CssItem... cssItems) throws IOException;
}
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
index 3bf6543..067efbe 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/servlet/ResourceServlet.java
@@ -126,7 +126,7 @@ public class ResourceServlet extends HttpServlet {
return;
}
- try (final InputStream inputStream = locateResource(resource)) {
+ try (InputStream inputStream = locateResource(resource)) {
if (inputStream != null) {
copy(inputStream, response.getOutputStream());
} else {
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
index 11afbfe..8722f8b 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/util/WebXmlUtils.java
@@ -156,7 +156,7 @@ public class WebXmlUtils {
final URLConnection connection = url.openConnection();
connection.setUseCaches(false);
- try (final InputStream input = connection.getInputStream()) {
+ try (InputStream input = connection.getInputStream()) {
final Document document = documentBuilder.parse(input);
document.getDocumentElement().normalize();
return document;
diff --git a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
index 7180bde..894e0e0 100644
--- a/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
+++ b/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
@@ -80,7 +80,7 @@ public abstract class TobagoResponseWriter extends ResponseWriter {
*/
@Override
@Deprecated
- public abstract void writeAttribute(String name, Object value, final String property) throws IOException;
+ public abstract void writeAttribute(String name, Object value, String property) throws IOException;
/**
* @deprecated since 1.0.11, should not directly called via this interface. There is be a special method which might
@@ -88,7 +88,7 @@ public abstract class TobagoResponseWriter extends ResponseWriter {
*/
@Override
@Deprecated
- public abstract void writeURIAttribute(String name, Object value, final String property) throws IOException;
+ public abstract void writeURIAttribute(String name, Object value, String property) throws IOException;
/**
* @deprecated Should not directly called via this interface. There is be a special method which might be better.
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
index aaab875..fcbaed2 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CssClassUtils.java
@@ -20,12 +20,12 @@
package org.apache.myfaces.tobago.renderkit.css;
import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+/**
+ * Helpful for tests. Not for use in production.
+ */
class CssClassUtils {
/**
@@ -34,8 +34,7 @@ class CssClassUtils {
static List<CssItem> compareCss(final String cssFileName, final CssItem[] cssItems) throws IOException {
final List<CssItem> missing = new ArrayList<>();
-
- final String fileContent = new String(Files.readAllBytes(Paths.get(cssFileName)), StandardCharsets.UTF_8);
+ final String fileContent = FileTestUtils.fileToString(cssFileName);
for (final CssItem cssItem : cssItems) {
if (!containsClassName(fileContent, cssItem.getName())) {
@@ -48,10 +47,10 @@ class CssClassUtils {
private static boolean containsClassName(final String content, final String className) {
return content.contains("." + className + " ")
- || content.contains("." + className + "{")
- || content.contains("." + className + ",")
- || content.contains("." + className + ":")
- || content.contains("." + className + ".")
- || content.contains("." + className + ">");
+ || content.contains("." + className + "{")
+ || content.contains("." + className + ",")
+ || content.contains("." + className + ":")
+ || content.contains("." + className + ".")
+ || content.contains("." + className + ">");
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
index c3c2a24..29652ec 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/html/HtmlElementsUnitTest.java
@@ -44,14 +44,14 @@ public class HtmlElementsUnitTest {
// list from spec.
final List<String> voids = Arrays.asList(
- "area", "base", "br", "col", "command", "embed",
- "hr", "img", "input", "keygen", "link", "meta",
- "param", "source", "track", "wbr");
+ "area", "base", "br", "col", "command", "embed",
+ "hr", "img", "input", "keygen", "link", "meta",
+ "param", "source", "track", "wbr");
for (final Field field : HtmlElements.class.getFields()) {
final HtmlElements element = (HtmlElements) field.get(null);
- Assert.assertEquals("Check void: '" + element + "'", voids.contains(element.getValue()), element.isVoid());
+ Assert.assertEquals("Check void: '" + element + "'", voids.contains(element.getValue()), element.isVoid());
}
}
diff --git a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
index 954592b..9eb42cf 100644
--- a/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
+++ b/tobago-core/src/test/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterUnitTest.java
@@ -134,7 +134,7 @@ public class TobagoResponseWriterUnitTest extends AbstractJsfTestCase {
@Test
public void testNonUtf8() throws IOException {
- try (final TobagoResponseWriter writer1
+ try (TobagoResponseWriter writer1
= new HtmlResponseWriter(stringWriter, "", StandardCharsets.ISO_8859_1)) {
writer1.startElement(HtmlElements.INPUT);
writer1.writeAttribute(HtmlAttributes.VALUE, "Gutschein über 100 €.", true);
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
index 3142811..c8af40b 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/ExceptionController.java
@@ -32,10 +32,10 @@ public class ExceptionController implements Serializable {
public String getStackTrace() {
final Throwable exception = (Throwable) FacesContext.getCurrentInstance().getExternalContext()
- .getRequestMap().get("javax.servlet.error.exception");
+ .getRequestMap().get("javax.servlet.error.exception");
final StringWriter stringWriter = new StringWriter();
final PrintWriter printWriter = new PrintWriter(stringWriter);
- if(exception != null) {
+ if (exception != null) {
exception.printStackTrace(printWriter);
}
return stringWriter.toString();
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
index 8d26fff..dbbd375 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/NavigationTree.java
@@ -157,7 +157,7 @@ public class NavigationTree implements Serializable {
final FacesContext facesContext = FacesContext.getCurrentInstance();
final ExternalContext externalContext = facesContext.getExternalContext();
final String viewId = facesContext.getViewRoot().getViewId();
- try (final InputStream resourceAsStream = externalContext.getResourceAsStream(viewId)) {
+ try (InputStream resourceAsStream = externalContext.getResourceAsStream(viewId)) {
return IOUtils.toString(resourceAsStream, StandardCharsets.UTF_8);
} catch (final IOException e) {
LOG.error("", e);
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
index 259c02a..992d9b1 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SourceFileReader.java
@@ -38,7 +38,7 @@ public abstract class SourceFileReader {
final ExternalContext externalContext = facesContext.getExternalContext();
final String viewId = facesContext.getViewRoot().getViewId();
final String file = viewId.substring(0, viewId.lastIndexOf("/")) + "/" + filename;
- try (final InputStream resourceAsStream = externalContext.getResourceAsStream(file)) {
+ try (InputStream resourceAsStream = externalContext.getResourceAsStream(file)) {
if (resourceAsStream != null) {
return IOUtils.toString(resourceAsStream, StandardCharsets.UTF_8);
}
diff --git a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
index 53b7361..878dea0 100644
--- a/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
+++ b/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/bestpractice/BestPracticeController.java
@@ -55,7 +55,7 @@ public class BestPracticeController {
final FacesContext facesContext = FacesContext.getCurrentInstance();
- try (final InputStream inputStream = getInputStream(pdf, facesContext)) {
+ try (InputStream inputStream = getInputStream(pdf, facesContext)) {
final HttpServletResponse response = (HttpServletResponse) facesContext.getExternalContext().getResponse();
response.setContentType(pdf ? "application/pdf" : "text/plain");
if (outside) {