You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/01/16 19:10:31 UTC
[commons-validator] branch master updated: No need to initialize instance variable to default value
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-validator.git
The following commit(s) were added to refs/heads/master by this push:
new a7d5a236 No need to initialize instance variable to default value
a7d5a236 is described below
commit a7d5a236a4a470d70e491f90ab540e2f5701fc5d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Mon Jan 16 14:10:26 2023 -0500
No need to initialize instance variable to default value
---
.../java/org/apache/commons/validator/Arg.java | 6 +++---
.../apache/commons/validator/DateValidator.java | 2 +-
.../java/org/apache/commons/validator/Field.java | 14 ++++++-------
.../java/org/apache/commons/validator/Form.java | 6 +++---
.../java/org/apache/commons/validator/FormSet.java | 8 ++++----
.../java/org/apache/commons/validator/Msg.java | 6 +++---
.../org/apache/commons/validator/Validator.java | 14 ++++++-------
.../apache/commons/validator/ValidatorAction.java | 24 +++++++++++-----------
.../apache/commons/validator/ValidatorResult.java | 6 +++---
.../java/org/apache/commons/validator/Var.java | 10 ++++-----
.../java/org/apache/commons/validator/package.html | 2 +-
.../routines/AbstractCalendarValidator.java | 4 ++--
.../routines/AbstractNumberValidator.java | 4 ++--
.../validator/routines/BigDecimalValidator.java | 2 +-
.../commons/validator/routines/DateValidator.java | 2 +-
.../validator/routines/DomainValidator.java | 2 +-
.../org/apache/commons/validator/util/Flags.java | 2 +-
.../commons/validator/AbstractCommonTest.java | 2 +-
.../apache/commons/validator/ExtensionTest.java | 2 +-
.../commons/validator/MultipleConfigFilesTest.java | 2 +-
.../org/apache/commons/validator/NameBean.java | 6 +++---
.../apache/commons/validator/RetrieveFormTest.java | 2 +-
.../org/apache/commons/validator/TypeBean.java | 16 +++++++--------
.../apache/commons/validator/ValidatorTest.java | 4 ++--
.../org/apache/commons/validator/ValueBean.java | 2 +-
25 files changed, 75 insertions(+), 75 deletions(-)
diff --git a/src/main/java/org/apache/commons/validator/Arg.java b/src/main/java/org/apache/commons/validator/Arg.java
index 6f43153a..eab76236 100644
--- a/src/main/java/org/apache/commons/validator/Arg.java
+++ b/src/main/java/org/apache/commons/validator/Arg.java
@@ -44,17 +44,17 @@ public class Arg implements Cloneable, Serializable {
* resolved in (optional).
* @since 1.1
*/
- protected String bundle = null;
+ protected String bundle;
/**
* The key or value of the argument.
*/
- protected String key = null;
+ protected String key;
/**
* The name dependency that this argument goes with (optional).
*/
- protected String name = null;
+ protected String name;
/**
* This argument's position in the message. Set postion=0 to
diff --git a/src/main/java/org/apache/commons/validator/DateValidator.java b/src/main/java/org/apache/commons/validator/DateValidator.java
index 33e93cdf..45546b2d 100644
--- a/src/main/java/org/apache/commons/validator/DateValidator.java
+++ b/src/main/java/org/apache/commons/validator/DateValidator.java
@@ -107,7 +107,7 @@ public class DateValidator {
return false;
}
- DateFormat formatter = null;
+ DateFormat formatter;
if (locale != null) {
formatter = DateFormat.getDateInstance(DateFormat.SHORT, locale);
} else {
diff --git a/src/main/java/org/apache/commons/validator/Field.java b/src/main/java/org/apache/commons/validator/Field.java
index 51514551..b30dbaa3 100644
--- a/src/main/java/org/apache/commons/validator/Field.java
+++ b/src/main/java/org/apache/commons/validator/Field.java
@@ -79,32 +79,32 @@ public class Field implements Cloneable, Serializable {
/**
* The Field's property name.
*/
- protected String property = null;
+ protected String property;
/**
* The Field's indexed property name.
*/
- protected String indexedProperty = null;
+ protected String indexedProperty;
/**
* The Field's indexed list property name.
*/
- protected String indexedListProperty = null;
+ protected String indexedListProperty;
/**
* The Field's unique key.
*/
- protected String key = null;
+ protected String key;
/**
* A comma separated list of validator's this field depends on.
*/
- protected String depends = null;
+ protected String depends;
/**
* The Page Number
*/
- protected int page = 0;
+ protected int page;
/**
* The flag that indicates whether scripting should be generated
@@ -116,7 +116,7 @@ public class Field implements Cloneable, Serializable {
/**
* The order of the Field in the Form.
*/
- protected int fieldOrder = 0;
+ protected int fieldOrder;
/**
* Internal representation of this.depends String as a List. This List
diff --git a/src/main/java/org/apache/commons/validator/Form.java b/src/main/java/org/apache/commons/validator/Form.java
index 9b1e57c6..f2c9bd3d 100644
--- a/src/main/java/org/apache/commons/validator/Form.java
+++ b/src/main/java/org/apache/commons/validator/Form.java
@@ -42,7 +42,7 @@ public class Form implements Serializable {
private static final long serialVersionUID = 6445211789563796371L;
/** The name/key the set of validation rules is stored under. */
- protected String name = null;
+ protected String name;
/**
* List of <code>Field</code>s. Used to maintain the order they were added
@@ -64,13 +64,13 @@ public class Form implements Serializable {
*
* @since 1.2.0
*/
- protected String inherit = null;
+ protected String inherit;
/**
* Whether or not the this <code>Form</code> was processed for replacing
* variables in strings with their values.
*/
- private boolean processed = false;
+ private boolean processed;
/**
* Gets the name/key of the set of validation rules.
diff --git a/src/main/java/org/apache/commons/validator/FormSet.java b/src/main/java/org/apache/commons/validator/FormSet.java
index 0bc5bb61..25eb2e75 100644
--- a/src/main/java/org/apache/commons/validator/FormSet.java
+++ b/src/main/java/org/apache/commons/validator/FormSet.java
@@ -42,16 +42,16 @@ public class FormSet implements Serializable {
* Whether or not the this <code>FormSet</code> was processed for replacing
* variables in strings with their values.
*/
- private boolean processed = false;
+ private boolean processed;
/** Language component of <code>Locale</code> (required). */
- private String language = null;
+ private String language;
/** Country component of <code>Locale</code> (optional). */
- private String country = null;
+ private String country;
/** Variant component of <code>Locale</code> (optional). */
- private String variant = null;
+ private String variant;
/**
* A <code>Map</code> of <code>Form</code>s using the name field of the
diff --git a/src/main/java/org/apache/commons/validator/Msg.java b/src/main/java/org/apache/commons/validator/Msg.java
index 80719cc6..e937f928 100644
--- a/src/main/java/org/apache/commons/validator/Msg.java
+++ b/src/main/java/org/apache/commons/validator/Msg.java
@@ -35,17 +35,17 @@ public class Msg implements Cloneable, Serializable {
* resolved in (optional).
* @since 1.1
*/
- protected String bundle = null;
+ protected String bundle;
/**
* The key or value of the argument.
*/
- protected String key = null;
+ protected String key;
/**
* The name dependency that this argument goes with (optional).
*/
- protected String name = null;
+ protected String name;
/**
* Whether or not the key is a message resource (optional). Defaults to
diff --git a/src/main/java/org/apache/commons/validator/Validator.java b/src/main/java/org/apache/commons/validator/Validator.java
index 63ce5e8b..3d025d10 100644
--- a/src/main/java/org/apache/commons/validator/Validator.java
+++ b/src/main/java/org/apache/commons/validator/Validator.java
@@ -91,18 +91,18 @@ public class Validator implements Serializable {
/**
* The Validator Resources.
*/
- protected ValidatorResources resources = null;
+ protected ValidatorResources resources;
/**
* The name of the form to validate
*/
- protected String formName = null;
+ protected String formName;
/**
* The name of the field on the form to validate
* @since 1.2.0
*/
- protected String fieldName = null;
+ protected String fieldName;
/**
* Maps validation method parameter class names to the objects to be passed
@@ -113,7 +113,7 @@ public class Validator implements Serializable {
/**
* The current page number to validate.
*/
- protected int page = 0;
+ protected int page;
/**
* The class loader to use for instantiating application objects.
@@ -121,18 +121,18 @@ public class Validator implements Serializable {
* used to load Digester itself, is used, based on the value of the
* <code>useContextClassLoader</code> variable.
*/
- protected transient ClassLoader classLoader = null;
+ protected transient ClassLoader classLoader;
/**
* Whether or not to use the Context ClassLoader when loading classes
* for instantiating new objects. Default is <code>false</code>.
*/
- protected boolean useContextClassLoader = false;
+ protected boolean useContextClassLoader;
/**
* Set this to true to not return Fields that pass validation. Only return failures.
*/
- protected boolean onlyReturnErrors = false;
+ protected boolean onlyReturnErrors;
/**
* Construct a <code>Validator</code> that will
diff --git a/src/main/java/org/apache/commons/validator/ValidatorAction.java b/src/main/java/org/apache/commons/validator/ValidatorAction.java
index 1495257e..99127857 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorAction.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorAction.java
@@ -54,29 +54,29 @@ public class ValidatorAction implements Serializable {
/**
* The name of the validation.
*/
- private String name = null;
+ private String name;
/**
* The full class name of the class containing
* the validation method associated with this action.
*/
- private String classname = null;
+ private String classname;
/**
* The Class object loaded from the classname.
*/
- private Class<?> validationClass = null;
+ private Class<?> validationClass;
/**
* The full method name of the validation to be performed. The method
* must be thread safe.
*/
- private String method = null;
+ private String method;
/**
* The Method object loaded from the method name.
*/
- private Method validationMethod = null;
+ private Method validationMethod;
/**
* <p>
@@ -102,44 +102,44 @@ public class ValidatorAction implements Serializable {
/**
* The Class objects for each entry in methodParameterList.
*/
- private Class<?>[] parameterClasses = null;
+ private Class<?>[] parameterClasses;
/**
* The other <code>ValidatorAction</code>s that this one depends on. If
* any errors occur in an action that this one depends on, this action will
* not be processsed.
*/
- private String depends = null;
+ private String depends;
/**
* The default error message associated with this action.
*/
- private String msg = null;
+ private String msg;
/**
* An optional field to contain the name to be used if JavaScript is
* generated.
*/
- private String jsFunctionName = null;
+ private String jsFunctionName;
/**
* An optional field to contain the class path to be used to retrieve the
* JavaScript function.
*/
- private String jsFunction = null;
+ private String jsFunction;
/**
* An optional field to containing a JavaScript representation of the
* java method assocated with this action.
*/
- private String javascript = null;
+ private String javascript;
/**
* If the java method matching the correct signature isn't static, the
* instance is stored in the action. This assumes the method is thread
* safe.
*/
- private Object instance = null;
+ private Object instance;
/**
* An internal List representation of the other <code>ValidatorAction</code>s
diff --git a/src/main/java/org/apache/commons/validator/ValidatorResult.java b/src/main/java/org/apache/commons/validator/ValidatorResult.java
index 06e34c0a..27a5e1b6 100644
--- a/src/main/java/org/apache/commons/validator/ValidatorResult.java
+++ b/src/main/java/org/apache/commons/validator/ValidatorResult.java
@@ -42,7 +42,7 @@ public class ValidatorResult implements Serializable {
* <code>Field</code> being validated.
* TODO This variable is not used. Need to investigate removing it.
*/
- protected Field field = null;
+ protected Field field;
/**
* Constructs a <code>ValidatorResult</code> with the associated field being
@@ -137,8 +137,8 @@ public class ValidatorResult implements Serializable {
private static final long serialVersionUID = 4076665918535320007L;
- private boolean valid = false;
- private Object result = null;
+ private boolean valid;
+ private Object result;
/**
* Construct a Result status.
diff --git a/src/main/java/org/apache/commons/validator/Var.java b/src/main/java/org/apache/commons/validator/Var.java
index cdc1504a..dad9e511 100644
--- a/src/main/java/org/apache/commons/validator/Var.java
+++ b/src/main/java/org/apache/commons/validator/Var.java
@@ -49,27 +49,27 @@ public class Var implements Cloneable, Serializable {
/**
* The name of the variable.
*/
- private String name = null;
+ private String name;
/**
* The key or value the variable.
*/
- private String value = null;
+ private String value;
/**
* The optional JavaScript type of the variable.
*/
- private String jsType = null;
+ private String jsType;
/**
* Whether the variable is a resource [false]
*/
- private boolean resource = false;
+ private boolean resource;
/**
* The bundle for a variable (when resource = 'true').
*/
- private String bundle = null;
+ private String bundle;
/**
* Default Constructor.
diff --git a/src/main/java/org/apache/commons/validator/package.html b/src/main/java/org/apache/commons/validator/package.html
index bd518738..5f6647b8 100644
--- a/src/main/java/org/apache/commons/validator/package.html
+++ b/src/main/java/org/apache/commons/validator/package.html
@@ -214,7 +214,7 @@ Validator validator = new Validator(resources, "nameForm");
validator.setParameter(Validator.BEAN_PARAM, name);
// Get results of the validation.
-Map results = null;
+Map results;
// throws ValidatorException (catch clause not shown here)
results = validator.validate();
diff --git a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
index 34e32d05..f9137ff0 100644
--- a/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/AbstractCalendarValidator.java
@@ -210,7 +210,7 @@ public abstract class AbstractCalendarValidator extends AbstractFormatValidator
*/
@Override
protected Format getFormat(final String pattern, final Locale locale) {
- DateFormat formatter = null;
+ DateFormat formatter;
final boolean usePattern = pattern != null && !pattern.isEmpty();
if (!usePattern) {
formatter = (DateFormat)getFormat(locale);
@@ -233,7 +233,7 @@ public abstract class AbstractCalendarValidator extends AbstractFormatValidator
*/
protected Format getFormat(final Locale locale) {
- DateFormat formatter = null;
+ DateFormat formatter;
if (dateStyle >= 0 && timeStyle >= 0) {
if (locale == null) {
formatter = DateFormat.getDateTimeInstance(dateStyle, timeStyle);
diff --git a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
index 5cd17efa..2ea68b6e 100644
--- a/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/AbstractNumberValidator.java
@@ -186,7 +186,7 @@ public abstract class AbstractNumberValidator extends AbstractFormatValidator {
@Override
protected Format getFormat(final String pattern, final Locale locale) {
- NumberFormat formatter = null;
+ NumberFormat formatter;
final boolean usePattern = pattern != null && !pattern.isEmpty();
if (!usePattern) {
formatter = (NumberFormat)getFormat(locale);
@@ -244,7 +244,7 @@ public abstract class AbstractNumberValidator extends AbstractFormatValidator {
* @return The <code>NumberFormat</code> to created.
*/
protected Format getFormat(final Locale locale) {
- NumberFormat formatter = null;
+ NumberFormat formatter;
switch (formatType) {
case CURRENCY_FORMAT:
if (locale == null) {
diff --git a/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java b/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java
index 71f85cbf..7401f1ea 100644
--- a/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/BigDecimalValidator.java
@@ -222,7 +222,7 @@ public class BigDecimalValidator extends AbstractNumberValidator {
*/
@Override
protected Object processParsedValue(final Object value, final Format formatter) {
- BigDecimal decimal = null;
+ BigDecimal decimal;
if (value instanceof Long) {
decimal = BigDecimal.valueOf(((Long)value).longValue());
} else {
diff --git a/src/main/java/org/apache/commons/validator/routines/DateValidator.java b/src/main/java/org/apache/commons/validator/routines/DateValidator.java
index a77aee9f..69895805 100644
--- a/src/main/java/org/apache/commons/validator/routines/DateValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DateValidator.java
@@ -335,7 +335,7 @@ public class DateValidator extends AbstractCalendarValidator {
*/
private Calendar getCalendar(final Date value, final TimeZone timeZone) {
- Calendar calendar = null;
+ Calendar calendar;
if (timeZone != null) {
calendar = Calendar.getInstance(timeZone);
} else {
diff --git a/src/main/java/org/apache/commons/validator/routines/DomainValidator.java b/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
index 1f70e0eb..4fd88d3b 100644
--- a/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
+++ b/src/main/java/org/apache/commons/validator/routines/DomainValidator.java
@@ -2013,7 +2013,7 @@ public class DomainValidator implements Serializable {
* This field does not need to be volatile since it is only accessed from
* synchronized methods.
*/
- private static boolean inUse = false;
+ private static boolean inUse;
/*
* These arrays are mutable.
diff --git a/src/main/java/org/apache/commons/validator/util/Flags.java b/src/main/java/org/apache/commons/validator/util/Flags.java
index f07e1a7d..03a5ca7c 100644
--- a/src/main/java/org/apache/commons/validator/util/Flags.java
+++ b/src/main/java/org/apache/commons/validator/util/Flags.java
@@ -44,7 +44,7 @@ public class Flags implements Serializable, Cloneable {
/**
* Represents the current flag state.
*/
- private long flags = 0;
+ private long flags;
/**
* Create a new Flags object.
diff --git a/src/test/java/org/apache/commons/validator/AbstractCommonTest.java b/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
index 99559fa9..bd6ef414 100644
--- a/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
+++ b/src/test/java/org/apache/commons/validator/AbstractCommonTest.java
@@ -32,7 +32,7 @@ abstract public class AbstractCommonTest extends TestCase {
/**
* Resources used for validation tests.
*/
- protected ValidatorResources resources = null;
+ protected ValidatorResources resources;
public AbstractCommonTest(final String string) {
super(string);
diff --git a/src/test/java/org/apache/commons/validator/ExtensionTest.java b/src/test/java/org/apache/commons/validator/ExtensionTest.java
index 1db78e24..c120462e 100644
--- a/src/test/java/org/apache/commons/validator/ExtensionTest.java
+++ b/src/test/java/org/apache/commons/validator/ExtensionTest.java
@@ -55,7 +55,7 @@ public class ExtensionTest extends TestCase {
/**
* Resources used for validation tests.
*/
- private ValidatorResources resources = null;
+ private ValidatorResources resources;
/**
* Constructor de ExtensionTest.
diff --git a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
index 44da6275..0af9b769 100644
--- a/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
+++ b/src/test/java/org/apache/commons/validator/MultipleConfigFilesTest.java
@@ -33,7 +33,7 @@ public class MultipleConfigFilesTest extends TestCase {
/**
* Resources used for validation tests.
*/
- private ValidatorResources resources = null;
+ private ValidatorResources resources;
/**
* The key used to retrieve the set of validation
diff --git a/src/test/java/org/apache/commons/validator/NameBean.java b/src/test/java/org/apache/commons/validator/NameBean.java
index 6e6a11f4..5a36dbfb 100644
--- a/src/test/java/org/apache/commons/validator/NameBean.java
+++ b/src/test/java/org/apache/commons/validator/NameBean.java
@@ -22,11 +22,11 @@ package org.apache.commons.validator;
*/
public class NameBean {
- protected String firstName = null;
+ protected String firstName;
- protected String middleName = null;
+ protected String middleName;
- protected String lastName = null;
+ protected String lastName;
public String getFirstName() {
return firstName;
diff --git a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
index 713c74ea..a741aed4 100644
--- a/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
+++ b/src/test/java/org/apache/commons/validator/RetrieveFormTest.java
@@ -31,7 +31,7 @@ public class RetrieveFormTest extends TestCase {
/**
* Resources used for validation tests.
*/
- private ValidatorResources resources = null;
+ private ValidatorResources resources;
/**
* Prefix for the forms.
diff --git a/src/test/java/org/apache/commons/validator/TypeBean.java b/src/test/java/org/apache/commons/validator/TypeBean.java
index 38ed158d..d1d909be 100644
--- a/src/test/java/org/apache/commons/validator/TypeBean.java
+++ b/src/test/java/org/apache/commons/validator/TypeBean.java
@@ -23,14 +23,14 @@ package org.apache.commons.validator;
*/
public class TypeBean {
- private String sByte = null;
- private String sShort = null;
- private String sInteger = null;
- private String sLong = null;
- private String sFloat = null;
- private String sDouble = null;
- private String sDate = null;
- private String sCreditCard = null;
+ private String sByte;
+ private String sShort;
+ private String sInteger;
+ private String sLong;
+ private String sFloat;
+ private String sDouble;
+ private String sDate;
+ private String sCreditCard;
public String getByte() {
return sByte;
diff --git a/src/test/java/org/apache/commons/validator/ValidatorTest.java b/src/test/java/org/apache/commons/validator/ValidatorTest.java
index c7a49f19..49ad75dd 100644
--- a/src/test/java/org/apache/commons/validator/ValidatorTest.java
+++ b/src/test/java/org/apache/commons/validator/ValidatorTest.java
@@ -259,8 +259,8 @@ public class ValidatorTest extends TestCase {
}
public static class TestBean {
- private String letter = null;
- private String date = null;
+ private String letter;
+ private String date;
public String getLetter() {
return letter;
diff --git a/src/test/java/org/apache/commons/validator/ValueBean.java b/src/test/java/org/apache/commons/validator/ValueBean.java
index 08627a32..3b66b5d7 100644
--- a/src/test/java/org/apache/commons/validator/ValueBean.java
+++ b/src/test/java/org/apache/commons/validator/ValueBean.java
@@ -22,7 +22,7 @@ package org.apache.commons.validator;
*/
public class ValueBean {
- protected String value = null;
+ protected String value;
/**
* Gets the value.