From 4fc27be9ae6c378d6c9c7b16da2d75293dcb3167 Mon Sep 17 00:00:00 2001 From: Luke Hutchison Date: Mon, 16 Aug 2021 18:16:53 -0600 Subject: [PATCH] Source > Cleanup --- src/main/java/io/github/classgraph/ClassTypeSignature.java | 4 ++-- src/main/java/io/github/classgraph/ModulePathInfo.java | 4 ++-- src/main/java/io/github/classgraph/ModuleRef.java | 3 +-- src/main/java/io/github/classgraph/Scanner.java | 3 +-- .../WebsphereLibertyClassLoaderHandler.java | 1 - .../classgraph/fileslice/reader/RandomAccessReader.java | 2 +- src/main/java/nonapi/io/github/classgraph/utils/Assert.java | 6 ++++-- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/io/github/classgraph/ClassTypeSignature.java b/src/main/java/io/github/classgraph/ClassTypeSignature.java index d8c0303ca..4fc34045d 100644 --- a/src/main/java/io/github/classgraph/ClassTypeSignature.java +++ b/src/main/java/io/github/classgraph/ClassTypeSignature.java @@ -415,7 +415,7 @@ static ClassTypeSignature parse(final String typeDescriptor, final ClassInfo cla if (parser.hasMore()) { throw new ParseException(parser, "Extra characters at end of type descriptor"); } - return new ClassTypeSignature(classInfo, typeParameters, - superclassSignature, superinterfaceSignatures, throwsSignatures); + return new ClassTypeSignature(classInfo, typeParameters, superclassSignature, superinterfaceSignatures, + throwsSignatures); } } \ No newline at end of file diff --git a/src/main/java/io/github/classgraph/ModulePathInfo.java b/src/main/java/io/github/classgraph/ModulePathInfo.java index de698d99b..c79871632 100644 --- a/src/main/java/io/github/classgraph/ModulePathInfo.java +++ b/src/main/java/io/github/classgraph/ModulePathInfo.java @@ -154,8 +154,8 @@ public ModulePathInfo() { argField.add(argParam); } else { // Split arg param into parts - argField.addAll(Arrays.asList(JarUtils.smartPathSplit(argParam, sepChar, - /* scanSpec = */ null))); + argField.addAll(Arrays + .asList(JarUtils.smartPathSplit(argParam, sepChar, /* scanSpec = */ null))); } } } diff --git a/src/main/java/io/github/classgraph/ModuleRef.java b/src/main/java/io/github/classgraph/ModuleRef.java index 23ebe44c1..0484d3716 100644 --- a/src/main/java/io/github/classgraph/ModuleRef.java +++ b/src/main/java/io/github/classgraph/ModuleRef.java @@ -93,8 +93,7 @@ public ModuleRef(final Object moduleReference, final Object moduleLayer) { // Should not happen throw new IllegalArgumentException("moduleReference.descriptor() should not return null"); } - this.name = (String) ReflectionUtils.invokeMethod(this.descriptor, "name", - /* throwException = */ true); + this.name = (String) ReflectionUtils.invokeMethod(this.descriptor, "name", /* throwException = */ true); @SuppressWarnings("unchecked") final Set modulePackages = (Set) ReflectionUtils.invokeMethod(this.descriptor, "packages", /* throwException = */ true); diff --git a/src/main/java/io/github/classgraph/Scanner.java b/src/main/java/io/github/classgraph/Scanner.java index 91f608df6..c8497c73c 100644 --- a/src/main/java/io/github/classgraph/Scanner.java +++ b/src/main/java/io/github/classgraph/Scanner.java @@ -835,8 +835,7 @@ private void preprocessClasspathElementsByType(final List fina for (final ClasspathElement classpathElt : finalTraditionalClasspathEltOrder) { if (classpathElt instanceof ClasspathElementFileDir) { // Separate out ClasspathElementDir elements from other types - classpathEltDirs.add(new SimpleEntry<>(classpathElt.getFile().getPath(), - classpathElt)); + classpathEltDirs.add(new SimpleEntry<>(classpathElt.getFile().getPath(), classpathElt)); } else if (classpathElt instanceof ClasspathElementZip) { // Separate out ClasspathElementZip elements from other types diff --git a/src/main/java/nonapi/io/github/classgraph/classloaderhandler/WebsphereLibertyClassLoaderHandler.java b/src/main/java/nonapi/io/github/classgraph/classloaderhandler/WebsphereLibertyClassLoaderHandler.java index f74074843..2d804bd52 100644 --- a/src/main/java/nonapi/io/github/classgraph/classloaderhandler/WebsphereLibertyClassLoaderHandler.java +++ b/src/main/java/nonapi/io/github/classgraph/classloaderhandler/WebsphereLibertyClassLoaderHandler.java @@ -32,7 +32,6 @@ import java.io.File; import java.net.URL; -import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashSet; diff --git a/src/main/java/nonapi/io/github/classgraph/fileslice/reader/RandomAccessReader.java b/src/main/java/nonapi/io/github/classgraph/fileslice/reader/RandomAccessReader.java index 8842afa25..65f6b3816 100644 --- a/src/main/java/nonapi/io/github/classgraph/fileslice/reader/RandomAccessReader.java +++ b/src/main/java/nonapi/io/github/classgraph/fileslice/reader/RandomAccessReader.java @@ -161,7 +161,7 @@ public interface RandomAccessReader { * If an I/O exception occurs. */ String readString(final long offset, final int numBytes, final boolean replaceSlashWithDot, - final boolean stripLSemicolon) throws IOException; + final boolean stripLSemicolon) throws IOException; /** * Reads the "modified UTF8" format defined in the Java classfile spec. diff --git a/src/main/java/nonapi/io/github/classgraph/utils/Assert.java b/src/main/java/nonapi/io/github/classgraph/utils/Assert.java index 3a35efd5f..936786b9d 100644 --- a/src/main/java/nonapi/io/github/classgraph/utils/Assert.java +++ b/src/main/java/nonapi/io/github/classgraph/utils/Assert.java @@ -7,7 +7,8 @@ public final class Assert { * * @param clazz * the class. - * @throws {@link IllegalArgumentException} if the class is not an annotation. + * @throws IllegalArgumentException + * if the class is not an annotation. */ public static void isAnnotation(final Class clazz) { if (!clazz.isAnnotation()) { @@ -20,7 +21,8 @@ public static void isAnnotation(final Class clazz) { * * @param clazz * the class. - * @throws {@link IllegalArgumentException} if the class is not an interface. + * @throws IllegalArgumentException + * if the class is not an interface. */ public static void isInterface(final Class clazz) { if (!clazz.isInterface()) {