project renamed envelope
This commit is contained in:
@@ -4,7 +4,7 @@ plugins {
|
||||
id "net.woggioni.gradle.multi-release-jar"
|
||||
}
|
||||
|
||||
ext.setProperty("jpms.module.name", "net.woggioni.executable.jar")
|
||||
ext.setProperty("jpms.module.name", "net.woggioni.envelope")
|
||||
|
||||
configurations {
|
||||
embedded
|
||||
@@ -30,7 +30,7 @@ tasks.withType(JavaCompile).configureEach {
|
||||
jar {
|
||||
manifest {
|
||||
attributes([
|
||||
(Attributes.Name.SPECIFICATION_TITLE) : "executable-jar-launcher",
|
||||
(Attributes.Name.SPECIFICATION_TITLE) : "envelope-launcher",
|
||||
(Attributes.Name.SEALED) : true
|
||||
].collectEntries {
|
||||
[it.key.toString(), it.value.toString()]
|
||||
@@ -57,6 +57,6 @@ tasks.register("tar", Tar) {
|
||||
tasks.named(JavaPlugin.COMPILE_JAVA_TASK_NAME, JavaCompile) {
|
||||
doFirst {
|
||||
String path = project(":common").extensions.getByType(JavaPluginExtension).sourceSets.named("main").get().output.asPath
|
||||
options.compilerArgs.addAll(["--patch-module", "net.woggioni.executable.jar=$path"])
|
||||
options.compilerArgs.addAll(["--patch-module", "net.woggioni.envelope=$path"])
|
||||
}
|
||||
}
|
||||
|
@@ -1,4 +1,4 @@
|
||||
package net.woggioni.executable.jar;
|
||||
package net.woggioni.envelope;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.lang.instrument.Instrumentation;
|
@@ -1,4 +1,4 @@
|
||||
package net.woggioni.executable.jar;
|
||||
package net.woggioni.envelope;
|
||||
|
||||
import java.io.InputStream;
|
||||
import java.lang.reflect.Method;
|
@@ -1,4 +1,4 @@
|
||||
package net.woggioni.executable.jar;
|
||||
package net.woggioni.envelope;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import lombok.SneakyThrows;
|
@@ -1,190 +0,0 @@
|
||||
package net.woggioni.executable.jar;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.net.URLStreamHandler;
|
||||
import java.nio.file.FileSystem;
|
||||
import java.nio.file.FileSystems;
|
||||
import java.nio.file.FileVisitResult;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.SimpleFileVisitor;
|
||||
import java.nio.file.attribute.BasicFileAttributes;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.Enumeration;
|
||||
import java.util.List;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.SneakyThrows;
|
||||
|
||||
/**
|
||||
* A classloader that loads classes from a {@link Path} instance
|
||||
*/
|
||||
public final class PathClassLoader extends ClassLoader {
|
||||
|
||||
private final Iterable<Path> paths;
|
||||
|
||||
static {
|
||||
registerAsParallelCapable();
|
||||
}
|
||||
|
||||
public PathClassLoader(Path ...path) {
|
||||
this(Arrays.asList(path), null);
|
||||
}
|
||||
|
||||
public PathClassLoader(Iterable<Path> paths) {
|
||||
this(paths, null);
|
||||
}
|
||||
|
||||
public PathClassLoader(Iterable<Path> paths, ClassLoader parent) {
|
||||
super(parent);
|
||||
this.paths = paths;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
protected Class<?> findClass(String name) {
|
||||
String resource = name.replace('.', '/').concat(".class");
|
||||
for(Path path : paths) {
|
||||
Path classPath = path.resolve(resource);
|
||||
if (Files.exists(classPath)) {
|
||||
byte[] byteCode = Files.readAllBytes(classPath);
|
||||
return defineClass(name, byteCode, 0, byteCode.length);
|
||||
}
|
||||
}
|
||||
throw new ClassNotFoundException(name);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
protected URL findResource(String name) {
|
||||
for(Path path : paths) {
|
||||
Path resolved = path.resolve(name);
|
||||
if (Files.exists(resolved)) {
|
||||
return toURL(resolved);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Enumeration<URL> findResources(final String name) throws IOException {
|
||||
final List<URL> resources = new ArrayList<>(1);
|
||||
for(Path path : paths) {
|
||||
Files.walkFileTree(path, new SimpleFileVisitor<Path>() {
|
||||
@Override
|
||||
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
|
||||
if (!name.isEmpty()) {
|
||||
this.addIfMatches(resources, file);
|
||||
}
|
||||
return super.visitFile(file, attrs);
|
||||
}
|
||||
|
||||
@Override
|
||||
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
|
||||
if (!name.isEmpty() || path.equals(dir)) {
|
||||
this.addIfMatches(resources, dir);
|
||||
}
|
||||
return super.preVisitDirectory(dir, attrs);
|
||||
}
|
||||
|
||||
void addIfMatches(List<URL> resources, Path file) throws IOException {
|
||||
if (path.relativize(file).toString().equals(name)) {
|
||||
resources.add(toURL(file));
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
return Collections.enumeration(resources);
|
||||
}
|
||||
|
||||
private static URL toURL(Path path) throws IOException {
|
||||
return new URL(null, path.toUri().toString(), PathURLStreamHandler.INSTANCE);
|
||||
}
|
||||
|
||||
private static final class PathURLConnection extends URLConnection {
|
||||
|
||||
private final Path path;
|
||||
|
||||
PathURLConnection(URL url, Path path) {
|
||||
super(url);
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void connect() {}
|
||||
|
||||
@Override
|
||||
public long getContentLengthLong() {
|
||||
try {
|
||||
return Files.size(this.path);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("could not get size of: " + this.path, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream getInputStream() throws IOException {
|
||||
return Files.newInputStream(this.path);
|
||||
}
|
||||
|
||||
@Override
|
||||
public OutputStream getOutputStream() throws IOException {
|
||||
return Files.newOutputStream(this.path);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public String getContentType() {
|
||||
return Files.probeContentType(this.path);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public long getLastModified() {
|
||||
BasicFileAttributes attributes = Files.readAttributes(this.path, BasicFileAttributes.class);
|
||||
return attributes.lastModifiedTime().toMillis();
|
||||
}
|
||||
}
|
||||
|
||||
@NoArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
private static final class PathURLStreamHandler extends URLStreamHandler {
|
||||
|
||||
static final URLStreamHandler INSTANCE = new PathURLStreamHandler();
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
protected URLConnection openConnection(URL url) {
|
||||
List<String> stack = new ArrayList<>();
|
||||
URL currentURL = url;
|
||||
while(true) {
|
||||
String file = currentURL.getFile();
|
||||
int exclamationMark = file.lastIndexOf('!');
|
||||
if(exclamationMark != -1) {
|
||||
stack.add(file.substring(exclamationMark + 1));
|
||||
currentURL = new URL(file.substring(0, exclamationMark));
|
||||
} else {
|
||||
stack.add(file);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
Path path;
|
||||
FileSystem fs = FileSystems.getDefault();
|
||||
while(true) {
|
||||
String pathString = stack.remove(stack.size() - 1);
|
||||
path = fs.getPath(pathString);
|
||||
if(stack.isEmpty()) break;
|
||||
else {
|
||||
fs = FileSystems.newFileSystem(path, null);
|
||||
}
|
||||
}
|
||||
return new PathURLConnection(url, path);
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,4 +1,4 @@
|
||||
module net.woggioni.executable.jar {
|
||||
module net.woggioni.envelope {
|
||||
requires java.logging;
|
||||
requires static lombok;
|
||||
requires net.woggioni.xclassloader;
|
||||
|
@@ -1,4 +1,4 @@
|
||||
package net.woggioni.executable.jar;
|
||||
package net.woggioni.envelope;
|
||||
|
||||
import java.lang.module.Configuration;
|
||||
import java.lang.module.ModuleFinder;
|
@@ -1,149 +0,0 @@
|
||||
package net.woggioni.executable.jar;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.OutputStream;
|
||||
import java.net.URI;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.net.URLStreamHandler;
|
||||
import java.nio.file.FileSystem;
|
||||
import java.nio.file.FileSystems;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.attribute.BasicFileAttributes;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.Stream;
|
||||
import java.util.stream.StreamSupport;
|
||||
import lombok.AccessLevel;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.SneakyThrows;
|
||||
import org.gradle.internal.impldep.org.junit.Ignore;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
public class FooTest {
|
||||
@Test
|
||||
@SneakyThrows
|
||||
void foo() {
|
||||
Path.of(new URI("jar:file:///home/woggioni/code/wson/benchmark/build/libs/benchmark-executable-1.0.jar"));
|
||||
}
|
||||
|
||||
@Test
|
||||
@SneakyThrows
|
||||
void foo2() {
|
||||
Path p = Path.of(new URI("file:///home/woggioni/code/wson/benchmark/build/libs/benchmark-executable-1.0.jar"));
|
||||
FileSystem fs = FileSystems.newFileSystem(p, null);
|
||||
StreamSupport.stream(fs.getRootDirectories().spliterator(), false).flatMap(new Function<Path, Stream<?>>() {
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public Stream<?> apply(Path path) {
|
||||
return Files.list(path);
|
||||
}
|
||||
}).forEach(r -> {
|
||||
System.out.println(r);
|
||||
});
|
||||
}
|
||||
|
||||
@Test
|
||||
@SneakyThrows
|
||||
void test() {
|
||||
Path fatJar = Path.of("/home/woggioni/code/wson/benchmark/build/libs/benchmark-executable-1.0.jar");
|
||||
List<Path> jars = StreamSupport.stream(FileSystems.newFileSystem(fatJar, null).getRootDirectories().spliterator(), false)
|
||||
.flatMap(new Function<Path, Stream<? extends Path>>() {
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public Stream<? extends Path> apply(Path root) {
|
||||
Path libDir = root.resolve("/LIB-INF");
|
||||
if (Files.exists(libDir) && Files.isDirectory(libDir)) {
|
||||
return Files.list(libDir);
|
||||
} else {
|
||||
return Stream.empty();
|
||||
}
|
||||
}
|
||||
}).flatMap(new Function<Path, Stream<Path>>() {
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public Stream<Path> apply(Path path) {
|
||||
return StreamSupport.stream(FileSystems.newFileSystem(path, null).getRootDirectories().spliterator(), false);
|
||||
}
|
||||
}).collect(Collectors.toList());
|
||||
PathClassLoader p = new PathClassLoader(jars.toArray(new Path[jars.size()]));
|
||||
Class<?> cl = p.loadClass("net.woggioni.wson.serialization.binary.JBONParser");
|
||||
System.out.println(cl);
|
||||
URL resource = p.findResource("citylots.json.xz");
|
||||
resource.openStream();
|
||||
}
|
||||
|
||||
@Test
|
||||
@Ignore
|
||||
@SneakyThrows
|
||||
void test2() {
|
||||
FileSystem fs = FileSystems.newFileSystem(new URI("jar:file:/home/woggioni/code/wson/benchmark/build/libs/benchmark-executable-1.0.jar"), new HashMap<>());
|
||||
String s = "jar:jar:file:///home/woggioni/code/wson/benchmark/build/libs/benchmark-executable-1.0.jar!/LIB-INF/wson-test-utils-1.0.jar!/citylots.json.xz";
|
||||
URI uri = new URI(s);
|
||||
Files.list(Path.of(uri)).forEach(System.out::println);
|
||||
}
|
||||
|
||||
private static final class PathURLConnection extends URLConnection {
|
||||
|
||||
private final Path path;
|
||||
|
||||
PathURLConnection(URL url, Path path) {
|
||||
super(url);
|
||||
this.path = path;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void connect() {}
|
||||
|
||||
@Override
|
||||
public long getContentLengthLong() {
|
||||
try {
|
||||
return Files.size(this.path);
|
||||
} catch (IOException e) {
|
||||
throw new RuntimeException("could not get size of: " + this.path, e);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public InputStream getInputStream() throws IOException {
|
||||
return Files.newInputStream(this.path);
|
||||
}
|
||||
|
||||
@Override
|
||||
public OutputStream getOutputStream() throws IOException {
|
||||
return Files.newOutputStream(this.path);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public String getContentType() {
|
||||
return Files.probeContentType(this.path);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
public long getLastModified() {
|
||||
BasicFileAttributes attributes = Files.readAttributes(this.path, BasicFileAttributes.class);
|
||||
return attributes.lastModifiedTime().toMillis();
|
||||
}
|
||||
}
|
||||
|
||||
@NoArgsConstructor(access = AccessLevel.PRIVATE)
|
||||
private static final class PathURLStreamHandler extends URLStreamHandler {
|
||||
|
||||
static final URLStreamHandler INSTANCE = new PathURLStreamHandler();
|
||||
|
||||
@Override
|
||||
@SneakyThrows
|
||||
protected URLConnection openConnection(URL url) {
|
||||
URI uri = url.toURI();
|
||||
Path path = Paths.get(uri);
|
||||
return new PathURLConnection(url, path);
|
||||
}
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user