This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push:
new 4f0a0a07f2 Align names
4f0a0a07f2 is described below
commit 4f0a0a07f2589cd23fe75eb2b349be24251668ed
Author: Mark Thomas <[email protected]>
AuthorDate: Fri Oct 30 17:56:05 2026 +0000
Align names
---
.../apache/catalina/webresources/JarContents.java | 4 ++--
.../catalina/webresources/JarWarResourceSet.java | 4 ++--
.../tomcat/util/scan/AbstractInputStreamJar.java | 6 +++---
java/org/apache/tomcat/util/scan/JarFileUrlJar.java | 6 +++---
.../apache/tomcat/util/scan/MultiReleaseUtil.java | 12 ++++++------
.../tomcat/util/scan/TestMultiVersionUtil.java | 20 ++++++++++----------
6 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/java/org/apache/catalina/webresources/JarContents.java
b/java/org/apache/catalina/webresources/JarContents.java
index f8954c3b2e..6bf94adfeb 100644
--- a/java/org/apache/catalina/webresources/JarContents.java
+++ b/java/org/apache/catalina/webresources/JarContents.java
@@ -23,7 +23,7 @@ import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import org.apache.tomcat.util.scan.MultiReleaseUtil;
-import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiVersionInfo;
+import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiReleaseInfo;
/**
* This class represents the contents of a jar by determining whether a given
resource <b>might</b> be in the cache,
@@ -98,7 +98,7 @@ public final class JarContents {
}
// Versioned entries should be added to the table according to their
real name
- MultiVersionInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
if (multiVersionInfo != null) {
if (multiVersionInfo.isValid() && multiVersionInfo.version() <=
Runtime.version().feature()) {
startPos = multiVersionInfo.namePos();
diff --git a/java/org/apache/catalina/webresources/JarWarResourceSet.java
b/java/org/apache/catalina/webresources/JarWarResourceSet.java
index 2e7591c2e0..d7f7551a53 100644
--- a/java/org/apache/catalina/webresources/JarWarResourceSet.java
+++ b/java/org/apache/catalina/webresources/JarWarResourceSet.java
@@ -34,7 +34,7 @@ import org.apache.catalina.WebResource;
import org.apache.catalina.WebResourceRoot;
import org.apache.tomcat.util.buf.UriUtil;
import org.apache.tomcat.util.scan.MultiReleaseUtil;
-import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiVersionInfo;
+import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiReleaseInfo;
/**
* Represents a {@link org.apache.catalina.WebResourceSet} based on a JAR file
that is nested inside a packed WAR file.
@@ -197,7 +197,7 @@ public class JarWarResourceSet extends
AbstractArchiveResourceSet {
Entry<String,JarEntry> entry = iter.next();
String name = entry.getKey();
JarEntry jarEntry = entry.getValue();
- MultiVersionInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
if (multiVersionInfo != null && multiVersionInfo.isValid()) {
// Remove the multi-release version
iter.remove();
diff --git a/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
b/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
index c92252bcc3..7728aaa119 100644
--- a/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
+++ b/java/org/apache/tomcat/util/scan/AbstractInputStreamJar.java
@@ -25,7 +25,7 @@ import java.util.jar.JarEntry;
import java.util.jar.Manifest;
import org.apache.tomcat.Jar;
-import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiVersionInfo;
+import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiReleaseInfo;
/**
* Base implementation of Jar for implementations that use a JarInputStream to
access the JAR file.
@@ -201,7 +201,7 @@ public abstract class AbstractInputStreamJar implements Jar
{
* ordinary entries.
*/
private static boolean isVersionedEntry(String name) {
- MultiVersionInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
return multiVersionInfo != null && multiVersionInfo.isValid();
}
@@ -251,7 +251,7 @@ public abstract class AbstractInputStreamJar implements Jar
{
// sufficient to be able to create the renaming map required
while (jarEntry != null) {
String name = jarEntry.getName();
- MultiVersionInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
if (multiVersionInfo != null && multiVersionInfo.isValid()) {
// Ignore any entries targeting for a later version than
// the target for this runtime
diff --git a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
index 2929a7e59a..f4bb24a6ed 100644
--- a/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
+++ b/java/org/apache/tomcat/util/scan/JarFileUrlJar.java
@@ -34,7 +34,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import org.apache.tomcat.Jar;
-import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiVersionInfo;
+import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiReleaseInfo;
/**
* Implementation of {@link Jar} that is optimised for file based JAR URLs
that refer directly to a JAR file (e.g. URLs
@@ -190,7 +190,7 @@ public class JarFileUrlJar implements Jar {
if (entries.hasMoreElements()) {
entry = entries.nextElement();
name = entry.getName();
- MultiVersionInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
// Get 'base' name
if (multiVersionInfo != null &&
multiVersionInfo.isValid()) {
name = name.substring(multiVersionInfo.namePos());
@@ -283,7 +283,7 @@ public class JarFileUrlJar implements Jar {
while (jarEntries.hasMoreElements()) {
JarEntry jarEntry = jarEntries.nextElement();
String name = jarEntry.getName();
- MultiVersionInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo multiVersionInfo =
MultiReleaseUtil.parseVersion(name);
if (multiVersionInfo != null && multiVersionInfo.isValid()) {
String baseName = name.substring(multiVersionInfo.namePos());
diff --git a/java/org/apache/tomcat/util/scan/MultiReleaseUtil.java
b/java/org/apache/tomcat/util/scan/MultiReleaseUtil.java
index 09fd494292..89f12904bb 100644
--- a/java/org/apache/tomcat/util/scan/MultiReleaseUtil.java
+++ b/java/org/apache/tomcat/util/scan/MultiReleaseUtil.java
@@ -41,7 +41,7 @@ public class MultiReleaseUtil {
* @return The {@code MultiVersionInfo} for the entry if the entry
represents a versioned entry, otherwise
* {@code null}
*/
- public static MultiVersionInfo parseVersion(String name) {
+ public static MultiReleaseInfo parseVersion(String name) {
if (name == null || name.isEmpty()) {
return null;
}
@@ -55,7 +55,7 @@ public class MultiReleaseUtil {
for (int i = VERSION_PATH_LENGTH + start; i < end; i++) {
char c = name.charAt(i);
if (c < '0' || c > '9' || ((i == VERSION_PATH_LENGTH +
start) && c == '0')) {
- return new MultiVersionInfo(-1, end + 1);
+ return new MultiReleaseInfo(-1, end + 1);
}
}
try {
@@ -63,13 +63,13 @@ public class MultiReleaseUtil {
if (version < MINIMUM_VERSIONED_JAVA) {
version = -1;
}
- return new MultiVersionInfo(version, end + 1);
+ return new MultiReleaseInfo(version, end + 1);
} catch (NumberFormatException e) {
// Must be overflow
- return new MultiVersionInfo(-1, end + 1);
+ return new MultiReleaseInfo(-1, end + 1);
}
}
- return new MultiVersionInfo(-1, -1);
+ return new MultiReleaseInfo(-1, -1);
}
return null;
@@ -83,7 +83,7 @@ public class MultiReleaseUtil {
* @param namePos The start position of the name. The first character
after the '/' after the version. {@code -1} if
* there was no '/' after the version or the version
was not present
*/
- public record MultiVersionInfo(int version, int namePos) {
+ public record MultiReleaseInfo(int version, int namePos) {
/**
* Has a valid multi-release entry been found?
diff --git a/test/org/apache/tomcat/util/scan/TestMultiVersionUtil.java
b/test/org/apache/tomcat/util/scan/TestMultiVersionUtil.java
index 3156bdf39d..81c724be71 100644
--- a/test/org/apache/tomcat/util/scan/TestMultiVersionUtil.java
+++ b/test/org/apache/tomcat/util/scan/TestMultiVersionUtil.java
@@ -19,13 +19,13 @@ package org.apache.tomcat.util.scan;
import org.junit.Assert;
import org.junit.Test;
-import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiVersionInfo;
+import org.apache.tomcat.util.scan.MultiReleaseUtil.MultiReleaseInfo;
public class TestMultiVersionUtil {
@Test
public void testValidVersion() {
- MultiVersionInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/9/test.txt");
+ MultiReleaseInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/9/test.txt");
Assert.assertNotNull(info);
Assert.assertTrue(info.isValid());
Assert.assertEquals(9, info.version());
@@ -39,7 +39,7 @@ public class TestMultiVersionUtil {
*/
@Test
public void testLeadingZeroVersionIsInvalid() {
- MultiVersionInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/09/test.txt");
+ MultiReleaseInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/09/test.txt");
Assert.assertNotNull(info);
Assert.assertFalse(info.isValid());
}
@@ -48,7 +48,7 @@ public class TestMultiVersionUtil {
@Test
public void testCurrentRuntimeVersion() {
int feature = Runtime.version().feature();
- MultiVersionInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/" + feature + "/test.txt");
+ MultiReleaseInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/" + feature + "/test.txt");
Assert.assertNotNull(info);
Assert.assertTrue(info.isValid());
Assert.assertEquals(feature, info.version());
@@ -70,7 +70,7 @@ public class TestMultiVersionUtil {
@Test
public void testLeadingSlash() {
String name = "/META-INF/versions/9/test.txt";
- MultiVersionInfo info = MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo info = MultiReleaseUtil.parseVersion(name);
Assert.assertNotNull(info);
Assert.assertTrue(info.isValid());
Assert.assertEquals(9, info.version());
@@ -81,7 +81,7 @@ public class TestMultiVersionUtil {
@Test
public void testDirectoryEntry() {
String name = "META-INF/versions/9/";
- MultiVersionInfo info = MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo info = MultiReleaseUtil.parseVersion(name);
Assert.assertNotNull(info);
Assert.assertTrue(info.isValid());
Assert.assertEquals(name.length(), info.namePos());
@@ -93,7 +93,7 @@ public class TestMultiVersionUtil {
String[] versions = { "+9", "-9", "9x", "x9", "9.0", "", "0", "09",
"00", "99999999999999", "2147483648" };
for (String version : versions) {
String name = "META-INF/versions/" + version + "/test.txt";
- MultiVersionInfo info = MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo info = MultiReleaseUtil.parseVersion(name);
Assert.assertNotNull(version, info);
Assert.assertFalse(version, info.isValid());
// The position of the resource name is still reported so callers
can keep the entry under its full name
@@ -104,7 +104,7 @@ public class TestMultiVersionUtil {
@Test
public void testNoSeparatorAfterVersionsDirectory() {
- MultiVersionInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/Foo.class");
+ MultiReleaseInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/Foo.class");
Assert.assertNotNull(info);
Assert.assertFalse(info.isValid());
Assert.assertEquals(-1, info.namePos());
@@ -118,14 +118,14 @@ public class TestMultiVersionUtil {
public void testMinimumVersion() {
for (int version = 1; version < 8; version++) {
String name = "META-INF/versions/" + version + "/test.txt";
- MultiVersionInfo info = MultiReleaseUtil.parseVersion(name);
+ MultiReleaseInfo info = MultiReleaseUtil.parseVersion(name);
Assert.assertNotNull(Integer.toString(version), info);
Assert.assertFalse(Integer.toString(version), info.isValid());
Assert.assertEquals(Integer.toString(version), "test.txt",
name.substring(info.namePos()));
}
for (int version = 8; version <= 10; version++) {
- MultiVersionInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/" + version + "/test.txt");
+ MultiReleaseInfo info =
MultiReleaseUtil.parseVersion("META-INF/versions/" + version + "/test.txt");
Assert.assertNotNull(Integer.toString(version), info);
Assert.assertTrue(Integer.toString(version), info.isValid());
Assert.assertEquals(version, info.version());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
