Author: fanningpj
Date: Thu Jun 18 20:50:20 2026
New Revision: 1935490
Log:
tidy up
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSet.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlWhitespace.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSet.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSet.java Thu Jun
18 20:37:55 2026 (r1935489)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/QNameSet.java Thu Jun
18 20:50:20 2026 (r1935490)
@@ -198,7 +198,7 @@ public final class QNameSet implements Q
* <p>
* This constuctor is PRIVATE because it uses the given
* sets directly, and it trusts its callers to set only immutable values.
- * This constructor is is only called by the static builder methods on
+ * This constructor is only called by the static builder methods on
* QNameSet: those methods are all careful assign only unchanging sets.
*/
private QNameSet(Set<String> excludedURIs, Set<String> includedURIs,
Set<QName> excludedQNamesInIncludedURIs, Set<QName>
includedQNamesInExcludedURIs) {
@@ -218,7 +218,7 @@ public final class QNameSet implements Q
}
/**
- * Local xml names are hased using "" as the namespace.
+ * Local xml names are hashed using "" as the namespace.
*/
private static String nsFromName(QName xmlName) {
String ns = xmlName.getNamespaceURI();
@@ -343,11 +343,7 @@ public final class QNameSet implements Q
return false;
}
- if
(set2.includedQNamesInExcludedURIs().stream().anyMatch(set1::contains)) {
- return false;
- }
-
- return true;
+ return
set2.includedQNamesInExcludedURIs().stream().noneMatch(set1::contains);
}
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java Thu Jun
18 20:37:55 2026 (r1935489)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlBeans.java Thu Jun
18 20:50:20 2026 (r1935490)
@@ -80,12 +80,8 @@ public final class XmlBeans {
/**
* Thread local QName cache for general use
*/
- private static final ThreadLocal _threadLocalLoaderQNameCache =
- new ThreadLocal() {
- protected Object initialValue() {
- return new SoftReference(new QNameCache(32));
- }
- };
+ private static final ThreadLocal<SoftReference<QNameCache>>
_threadLocalLoaderQNameCache =
+ ThreadLocal.withInitial(() -> new SoftReference<>(new QNameCache(32)));
public static void clearThreadLocals() {
// clear thread local here
@@ -96,11 +92,11 @@ public final class XmlBeans {
* Returns a thread local QNameCache
*/
public static QNameCache getQNameCache() {
- SoftReference softRef = (SoftReference)
_threadLocalLoaderQNameCache.get();
- QNameCache qnameCache = (QNameCache) (softRef).get();
+ SoftReference<QNameCache> softRef = _threadLocalLoaderQNameCache.get();
+ QNameCache qnameCache = softRef.get();
if (qnameCache == null) {
qnameCache = new QNameCache(32);
- _threadLocalLoaderQNameCache.set(new SoftReference(qnameCache));
+ _threadLocalLoaderQNameCache.set(new SoftReference<>(qnameCache));
}
return qnameCache;
}
@@ -445,7 +441,7 @@ public final class XmlBeans {
public static SchemaTypeSystem typeSystemForClassLoader(ClassLoader
loader, String stsName) {
try {
ClassLoader cl = loader == null ?
Thread.currentThread().getContextClassLoader() : loader;
- Class clazz = cl.loadClass(stsName + "." + HOLDER_CLASS_NAME);
+ Class<?> clazz = cl.loadClass(stsName + "." + HOLDER_CLASS_NAME);
SchemaTypeSystem sts = (SchemaTypeSystem)
(clazz.getDeclaredField(TYPE_SYSTEM_FIELD).get(null));
if (sts == null) {
@@ -482,7 +478,7 @@ public final class XmlBeans {
* Returns the SchemaType from a corresponding XmlObject subclass,
* or null if none.
*/
- public static SchemaType typeForClass(Class c) {
+ public static SchemaType typeForClass(Class<?> c) {
if (c == null || !XmlObject.class.isAssignableFrom(c)) {
return null;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
Thu Jun 18 20:37:55 2026 (r1935489)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
Thu Jun 18 20:50:20 2026 (r1935490)
@@ -25,8 +25,7 @@ public final class XmlStreamUtils
public static String printEvent(XMLStreamReader xmlr)
{
StringBuilder b = new StringBuilder();
- b.append("EVENT:[" + xmlr.getLocation().getLineNumber() + "][" +
- xmlr.getLocation().getColumnNumber() + "] ");
+
b.append("EVENT:[").append(xmlr.getLocation().getLineNumber()).append("][").append(xmlr.getLocation().getColumnNumber()).append("]
");
b.append(getName(xmlr.getEventType()));
b.append(" [");
switch (xmlr.getEventType()) {
@@ -37,9 +36,9 @@ public final class XmlStreamUtils
b.append(" ");
String n = xmlr.getNamespacePrefix(i);
if ("xmlns".equals(n)) {
- b.append("xmlns=\"" + xmlr.getNamespaceURI(i) + "\"");
+ b.append("xmlns=\"").append(xmlr.getNamespaceURI(i)).append("\"");
} else {
- b.append("xmlns:" + n);
+ b.append("xmlns:").append(n);
b.append("=\"");
b.append(xmlr.getNamespaceURI(i));
b.append("\"");
@@ -66,9 +65,9 @@ public final class XmlStreamUtils
b.append(" ");
String n = xmlr.getNamespacePrefix(i);
if ("xmlns".equals(n)) {
- b.append("xmlns=\"" + xmlr.getNamespaceURI(i) + "\"");
+ b.append("xmlns=\"").append(xmlr.getNamespaceURI(i)).append("\"");
} else {
- b.append("xmlns:" + n);
+ b.append("xmlns:").append(n);
b.append("=\"");
b.append(xmlr.getNamespaceURI(i));
b.append("\"");
@@ -91,7 +90,7 @@ public final class XmlStreamUtils
String data = xmlr.getPIData();
if (data == null) data = "";
b.append("<?");
- b.append(target + " " + data);
+ b.append(target).append(" ").append(data);
b.append("?>");
break;
case XMLStreamReader.CDATA:
@@ -108,14 +107,14 @@ public final class XmlStreamUtils
b.append("-->");
break;
case XMLStreamReader.ENTITY_REFERENCE:
- b.append(xmlr.getLocalName() + "=");
+ b.append(xmlr.getLocalName()).append("=");
if (xmlr.hasText())
- b.append("[" + xmlr.getText() + "]");
+ b.append("[").append(xmlr.getText()).append("]");
break;
case XMLStreamReader.START_DOCUMENT:
b.append("<?xml");
- b.append(" version='" + xmlr.getVersion() + "'");
- b.append(" encoding='" + xmlr.getCharacterEncodingScheme() + "'");
+ b.append(" version='").append(xmlr.getVersion()).append('\'');
+ b.append("
encoding='").append(xmlr.getCharacterEncodingScheme()).append('\'');
if (xmlr.isStandalone())
b.append(" standalone='yes'");
else
@@ -134,8 +133,8 @@ public final class XmlStreamUtils
String localName,
StringBuilder b)
{
- if (uri != null && !("".equals(uri))) b.append("['" + uri + "']:");
- if (prefix != null && !("".equals(prefix))) b.append(prefix + ":");
+ if (uri != null && !(uri.isEmpty()))
b.append("['").append(uri).append("']:");
+ if (prefix != null && !(prefix.isEmpty())) b.append(prefix).append(':');
if (localName != null) b.append(localName);
}
@@ -184,31 +183,33 @@ public final class XmlStreamUtils
public static int getType(String val)
{
- if (val.equals("START_ELEMENT"))
- return XMLStreamReader.START_ELEMENT;
- if (val.equals("SPACE"))
- return XMLStreamReader.SPACE;
- if (val.equals("END_ELEMENT"))
- return XMLStreamReader.END_ELEMENT;
- if (val.equals("PROCESSING_INSTRUCTION"))
- return XMLStreamReader.PROCESSING_INSTRUCTION;
- if (val.equals("CHARACTERS"))
- return XMLStreamReader.CHARACTERS;
- if (val.equals("COMMENT"))
- return XMLStreamReader.COMMENT;
- if (val.equals("START_DOCUMENT"))
- return XMLStreamReader.START_DOCUMENT;
- if (val.equals("END_DOCUMENT"))
- return XMLStreamReader.END_DOCUMENT;
- if (val.equals("ATTRIBUTE"))
- return XMLStreamReader.ATTRIBUTE;
- if (val.equals("DTD"))
- return XMLStreamReader.DTD;
- if (val.equals("CDATA"))
- return XMLStreamReader.CDATA;
- if (val.equals("NAMESPACE"))
- return XMLStreamReader.NAMESPACE;
- return -1;
+ switch (val) {
+ case "START_ELEMENT":
+ return XMLStreamReader.START_ELEMENT;
+ case "SPACE":
+ return XMLStreamReader.SPACE;
+ case "END_ELEMENT":
+ return XMLStreamReader.END_ELEMENT;
+ case "PROCESSING_INSTRUCTION":
+ return XMLStreamReader.PROCESSING_INSTRUCTION;
+ case "CHARACTERS":
+ return XMLStreamReader.CHARACTERS;
+ case "COMMENT":
+ return XMLStreamReader.COMMENT;
+ case "START_DOCUMENT":
+ return XMLStreamReader.START_DOCUMENT;
+ case "END_DOCUMENT":
+ return XMLStreamReader.END_DOCUMENT;
+ case "ATTRIBUTE":
+ return XMLStreamReader.ATTRIBUTE;
+ case "DTD":
+ return XMLStreamReader.DTD;
+ case "CDATA":
+ return XMLStreamReader.CDATA;
+ case "NAMESPACE":
+ return XMLStreamReader.NAMESPACE;
+ }
+ return -1;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlWhitespace.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlWhitespace.java
Thu Jun 18 20:37:55 2026 (r1935489)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlWhitespace.java
Thu Jun 18 20:50:20 2026 (r1935490)
@@ -109,14 +109,12 @@ public class XmlWhitespace
break examine;
return v;
}
- /* j is pointing at the first ws to be removed, or past end */
+ // j is pointing at the first ws to be removed, or past end
i = j;
}
else
{
- /**
- * j is pointing at the last whitespace in the initial run
- */
+ // j is pointing at the last whitespace in the initial run
while (j + 1 < v.length() && v.charAt(j + 1) == ' ')
j += 1;
i = 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
