Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-04 12:59:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Issue #6052 - make ModuleLocation optional on Android

Browse Source 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
This commit is contained in:
Joakim Erdfelt 2021-03-10 10:45:29 -06:00
parent b899261497
commit d7982f869b
No known key found for this signature in database
GPG Key ID: 2D0E1FB8FE4B68B4
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jetty-client/pom.xml
View File

@ -51,6 +51,7 @@
<goal>shade</goal>
</goals>
<configuration>
<minimizeJar>true</minimizeJar>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>hybrid</shadedClassifierName>
<artifactSet>

6
jetty-util/src/main/java/org/eclipse/jetty/util/ModuleLocation.java
View File

@ -23,6 +23,7 @@ import java.lang.invoke.MethodHandles;
import java.lang.reflect.Method;
import java.net.URI;
import java.util.Optional;
import java.util.function.Function;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@ -53,7 +54,7 @@ import static java.lang.invoke.MethodType.methodType;
*
* In Jetty 10, this entire class can be moved to direct calls to java.lang.Module in TypeUtil.getModuleLocation()
*/
class ModuleLocation
class ModuleLocation implements Function<Class<?>, URI>
{
private static final Logger LOG = Log.getLogger(ModuleLocation.class);
@ -100,7 +101,8 @@ class ModuleLocation
}
}
public URI getModuleLocation(Class<?> clazz)
@Override
public URI apply(Class<?> clazz)
{
try
{

23
jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
View File

@ -38,6 +38,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
import org.eclipse.jetty.util.log.Log;
import org.eclipse.jetty.util.log.Logger;
@ -178,7 +179,7 @@ public class TypeUtil
}
private static final MethodHandle[] LOCATION_METHODS;
private static final ModuleLocation MODULE_LOCATION;
private static final Function<Class<?>, URI> MODULE_LOCATION;
static
{
@ -190,17 +191,23 @@ public class TypeUtil
try
{
locationMethods.add(lookup.findStatic(TypeUtil.class, "getCodeSourceLocation", type));
ModuleLocation moduleLocation = null;
Function<Class<?>, URI> moduleFunc = null;
try
{
moduleLocation = new ModuleLocation();
locationMethods.add(lookup.findStatic(TypeUtil.class, "getModuleLocation", type));
Class<?> clazzModuleLocation = Class.forName(TypeUtil.class.getPackage().getName() + ".ModuleLocation");
Object obj = clazzModuleLocation.getConstructor().newInstance();
if (obj instanceof Function)
{
//noinspection unchecked
moduleFunc = (Function<Class<?>, URI>)obj;
locationMethods.add(lookup.findStatic(TypeUtil.class, "getModuleLocation", type));
}
}
catch (UnsupportedOperationException e)
catch (Throwable t)
{
LOG.debug("JVM Runtime does not support Modules");
LOG.debug("This JVM Runtime does not support Modules, disabling Jetty internal support");
}
MODULE_LOCATION = moduleLocation;
MODULE_LOCATION = moduleFunc;
locationMethods.add(lookup.findStatic(TypeUtil.class, "getClassLoaderLocation", type));
locationMethods.add(lookup.findStatic(TypeUtil.class, "getSystemClassLoaderLocation", type));
LOCATION_METHODS = locationMethods.toArray(new MethodHandle[0]);
@ -723,7 +730,7 @@ public class TypeUtil
// In Jetty 10, this method can be implemented directly, without reflection
if (MODULE_LOCATION != null)
{
return MODULE_LOCATION.getModuleLocation(clazz);
return MODULE_LOCATION.apply(clazz);
}
return null;
}