Rather than performing a linear unbounded search followed by a
conditional remove, use an interator and remove the first matching
property, bailing out.
Change-Id: Ia5de2175628c9730d7c76df58e15540f3cbb4fa3
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit
a5f323b5a0eeb5d4a0cb82b37f751ae780ba1f91)
}
private def void removeProperty(Collection<GeneratedProperty> props, String name) {
- var GeneratedProperty toRemove = null
- for (p : props) {
- if (p.name.equals(name)) {
- toRemove = p;
+ val iter = props.iterator
+ while (iter.hasNext) {
+ if (name.equals(iter.next.name)) {
+ iter.remove
+ return
}
}
- if (toRemove !== null) {
- props.remove(toRemove);
- }
}
private static def findDeprecatedAnnotation(List<AnnotationType> annotations) {