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-bcel.git
The following commit(s) were added to refs/heads/master by this push:
new d6c80b5e Add org.apache.bcel.classfile.Module.EXTENSION
d6c80b5e is described below
commit d6c80b5ea3d26fcb4f3a26fafde5575579bc79c3
Author: Gary David Gregory (Code signing key) <ggreg...@apache.org>
AuthorDate: Sat Nov 19 16:33:35 2022 -0500
Add org.apache.bcel.classfile.Module.EXTENSION
---
src/changes/changes.xml | 1 +
src/main/java/org/apache/bcel/classfile/Module.java | 7 +++++++
src/main/java/org/apache/bcel/util/ClassPath.java | 4 ++--
src/test/java/org/apache/bcel/generic/JavaHome.java | 3 ++-
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 4adb3858..fe0e051c 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -66,6 +66,7 @@ The <action> type attribute can be add,update,fix,remove.
<!-- ADD -->
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add
org.apache.bcel.classfile.ClassFormatException.ClassFormatException(Throwable).</action>
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add org.apache.bcel.classfile.JavaClass.EXTENSION.</action>
+ <action type="add" dev="ggregory" due-to="Gary
Gregory">Add org.apache.bcel.classfile.Module.EXTENSION.</action>
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add org.apache.bcel.util.Args.</action>
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add org.apache.bcel.generic.ArrayType.getClassName().</action>
<action type="add" dev="ggregory" due-to="Gary
Gregory">Add org.apache.bcel.generic.Type.getClassName().</action>
diff --git a/src/main/java/org/apache/bcel/classfile/Module.java
b/src/main/java/org/apache/bcel/classfile/Module.java
index f25b3bc7..9740d016 100644
--- a/src/main/java/org/apache/bcel/classfile/Module.java
+++ b/src/main/java/org/apache/bcel/classfile/Module.java
@@ -33,6 +33,13 @@ import org.apache.bcel.Const;
*/
public final class Module extends Attribute {
+ /**
+ * The module file name extension.
+ *
+ * @since 6.7.0
+ */
+ public static final String EXTENSION = ".jmod";
+
private final int moduleNameIndex;
private final int moduleFlags;
private final int moduleVersionIndex;
diff --git a/src/main/java/org/apache/bcel/util/ClassPath.java
b/src/main/java/org/apache/bcel/util/ClassPath.java
index c6e36c6d..783a9c85 100644
--- a/src/main/java/org/apache/bcel/util/ClassPath.java
+++ b/src/main/java/org/apache/bcel/util/ClassPath.java
@@ -435,7 +435,7 @@ public class ClassPath implements Closeable {
private static final FilenameFilter MODULES_FILTER = (dir, name) -> {
name = name.toLowerCase(Locale.ENGLISH);
- return name.endsWith(".jmod");
+ return name.endsWith(org.apache.bcel.classfile.Module.EXTENSION);
};
public static final ClassPath SYSTEM_CLASS_PATH = new
ClassPath(getClassPath());
@@ -546,7 +546,7 @@ public class ClassPath implements Closeable {
if (file.exists()) {
if (file.isDirectory()) {
paths.add(new Dir(path));
- } else if (path.endsWith(".jmod")) {
+ } else if
(path.endsWith(org.apache.bcel.classfile.Module.EXTENSION)) {
paths.add(new Module(new ZipFile(file)));
} else if
(path.endsWith(ModularRuntimeImage.MODULES_PATH)) {
paths.add(new
JrtModules(ModularRuntimeImage.MODULES_PATH));
diff --git a/src/test/java/org/apache/bcel/generic/JavaHome.java
b/src/test/java/org/apache/bcel/generic/JavaHome.java
index a13f57d5..d59bc2e4 100644
--- a/src/test/java/org/apache/bcel/generic/JavaHome.java
+++ b/src/test/java/org/apache/bcel/generic/JavaHome.java
@@ -36,6 +36,7 @@ import java.util.jar.JarFile;
import java.util.stream.Stream;
import org.apache.bcel.classfile.JavaClass;
+import org.apache.bcel.classfile.Module;
import org.apache.bcel.classfile.Utility;
import org.apache.bcel.util.ModularRuntimeImage;
import org.apache.commons.lang3.StringUtils;
@@ -253,7 +254,7 @@ public class JavaHome {
}
private Stream<Path> streamModuleByExt() {
- return streamEndsWith(".jmod");
+ return streamEndsWith(Module.EXTENSION);
}
private JarFile toJarFile(final Path path) {
