8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
/*
|
2016-03-31 15:20:50 -07:00
|
|
|
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
|
|
|
*
|
|
|
|
* This code is free software; you can redistribute it and/or modify it
|
|
|
|
* under the terms of the GNU General Public License version 2 only, as
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
*
|
|
|
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
|
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
|
|
* version 2 for more details (a copy is included in the LICENSE file that
|
|
|
|
* accompanied this code).
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License version
|
|
|
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
|
|
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*
|
|
|
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
|
|
* or visit www.oracle.com if you need additional information or have any
|
|
|
|
* questions.
|
|
|
|
*/
|
|
|
|
|
|
|
|
import java.io.File;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.PrintStream;
|
|
|
|
import java.lang.annotation.Annotation;
|
|
|
|
import java.lang.annotation.Retention;
|
|
|
|
import java.lang.annotation.RetentionPolicy;
|
|
|
|
import java.lang.reflect.InvocationTargetException;
|
|
|
|
import java.lang.reflect.Method;
|
|
|
|
import java.nio.file.FileVisitResult;
|
|
|
|
import java.nio.file.Files;
|
|
|
|
import java.nio.file.Path;
|
|
|
|
import java.nio.file.Paths;
|
|
|
|
import java.nio.file.SimpleFileVisitor;
|
|
|
|
import java.nio.file.attribute.BasicFileAttributes;
|
|
|
|
import java.util.ArrayList;
|
|
|
|
import java.util.Arrays;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Set;
|
|
|
|
import java.util.TreeSet;
|
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
2016-03-31 15:20:50 -07:00
|
|
|
import toolbox.JavacTask;
|
|
|
|
import toolbox.ToolBox;
|
|
|
|
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
/**
|
|
|
|
* Base class for module tests.
|
|
|
|
*/
|
|
|
|
public class ModuleTestBase {
|
|
|
|
protected ToolBox tb;
|
|
|
|
protected PrintStream out;
|
|
|
|
private int errors;
|
|
|
|
|
|
|
|
/** Marker annotation for test methods to be invoked by runTests. */
|
|
|
|
@Retention(RetentionPolicy.RUNTIME)
|
|
|
|
@interface Test { }
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Run all methods annotated with @Test, and throw an exception if any
|
|
|
|
* errors are reported..
|
|
|
|
*
|
|
|
|
* @throws Exception if any errors occurred
|
|
|
|
*/
|
|
|
|
void runTests() throws Exception {
|
|
|
|
if (tb == null)
|
|
|
|
tb = new ToolBox();
|
|
|
|
out = System.err;
|
|
|
|
|
|
|
|
for (Method m: getClass().getDeclaredMethods()) {
|
|
|
|
Annotation a = m.getAnnotation(Test.class);
|
|
|
|
if (a != null) {
|
|
|
|
try {
|
|
|
|
out.println("Running test " + m.getName());
|
|
|
|
Path baseDir = Paths.get(m.getName());
|
|
|
|
m.invoke(this, new Object[] { baseDir });
|
|
|
|
} catch (InvocationTargetException e) {
|
|
|
|
Throwable cause = e.getCause();
|
|
|
|
error("Exception: " + e.getCause());
|
|
|
|
cause.printStackTrace(out);
|
|
|
|
}
|
|
|
|
out.println();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (errors > 0)
|
|
|
|
throw new Exception(errors + " errors occurred");
|
|
|
|
}
|
|
|
|
|
|
|
|
// move to ToolBox?
|
|
|
|
// change returntyp to List<Path> -- means updating ToolBox methods
|
|
|
|
Path[] findJavaFiles(Path... paths) throws IOException {
|
|
|
|
Set<Path> files = new TreeSet<>();
|
|
|
|
for (Path p : paths) {
|
|
|
|
Files.walkFileTree(p, new SimpleFileVisitor<Path>() {
|
|
|
|
@Override
|
|
|
|
public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
|
|
|
|
throws IOException {
|
|
|
|
if (file.getFileName().toString().endsWith(".java")) {
|
|
|
|
files.add(file);
|
|
|
|
}
|
|
|
|
return FileVisitResult.CONTINUE;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
return files.toArray(new Path[files.size()]);
|
|
|
|
}
|
|
|
|
|
|
|
|
void error(String message) {
|
|
|
|
out.println("Error: " + message);
|
|
|
|
errors++;
|
|
|
|
}
|
|
|
|
|
|
|
|
public class ModuleBuilder {
|
|
|
|
|
|
|
|
private final String name;
|
|
|
|
private String requires = "";
|
|
|
|
private String exports = "";
|
|
|
|
private String uses = "";
|
|
|
|
private String provides = "";
|
|
|
|
private String modulePath = "";
|
|
|
|
private List<String> content = new ArrayList<>();
|
|
|
|
|
|
|
|
public ModuleBuilder(String name) {
|
|
|
|
this.name = name;
|
|
|
|
}
|
|
|
|
|
|
|
|
public ModuleBuilder requiresPublic(String requires, Path... modulePath) {
|
|
|
|
return requires("public " + requires, modulePath);
|
|
|
|
}
|
|
|
|
|
|
|
|
public ModuleBuilder requires(String requires, Path... modulePath) {
|
|
|
|
this.requires += " requires " + requires + ";\n";
|
|
|
|
this.modulePath += Arrays.stream(modulePath)
|
|
|
|
.map(Path::toString)
|
|
|
|
.collect(Collectors.joining(File.pathSeparator));
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public ModuleBuilder exportsTo(String pkg, String module) {
|
|
|
|
return exports(pkg + " to " + module);
|
|
|
|
}
|
|
|
|
|
|
|
|
public ModuleBuilder exports(String pkg) {
|
|
|
|
this.exports += " exports " + pkg + ";\n";
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public ModuleBuilder uses(String uses) {
|
|
|
|
this.uses += " uses " + uses + ";\n";
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public ModuleBuilder provides(String service, String implementation) {
|
|
|
|
this.provides += " provides " + service + " with " + implementation + ";\n";
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public ModuleBuilder classes(String... content) {
|
|
|
|
this.content.addAll(Arrays.asList(content));
|
|
|
|
return this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public Path write(Path where) throws IOException {
|
|
|
|
Files.createDirectories(where);
|
|
|
|
List<String> sources = new ArrayList<>();
|
|
|
|
sources.add("module " + name + "{"
|
|
|
|
+ requires
|
|
|
|
+ exports
|
|
|
|
+ uses
|
|
|
|
+ provides
|
|
|
|
+ "}");
|
|
|
|
sources.addAll(content);
|
|
|
|
Path moduleSrc = where.resolve(name + "/src");
|
|
|
|
tb.writeJavaFiles(moduleSrc, sources.toArray(new String[]{}));
|
|
|
|
return moduleSrc;
|
|
|
|
}
|
|
|
|
|
|
|
|
public void build(Path where) throws IOException {
|
|
|
|
Path moduleSrc = write(where);
|
2016-03-31 15:20:50 -07:00
|
|
|
new JavacTask(tb)
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
.outdir(where.resolve(name))
|
|
|
|
.options("-mp", modulePath)
|
|
|
|
.files(findJavaFiles(moduleSrc))
|
|
|
|
.run()
|
|
|
|
.writeAll();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|