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-configuration.git
The following commit(s) were added to refs/heads/master by this push:
new dfcbcc8c Camel case
dfcbcc8c is described below
commit dfcbcc8cd2b51eb75e10918512ec6eac3f7e79f1
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Thu Mar 20 08:45:40 2025 -0400
Camel case
---
.../tree/xpath/AbstractConfigurationNodeIterator.java | 6 +++---
.../tree/xpath/ConfigurationNodeIteratorAttribute.java | 16 ++++++++--------
.../tree/xpath/ConfigurationNodeIteratorChildren.java | 12 ++++++------
.../tree/xpath/ConfigurationNodePointer.java | 6 +++---
.../tree/xpath/ConfigurationNodePointerFactory.java | 8 ++++----
.../tree/xpath/TestConfigurationAttributePointer.java | 6 +++---
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java
index d907e595..8d743f1a 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/AbstractConfigurationNodeIterator.java
@@ -56,11 +56,11 @@ abstract class AbstractConfigurationNodeIterator<T>
implements NodeIterator {
* Returns the qualified name from the given {@code QName}. If the name
has no namespace, result is the simple name.
* Otherwise, the namespace prefix is added.
*
- * @param name the {@code QName}
+ * @param qName the {@code QName}
* @return the qualified name
*/
- protected static String qualifiedName(final QName name) {
- return name.getPrefix() == null ? name.getName() :
prefixName(name.getPrefix(), name.getName());
+ protected static String qualifiedName(final QName qName) {
+ return qName.getPrefix() == null ? qName.getName() :
prefixName(qName.getPrefix(), qName.getName());
}
/** Stores the parent node pointer. */
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
index 47c450f0..9e6e4dce 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorAttribute.java
@@ -44,12 +44,12 @@ final class ConfigurationNodeIteratorAttribute<T> extends
AbstractConfigurationN
* Creates a new instance of {@code ConfigurationNodeIteratorAttribute}.
*
* @param parent the parent node pointer
- * @param name the name of the selected attribute
+ * @param qName the name of the selected attribute
*/
- public ConfigurationNodeIteratorAttribute(final
ConfigurationNodePointer<T> parent, final QName name) {
+ public ConfigurationNodeIteratorAttribute(final
ConfigurationNodePointer<T> parent, final QName qName) {
super(parent, false);
parentPointer = parent;
- attributeNames = createAttributeDataList(parent, name);
+ attributeNames = createAttributeDataList(parent, qName);
}
/**
@@ -69,16 +69,16 @@ final class ConfigurationNodeIteratorAttribute<T> extends
AbstractConfigurationN
* Determines which attributes are selected based on the passed in node
name.
*
* @param parent the parent node pointer
- * @param name the name of the selected attribute
+ * @param qName the name of the selected attribute
* @return a list with the selected attributes
*/
- private List<String> createAttributeDataList(final
ConfigurationNodePointer<T> parent, final QName name) {
+ private List<String> createAttributeDataList(final
ConfigurationNodePointer<T> parent, final QName qName) {
final List<String> result = new ArrayList<>();
- if (!WILDCARD.equals(name.getName())) {
- addAttributeData(parent, result, qualifiedName(name));
+ if (!WILDCARD.equals(qName.getName())) {
+ addAttributeData(parent, result, qualifiedName(qName));
} else {
final Set<String> names = new
LinkedHashSet<>(parent.getNodeHandler().getAttributes(parent.getConfigurationNode()));
- final String prefix = name.getPrefix() != null ?
prefixName(name.getPrefix(), null) : null;
+ final String prefix = qName.getPrefix() != null ?
prefixName(qName.getPrefix(), null) : null;
names.forEach(n -> {
if (prefix == null || StringUtils.startsWith(n, prefix)) {
addAttributeData(parent, result, n);
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
index 3c3d4bd9..bdc0a810 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodeIteratorChildren.java
@@ -85,8 +85,8 @@ final class ConfigurationNodeIteratorChildren<T> extends
AbstractConfigurationNo
}
if (test instanceof NodeNameTest) {
final NodeNameTest nameTest = (NodeNameTest) test;
- final QName name = nameTest.getNodeName();
- return nameTest.isWildcard() ?
createSubNodeListForWildcardName(node, name) : createSubNodeListForName(node,
name);
+ final QName qName = nameTest.getNodeName();
+ return nameTest.isWildcard() ?
createSubNodeListForWildcardName(node, qName) : createSubNodeListForName(node,
qName);
}
if (test instanceof NodeTypeTest) {
final NodeTypeTest typeTest = (NodeTypeTest) test;
@@ -120,16 +120,16 @@ final class ConfigurationNodeIteratorChildren<T> extends
AbstractConfigurationNo
* Obtains the list of selected sub nodes for a {@code NodeNameTest} with
a wildcard name.
*
* @param node the current node
- * @param name the name to be selected
+ * @param qName the name to be selected
* @return the list with selected sub nodes
*/
- private List<T> createSubNodeListForWildcardName(final T node, final QName
name) {
+ private List<T> createSubNodeListForWildcardName(final T node, final QName
qName) {
final List<T> children = getNodeHandler().getChildren(node);
- if (name.getPrefix() == null) {
+ if (qName.getPrefix() == null) {
return children;
}
final List<T> prefixChildren = new ArrayList<>(children.size());
- final String prefix = prefixName(name.getPrefix(), null);
+ final String prefix = prefixName(qName.getPrefix(), null);
children.forEach(child -> {
if (StringUtils.startsWith(getNodeHandler().nodeName(child),
prefix)) {
prefixChildren.add(child);
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java
index 78612066..67d1f72a 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointer.java
@@ -78,12 +78,12 @@ final class ConfigurationNodePointer<T> extends NodePointer
{
/**
* Returns an iterator for the attributes that match the given name.
*
- * @param name the attribute name
+ * @param qName the attribute name
* @return the iterator for the attributes
*/
@Override
- public NodeIterator attributeIterator(final QName name) {
- return new ConfigurationNodeIteratorAttribute<>(this, name);
+ public NodeIterator attributeIterator(final QName qName) {
+ return new ConfigurationNodeIteratorAttribute<>(this, qName);
}
/**
diff --git
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java
index 8aed8aba..106ea312 100644
---
a/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java
+++
b/src/main/java/org/apache/commons/configuration2/tree/xpath/ConfigurationNodePointerFactory.java
@@ -102,7 +102,7 @@ public class ConfigurationNodePointerFactory implements
NodePointerFactory {
* returned.
*
* @param parent the parent node
- * @param name the name
+ * @param qName the name
* @param bean the bean
* @return a pointer for a configuration node if the bean is such a node
*/
@@ -112,7 +112,7 @@ public class ConfigurationNodePointerFactory implements
NodePointerFactory {
* Type casts are safe here, see above. Also, the hierarchy of node
pointers is consistent, so a parent is compatible to
* a child.
*/
- public NodePointer createNodePointer(final NodePointer parent, final QName
name, final Object bean) {
+ public NodePointer createNodePointer(final NodePointer parent, final QName
qName, final Object bean) {
if (bean instanceof NodeWrapper) {
final NodeWrapper<Object> wrapper = (NodeWrapper<Object>) bean;
return new
ConfigurationNodePointer<>((ConfigurationNodePointer<Object>) parent,
wrapper.getNode(), wrapper.getNodeHandler());
@@ -124,7 +124,7 @@ public class ConfigurationNodePointerFactory implements
NodePointerFactory {
* Creates a node pointer for the specified bean. If the bean is a
configuration node (indicated by a wrapper object), a
* corresponding pointer is returned.
*
- * @param name the name of the node
+ * @param qName the name of the node
* @param bean the bean
* @param locale the locale
* @return a pointer for a configuration node if the bean is such a node
@@ -135,7 +135,7 @@ public class ConfigurationNodePointerFactory implements
NodePointerFactory {
* Type casts are safe here; because of the way the NodeWrapper was
constructed the node handler must be compatible with
* the node.
*/
- public NodePointer createNodePointer(final QName name, final Object bean,
final Locale locale) {
+ public NodePointer createNodePointer(final QName qName, final Object bean,
final Locale locale) {
if (bean instanceof NodeWrapper) {
final NodeWrapper<Object> wrapper = (NodeWrapper<Object>) bean;
return new ConfigurationNodePointer<>(wrapper.getNode(), locale,
wrapper.getNodeHandler());
diff --git
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java
index e68f7fe2..8fef0969 100644
---
a/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java
+++
b/src/test/java/org/apache/commons/configuration2/tree/xpath/TestConfigurationAttributePointer.java
@@ -110,9 +110,9 @@ public class TestConfigurationAttributePointer {
*/
@Test
public void testGetName() {
- final QName name = pointer.getName();
- assertEquals(ATTR_NAME, name.getName());
- assertNull(name.getPrefix());
+ final QName qName = pointer.getName();
+ assertEquals(ATTR_NAME, qName.getName());
+ assertNull(qName.getPrefix());
}
/**
