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 2020/11/21 02:56:57 UTC
[commons-digester] branch master updated: No need to initialize 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-digester.git
The following commit(s) were added to refs/heads/master by this push:
new e591139 No need to initialize to default value.
e591139 is described below
commit e591139dfcbebb87c6b00968bc6c96956d27d577
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 20 21:56:52 2020 -0500
No need to initialize to default value.
---
.../java/org/apache/commons/digester3/Digester.java | 5 ++---
.../org/apache/commons/digester3/DigesterTestCase.java | 2 +-
.../commons/digester3/ExtendedBaseRulesTestCase.java | 17 +++++++----------
.../java/org/apache/commons/digester3/RuleTestCase.java | 11 +++++------
.../org/apache/commons/digester3/RulesBaseTestCase.java | 7 ++-----
5 files changed, 17 insertions(+), 25 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/digester3/Digester.java b/core/src/main/java/org/apache/commons/digester3/Digester.java
index 1c106ac..fe37657 100644
--- a/core/src/main/java/org/apache/commons/digester3/Digester.java
+++ b/core/src/main/java/org/apache/commons/digester3/Digester.java
@@ -2738,7 +2738,6 @@ public class Digester
*/
public <T> T pop( String stackName )
{
- T result = null;
Stack<Object> namedStack = stacksByName.get( stackName );
if ( namedStack == null )
{
@@ -2749,7 +2748,7 @@ public class Digester
throw new EmptyStackException();
}
- result = this.<T> npeSafeCast( namedStack.pop() );
+ T result = this.<T> npeSafeCast( namedStack.pop() );
if ( stackAction != null )
{
@@ -2793,7 +2792,7 @@ public class Digester
*/
public <T> T peek( String stackName, int n )
{
- T result = null;
+ T result;
Stack<Object> namedStack = stacksByName.get( stackName );
if ( namedStack == null )
{
diff --git a/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java b/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
index 9ddf644..dafb06a 100644
--- a/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/DigesterTestCase.java
@@ -345,7 +345,7 @@ public class DigesterTestCase
public void testStackMethods()
{
- Object value = null;
+ Object value;
// New stack must be empty
assertEquals( "New stack is empty", 0, digester.getCount() );
diff --git a/core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java b/core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java
index 70d6929..c6d0d17 100644
--- a/core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/ExtendedBaseRulesTestCase.java
@@ -74,16 +74,13 @@ public class ExtendedBaseRulesTestCase
digester.addRule( "alpha/beta/gamma/?", new TestRule( "exact_parent" ) );
digester.addRule( "*/beta/gamma/?", new TestRule( "wild_parent" ) );
- List<Rule> list = null;
- Iterator<Rule> it = null;
-
// this should match just the exact since this has presidence
- list = digester.getRules().match( null, "alpha/beta/gamma/delta", null, null );
+ List<Rule> list = digester.getRules().match( null, "alpha/beta/gamma/delta", null, null );
// all three rules should match
assertEquals( "Testing basic parent mismatch (A)", 1, list.size() );
- it = list.iterator();
+ Iterator<Rule> it = list.iterator();
assertEquals( "Testing basic parent mismatch (B)", "exact", ( (TestRule) it.next() ).getIdentifier() );
// we don't have an exact match for this child so we should get the exact parent
@@ -142,8 +139,8 @@ public class ExtendedBaseRulesTestCase
digester.addRule( "*/gamma/?", new TestRule( "non_wildhead_child" ) );
digester.addRule( "!*/epsilon/beta/gamma/?", new TestRule( "universal_wildhead_child" ) );
- List<Rule> list = null;
- Iterator<Rule> it = null;
+ List<Rule> list;
+ Iterator<Rule> it;
// test universal wild head
list = digester.getRules().match( null, "alpha/beta/gamma", null, null );
@@ -222,8 +219,8 @@ public class ExtendedBaseRulesTestCase
digester.addRule( "alpha/beta/gamma/delta", new TestRule( "exact" ) );
digester.addRule( "*/beta/gamma/?", new TestRule( "wild_parent" ) );
- List<Rule> list = null;
- Iterator<Rule> it = null;
+ List<Rule> list;
+ Iterator<Rule> it;
// The universal wild will always match whatever else does
list = digester.getRules().match( null, "alpha/beta/gamma/delta", null, null );
@@ -276,7 +273,7 @@ public class ExtendedBaseRulesTestCase
// The combinations a little large to test everything but we'll pick a couple and try them.
digester.addRule( "*/a", new TestRule( "a_tail" ) );
- List<Rule> list = null;
+ List<Rule> list;
list = digester.getRules().match( null, "a", null, null );
diff --git a/core/src/test/java/org/apache/commons/digester3/RuleTestCase.java b/core/src/test/java/org/apache/commons/digester3/RuleTestCase.java
index b56c008..180af84 100644
--- a/core/src/test/java/org/apache/commons/digester3/RuleTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/RuleTestCase.java
@@ -145,8 +145,7 @@ public class RuleTestCase
digester.addSetNext( "employee/address", "addAddress" );
// Parse our test input once
- Object root = null;
- root = digester.parse( getInputStream( "Test1.xml" ) );
+ Object root = digester.parse( getInputStream( "Test1.xml" ) );
validateObjectCreate3( root );
@@ -228,13 +227,13 @@ public class RuleTestCase
digester.addSetNext( "employee/address", "addAddress" );
// Parse our test input the first time
- Object root1 = null;
+ Object root1;
root1 = digester.parse( getInputStream( "Test1.xml" ) );
validateObjectCreate3( root1 );
// Parse our test input the second time
- Object root2 = null;
+ Object root2;
root2 = digester.parse( getInputStream( "Test1.xml" ) );
validateObjectCreate3( root2 );
@@ -338,7 +337,7 @@ public class RuleTestCase
digester.addSetTop( "employee/address", "setEmployee" );
// Parse our test input.
- Object root = null;
+ Object root;
root = digester.parse( getInputStream( "Test1.xml" ) );
validateObjectCreate3( root );
@@ -360,7 +359,7 @@ public class RuleTestCase
digester.addSetTop( "employee/address", "setEmployee", "org.apache.commons.digester3.Employee" );
// Parse our test input.
- Object root = null;
+ Object root;
root = digester.parse( getInputStream( "Test1.xml" ) );
validateObjectCreate3( root );
diff --git a/core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java b/core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java
index 115defc..f48720b 100644
--- a/core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/RulesBaseTestCase.java
@@ -175,9 +175,6 @@ public class RulesBaseTestCase
public void testBasicNamespaceMatching()
{
- List<Rule> list = null;
- Iterator<Rule> it = null;
-
// clear any existing rules
digester.getRules().clear();
@@ -187,14 +184,14 @@ public class RulesBaseTestCase
digester.addRule( "alpha/beta/gamma", new TestRule( "No-Namespace" ) );
digester.addRule( "alpha/beta/gamma", new TestRule( "Euclidean-Namespace", "euclidean" ) );
- list = digester.getRules().rules();
+ List<Rule> list = digester.getRules().rules();
// test that matching null namespace brings back namespace and non-namespace rules
list = digester.getRules().match( null, "alpha/beta/gamma", null, null );
assertEquals( "Null namespace match (A)", 2, list.size() );
- it = list.iterator();
+ Iterator<Rule> it = list.iterator();
assertEquals( "Null namespace match (B)", "No-Namespace", ( (TestRule) it.next() ).getIdentifier() );
assertEquals( "Null namespace match (C)", "Euclidean-Namespace", ( (TestRule) it.next() ).getIdentifier() );