Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x

This commit is contained in:
Joakim Erdfelt 2020-10-20 11:34:41 -05:00
parent 7534610c74 4ecaf3049c
commit 6b0736f263
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
1 changed files with 32 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
View File

@ -29,12 +29,12 @@ import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.jetty.util.JavaVersion; import org.eclipse.jetty.util.JavaVersion;
import org.eclipse.jetty.util.Loader; import org.eclipse.jetty.util.Loader;
import org.eclipse.jetty.util.ManifestUtils;
import org.eclipse.jetty.util.MultiException; import org.eclipse.jetty.util.MultiException;
import org.eclipse.jetty.util.MultiReleaseJarFile; import org.eclipse.jetty.util.MultiReleaseJarFile;
import org.eclipse.jetty.util.StringUtil; import org.eclipse.jetty.util.StringUtil;
@ -70,8 +70,7 @@ import org.slf4j.LoggerFactory;
public class AnnotationParser public class AnnotationParser
{ {
private static final Logger LOG = LoggerFactory.getLogger(AnnotationParser.class); private static final Logger LOG = LoggerFactory.getLogger(AnnotationParser.class);
private static final int ASM_OPCODE_VERSION = Opcodes.ASM9; //compatibility of api private static final int ASM_VERSION = asmVersion();
private static final String ASM_OPCODE_VERSION_STR = "ASM9";
/** /**
* Map of classnames scanned and the first location from which scan occurred * Map of classnames scanned and the first location from which scan occurred
@ -83,67 +82,39 @@ public class AnnotationParser
/** /**
* Determine the runtime version of asm. * Determine the runtime version of asm.
* *
* @return the org.objectweb.asm.Opcode matching the runtime version of asm. * @return the {@link org.objectweb.asm.Opcodes} ASM value matching the runtime version of asm.
*/ */
public static int asmVersion() private static int asmVersion()
{ {
int asmVersion = ASM_OPCODE_VERSION; // Find the highest available ASM version on the runtime/classpath, because
String version = ManifestUtils.getVersion(Opcodes.class).orElse(null); // if we run with a lower than available ASM version, against a class with
if (version == null) // new language features we'll get an UnsupportedOperationException, even if
{ // the ASM version supports the new language features.
LOG.warn("Unknown ASM version, assuming {}", ASM_OPCODE_VERSION_STR); // Also, if we run with a higher than available ASM version, we'll get
} // an IllegalArgumentException from org.objectweb.asm.ClassVisitor.
else // So must find exactly the maximum ASM api version available.
{
int dot = version.indexOf('.'); Optional<Integer> asmVersion = Arrays.stream(Opcodes.class.getFields()).sequential()
version = version.substring(0, (dot < 0 ? version.length() : dot)).trim(); .filter((f) -> f.getName().matches("ASM[0-9]+"))
.map((f) -> f.getName().substring(3))
.map(Integer::parseInt)
.max(Integer::compareTo);
if (!asmVersion.isPresent())
throw new IllegalStateException("Invalid " + Opcodes.class.getName());
int asmFieldId = asmVersion.get();
try try
{ {
int v = Integer.parseInt(version); String fieldName = "ASM" + asmFieldId;
switch (v) if (LOG.isDebugEnabled())
LOG.debug("Using ASM API from {}.{}", Opcodes.class.getName(), fieldName);
return (int)Opcodes.class.getField(fieldName).get(null);
}
catch (Throwable e)
{ {
case 4: throw new IllegalStateException(e);
{
asmVersion = Opcodes.ASM4;
break;
} }
case 5:
{
asmVersion = Opcodes.ASM5;
break;
}
case 6:
{
asmVersion = Opcodes.ASM6;
break;
}
case 7:
{
asmVersion = Opcodes.ASM7;
break;
}
case 8:
{
asmVersion = Opcodes.ASM8;
break;
}
case 9:
{
asmVersion = Opcodes.ASM9;
break;
}
default:
{
LOG.warn("Unrecognized ASM version, assuming {}", ASM_OPCODE_VERSION_STR);
}
}
}
catch (NumberFormatException e)
{
LOG.warn("Unable to parse ASM version, assuming {}", ASM_OPCODE_VERSION_STR);
}
}
return asmVersion;
} }
/** /**
@ -489,7 +460,7 @@ public class AnnotationParser
*/ */
public static class MyClassVisitor extends ClassVisitor public static class MyClassVisitor extends ClassVisitor
{ {
int _asmVersion; final int _asmVersion;
final Resource _containingResource; final Resource _containingResource;
final Set<? extends Handler> _handlers; final Set<? extends Handler> _handlers;
ClassInfo _ci; ClassInfo _ci;
@ -568,7 +539,7 @@ public class AnnotationParser
*/ */
public AnnotationParser(int javaPlatform) public AnnotationParser(int javaPlatform)
{ {
_asmVersion = asmVersion(); _asmVersion = ASM_VERSION;
if (javaPlatform == 0) if (javaPlatform == 0)
javaPlatform = JavaVersion.VERSION.getPlatform(); javaPlatform = JavaVersion.VERSION.getPlatform();
_javaPlatform = javaPlatform; _javaPlatform = javaPlatform;
@ -580,7 +551,7 @@ public class AnnotationParser
javaPlatform = JavaVersion.VERSION.getPlatform(); javaPlatform = JavaVersion.VERSION.getPlatform();
_javaPlatform = javaPlatform; _javaPlatform = javaPlatform;
if (asmVersion == 0) if (asmVersion == 0)
asmVersion = ASM_OPCODE_VERSION; asmVersion = ASM_VERSION;
_asmVersion = asmVersion; _asmVersion = asmVersion;
} }