Author: fanningpj
Date: Thu Jun 18 20:37:55 2026
New Revision: 1935489
Log:
use StandardCharsets
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
Thu Jun 18 20:33:11 2026 (r1935488)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/PushedInputStream.java
Thu Jun 18 20:37:55 2026 (r1935489)
@@ -22,8 +22,8 @@ import java.io.InputStream;
public abstract class PushedInputStream extends InputStream
{
- private static int defaultBufferSize = 2048;
- protected byte buf[];
+ private static final int defaultBufferSize = 2048;
+ protected byte[] buf;
protected int writepos;
protected int readpos;
protected int markpos = -1;
@@ -88,7 +88,7 @@ public abstract class PushedInputStream
else
{
int newcount = size + cb;
- byte newbuf[] = new byte[Math.max(buf.length << 1, newcount)];
+ byte[] newbuf = new byte[Math.max(buf.length << 1, newcount)];
System.arraycopy(buf, savepos, newbuf, 0, size);
buf = newbuf;
}
@@ -126,7 +126,7 @@ public abstract class PushedInputStream
avail = writepos - readpos;
if (avail <= 0) return -1;
}
- int cnt = (avail < len) ? avail : len;
+ int cnt = Math.min(avail, len);
System.arraycopy(buf, readpos, b, off, cnt);
readpos += cnt;
return cnt;
@@ -151,7 +151,7 @@ public abstract class PushedInputStream
return 0;
}
- long skipped = (avail < n) ? avail : n;
+ long skipped = Math.min(avail, n);
readpos = Math.addExact(readpos, Math.toIntExact(skipped));
return skipped;
}
@@ -191,7 +191,7 @@ public abstract class PushedInputStream
writepos += 1;
}
- public synchronized void write(byte b[], int off, int len)
+ public synchronized void write(byte[] b, int off, int len)
{
if ((off < 0) || (off > b.length) || (len < 0) ||
((off + len) > b.length) || ((off + len) < 0))
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
Thu Jun 18 20:33:11 2026 (r1935488)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/QNameHelper.java
Thu Jun 18 20:37:55 2026 (r1935489)
@@ -20,7 +20,7 @@ import org.apache.xmlbeans.SchemaType;
import org.apache.xmlbeans.xml.stream.XMLName;
import javax.xml.namespace.QName;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Collections;
@@ -80,9 +80,7 @@ public class QNameHelper
return true;
if (c >= 'A' && c <= 'Z')
return true;
- if (c >= '0' && c <= '9')
- return true;
- return false;
+ return c >= '0' && c <= '9';
}
// This produces a string which is a safe filename from the given string s.
@@ -118,21 +116,12 @@ public class QNameHelper
}
else
{
- byte[] utf8 = null;
- try
- {
- utf8 = s.substring(i, i + 1).getBytes("UTF-8");
- for (int j = 0; j < utf8.length; j++)
- {
- result.append('_');
- result.append(hexdigits[(utf8[j] >> 4) & 0xF]);
- result.append(hexdigits[utf8[j] & 0xF]);
- }
- }
- catch(UnsupportedEncodingException uee)
+ byte[] utf8 = s.substring(i, i +
1).getBytes(StandardCharsets.UTF_8);
+ for (int j = 0; j < utf8.length; j++)
{
- // should never happen - UTF-8 i always supported
- result.append("_BAD_UTF8_CHAR");
+ result.append('_');
+ result.append(hexdigits[(utf8[j] >> 4) & 0xF]);
+ result.append(hexdigits[utf8[j] & 0xF]);
}
}
}
@@ -145,16 +134,7 @@ public class QNameHelper
try
{
MessageDigest md = MessageDigest.getInstance("SHA");
- byte[] inputBytes = null;
- try
- {
- inputBytes = s.getBytes("UTF-8");
- }
- catch(UnsupportedEncodingException uee)
- {
- // should never happen - UTF-8 is always supported
- inputBytes = new byte[0];
- }
+ byte[] inputBytes = s.getBytes(StandardCharsets.UTF_8);
byte[] digest = md.digest(inputBytes);
assert(digest.length == 20); // SHA1 160 bits == 20 bytes
result = new StringBuilder(URI_SHA1_PREFIX);
@@ -268,7 +248,7 @@ public class QNameHelper
public static String suggestPrefix(String namespace)
{
- String result = (String)WELL_KNOWN_PREFIXES.get(namespace);
+ String result = WELL_KNOWN_PREFIXES.get(namespace);
if (result != null)
return result;
@@ -334,10 +314,7 @@ public class QNameHelper
return false;
if (s.charAt(i + 1) != 'M' && s.charAt(i + 1) != 'm')
return false;
- if (s.charAt(i + 2) != 'L' && s.charAt(i + 2) != 'l')
- return false;
-
- return true;
+ return s.charAt(i + 2) == 'L' || s.charAt(i + 2) == 'l';
}
private static boolean isVowel(char ch)
Modified:
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
==============================================================================
---
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
Thu Jun 18 20:33:11 2026 (r1935488)
+++
xmlbeans/trunk/src/main/java/org/apache/xmlbeans/impl/common/XMLNameHelper.java
Thu Jun 18 20:37:55 2026 (r1935489)
@@ -17,7 +17,7 @@ package org.apache.xmlbeans.impl.common;
import org.apache.xmlbeans.xml.stream.XMLName;
import javax.xml.namespace.QName;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
public class XMLNameHelper
{
@@ -69,9 +69,7 @@ public class XMLNameHelper
return true;
if (c >= 'A' && c <= 'Z')
return true;
- if (c >= '0' && c <= '9')
- return true;
- return false;
+ return c >= '0' && c <= '9';
}
public static String hexsafe(String s)
@@ -86,21 +84,12 @@ public class XMLNameHelper
}
else
{
- byte[] utf8 = null;
- try
- {
- utf8 = s.substring(i, i + 1).getBytes("UTF-8");
+ byte[] utf8 = s.substring(i, i +
1).getBytes(StandardCharsets.UTF_8);
for (int j = 0; j < utf8.length; j++)
{
result.append('_');
result.append(hexdigits[(utf8[j] >> 4) & 0xF]);
result.append(hexdigits[utf8[j] & 0xF]);
- }
- }
- catch(UnsupportedEncodingException uee)
- {
- // should never happen - UTF-8 is always supported
- result.append("_BAD_UTF8_CHAR");
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
