Author: tv
Date: Wed Dec 7 11:14:53 2016
New Revision: 1773047
URL: http://svn.apache.org/viewvc?rev=1773047&view=rev
Log:
Fix FindBugs issues
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java?rev=1773047&r1=1773046&r2=1773047&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/IntakeServiceImpl.java
Wed Dec 7 11:14:53 2016
@@ -33,6 +33,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.Set;
@@ -797,9 +798,9 @@ public class IntakeServiceImpl extends A
String groupPrefix = appData.getGroupPrefix();
- for (int i = glist.size() - 1; i >= 0; i--)
+ for (ListIterator<Group> i = glist.listIterator(glist.size());
i.hasPrevious();)
{
- Group g = glist.get(i);
+ Group g = i.previous();
String groupName = g.getIntakeGroupName();
boolean registerUnqualified = registerGroup(groupName, g,
appData, true);
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java?rev=1773047&r1=1773046&r2=1773047&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Field.java
Wed Dec 7 11:14:53 2016
@@ -107,12 +107,6 @@ public abstract class Field<T> implement
/** Is this field always required? This is only set through the XML file
*/
private boolean alwaysRequired;
- /**
- * Value of the field if an error occurs while getting
- * the value from the mapped object
- */
- private T onError;
-
/** Default value of the field */
protected T defaultValue;
@@ -832,11 +826,6 @@ public abstract class Field<T> implement
val = getTestValue();
}
- if (val == null)
- {
- val = onError;
- }
-
return val;
}
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java?rev=1773047&r1=1773046&r2=1773047&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/Group.java
Wed Dec 7 11:14:53 2016
@@ -125,7 +125,7 @@ public class Group implements Serializab
/**
* The object containing the request data
*/
- private ValueParser pp;
+ private transient ValueParser pp;
/**
* A flag to help prevent duplicate hidden fields declaring this group.
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java?rev=1773047&r1=1773046&r2=1773047&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/IntegerField.java
Wed Dec 7 11:14:53 2016
@@ -61,7 +61,7 @@ public class IntegerField
return;
}
- defaultValue = new Integer(prop);
+ defaultValue = Integer.valueOf(prop);
}
/**
@@ -82,7 +82,7 @@ public class IntegerField
return;
}
- emptyValue = new Integer(prop);
+ emptyValue = Integer.valueOf(prop);
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java?rev=1773047&r1=1773046&r2=1773047&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/LongField.java
Wed Dec 7 11:14:53 2016
@@ -61,7 +61,7 @@ public class LongField
return;
}
- defaultValue = new Long(prop);
+ defaultValue = Long.valueOf(prop);
}
/**
@@ -82,7 +82,7 @@ public class LongField
return;
}
- emptyValue = new Long(prop);
+ emptyValue = Long.valueOf(prop);
}
/**
Modified:
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
URL:
http://svn.apache.org/viewvc/turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java?rev=1773047&r1=1773046&r2=1773047&view=diff
==============================================================================
---
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
(original)
+++
turbine/fulcrum/trunk/intake/src/java/org/apache/fulcrum/intake/model/ShortField.java
Wed Dec 7 11:14:53 2016
@@ -61,7 +61,7 @@ public class ShortField
return;
}
- defaultValue = new Short(prop);
+ defaultValue = Short.valueOf(prop);
}
/**
@@ -82,7 +82,7 @@ public class ShortField
return;
}
- emptyValue = new Short(prop);
+ emptyValue = Short.valueOf(prop);
}
/**
