Author: fanningpj
Date: Thu Jun 18 21:09:34 2026
New Revision: 1935491
Log:
tidy up
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlError.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlObjectList.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RangeToken.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
xmlbeans/trunk/src/test/java/xmlcursor/xpath/common/XPathCommon.java
xmlbeans/trunk/src/test/java/xmlobject/detailed/TypedSettersTests.java
Modified: xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlError.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlError.java Thu Jun
18 20:50:20 2026 (r1935490)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/XmlError.java Thu Jun
18 21:09:34 2026 (r1935491)
@@ -591,7 +591,7 @@ public class XmlError implements java.io
sb.append(getColumn());
sb.append(':');
}
- sb.append(" ");
+ sb.append(' ');
}
switch (getSeverity()) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlObjectList.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlObjectList.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlObjectList.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -124,7 +124,7 @@ public class XmlObjectList
for (int i = 0 ; i < _objects.length ; i++)
{
- if (i != 0) b.append(" ");
+ if (i != 0) b.append(' ');
b.append(prettytrim(((SimpleValue)_objects[i]).getStringValue()));
}
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:50:20 2026 (r1935490)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XmlStreamUtils.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -25,35 +25,39 @@ public final class XmlStreamUtils
public static String printEvent(XMLStreamReader xmlr)
{
StringBuilder b = new StringBuilder();
-
b.append("EVENT:[").append(xmlr.getLocation().getLineNumber()).append("][").append(xmlr.getLocation().getColumnNumber()).append("]
");
- b.append(getName(xmlr.getEventType()));
- b.append(" [");
+ b.append("EVENT:[")
+ .append(xmlr.getLocation().getLineNumber())
+ .append("][")
+ .append(xmlr.getLocation().getColumnNumber())
+ .append("] ")
+ .append(getName(xmlr.getEventType()))
+ .append(" [");
switch (xmlr.getEventType()) {
case XMLStreamReader.START_ELEMENT:
- b.append("<");
+ b.append('<');
printName(xmlr, b);
for (int i = 0; i < xmlr.getNamespaceCount(); i++) {
- b.append(" ");
+ b.append(' ');
String n = xmlr.getNamespacePrefix(i);
if ("xmlns".equals(n)) {
- b.append("xmlns=\"").append(xmlr.getNamespaceURI(i)).append("\"");
+ b.append("xmlns=\"").append(xmlr.getNamespaceURI(i)).append('\"');
} else {
b.append("xmlns:").append(n);
b.append("=\"");
b.append(xmlr.getNamespaceURI(i));
- b.append("\"");
+ b.append('\"');
}
}
for (int i = 0; i < xmlr.getAttributeCount(); i++) {
- b.append(" ");
+ b.append(' ');
printName(xmlr.getAttributePrefix(i),
xmlr.getAttributeNamespace(i),
xmlr.getAttributeLocalName(i),
b);
b.append("=\"");
b.append(xmlr.getAttributeValue(i));
- b.append("\"");
+ b.append('\"');
}
b.append(">");
@@ -62,18 +66,18 @@ public final class XmlStreamUtils
b.append("</");
printName(xmlr, b);
for (int i = 0; i < xmlr.getNamespaceCount(); i++) {
- b.append(" ");
+ b.append(' ');
String n = xmlr.getNamespacePrefix(i);
if ("xmlns".equals(n)) {
- b.append("xmlns=\"").append(xmlr.getNamespaceURI(i)).append("\"");
+ b.append("xmlns=\"").append(xmlr.getNamespaceURI(i)).append('\"');
} else {
b.append("xmlns:").append(n);
b.append("=\"");
b.append(xmlr.getNamespaceURI(i));
- b.append("\"");
+ b.append('\"');
}
}
- b.append(">");
+ b.append('>');
break;
case XMLStreamReader.SPACE:
case XMLStreamReader.CHARACTERS:
@@ -90,7 +94,7 @@ public final class XmlStreamUtils
String data = xmlr.getPIData();
if (data == null) data = "";
b.append("<?");
- b.append(target).append(" ").append(data);
+ b.append(target).append(' ').append(data);
b.append("?>");
break;
case XMLStreamReader.CDATA:
@@ -107,9 +111,9 @@ public final class XmlStreamUtils
b.append("-->");
break;
case XMLStreamReader.ENTITY_REFERENCE:
- b.append(xmlr.getLocalName()).append("=");
+ b.append(xmlr.getLocalName()).append('=');
if (xmlr.hasText())
- b.append("[").append(xmlr.getText()).append("]");
+ b.append('[').append(xmlr.getText()).append(']');
break;
case XMLStreamReader.START_DOCUMENT:
b.append("<?xml");
@@ -123,7 +127,7 @@ public final class XmlStreamUtils
break;
}
- b.append("]");
+ b.append(']');
return b.toString();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/config/InterfaceExtensionImpl.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -283,12 +283,12 @@ public class InterfaceExtensionImpl impl
public String toString() {
StringBuilder buf = new StringBuilder();
- buf.append(" static handler:
").append(_delegateToClassName).append("\n");
- buf.append(" interface: ").append(_interfaceClassName).append("\n");
- buf.append(" name set: ").append(_xbeanSet).append("\n");
+ buf.append(" static handler:
").append(_delegateToClassName).append('\n');
+ buf.append(" interface: ").append(_interfaceClassName).append('\n');
+ buf.append(" name set: ").append(_xbeanSet).append('\n');
for (int i = 0; i < _methods.length; i++)
- buf.append("
method[").append(i).append("]=").append(_methods[i]).append("\n");
+ buf.append("
method[").append(i).append("]=").append(_methods[i]).append('\n');
return buf.toString();
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RangeToken.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RangeToken.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/regex/RangeToken.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -567,7 +567,7 @@ final class RangeToken extends Token imp
ret = "\\s";
} else {
StringBuilder sb = new StringBuilder();
- sb.append("[");
+ sb.append('[');
for (int i = 0; i < this.ranges.length; i += 2) {
if ((options & RegularExpression.SPECIAL_COMMA) != 0 && i
> 0) {
sb.append(",");
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeCodePrinter.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -186,7 +186,7 @@ public final class SchemaTypeCodePrinter
}
emit("/**");
- if (opt.isCompileAnnotationAsJavadoc() && sType.getDocumentation() !=
null && sType.getDocumentation().length() > 0){
+ if (opt.isCompileAnnotationAsJavadoc() && sType.getDocumentation() !=
null && !sType.getDocumentation().isEmpty()){
emit(" *");
printJavaDocBody(sType.getDocumentation());
emit(" *");
@@ -533,9 +533,6 @@ public final class SchemaTypeCodePrinter
for (int i = 0; i < str.length(); i++) {
char ch = str.charAt(i);
switch (ch) {
- default:
- sb.append(ch);
- break;
case '\n':
sb.append("\\n");
break;
@@ -548,6 +545,9 @@ public final class SchemaTypeCodePrinter
case '\\':
sb.append("\\\\");
break;
+ default:
+ sb.append(ch);
+ break;
}
}
return sb.toString();
@@ -797,7 +797,7 @@ public final class SchemaTypeCodePrinter
boolean xmltype = (javaType == SchemaProperty.XML_OBJECT);
if (prop.extendsJavaSingleton()) {
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0){
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()){
printJavaDocParagraph(propertyDocumentation);
}else {
printJavaDoc((several ? "Gets first " : "Gets the ") +
propdesc, BeanMethod.GET);
@@ -816,7 +816,7 @@ public final class SchemaTypeCodePrinter
}
if (prop.extendsJavaOption()) {
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0){
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()){
printJavaDocParagraph(propertyDocumentation);
}else {
printJavaDoc((several ? "True if has at least one " : "True if
has ") + propdesc, BeanMethod.IS_SET);
@@ -825,7 +825,7 @@ public final class SchemaTypeCodePrinter
}
if (several) {
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0){
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()){
printJavaDocParagraph(propertyDocumentation);
}
@@ -836,14 +836,14 @@ public final class SchemaTypeCodePrinter
wrappedType = javaWrappedType(javaType);
}
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0){
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()){
printJavaDocParagraph(propertyDocumentation);
}else{
printJavaDoc("Gets a List of " + propdesc + "s",
BeanMethod.GET_LIST);
}
emit("java.util.List<" + wrappedType + "> get" + propertyName +
"List();", BeanMethod.GET_LIST);
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0){
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()){
printJavaDocParagraph(propertyDocumentation);
}else{
printJavaDoc("Gets array of all " + propdesc + "s",
BeanMethod.GET_ARRAY);
@@ -896,7 +896,7 @@ public final class SchemaTypeCodePrinter
String propdesc = "\"" + qName.getLocalPart() + "\"" + (isAttr ? "
attribute" : " element");
if (singleton) {
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0) {
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()) {
printJavaDocParagraph(propertyDocumentation);
} else {
printJavaDoc((several ? "Sets first " : "Sets the ") +
propdesc, BeanMethod.SET);
@@ -920,7 +920,7 @@ public final class SchemaTypeCodePrinter
}
if (optional) {
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0) {
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()) {
printJavaDocParagraph(propertyDocumentation);
} else {
printJavaDoc((several ? "Removes first " : "Unsets the ") +
propdesc, BeanMethod.UNSET);
@@ -931,14 +931,14 @@ public final class SchemaTypeCodePrinter
if (several) {
String arrayName = propertyName + "Array";
- if(opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0) {
+ if(opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()) {
printJavaDocParagraph(propertyDocumentation);
} else {
printJavaDoc("Sets array of all " + propdesc,
BeanMethod.SET_ARRAY);
}
emit("void set" + arrayName + "(" + type + "[] " + safeVarName +
"Array);", BeanMethod.SET_ARRAY);
- if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && propertyDocumentation.length() > 0) {
+ if (opt.isCompileAnnotationAsJavadoc() && propertyDocumentation !=
null && !propertyDocumentation.isEmpty()) {
printJavaDocParagraph(propertyDocumentation);
} else {
printJavaDoc("Sets ith " + propdesc, BeanMethod.SET_IDX);
@@ -1000,8 +1000,6 @@ public final class SchemaTypeCodePrinter
return "org.apache.xmlbeans.impl.values.JavaDoubleHolderEx";
case SchemaType.BTC_DECIMAL:
switch (sType.getDecimalSize()) {
- default:
- assert (false);
case SchemaType.SIZE_BIG_DECIMAL:
return
"org.apache.xmlbeans.impl.values.JavaDecimalHolderEx";
case SchemaType.SIZE_BIG_INTEGER:
@@ -1012,6 +1010,8 @@ public final class SchemaTypeCodePrinter
case SchemaType.SIZE_SHORT:
case SchemaType.SIZE_BYTE:
return
"org.apache.xmlbeans.impl.values.JavaIntHolderEx";
+ default:
+ assert (false);
}
case SchemaType.BTC_STRING:
if (sType.hasStringEnumValues()) {
@@ -1140,7 +1140,6 @@ public final class SchemaTypeCodePrinter
case SchemaProperty.JAVA_LONG:
return "0L";
- default:
case SchemaProperty.XML_OBJECT:
case SchemaProperty.JAVA_BIG_DECIMAL:
case SchemaProperty.JAVA_BIG_INTEGER:
@@ -1154,6 +1153,7 @@ public final class SchemaTypeCodePrinter
case SchemaProperty.JAVA_CALENDAR:
case SchemaProperty.JAVA_ENUM:
case SchemaProperty.JAVA_OBJECT:
+ default:
return "null";
}
}
@@ -1517,9 +1517,6 @@ public final class SchemaTypeCodePrinter
String prePostOpString(int opType) {
switch (opType) {
- default:
- assert false;
-
case PrePostExtension.OPERATION_SET:
return "org.apache.xmlbeans.PrePostExtension.OPERATION_SET";
@@ -1528,6 +1525,9 @@ public final class SchemaTypeCodePrinter
case PrePostExtension.OPERATION_REMOVE:
return "org.apache.xmlbeans.PrePostExtension.OPERATION_REMOVE";
+
+ default:
+ throw new IllegalArgumentException("Invalid opType: " +
opType);
}
}
@@ -1653,7 +1653,7 @@ public final class SchemaTypeCodePrinter
if (prop.extendsJavaSingleton()) {
if (bmList == null || bmList.contains(BeanMethod.GET)) {
// Value getProp()
- if(opt.isCompileAnnotationAsJavadoc() && propertyDocumentation
!= null && propertyDocumentation.length() > 0){
+ if(opt.isCompileAnnotationAsJavadoc() && propertyDocumentation
!= null && !propertyDocumentation.isEmpty()){
printJavaDocParagraph(propertyDocumentation);
} else {
printJavaDoc((several ? "Gets first " : "Gets the ") +
propdesc);
@@ -2341,7 +2341,7 @@ public final class SchemaTypeCodePrinter
StringBuilder decl = new StringBuilder(60);
decl.append("public ").append(method.getReturnType());
- decl.append(" ").append(method.getName()).append("(");
+ decl.append(' ').append(method.getName()).append('(');
// first parameter is always XmlObject, i.e. which is "this" and
therefore doesn't need
// to be in the method declaration of the type implementation
@@ -2351,10 +2351,10 @@ public final class SchemaTypeCodePrinter
if (i > 1) {
decl.append(", ");
}
- decl.append(paramTypes[i]).append(" ").append(paramNames[i]);
+ decl.append(paramTypes[i]).append(' ').append(paramNames[i]);
}
- decl.append(")");
+ decl.append(')');
String[] exceptions = method.getExceptionTypes();
for (int i = 0; i < exceptions.length; i++) {
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/schema/SchemaTypeLoaderImpl.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -285,10 +285,7 @@ public class SchemaTypeLoaderImpl extend
}
if (_classLoader != null) {
- SchemaTypeSystem result = getTypeSystemOnClassloader(name);
- if (result != null) {
- return result;
- }
+ return getTypeSystemOnClassloader(name);
}
return null;
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/store/Locale.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -283,9 +283,9 @@ public final class Locale
if (name.getNamespaceURI() == null) {
sb.append("<no namespace>");
} else {
- sb.append("\"");
+ sb.append('\"');
sb.append(name.getNamespaceURI());
- sb.append("\"");
+ sb.append('\"');
}
}
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
==============================================================================
--- xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++ xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/tool/CodeGenUtil.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -348,7 +348,7 @@ public class CodeGenUtil {
private static Thread copy(InputStream stream, final StringBuilder output)
{
final BufferedReader reader = new BufferedReader(new
InputStreamReader(stream, Charset.defaultCharset()));
Thread readerThread = new Thread(() ->
- reader.lines().forEach(s -> output.append(s).append("\n"))
+ reader.lines().forEach(s -> output.append(s).append('\n'))
);
readerThread.start();
return readerThread;
Modified: xmlbeans/trunk/src/test/java/xmlcursor/xpath/common/XPathCommon.java
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlcursor/xpath/common/XPathCommon.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++ xmlbeans/trunk/src/test/java/xmlcursor/xpath/common/XPathCommon.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -32,7 +32,7 @@ public class XPathCommon {
xm.setLoadStripWhitespace();
StringBuilder sb = new StringBuilder();
for (int i = 0; i < rObj.length; i++) {
- sb.append("[" + i + "] -- " + rObj[i].xmlText(xm) + "\n");
+ sb.append('[').append(i).append("] --
").append(rObj[i].xmlText(xm)).append('\n');
}
return sb.toString();
}
@@ -45,7 +45,7 @@ public class XPathCommon {
StringBuilder st = new StringBuilder();
for (int i = 0; i < rObj.length; i++) {
- st.append("[" + i + "] -- " + rObj[i].xmlText(xm));
+ st.append('[').append(i).append("] --
").append(rObj[i].xmlText(xm));
}
return st.toString();
}
@@ -58,7 +58,7 @@ public class XPathCommon {
StringBuilder st = new StringBuilder();
int i = 0;
while (rObj.toNextSelection()) {
- st.append("[cursor-" + i + "] -- " + rObj.xmlText(xm));
+ st.append("[cursor-").append(i).append("] --
").append(rObj.xmlText(xm));
i++;
}
@@ -72,7 +72,7 @@ public class XPathCommon {
StringBuilder sb = new StringBuilder();
int i = 0;
while (rObj.toNextSelection()) {
- sb.append("[cursor-" + i + "] -- " + rObj.xmlText(xm) + "\n");
+ sb.append("[cursor-").append(i).append("] --
").append(rObj.xmlText(xm)).append("\n");
i++;
}
return sb.toString();
Modified: xmlbeans/trunk/src/test/java/xmlobject/detailed/TypedSettersTests.java
==============================================================================
--- xmlbeans/trunk/src/test/java/xmlobject/detailed/TypedSettersTests.java
Thu Jun 18 20:50:20 2026 (r1935490)
+++ xmlbeans/trunk/src/test/java/xmlobject/detailed/TypedSettersTests.java
Thu Jun 18 21:09:34 2026 (r1935491)
@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -70,8 +71,8 @@ public class TypedSettersTests {
sb.append(instanceNs);
break;
case "type":
- assertTrue(arg.length() > 0);
- sb.append("xsi:type=\"").append(arg).append("\"");
+ assertFalse(arg.isEmpty());
+ sb.append("xsi:type=\"").append(arg).append('\"');
break;
default:
Assertions.fail();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
