diff --git a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java b/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java index 306bf82b105..f560774b3de 100644 --- a/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java +++ b/langtools/src/java.compiler/share/classes/javax/lang/model/element/ModuleElement.java @@ -96,10 +96,12 @@ public interface ModuleElement extends Element, QualifiedNameable { * @since 9 */ enum DirectiveKind { - /** A "requires [public] module-name" directive. */ + /** A "requires (static|transitive)* module-name" directive. */ REQUIRES, /** An "exports package-name [to module-name-list]" directive. */ EXPORTS, + /** An "opens package-name [to module-name-list]" directive. */ + OPENS, /** A "uses service-name" directive. */ USES, /** A "provides service-name with implementation-name" directive. */ @@ -127,10 +129,16 @@ public interface ModuleElement extends Element, QualifiedNameable { */ interface RequiresDirective extends Directive { /** - * Returns whether or not this is a public dependency. - * @return whether or not this is a public dependency + * Returns whether or not this is a static dependency. + * @return whether or not this is a static dependency */ - boolean isPublic(); + boolean isStatic(); + + /** + * Returns whether or not this is a transitive dependency. + * @return whether or not this is a transitive dependency + */ + boolean isTransitive(); /** * Returns the module that is required @@ -144,6 +152,7 @@ public interface ModuleElement extends Element, QualifiedNameable { * @since 9 */ interface ExportsDirective extends Directive { + /** * Returns the package being exported. * @return the package being exported @@ -159,6 +168,27 @@ public interface ModuleElement extends Element, QualifiedNameable { List getTargetModules(); } + /** + * An opened package of a module. + * @since 9 + */ + interface OpensDirective extends Directive { + + /** + * Returns the package being opened. + * @return the package being opened + */ + PackageElement getPackage(); + + /** + * Returns the specific modules to which the package is being open + * or null, if the package is open all modules which + * have readability to this module. + * @return the specific modules to which the package is being opened + */ + List getTargetModules(); + } + /** * An implementation of a service provided by a module. * @since 9 @@ -171,10 +201,10 @@ public interface ModuleElement extends Element, QualifiedNameable { TypeElement getService(); /** - * Returns the implementation of the service being provided. - * @return the implementation of the service being provided + * Returns the implementations of the service being provided. + * @return the implementations of the service being provided */ - TypeElement getImplementation(); + List getImplementations(); } /** diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java index aeaef2b3dcf..9270b2b4cad 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ExportsTree.java @@ -39,11 +39,12 @@ import java.util.List; * @since 9 */ public interface ExportsTree extends DirectiveTree { + /** * Returns the name of the package to be exported. * @return the name of the package to be exported */ - ExpressionTree getExportName(); + ExpressionTree getPackageName(); /** * Returns the names of the modules to which the package is exported, diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java index bcfa6ef9363..c9f5392dc13 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ModuleTree.java @@ -33,7 +33,8 @@ import java.util.List; * * For example: * 
- *    module module-name {
+ *    annotations
+ *    [open] module module-name {
  *        directives
  *    }
  *
@@ -41,6 +42,18 @@ import java.util.List; * @since 9 */ public interface ModuleTree extends Tree { + /** + * Returns the annotations associated with this module declaration. + * @return the annotations + */ + List getAnnotations(); + + /** + * Returns the type of this module. + * @return the type of this module + */ + ModuleKind getModuleType(); + /** * Returns the name of the module. * @return the name of the module @@ -52,4 +65,19 @@ public interface ModuleTree extends Tree { * @return the directives in the module declaration */ List getDirectives(); + + /** + * The kind of the module. + */ + enum ModuleKind { + /** + * Open module. + */ + OPEN, + /** + * Strong module. + */ + STRONG; + } + } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java new file mode 100644 index 00000000000..7ccb4bbae94 --- /dev/null +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/OpensTree.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved. + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package com.sun.source.tree; + +import java.util.List; + +/** + * A tree node for an 'opens' directive in a module declaration. + * + * For example: + * 
+ *    opens   package-name;
+ *    opens   package-name to module-name;
+ *
+ * + * @since 9 + */ +public interface OpensTree extends DirectiveTree { + + /** + * Returns the name of the package to be opened. + * @return the name of the package to be opened + */ + ExpressionTree getPackageName(); + + /** + * Returns the names of the modules to which the package is opened, + * or null, if the package is opened to all modules. + * + * @return the names of the modules to which the package is opened, or null + */ + List getModuleNames(); +} diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java index 3189f3f8f10..fa22f3ba488 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/ProvidesTree.java @@ -25,6 +25,8 @@ package com.sun.source.tree; +import java.util.List; + /** * A tree node for a 'provides' directive in a module declaration. * @@ -43,8 +45,8 @@ public interface ProvidesTree extends DirectiveTree { ExpressionTree getServiceName(); /** - * Returns the name of the implementation type being provided. - * @return the name of the implementation type being provided + * Returns the names of the implementation types being provided. + * @return the names of the implementation types being provided */ - ExpressionTree getImplementationName(); + List getImplementationNames(); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java index 9a5f55c6aa5..c7c7dd85d2c 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/RequiresTree.java @@ -31,17 +31,24 @@ package com.sun.source.tree; * For example: * 
  *    requires module-name;
- *    requires public module-name;
+ *    requires static module-name;
+ *    requires transitive module-name;
  *
* * @since 9 */ public interface RequiresTree extends DirectiveTree { /** - * Returns true if this is a "requires public" directive. - * @return true if this is a "requires public" directive + * Returns true if this is a "requires static" directive. + * @return true if this is a "requires static" directive */ - boolean isPublic(); + boolean isStatic(); + + /** + * Returns true if this is a "requires transitive" directive. + * @return true if this is a "requires transitive" directive + */ + boolean isTransitive(); /** * Returns the name of the module that is required. diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java index 73f1fd4f147..0cd1780345e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/Tree.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -610,25 +610,31 @@ public interface Tree { /** * Used for instances of {@link ExportsTree} representing - * export directives in a module declaration. + * exports directives in a module declaration. */ EXPORTS(ExportsTree.class), + /** + * Used for instances of {@link ExportsTree} representing + * opens directives in a module declaration. + */ + OPENS(OpensTree.class), + /** * Used for instances of {@link ProvidesTree} representing - * export directives in a module declaration. + * provides directives in a module declaration. */ PROVIDES(ProvidesTree.class), /** * Used for instances of {@link RequiresTree} representing - * export directives in a module declaration. + * requires directives in a module declaration. */ REQUIRES(RequiresTree.class), /** * Used for instances of {@link UsesTree} representing - * export directives in a module declaration. + * uses directives in a module declaration. */ USES(UsesTree.class), diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java index f1f951e4795..3d615e4857c 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/tree/TreeVisitor.java @@ -497,6 +497,14 @@ public interface TreeVisitor { */ R visitExports(ExportsTree node, P p); + /** + * Visits an OpensTree node. + * @param node the node being visited + * @param p a parameter value + * @return a result value + */ + R visitOpens(OpensTree node, P p); + /** * Visits a ProvidesTree node. * @param node the node being visited diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java index 0b13ca710b8..85c88ce110a 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/SimpleTreeVisitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -728,6 +728,11 @@ public class SimpleTreeVisitor implements TreeVisitor { return defaultAction(node, p); } + @Override + public R visitOpens(OpensTree node, P p) { + return defaultAction(node, p); + } + @Override public R visitProvides(ProvidesTree node, P p) { return defaultAction(node, p); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java index 3751154a1a9..7ba59576782 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/source/util/TreeScanner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -846,28 +846,41 @@ public class TreeScanner implements TreeVisitor { return r; } + @Override public R visitModule(ModuleTree node, P p) { - R r = scan(node.getName(), p); + R r = scan(node.getAnnotations(), p); + r = scanAndReduce(node.getName(), p, r); r = scanAndReduce(node.getDirectives(), p, r); return r; } + @Override public R visitExports(ExportsTree node, P p) { - R r = scan(node.getExportName(), p); + R r = scan(node.getPackageName(), p); r = scanAndReduce(node.getModuleNames(), p, r); return r; } - public R visitProvides(ProvidesTree node, P p) { - R r = scan(node.getServiceName(), p); - r = scanAndReduce(node.getImplementationName(), p, r); + @Override + public R visitOpens(OpensTree node, P p) { + R r = scan(node.getPackageName(), p); + r = scanAndReduce(node.getModuleNames(), p, r); return r; } + @Override + public R visitProvides(ProvidesTree node, P p) { + R r = scan(node.getServiceName(), p); + r = scanAndReduce(node.getImplementationNames(), p, r); + return r; + } + + @Override public R visitRequires(RequiresTree node, P p) { return scan(node.getModuleName(), p); } + @Override public R visitUses(UsesTree node, P p) { return scan(node.getServiceName(), p); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java index 7cccabeb5bd..53351871981 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java @@ -29,13 +29,16 @@ import java.io.IOException; import java.nio.file.Path; import java.util.EnumSet; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; +import java.util.NoSuchElementException; import java.util.Set; import javax.lang.model.SourceVersion; import javax.tools.JavaFileManager; import javax.tools.JavaFileManager.Location; import javax.tools.JavaFileObject; +import javax.tools.JavaFileObject.Kind; import javax.tools.StandardJavaFileManager; import javax.tools.StandardLocation; @@ -558,17 +561,17 @@ public class ClassFinder { if (wantClassFiles && (classLocn != null)) { fillIn(p, classLocn, - fileManager.list(classLocn, - packageName, - classKinds, - false)); + list(classLocn, + p, + packageName, + classKinds)); } if (wantSourceFiles && (sourceLocn != null)) { fillIn(p, sourceLocn, - fileManager.list(sourceLocn, - packageName, - sourceKinds, - false)); + list(sourceLocn, + p, + packageName, + sourceKinds)); } } @@ -620,23 +623,23 @@ public class ClassFinder { String packageName = p.fullname.toString(); if (wantSourceFiles && !haveSourcePath) { fillIn(p, CLASS_PATH, - fileManager.list(CLASS_PATH, - packageName, - kinds, - false)); + list(CLASS_PATH, + p, + packageName, + kinds)); } else { if (wantClassFiles) fillIn(p, CLASS_PATH, - fileManager.list(CLASS_PATH, - packageName, - classKinds, - false)); + list(CLASS_PATH, + p, + packageName, + classKinds)); if (wantSourceFiles) fillIn(p, SOURCE_PATH, - fileManager.list(SOURCE_PATH, - packageName, - sourceKinds, - false)); + list(SOURCE_PATH, + p, + packageName, + sourceKinds)); } } @@ -645,12 +648,12 @@ public class ClassFinder { */ private void scanPlatformPath(PackageSymbol p) throws IOException { fillIn(p, PLATFORM_CLASS_PATH, - fileManager.list(PLATFORM_CLASS_PATH, - p.fullname.toString(), - allowSigFiles ? EnumSet.of(JavaFileObject.Kind.CLASS, - JavaFileObject.Kind.OTHER) - : EnumSet.of(JavaFileObject.Kind.CLASS), - false)); + list(PLATFORM_CLASS_PATH, + p, + p.fullname.toString(), + allowSigFiles ? EnumSet.of(JavaFileObject.Kind.CLASS, + JavaFileObject.Kind.OTHER) + : EnumSet.of(JavaFileObject.Kind.CLASS))); } // where @SuppressWarnings("fallthrough") @@ -662,10 +665,7 @@ public class ClassFinder { for (JavaFileObject fo : files) { switch (fo.getKind()) { case OTHER: - boolean sigFile = location == PLATFORM_CLASS_PATH && - allowSigFiles && - fo.getName().endsWith(".sig"); - if (!sigFile) { + if (!isSigFile(location, fo)) { extraFileActions(p, fo); break; } @@ -682,10 +682,61 @@ public class ClassFinder { } default: extraFileActions(p, fo); + break; } } } + boolean isSigFile(Location location, JavaFileObject fo) { + return location == PLATFORM_CLASS_PATH && + allowSigFiles && + fo.getName().endsWith(".sig"); + } + + Iterable list(Location location, + PackageSymbol p, + String packageName, + Set kinds) throws IOException { + Iterable listed = fileManager.list(location, + packageName, + EnumSet.allOf(Kind.class), + false); + return () -> new Iterator() { + private final Iterator original = listed.iterator(); + private JavaFileObject next; + @Override + public boolean hasNext() { + if (next == null) { + while (original.hasNext()) { + JavaFileObject fo = original.next(); + + if (fo.getKind() != Kind.CLASS && + fo.getKind() != Kind.SOURCE && + !isSigFile(currentLoc, fo)) { + p.flags_field |= Flags.HAS_RESOURCE; + } + + if (kinds.contains(fo.getKind())) { + next = fo; + break; + } + } + } + return next != null; + } + + @Override + public JavaFileObject next() { + if (!hasNext()) + throw new NoSuchElementException(); + JavaFileObject result = next; + next = null; + return result; + } + + }; + } + /** * Used for bad class definition files, such as bad .class files or * for .java files with unexpected package or class names. diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java index 7fc0ffa47dd..e8ae0be7edb 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Directive.java @@ -53,7 +53,8 @@ public abstract class Directive implements ModuleElement.Directive { /** Flags for RequiresDirective. */ public enum RequiresFlag { - PUBLIC(0x0020), + TRANSITIVE(0x0010), + STATIC_PHASE(0x0020), SYNTHETIC(0x1000), MANDATED(0x8000), EXTRA(0x10000); @@ -73,17 +74,44 @@ public abstract class Directive implements ModuleElement.Directive { public final int value; } + /** Flags for ExportsDirective. */ + public enum ExportsFlag { + SYNTHETIC(0x1000), + MANDATED(0x8000); + + // overkill? move to ClassWriter? + public static int value(Set s) { + int v = 0; + for (ExportsFlag f: s) + v |= f.value; + return v; + } + + ExportsFlag(int value) { + this.value = value; + } + + public final int value; + } + /** * 'exports' Package ';' + * 'exports' Package 'to' ModuleList ';' */ public static class ExportsDirective extends Directive implements ModuleElement.ExportsDirective { public final PackageSymbol packge; public final List modules; + public final Set flags; public ExportsDirective(PackageSymbol packge, List modules) { + this(packge, modules, EnumSet.noneOf(ExportsFlag.class)); + } + + public ExportsDirective(PackageSymbol packge, List modules, Set flags) { this.packge = packge; this.modules = modules; + this.flags = flags; } @Override @DefinedBy(Api.LANGUAGE_MODEL) @@ -92,12 +120,12 @@ public abstract class Directive implements ModuleElement.Directive { } @Override @DefinedBy(Api.LANGUAGE_MODEL) - public PackageElement getPackage() { + public PackageSymbol getPackage() { return packge; } @Override @DefinedBy(Api.LANGUAGE_MODEL) - public java.util.List getTargetModules() { + public java.util.List getTargetModules() { return modules == null ? null : Collections.unmodifiableList(modules); @@ -112,17 +140,83 @@ public abstract class Directive implements ModuleElement.Directive { } } + /** Flags for OpensDirective. */ + public enum OpensFlag { + SYNTHETIC(0x1000), + MANDATED(0x8000); + + // overkill? move to ClassWriter? + public static int value(Set s) { + int v = 0; + for (OpensFlag f: s) + v |= f.value; + return v; + } + + OpensFlag(int value) { + this.value = value; + } + + public final int value; + } + + /** + * 'opens' Package ';' + * 'opens' Package 'to' ModuleList ';' + */ + public static class OpensDirective extends Directive + implements ModuleElement.OpensDirective { + public final PackageSymbol packge; + public final List modules; + public final Set flags; + + public OpensDirective(PackageSymbol packge, List modules) { + this(packge, modules, EnumSet.noneOf(OpensFlag.class)); + } + + public OpensDirective(PackageSymbol packge, List modules, Set flags) { + this.packge = packge; + this.modules = modules; + this.flags = flags; + } + + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public ModuleElement.DirectiveKind getKind() { + return ModuleElement.DirectiveKind.OPENS; + } + + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public PackageSymbol getPackage() { + return packge; + } + + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public java.util.List getTargetModules() { + return modules == null + ? null + : Collections.unmodifiableList(modules); + } + + @Override + public String toString() { + if (modules == null) + return "Opens[" + packge + "]"; + else + return "Opens[" + packge + ":" + modules + "]"; + } + } + /** * 'provides' ServiceName 'with' QualifiedIdentifer ';' */ public static class ProvidesDirective extends Directive implements ModuleElement.ProvidesDirective { public final ClassSymbol service; - public final ClassSymbol impl; + public final List impls; - public ProvidesDirective(ClassSymbol service, ClassSymbol impl) { + public ProvidesDirective(ClassSymbol service, List impls) { this.service = service; - this.impl = impl; + this.impls = impls; } @Override @DefinedBy(Api.LANGUAGE_MODEL) @@ -131,37 +225,39 @@ public abstract class Directive implements ModuleElement.Directive { } @Override @DefinedBy(Api.LANGUAGE_MODEL) - public TypeElement getService() { + public ClassSymbol getService() { return service; } @Override @DefinedBy(Api.LANGUAGE_MODEL) - public TypeElement getImplementation() { - return impl; + public List getImplementations() { + return impls; } @Override public String toString() { - return "Provides[" + service + "," + impl + "]"; + return "Provides[" + service + "," + impls + "]"; } + // TODO: delete? @Override public boolean equals(Object obj) { if (!(obj instanceof ProvidesDirective)) { return false; } ProvidesDirective other = (ProvidesDirective)obj; - return service == other.service && impl == other.impl; + return service == other.service && impls.equals(other.impls); } + // TODO: delete? @Override public int hashCode() { - return service.hashCode() * 31 + impl.hashCode() * 37; + return service.hashCode() * 31 + impls.hashCode() * 37; } } /** - * 'requires' ['public'] ModuleName ';' + * 'requires' ('static' | 'transitive')* ModuleName ';' */ public static class RequiresDirective extends Directive implements ModuleElement.RequiresDirective { @@ -183,12 +279,17 @@ public abstract class Directive implements ModuleElement.Directive { } @Override @DefinedBy(Api.LANGUAGE_MODEL) - public boolean isPublic() { - return flags.contains(RequiresFlag.PUBLIC); + public boolean isStatic() { + return flags.contains(RequiresFlag.STATIC_PHASE); } @Override @DefinedBy(Api.LANGUAGE_MODEL) - public ModuleElement getDependency() { + public boolean isTransitive() { + return flags.contains(RequiresFlag.TRANSITIVE); + } + + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public ModuleSymbol getDependency() { return module; } @@ -215,7 +316,7 @@ public abstract class Directive implements ModuleElement.Directive { } @Override @DefinedBy(Api.LANGUAGE_MODEL) - public TypeElement getService() { + public ClassSymbol getService() { return service; } @@ -224,6 +325,7 @@ public abstract class Directive implements ModuleElement.Directive { return "Uses[" + service + "]"; } + // TODO: delete? @Override public boolean equals(Object obj) { if (!(obj instanceof UsesDirective)) { @@ -233,6 +335,7 @@ public abstract class Directive implements ModuleElement.Directive { return service == other.service; } + // TODO: delete? @Override public int hashCode() { return service.hashCode() * 31; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java index 16185f28d85..503e430df91 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Flags.java @@ -293,10 +293,20 @@ public class Flags { */ public static final long SYSTEM_MODULE = 1L<<53; + /** + * Flag to indicate the given symbol has a @Deprecated annotation. + */ + public static final long DEPRECATED_ANNOTATION = 1L<<54; + /** * Flag to indicate the given symbol has been deprecated and marked for removal. */ - public static final long DEPRECATED_REMOVAL = 1L<<54; + public static final long DEPRECATED_REMOVAL = 1L<<55; + + /** + * Flag to indicate the given PackageSymbol contains any non-.java and non-.class resources. + */ + public static final long HAS_RESOURCE = 1L<<56; /** Modifier masks. */ @@ -408,7 +418,11 @@ public class Flags { LAMBDA_METHOD(Flags.LAMBDA_METHOD), TYPE_TRANSLATED(Flags.TYPE_TRANSLATED), MODULE(Flags.MODULE), - DEPRECATED_REMOVAL(Flags.DEPRECATED_REMOVAL); + AUTOMATIC_MODULE(Flags.AUTOMATIC_MODULE), + SYSTEM_MODULE(Flags.SYSTEM_MODULE), + DEPRECATED_ANNOTATION(Flags.DEPRECATED_ANNOTATION), + DEPRECATED_REMOVAL(Flags.DEPRECATED_REMOVAL), + HAS_RESOURCE(Flags.HAS_RESOURCE); Flag(long flag) { this.value = flag; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java index 5b7d30c80b0..dc93c65d55b 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java index 4c3ca382572..1e713f05c6a 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java @@ -28,6 +28,7 @@ package com.sun.tools.javac.code; import java.lang.annotation.Annotation; import java.lang.annotation.Inherited; import java.util.Collections; +import java.util.EnumSet; import java.util.Map; import java.util.Set; import java.util.concurrent.Callable; @@ -47,6 +48,7 @@ import javax.tools.JavaFileManager; import javax.tools.JavaFileObject; import com.sun.tools.javac.code.ClassFinder.BadEnclosingMethodAttr; +import com.sun.tools.javac.code.Directive.RequiresFlag; import com.sun.tools.javac.code.Kinds.Kind; import com.sun.tools.javac.comp.Annotate.AnnotationTypeMetadata; import com.sun.tools.javac.code.Scope.WriteableScope; @@ -359,6 +361,10 @@ public abstract class Symbol extends AnnoConstruct implements Element { return (flags_field & DEPRECATED) != 0; } + public boolean hasDeprecatedAnnotation() { + return (flags_field & DEPRECATED_ANNOTATION) != 0; + } + public boolean isDeprecatedForRemoval() { return (flags_field & DEPRECATED_REMOVAL) != 0; } @@ -907,6 +913,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { public List directives; public List requires; public List exports; + public List opens; public List provides; public List uses; @@ -917,6 +924,7 @@ public abstract class Symbol extends AnnoConstruct implements Element { public List enclosedPackages = List.nil(); public Completer usesProvidesCompleter = Completer.NULL_COMPLETER; + public final Set flags = EnumSet.noneOf(ModuleFlags.class); /** * Create a ModuleSymbol with an associated module-info ClassSymbol. @@ -942,6 +950,11 @@ public abstract class Symbol extends AnnoConstruct implements Element { return name.isEmpty() && owner == null; } + @Override + public boolean isDeprecated() { + return hasDeprecatedAnnotation(); + } + public boolean isNoModule() { return false; } @@ -1007,6 +1020,26 @@ public abstract class Symbol extends AnnoConstruct implements Element { } + public enum ModuleFlags { + OPEN(0x0020), + SYNTHETIC(0x1000), + MANDATED(0x8000); + + public static int value(Set s) { + int v = 0; + for (ModuleFlags f: s) + v |= f.value; + return v; + } + + private ModuleFlags(int value) { + this.value = value; + } + + public final int value; + + } + /** A class for package symbols */ public static class PackageSymbol extends TypeSymbol diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java index 69df6f00e9d..f0bf5f046fa 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/TypeAnnotations.java @@ -237,6 +237,9 @@ public class TypeAnnotations { // TYPE_PARAMETER doesn't aid in distinguishing between // Type annotations and declaration annotations on an // Element + } else if (e.value.name == names.MODULE) { + if (s.kind == MDL) + return AnnotationType.DECLARATION; } else { Assert.error("annotationTargetType(): unrecognized Attribute name " + e.value.name + " (" + e.value.name.getClass() + ")"); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java index 574ae1008a6..da01293dbf1 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Annotate.java @@ -45,6 +45,7 @@ import javax.tools.JavaFileObject; import java.util.*; import static com.sun.tools.javac.code.Flags.SYNTHETIC; +import static com.sun.tools.javac.code.Kinds.Kind.MDL; import static com.sun.tools.javac.code.Kinds.Kind.MTH; import static com.sun.tools.javac.code.Kinds.Kind.VAR; import static com.sun.tools.javac.code.Scope.LookupKind.NON_RECURSIVE; @@ -337,9 +338,9 @@ public class Annotate { // Note: @Deprecated has no effect on local variables and parameters if (!c.type.isErroneous() - && toAnnotate.owner.kind != MTH + && (toAnnotate.kind == MDL || toAnnotate.owner.kind != MTH) && types.isSameType(c.type, syms.deprecatedType)) { - toAnnotate.flags_field |= Flags.DEPRECATED; + toAnnotate.flags_field |= (Flags.DEPRECATED | Flags.DEPRECATED_ANNOTATION); Attribute fr = c.member(names.forRemoval); if (fr instanceof Attribute.Constant) { Attribute.Constant v = (Attribute.Constant) fr; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java index 3aee3c44504..6acbe1103a2 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java @@ -4432,6 +4432,17 @@ public class Attr extends JCTree.Visitor { public void visitModuleDef(JCModuleDecl tree) { tree.sym.completeUsesProvides(); + ModuleSymbol msym = tree.sym; + Lint lint = env.outer.info.lint = env.outer.info.lint.augment(msym); + Lint prevLint = chk.setLint(lint); + + chk.checkDeprecatedAnnotation(tree, msym); + + try { + deferredLintHandler.flush(tree.pos()); + } finally { + chk.setLint(prevLint); + } } /** Finish the attribution of a class. */ diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java index bc1ab5f5e06..8150c6fccb8 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java @@ -227,10 +227,18 @@ public class Check { void warnDeprecated(DiagnosticPosition pos, Symbol sym) { if (sym.isDeprecatedForRemoval()) { if (!lint.isSuppressed(LintCategory.REMOVAL)) { - removalHandler.report(pos, "has.been.deprecated.for.removal", sym, sym.location()); + if (sym.kind == MDL) { + removalHandler.report(pos, "has.been.deprecated.for.removal.module", sym); + } else { + removalHandler.report(pos, "has.been.deprecated.for.removal", sym, sym.location()); + } } } else if (!lint.isSuppressed(LintCategory.DEPRECATION)) { - deprecationHandler.report(pos, "has.been.deprecated", sym, sym.location()); + if (sym.kind == MDL) { + deprecationHandler.report(pos, "has.been.deprecated.module", sym); + } else { + deprecationHandler.report(pos, "has.been.deprecated", sym, sym.location()); + } } } @@ -3245,7 +3253,7 @@ public class Check { void checkDeprecated(final DiagnosticPosition pos, final Symbol other, final Symbol s) { if ( (s.isDeprecatedForRemoval() || s.isDeprecated() && !other.isDeprecated()) - && s.outermostClass() != other.outermostClass()) { + && (s.outermostClass() != other.outermostClass() || s.outermostClass() == null)) { deferredLintHandler.report(new DeferredLintHandler.LintLogger() { @Override public void report() { @@ -3851,7 +3859,7 @@ public class Check { } if (whatPackage.modle != inPackage.modle && whatPackage.modle != syms.java_base) { - //check that relativeTo.modle requires public what.modle, somehow: + //check that relativeTo.modle requires transitive what.modle, somehow: List todo = List.of(inPackage.modle); while (todo.nonEmpty()) { @@ -3860,13 +3868,13 @@ public class Check { if (current == whatPackage.modle) return ; //OK for (RequiresDirective req : current.requires) { - if (req.isPublic()) { + if (req.isTransitive()) { todo = todo.prepend(req.module); } } } - log.warning(LintCategory.EXPORTS, pos, Warnings.LeaksNotAccessibleNotRequiredPublic(kindName(what), what, what.packge().modle)); + log.warning(LintCategory.EXPORTS, pos, Warnings.LeaksNotAccessibleNotRequiredTransitive(kindName(what), what, what.packge().modle)); } } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java index deda2e47890..c6b2c1867e3 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Enter.java @@ -167,6 +167,9 @@ public class Enter extends JCTree.Visitor { */ ListBuffer uncompleted; + /** The queue of modules whose imports still need to be checked. */ + ListBuffer unfinishedModules = new ListBuffer<>(); + /** A dummy class to serve as enclClass for toplevel environments. */ private JCClassDecl predefClassDef; @@ -308,6 +311,10 @@ public class Enter extends JCTree.Visitor { boolean isPkgInfo = tree.sourcefile.isNameCompatible("package-info", JavaFileObject.Kind.SOURCE); if (TreeInfo.isModuleInfo(tree)) { + JCPackageDecl pd = tree.getPackage(); + if (pd != null) { + log.error(pd.pos(), Errors.NoPkgInModuleInfoJava); + } tree.packge = syms.rootPackage; Env topEnv = topLevelEnv(tree); classEnter(tree.defs, topEnv); @@ -509,7 +516,9 @@ public class Enter extends JCTree.Visitor { public void visitModuleDef(JCModuleDecl tree) { Env moduleEnv = moduleEnv(tree, env); typeEnvs.put(tree.sym, moduleEnv); - todo.append(moduleEnv); + if (modules.isInModuleGraph(tree.sym)) { + todo.append(moduleEnv); + } } /** Default class enter visitor method: do nothing. @@ -552,7 +561,19 @@ public class Enter extends JCTree.Visitor { prevUncompleted.append(clazz); } - typeEnter.ensureImportsChecked(trees); + if (!modules.modulesInitialized()) { + for (JCCompilationUnit cut : trees) { + if (cut.getModuleDecl() != null) { + unfinishedModules.append(cut); + } else { + typeEnter.ensureImportsChecked(List.of(cut)); + } + } + } else { + typeEnter.ensureImportsChecked(unfinishedModules.toList()); + unfinishedModules.clear(); + typeEnter.ensureImportsChecked(trees); + } } } finally { uncompleted = prevUncompleted; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java index 0333f735416..08b37f7e49a 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java @@ -2387,6 +2387,7 @@ public class Lower extends TreeTranslator { public void visitModuleDef(JCModuleDecl tree) { ModuleSymbol msym = tree.sym; ClassSymbol c = msym.module_info; + c.setAttributes(msym); c.flags_field |= Flags.MODULE; createInfoClass(List.nil(), tree.sym.module_info); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java index b52af6545d6..07c96edf3db 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java @@ -50,9 +50,14 @@ import javax.tools.JavaFileObject; import javax.tools.JavaFileObject.Kind; import javax.tools.StandardLocation; +import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.ClassFinder; +import com.sun.tools.javac.code.DeferredLintHandler; import com.sun.tools.javac.code.Directive; import com.sun.tools.javac.code.Directive.ExportsDirective; +import com.sun.tools.javac.code.Directive.ExportsFlag; +import com.sun.tools.javac.code.Directive.OpensDirective; +import com.sun.tools.javac.code.Directive.OpensFlag; import com.sun.tools.javac.code.Directive.RequiresDirective; import com.sun.tools.javac.code.Directive.RequiresFlag; import com.sun.tools.javac.code.Directive.UsesDirective; @@ -66,6 +71,7 @@ import com.sun.tools.javac.code.Symbol.ClassSymbol; import com.sun.tools.javac.code.Symbol.Completer; import com.sun.tools.javac.code.Symbol.CompletionFailure; import com.sun.tools.javac.code.Symbol.MethodSymbol; +import com.sun.tools.javac.code.Symbol.ModuleFlags; import com.sun.tools.javac.code.Symbol.ModuleSymbol; import com.sun.tools.javac.code.Symbol.PackageSymbol; import com.sun.tools.javac.code.Symtab; @@ -78,14 +84,18 @@ import com.sun.tools.javac.resources.CompilerProperties.Errors; import com.sun.tools.javac.resources.CompilerProperties.Warnings; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; +import com.sun.tools.javac.tree.JCTree.JCDirective; import com.sun.tools.javac.tree.JCTree.JCExports; import com.sun.tools.javac.tree.JCTree.JCExpression; import com.sun.tools.javac.tree.JCTree.JCModuleDecl; +import com.sun.tools.javac.tree.JCTree.JCOpens; import com.sun.tools.javac.tree.JCTree.JCPackageDecl; import com.sun.tools.javac.tree.JCTree.JCProvides; import com.sun.tools.javac.tree.JCTree.JCRequires; import com.sun.tools.javac.tree.JCTree.JCUses; +import com.sun.tools.javac.tree.JCTree.Tag; import com.sun.tools.javac.tree.TreeInfo; +import com.sun.tools.javac.util.Abort; import com.sun.tools.javac.util.Assert; import com.sun.tools.javac.util.Context; import com.sun.tools.javac.util.JCDiagnostic; @@ -96,20 +106,15 @@ import com.sun.tools.javac.util.Log; import com.sun.tools.javac.util.Name; import com.sun.tools.javac.util.Names; import com.sun.tools.javac.util.Options; - -import static com.sun.tools.javac.code.Flags.UNATTRIBUTED; -import static com.sun.tools.javac.code.Kinds.Kind.MDL; -import static com.sun.tools.javac.code.TypeTag.CLASS; - -import com.sun.tools.javac.tree.JCTree.JCDirective; -import com.sun.tools.javac.tree.JCTree.Tag; -import com.sun.tools.javac.util.Abort; import com.sun.tools.javac.util.Position; import static com.sun.tools.javac.code.Flags.ABSTRACT; import static com.sun.tools.javac.code.Flags.ENUM; import static com.sun.tools.javac.code.Flags.PUBLIC; -import static com.sun.tools.javac.tree.JCTree.Tag.MODULEDEF; +import static com.sun.tools.javac.code.Flags.UNATTRIBUTED; +import static com.sun.tools.javac.code.Kinds.Kind.MDL; +import static com.sun.tools.javac.code.Kinds.Kind.MTH; +import static com.sun.tools.javac.code.TypeTag.CLASS; /** * TODO: fill in @@ -127,6 +132,8 @@ public class Modules extends JCTree.Visitor { private final Names names; private final Symtab syms; private final Attr attr; + private final Check chk; + private final DeferredLintHandler deferredLintHandler; private final TypeEnvs typeEnvs; private final Types types; private final JavaFileManager fileManager; @@ -169,6 +176,8 @@ public class Modules extends JCTree.Visitor { names = Names.instance(context); syms = Symtab.instance(context); attr = Attr.instance(context); + chk = Check.instance(context); + deferredLintHandler = DeferredLintHandler.instance(context); typeEnvs = TypeEnvs.instance(context); moduleFinder = ModuleFinder.instance(context); types = Types.instance(context); @@ -276,6 +285,10 @@ public class Modules extends JCTree.Visitor { return defaultModule; } + public boolean modulesInitialized() { + return allModules != null; + } + private Set enterModules(List trees, ClassSymbol c) { Set modules = new LinkedHashSet<>(); for (JCCompilationUnit tree : trees) { @@ -292,9 +305,9 @@ public class Modules extends JCTree.Visitor { private void enterModule(JCCompilationUnit toplevel, ClassSymbol c, Set modules) { boolean isModuleInfo = toplevel.sourcefile.isNameCompatible("module-info", Kind.SOURCE); - boolean isModuleDecl = toplevel.defs.nonEmpty() && toplevel.defs.head.hasTag(MODULEDEF); + boolean isModuleDecl = toplevel.getModuleDecl() != null; if (isModuleDecl) { - JCModuleDecl decl = (JCModuleDecl) toplevel.defs.head; + JCModuleDecl decl = toplevel.getModuleDecl(); if (!isModuleInfo) { log.error(decl.pos(), Errors.ModuleDeclSbInModuleInfoJava); } @@ -352,8 +365,8 @@ public class Modules extends JCTree.Visitor { if (locn != null) { Name name = names.fromString(fileManager.inferModuleName(locn)); ModuleSymbol msym; - if (tree.defs.head.hasTag(MODULEDEF)) { - JCModuleDecl decl = (JCModuleDecl) tree.defs.head; + JCModuleDecl decl = tree.getModuleDecl(); + if (decl != null) { msym = decl.sym; if (msym.name != name) { log.error(decl.qualId, Errors.ModuleNameMismatch(msym.name, name)); @@ -449,17 +462,14 @@ public class Modules extends JCTree.Visitor { } private Location getModuleLocation(JCCompilationUnit tree) throws IOException { - switch (tree.defs.head.getTag()) { - case MODULEDEF: - return getModuleLocation(tree.sourcefile, null); - - case PACKAGEDEF: - JCPackageDecl pkg = (JCPackageDecl) tree.defs.head; - return getModuleLocation(tree.sourcefile, TreeInfo.fullName(pkg.pid)); - - default: - // code in unnamed module - return null; + if (tree.getModuleDecl() != null) { + return getModuleLocation(tree.sourcefile, null); + } else if (tree.getPackage() != null) { + JCPackageDecl pkg = tree.getPackage(); + return getModuleLocation(tree.sourcefile, TreeInfo.fullName(pkg.pid)); + } else { + // code in unnamed module + return null; } } @@ -535,6 +545,7 @@ public class Modules extends JCTree.Visitor { String pack = binName.lastIndexOf('.') != (-1) ? binName.substring(0, binName.lastIndexOf('.')) : ""; //unnamed package???? if (seenPackages.add(pack)) { ExportsDirective d = new ExportsDirective(syms.enterPackage(msym, names.fromString(pack)), null); + //TODO: opens? directives.add(d); exports.add(d); } @@ -562,7 +573,7 @@ public class Modules extends JCTree.Visitor { if (ms == syms.unnamedModule || ms == msym) continue; Set flags = (ms.flags_field & Flags.AUTOMATIC_MODULE) != 0 ? - EnumSet.of(RequiresFlag.PUBLIC) : EnumSet.noneOf(RequiresFlag.class); + EnumSet.of(RequiresFlag.TRANSITIVE) : EnumSet.noneOf(RequiresFlag.class); RequiresDirective d = new RequiresDirective(ms, flags); directives.add(d); requires.add(d); @@ -585,9 +596,10 @@ public class Modules extends JCTree.Visitor { ModuleVisitor v = new ModuleVisitor(); JavaFileObject prev = log.useSource(tree.sourcefile); try { - tree.defs.head.accept(v); - checkCyclicDependencies((JCModuleDecl) tree.defs.head); + JCModuleDecl moduleDecl = tree.getModuleDecl(); + moduleDecl.accept(v); completeModule(msym); + checkCyclicDependencies(moduleDecl); } finally { log.useSource(prev); msym.flags_field &= ~UNATTRIBUTED; @@ -605,17 +617,25 @@ public class Modules extends JCTree.Visitor { class ModuleVisitor extends JCTree.Visitor { private ModuleSymbol sym; private final Set allRequires = new HashSet<>(); - private final Set allExports = new HashSet<>(); + private final Map> allExports = new HashMap<>(); + private final Map> allOpens = new HashMap<>(); @Override public void visitModuleDef(JCModuleDecl tree) { sym = Assert.checkNonNull(tree.sym); + if (tree.getModuleType() == ModuleKind.OPEN) { + sym.flags.add(ModuleFlags.OPEN); + } + sym.flags_field |= (tree.mods.flags & Flags.DEPRECATED); + sym.requires = List.nil(); sym.exports = List.nil(); + sym.opens = List.nil(); tree.directives.forEach(t -> t.accept(this)); sym.requires = sym.requires.reverse(); sym.exports = sym.exports.reverse(); + sym.opens = sym.opens.reverse(); ensureJavaBase(); } @@ -629,8 +649,10 @@ public class Modules extends JCTree.Visitor { } else { allRequires.add(msym); Set flags = EnumSet.noneOf(RequiresFlag.class); - if (tree.isPublic) - flags.add(RequiresFlag.PUBLIC); + if (tree.isTransitive) + flags.add(RequiresFlag.TRANSITIVE); + if (tree.isStaticPhase) + flags.add(RequiresFlag.STATIC_PHASE); RequiresDirective d = new RequiresDirective(msym, flags); tree.directive = d; sym.requires = sym.requires.prepend(d); @@ -642,31 +664,125 @@ public class Modules extends JCTree.Visitor { Name name = TreeInfo.fullName(tree.qualid); PackageSymbol packge = syms.enterPackage(sym, name); attr.setPackageSymbols(tree.qualid, packge); - if (!allExports.add(packge)) { - log.error(tree.qualid.pos(), Errors.DuplicateExports(packge)); + + if (tree.hasTag(Tag.OPENS) && sym.flags.contains(ModuleFlags.OPEN)) { + log.error(tree.pos(), Errors.NoOpensUnlessStrong); + } + List exportsForPackage = allExports.computeIfAbsent(packge, p -> List.nil()); + for (ExportsDirective d : exportsForPackage) { + reportExportsConflict(tree, packge); } List toModules = null; if (tree.moduleNames != null) { - Set to = new HashSet<>(); + Set to = new LinkedHashSet<>(); for (JCExpression n: tree.moduleNames) { ModuleSymbol msym = lookupModule(n); if (msym.kind != MDL) { log.error(n.pos(), Errors.ModuleNotFound(msym)); - } else if (!to.add(msym)) { - log.error(n.pos(), Errors.DuplicateExports(msym)); + } else { + for (ExportsDirective d : exportsForPackage) { + checkDuplicateExportsToModule(n, msym, d); + } + if (!to.add(msym)) { + reportExportsConflictToModule(n, msym); + } } } toModules = List.from(to); } if (toModules == null || !toModules.isEmpty()) { - ExportsDirective d = new ExportsDirective(packge, toModules); - tree.directive = d; + Set flags = EnumSet.noneOf(ExportsFlag.class); + ExportsDirective d = new ExportsDirective(packge, toModules, flags); sym.exports = sym.exports.prepend(d); + tree.directive = d; + + allExports.put(packge, exportsForPackage.prepend(d)); } } + private void reportExportsConflict(JCExports tree, PackageSymbol packge) { + log.error(tree.qualid.pos(), Errors.ConflictingExports(packge)); + } + + private void checkDuplicateExportsToModule(JCExpression name, ModuleSymbol msym, + ExportsDirective d) { + if (d.modules != null) { + for (ModuleSymbol other : d.modules) { + if (msym == other) { + reportExportsConflictToModule(name, msym); + } + } + } + } + + private void reportExportsConflictToModule(JCExpression name, ModuleSymbol msym) { + log.error(name.pos(), Errors.ConflictingExportsToModule(msym)); + } + + @Override + public void visitOpens(JCOpens tree) { + Name name = TreeInfo.fullName(tree.qualid); + PackageSymbol packge = syms.enterPackage(sym, name); + attr.setPackageSymbols(tree.qualid, packge); + + if (sym.flags.contains(ModuleFlags.OPEN)) { + log.error(tree.pos(), Errors.NoOpensUnlessStrong); + } + List opensForPackage = allOpens.computeIfAbsent(packge, p -> List.nil()); + for (OpensDirective d : opensForPackage) { + reportOpensConflict(tree, packge); + } + + List toModules = null; + if (tree.moduleNames != null) { + Set to = new LinkedHashSet<>(); + for (JCExpression n: tree.moduleNames) { + ModuleSymbol msym = lookupModule(n); + if (msym.kind != MDL) { + log.error(n.pos(), Errors.ModuleNotFound(msym)); + } else { + for (OpensDirective d : opensForPackage) { + checkDuplicateOpensToModule(n, msym, d); + } + if (!to.add(msym)) { + reportOpensConflictToModule(n, msym); + } + } + } + toModules = List.from(to); + } + + if (toModules == null || !toModules.isEmpty()) { + Set flags = EnumSet.noneOf(OpensFlag.class); + OpensDirective d = new OpensDirective(packge, toModules, flags); + sym.opens = sym.opens.prepend(d); + tree.directive = d; + + allOpens.put(packge, opensForPackage.prepend(d)); + } + } + + private void reportOpensConflict(JCOpens tree, PackageSymbol packge) { + log.error(tree.qualid.pos(), Errors.ConflictingOpens(packge)); + } + + private void checkDuplicateOpensToModule(JCExpression name, ModuleSymbol msym, + OpensDirective d) { + if (d.modules != null) { + for (ModuleSymbol other : d.modules) { + if (msym == other) { + reportOpensConflictToModule(name, msym); + } + } + } + } + + private void reportOpensConflictToModule(JCExpression name, ModuleSymbol msym) { + log.error(name.pos(), Errors.ConflictingOpensToModule(msym)); + } + @Override public void visitProvides(JCProvides tree) { } @@ -706,10 +822,14 @@ public class Modules extends JCTree.Visitor { Env env = typeEnvs.get(msym); UsesProvidesVisitor v = new UsesProvidesVisitor(msym, env); JavaFileObject prev = log.useSource(env.toplevel.sourcefile); + JCModuleDecl decl = env.toplevel.getModuleDecl(); + DiagnosticPosition prevLintPos = deferredLintHandler.setPos(decl.pos()); + try { - env.toplevel.defs.head.accept(v); + decl.accept(v); } finally { log.useSource(prev); + deferredLintHandler.setPos(prevLintPos); } }; } @@ -718,8 +838,8 @@ public class Modules extends JCTree.Visitor { private final ModuleSymbol msym; private final Env env; - private final Set allUses = new HashSet<>(); - private final Set allProvides = new HashSet<>(); + private final Set allUses = new HashSet<>(); + private final Map> allProvides = new HashMap<>(); public UsesProvidesVisitor(ModuleSymbol msym, Env env) { this.msym = msym; @@ -752,6 +872,15 @@ public class Modules extends JCTree.Visitor { msym.directives = msym.directives.prepend(tree.directive); } + @Override + public void visitOpens(JCOpens tree) { + if (tree.directive.packge.members().isEmpty() && + ((tree.directive.packge.flags() & Flags.HAS_RESOURCE) == 0)) { + log.error(tree.qualid.pos(), Errors.PackageEmptyOrNotFound(tree.directive.packge)); + } + msym.directives = msym.directives.prepend(tree.directive); + } + MethodSymbol noArgsConstructor(ClassSymbol tsym) { for (Symbol sym : tsym.members().getSymbolsByName(names.init)) { MethodSymbol mSym = (MethodSymbol)sym; @@ -762,34 +891,61 @@ public class Modules extends JCTree.Visitor { return null; } + MethodSymbol factoryMethod(ClassSymbol tsym) { + for (Symbol sym : tsym.members().getSymbolsByName(names.provider, sym -> sym.kind == MTH)) { + MethodSymbol mSym = (MethodSymbol)sym; + if (mSym.isStatic() && (mSym.flags() & Flags.PUBLIC) != 0 && mSym.params().isEmpty()) { + return mSym; + } + } + return null; + } + Map directiveToTreeMap = new HashMap<>(); @Override public void visitProvides(JCProvides tree) { Type st = attr.attribType(tree.serviceName, env, syms.objectType); - Type it = attr.attribType(tree.implName, env, syms.objectType); ClassSymbol service = (ClassSymbol) st.tsym; - ClassSymbol impl = (ClassSymbol) it.tsym; - if (!types.isSubtype(it, st)) { - log.error(tree.implName.pos(), Errors.ServiceImplementationMustBeSubtypeOfServiceInterface); - } - if ((impl.flags() & ABSTRACT) != 0) { - log.error(tree.implName.pos(), Errors.ServiceImplementationIsAbstract(impl)); - } else if (impl.isInner()) { - log.error(tree.implName.pos(), Errors.ServiceImplementationIsInner(impl)); - } else { - MethodSymbol constr = noArgsConstructor(impl); - if (constr == null) { - log.error(tree.implName.pos(), Errors.ServiceImplementationDoesntHaveANoArgsConstructor(impl)); - } else if ((constr.flags() & PUBLIC) == 0) { - log.error(tree.implName.pos(), Errors.ServiceImplementationNoArgsConstructorNotPublic(impl)); + ListBuffer impls = new ListBuffer<>(); + for (JCExpression implName : tree.implNames) { + Type it = attr.attribType(implName, env, syms.objectType); + ClassSymbol impl = (ClassSymbol) it.tsym; + //find provider factory: + MethodSymbol factory = factoryMethod(impl); + if (factory != null) { + Type returnType = factory.type.getReturnType(); + if (!types.isSubtype(returnType, st)) { + log.error(implName.pos(), Errors.ServiceImplementationProviderReturnMustBeSubtypeOfServiceInterface); + } + } else { + if (!types.isSubtype(it, st)) { + log.error(implName.pos(), Errors.ServiceImplementationMustBeSubtypeOfServiceInterface); + } else if ((impl.flags() & ABSTRACT) != 0) { + log.error(implName.pos(), Errors.ServiceImplementationIsAbstract(impl)); + } else if (impl.isInner()) { + log.error(implName.pos(), Errors.ServiceImplementationIsInner(impl)); + } else { + MethodSymbol constr = noArgsConstructor(impl); + if (constr == null) { + log.error(implName.pos(), Errors.ServiceImplementationDoesntHaveANoArgsConstructor(impl)); + } else if ((constr.flags() & PUBLIC) == 0) { + log.error(implName.pos(), Errors.ServiceImplementationNoArgsConstructorNotPublic(impl)); + } + } + } + if (it.hasTag(CLASS)) { + // For now, we just check the pair (service-type, impl-type) is unique + // TODO, check only one provides per service type as well + if (allProvides.computeIfAbsent(service, s -> new HashSet<>()).add(impl)) { + impls.append(impl); + } else { + log.error(implName.pos(), Errors.DuplicateProvides(service, impl)); + } } } - if (st.hasTag(CLASS) && it.hasTag(CLASS)) { - Directive.ProvidesDirective d = new Directive.ProvidesDirective(service, impl); - if (!allProvides.add(d)) { - log.error(tree.pos(), Errors.DuplicateProvides(service, impl)); - } + if (st.hasTag(CLASS) && !impls.isEmpty()) { + Directive.ProvidesDirective d = new Directive.ProvidesDirective(service, impls.toList()); msym.provides = msym.provides.prepend(d); msym.directives = msym.directives.prepend(d); directiveToTreeMap.put(d, tree); @@ -799,6 +955,7 @@ public class Modules extends JCTree.Visitor { @Override public void visitRequires(JCRequires tree) { if (tree.directive != null) { + chk.checkDeprecated(tree.moduleName.pos(), msym, tree.directive.module); msym.directives = msym.directives.prepend(tree.directive); } } @@ -811,53 +968,58 @@ public class Modules extends JCTree.Visitor { log.error(tree.qualid.pos(), Errors.ServiceDefinitionIsEnum(st.tsym)); } else if (st.hasTag(CLASS)) { ClassSymbol service = (ClassSymbol) st.tsym; - Directive.UsesDirective d = new Directive.UsesDirective(service); - if (!allUses.add(d)) { + if (allUses.add(service)) { + Directive.UsesDirective d = new Directive.UsesDirective(service); + msym.uses = msym.uses.prepend(d); + msym.directives = msym.directives.prepend(d); + } else { log.error(tree.pos(), Errors.DuplicateUses(service)); } - msym.uses = msym.uses.prepend(d); - msym.directives = msym.directives.prepend(d); } } private void checkForCorrectness() { - for (Directive.ProvidesDirective provides : allProvides) { + for (Directive.ProvidesDirective provides : msym.provides) { JCProvides tree = directiveToTreeMap.get(provides); - /* The implementation must be defined in the same module as the provides directive - * (else, error) - */ - PackageSymbol implementationDefiningPackage = provides.impl.packge(); - if (implementationDefiningPackage.modle != msym) { - log.error(tree.pos(), Errors.ServiceImplementationNotInRightModule(implementationDefiningPackage.modle)); - } - - /* There is no inherent requirement that module that provides a service should actually - * use it itself. However, it is a pointless declaration if the service package is not - * exported and there is no uses for the service. - */ - PackageSymbol interfaceDeclaringPackage = provides.service.packge(); - boolean isInterfaceDeclaredInCurrentModule = interfaceDeclaringPackage.modle == msym; - boolean isInterfaceExportedFromAReadableModule = - msym.visiblePackages.get(interfaceDeclaringPackage.fullname) == interfaceDeclaringPackage; - if (isInterfaceDeclaredInCurrentModule && !isInterfaceExportedFromAReadableModule) { - // ok the interface is declared in this module. Let's check if it's exported - boolean warn = true; - for (ExportsDirective export : msym.exports) { - if (interfaceDeclaringPackage == export.packge) { - warn = false; - break; - } + for (ClassSymbol impl : provides.impls) { + /* The implementation must be defined in the same module as the provides directive + * (else, error) + */ + PackageSymbol implementationDefiningPackage = impl.packge(); + if (implementationDefiningPackage.modle != msym) { + // TODO: should use tree for the implentation name, not the entire provides tree + // TODO: should improve error message to identify the implementation type + log.error(tree.pos(), Errors.ServiceImplementationNotInRightModule(implementationDefiningPackage.modle)); } - if (warn) { - for (UsesDirective uses : msym.uses) { - if (provides.service == uses.service) { + + /* There is no inherent requirement that module that provides a service should actually + * use it itself. However, it is a pointless declaration if the service package is not + * exported and there is no uses for the service. + */ + PackageSymbol interfaceDeclaringPackage = provides.service.packge(); + boolean isInterfaceDeclaredInCurrentModule = interfaceDeclaringPackage.modle == msym; + boolean isInterfaceExportedFromAReadableModule = + msym.visiblePackages.get(interfaceDeclaringPackage.fullname) == interfaceDeclaringPackage; + if (isInterfaceDeclaredInCurrentModule && !isInterfaceExportedFromAReadableModule) { + // ok the interface is declared in this module. Let's check if it's exported + boolean warn = true; + for (ExportsDirective export : msym.exports) { + if (interfaceDeclaringPackage == export.packge) { warn = false; break; } } - } - if (warn) { - log.warning(tree.pos(), Warnings.ServiceProvidedButNotExportedOrUsed(provides.service)); + if (warn) { + for (UsesDirective uses : msym.uses) { + if (provides.service == uses.service) { + warn = false; + break; + } + } + } + if (warn) { + log.warning(tree.pos(), Warnings.ServiceProvidedButNotExportedOrUsed(provides.service)); + } } } } @@ -973,6 +1135,10 @@ public class Modules extends JCTree.Visitor { allModules = result; } + public boolean isInModuleGraph(ModuleSymbol msym) { + return allModules == null || allModules.contains(msym); + } + private Set computeTransitiveClosure(Iterable base, Set observable) { List todo = List.nil(); @@ -1019,7 +1185,8 @@ public class Modules extends JCTree.Visitor { return ; } ModuleSymbol msym = (ModuleSymbol) sym; - Set allModules = allModules(); + Set allModules = new HashSet<>(allModules()); + allModules.remove(syms.unnamedModule); for (ModuleSymbol m : allModules) { m.complete(); } @@ -1033,7 +1200,7 @@ public class Modules extends JCTree.Visitor { }; } - private final Map> requiresPublicCache = new HashMap<>(); + private final Map> requiresTransitiveCache = new HashMap<>(); private void completeModule(ModuleSymbol msym) { if (inInitModules) { @@ -1079,34 +1246,36 @@ public class Modules extends JCTree.Visitor { } Set readable = new LinkedHashSet<>(); - Set requiresPublic = new HashSet<>(); + Set requiresTransitive = new HashSet<>(); for (RequiresDirective d : msym.requires) { d.module.complete(); readable.add(d.module); - Set s = retrieveRequiresPublic(d.module); + Set s = retrieveRequiresTransitive(d.module); Assert.checkNonNull(s, () -> "no entry in cache for " + d.module); readable.addAll(s); - if (d.flags.contains(RequiresFlag.PUBLIC)) { - requiresPublic.add(d.module); - requiresPublic.addAll(s); + if (d.flags.contains(RequiresFlag.TRANSITIVE)) { + requiresTransitive.add(d.module); + requiresTransitive.addAll(s); } } - requiresPublicCache.put(msym, requiresPublic); + requiresTransitiveCache.put(msym, requiresTransitive); initVisiblePackages(msym, readable); for (ExportsDirective d: msym.exports) { - d.packge.modle = msym; + if (d.packge != null) { + d.packge.modle = msym; + } } } - private Set retrieveRequiresPublic(ModuleSymbol msym) { - Set requiresPublic = requiresPublicCache.get(msym); + private Set retrieveRequiresTransitive(ModuleSymbol msym) { + Set requiresTransitive = requiresTransitiveCache.get(msym); - if (requiresPublic == null) { + if (requiresTransitive == null) { //the module graph may contain cycles involving automatic modules or --add-reads edges - requiresPublic = new HashSet<>(); + requiresTransitive = new HashSet<>(); Set seen = new HashSet<>(); List todo = List.of(msym); @@ -1116,14 +1285,14 @@ public class Modules extends JCTree.Visitor { todo = todo.tail; if (!seen.add(current)) continue; - requiresPublic.add(current); + requiresTransitive.add(current); current.complete(); Iterable requires; if (current != syms.unnamedModule) { Assert.checkNonNull(current.requires, () -> current + ".requires == null; " + msym); requires = current.requires; for (RequiresDirective rd : requires) { - if (rd.isPublic()) + if (rd.isTransitive()) todo = todo.prepend(rd.module); } } else { @@ -1133,10 +1302,10 @@ public class Modules extends JCTree.Visitor { } } - requiresPublic.remove(msym); + requiresTransitive.remove(msym); } - return requiresPublic; + return requiresTransitive; } private void initVisiblePackages(ModuleSymbol msym, Collection readable) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java index c941de3f5b7..ff6bd7174ab 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/TypeEnter.java @@ -160,8 +160,6 @@ public class TypeEnter implements Completer { // if there remain any unimported toplevels (these must have // no classes at all), process their import statements as well. for (JCCompilationUnit tree : trees) { - if (tree.defs.nonEmpty() && tree.defs.head.hasTag(MODULEDEF)) - continue; if (!tree.starImportScope.isFilled()) { Env topEnv = enter.topLevelEnv(tree); finishImports(tree, () -> { completeClass.resolveImports(tree, topEnv); }); @@ -344,13 +342,22 @@ public class TypeEnter implements Completer { throw new FatalError(diags.fragment("fatal.err.no.java.lang")); importAll(make.at(tree.pos()).Import(make.QualIdent(javaLang), false), javaLang, env); + JCModuleDecl decl = tree.getModuleDecl(); + // Process the package def and all import clauses. - if (tree.getPackage() != null) + if (tree.getPackage() != null && decl == null) checkClassPackageClash(tree.getPackage()); for (JCImport imp : tree.getImports()) { doImport(imp); } + + if (decl != null) { + //check @Deprecated: + markDeprecated(decl.sym, decl.mods.annotations, env); + // process module annotations + annotate.annotateLater(decl.mods.annotations, env, env.toplevel.modle, null); + } } finally { this.env = prevEnv; chk.setLint(prevLint); @@ -745,12 +752,7 @@ public class TypeEnter implements Completer { } } - // Annotations. - // In general, we cannot fully process annotations yet, but we - // can attribute the annotation types and then check to see if the - // @Deprecated annotation is present. - attr.attribAnnotationTypes(tree.mods.annotations, baseEnv); - handleDeprecatedAnnotation(tree.mods.annotations, sym); + markDeprecated(sym, tree.mods.annotations, baseEnv); chk.checkNonCyclicDecl(tree); } @@ -765,32 +767,6 @@ public class TypeEnter implements Completer { return superType; } - /** - * If a list of annotations contains a reference to java.lang.Deprecated, - * set the DEPRECATED flag. - * If the annotation is marked forRemoval=true, also set DEPRECATED_REMOVAL. - **/ - private void handleDeprecatedAnnotation(List annotations, Symbol sym) { - for (List al = annotations; !al.isEmpty(); al = al.tail) { - JCAnnotation a = al.head; - if (a.annotationType.type == syms.deprecatedType) { - sym.flags_field |= Flags.DEPRECATED; - a.args.stream() - .filter(e -> e.hasTag(ASSIGN)) - .map(e -> (JCAssign) e) - .filter(assign -> TreeInfo.name(assign.lhs) == names.forRemoval) - .findFirst() - .ifPresent(assign -> { - JCExpression rhs = TreeInfo.skipParens(assign.rhs); - if (rhs.hasTag(LITERAL) - && Boolean.TRUE.equals(((JCLiteral) rhs).getValue())) { - sym.flags_field |= DEPRECATED_REMOVAL; - } - }); - } - } - } - @Override public void complete(Symbol sym) throws CompletionFailure { Assert.check((topLevelPhase instanceof ImportsPhase) || @@ -1135,4 +1111,41 @@ public class TypeEnter implements Completer { List typeargs = typarams.nonEmpty() ? make.Types(typarams) : null; return make.Exec(make.Apply(typeargs, meth, make.Idents(params))); } + + /** + * Mark sym deprecated if annotations contain @Deprecated annotation. + */ + public void markDeprecated(Symbol sym, List annotations, Env env) { + // In general, we cannot fully process annotations yet, but we + // can attribute the annotation types and then check to see if the + // @Deprecated annotation is present. + attr.attribAnnotationTypes(annotations, env); + handleDeprecatedAnnotations(annotations, sym); + } + + /** + * If a list of annotations contains a reference to java.lang.Deprecated, + * set the DEPRECATED flag. + * If the annotation is marked forRemoval=true, also set DEPRECATED_REMOVAL. + **/ + private void handleDeprecatedAnnotations(List annotations, Symbol sym) { + for (List al = annotations; !al.isEmpty(); al = al.tail) { + JCAnnotation a = al.head; + if (a.annotationType.type == syms.deprecatedType) { + sym.flags_field |= (Flags.DEPRECATED | Flags.DEPRECATED_ANNOTATION); + a.args.stream() + .filter(e -> e.hasTag(ASSIGN)) + .map(e -> (JCAssign) e) + .filter(assign -> TreeInfo.name(assign.lhs) == names.forRemoval) + .findFirst() + .ifPresent(assign -> { + JCExpression rhs = TreeInfo.skipParens(assign.rhs); + if (rhs.hasTag(LITERAL) + && Boolean.TRUE.equals(((JCLiteral) rhs).getValue())) { + sym.flags_field |= DEPRECATED_REMOVAL; + } + }); + } + } + } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java index a779836f06d..eaf43e09dd8 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/BaseFileManager.java @@ -29,6 +29,7 @@ import java.io.IOException; import java.io.InputStream; import java.lang.ref.SoftReference; import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; @@ -128,7 +129,7 @@ public abstract class BaseFileManager implements JavaFileManager { protected String classLoaderClass; - protected Locations locations; + protected final Locations locations; /** * A flag for clients to use to indicate that this file manager should @@ -209,7 +210,10 @@ public abstract class BaseFileManager implements JavaFileManager { addReadsMethod.invoke(thisModule, targetModule); } catch (NoSuchMethodException e) { // ignore - } catch (Exception e) { + } catch (IllegalAccessException + | IllegalArgumentException + | SecurityException + | InvocationTargetException e) { throw new Abort(e); } return targetLoader; @@ -324,12 +328,12 @@ public abstract class BaseFileManager implements JavaFileManager { @SuppressWarnings("cast") public CharBuffer decode(ByteBuffer inbuf, boolean ignoreEncodingErrors) { - String encodingName = getEncodingName(); + String encName = getEncodingName(); CharsetDecoder decoder; try { - decoder = getDecoder(encodingName, ignoreEncodingErrors); + decoder = getDecoder(encName, ignoreEncodingErrors); } catch (IllegalCharsetNameException | UnsupportedCharsetException e) { - log.error("unsupported.encoding", encodingName); + log.error("unsupported.encoding", encName); return (CharBuffer)CharBuffer.allocate(1).flip(); } @@ -365,7 +369,7 @@ public abstract class BaseFileManager implements JavaFileManager { unmappable.append(String.format("%02X", inbuf.get())); } - String charsetName = charset == null ? encodingName : charset.name(); + String charsetName = charset == null ? encName : charset.name(); log.error(dest.limit(), Errors.IllegalCharForEncoding(unmappable.toString(), charsetName)); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java index 843a0e808b2..fedd962aa83 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java @@ -1091,7 +1091,8 @@ public class Locations { } // finally clean up the module name - mn = mn.replaceAll("[^A-Za-z0-9]", ".") // replace non-alphanumeric + mn = mn.replaceAll("(\\.|\\d)*$", "") // remove trailing version + .replaceAll("[^A-Za-z0-9]", ".") // replace non-alphanumeric .replaceAll("(\\.)(\\1)+", ".") // collapse repeating dots .replaceAll("^\\.", "") // drop leading dots .replaceAll("\\.$", ""); // drop trailing dots diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java index 62bfd05484c..b6d05804828 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassFile.java @@ -129,8 +129,11 @@ public class ClassFile { * String Translation Routines ***********************************************************************/ - /** Return internal representation of buf[offset..offset+len-1], - * converting '/' to '.'. + /** + * Return internal representation of buf[offset..offset+len-1], converting '/' to '.'. + * + * Note: the naming is the inverse of that used by JVMS 4.2 The Internal Form Of Names, + * which defines "internal name" to be the form using "/" instead of "." */ public static byte[] internalize(byte[] buf, int offset, int len) { byte[] translated = new byte[len]; @@ -142,15 +145,21 @@ public class ClassFile { return translated; } - /** Return internal representation of given name, - * converting '/' to '.'. + /** + * Return internal representation of given name, converting '/' to '.'. + * + * Note: the naming is the inverse of that used by JVMS 4.2 The Internal Form Of Names, + * which defines "internal name" to be the form using "/" instead of "." */ public static byte[] internalize(Name name) { return internalize(name.getByteArray(), name.getByteOffset(), name.getByteLength()); } - /** Return external representation of buf[offset..offset+len-1], - * converting '.' to '/'. + /** + * Return external representation of buf[offset..offset+len-1], converting '.' to '/'. + * + * Note: the naming is the inverse of that used by JVMS 4.2 The Internal Form Of Names, + * which defines "internal name" to be the form using "/" instead of "." */ public static byte[] externalize(byte[] buf, int offset, int len) { byte[] translated = new byte[len]; @@ -162,8 +171,11 @@ public class ClassFile { return translated; } - /** Return external representation of given name, - * converting '/' to '.'. + /** + * Return external representation of given name, converting '/' to '.'. + * + * Note: the naming is the inverse of that used by JVMS 4.2 The Internal Form Of Names, + * which defines "internal name" to be the form using "/" instead of "." */ public static byte[] externalize(Name name) { return externalize(name.getByteArray(), name.getByteOffset(), name.getByteLength()); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java index 1416d2b8b9b..fc92deaa921 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassReader.java @@ -62,7 +62,9 @@ import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.Kind.*; + import com.sun.tools.javac.code.Scope.LookupKind; + import static com.sun.tools.javac.code.TypeTag.ARRAY; import static com.sun.tools.javac.code.TypeTag.CLASS; import static com.sun.tools.javac.code.TypeTag.TYPEVAR; @@ -159,6 +161,9 @@ public class ClassReader { */ protected ModuleSymbol currentModule = null; + // FIXME: temporary compatibility code + private boolean readNewModuleAttribute; + /** The buffer containing the currently read class file. */ byte[] buf = new byte[INITIAL_BUFFER_SIZE]; @@ -584,6 +589,53 @@ public class ClassReader { throw badClassFile("bad.module-info.name"); } + /** Read the name of a module. + * The name is stored in a CONSTANT_Utf8 entry, in + * JVMS 4.2 internal form (with '/' instead of '.') + */ + Name readModuleName(int i) { + Name name = readName(i); + // FIXME: temporary compatibility code + if (readNewModuleAttribute) { + return names.fromUtf(internalize(name)); + } else { + return name; + } + } + + /** Read module_flags. + */ + Set readModuleFlags(int flags) { + Set set = EnumSet.noneOf(ModuleFlags.class); + for (ModuleFlags f : ModuleFlags.values()) { + if ((flags & f.value) != 0) + set.add(f); + } + return set; + } + + /** Read exports_flags. + */ + Set readExportsFlags(int flags) { + Set set = EnumSet.noneOf(ExportsFlag.class); + for (ExportsFlag f: ExportsFlag.values()) { + if ((flags & f.value) != 0) + set.add(f); + } + return set; + } + + /** Read opens_flags. + */ + Set readOpensFlags(int flags) { + Set set = EnumSet.noneOf(OpensFlag.class); + for (OpensFlag f: OpensFlag.values()) { + if ((flags & f.value) != 0) + set.add(f); + } + return set; + } + /** Read requires_flags. */ Set readRequiresFlags(int flags) { @@ -996,7 +1048,9 @@ public class ClassReader { new AttributeReader(names.Deprecated, V45_3, CLASS_OR_MEMBER_ATTRIBUTE) { protected void read(Symbol sym, int attrLen) { - sym.flags_field |= DEPRECATED; + Symbol s = sym.owner.kind == MDL ? sym.owner : sym; + + s.flags_field |= DEPRECATED; } }, @@ -1228,11 +1282,20 @@ public class ClassReader { ModuleSymbol msym = (ModuleSymbol) sym.owner; ListBuffer directives = new ListBuffer<>(); + // FIXME: temporary compatibility code + if (readNewModuleAttribute) { + Name moduleName = readModuleName(nextChar()); + if (currentModule.name != moduleName) { + throw badClassFile("module.name.mismatch", moduleName, currentModule.name); + } + } + + msym.flags.addAll(readModuleFlags(nextChar())); + ListBuffer requires = new ListBuffer<>(); int nrequires = nextChar(); for (int i = 0; i < nrequires; i++) { - Name name = readName(nextChar()); - ModuleSymbol rsym = syms.enterModule(name); + ModuleSymbol rsym = syms.enterModule(readModuleName(nextChar())); Set flags = readRequiresFlags(nextChar()); requires.add(new RequiresDirective(rsym, flags)); } @@ -1244,6 +1307,7 @@ public class ClassReader { for (int i = 0; i < nexports; i++) { Name n = readName(nextChar()); PackageSymbol p = syms.enterPackage(currentModule, names.fromUtf(internalize(n))); + Set flags = readExportsFlags(nextChar()); int nto = nextChar(); List to; if (nto == 0) { @@ -1251,13 +1315,36 @@ public class ClassReader { } else { ListBuffer lb = new ListBuffer<>(); for (int t = 0; t < nto; t++) - lb.append(syms.enterModule(readName(nextChar()))); + lb.append(syms.enterModule(readModuleName(nextChar()))); to = lb.toList(); } - exports.add(new ExportsDirective(p, to)); + exports.add(new ExportsDirective(p, to, flags)); } msym.exports = exports.toList(); directives.addAll(msym.exports); + ListBuffer opens = new ListBuffer<>(); + int nopens = nextChar(); + if (nopens != 0 && msym.flags.contains(ModuleFlags.OPEN)) { + throw badClassFile("module.non.zero.opens", currentModule.name); + } + for (int i = 0; i < nopens; i++) { + Name n = readName(nextChar()); + PackageSymbol p = syms.enterPackage(currentModule, names.fromUtf(internalize(n))); + Set flags = readOpensFlags(nextChar()); + int nto = nextChar(); + List to; + if (nto == 0) { + to = null; + } else { + ListBuffer lb = new ListBuffer<>(); + for (int t = 0; t < nto; t++) + lb.append(syms.enterModule(readModuleName(nextChar()))); + to = lb.toList(); + } + opens.add(new OpensDirective(p, to, flags)); + } + msym.opens = opens.toList(); + directives.addAll(msym.opens); msym.directives = directives.toList(); @@ -1271,17 +1358,21 @@ public class ClassReader { ListBuffer provides = new ListBuffer<>(); int nprovides = nextChar(); - for (int i = 0; i < nprovides; i++) { + for (int p = 0; p < nprovides; p++) { Name srvc = readClassName(nextChar()); - Name impl = readClassName(nextChar()); - provides.add(new InterimProvidesDirective(srvc, impl)); + int nimpls = nextChar(); + ListBuffer impls = new ListBuffer<>(); + for (int i = 0; i < nimpls; i++) { + impls.append(readClassName(nextChar())); + provides.add(new InterimProvidesDirective(srvc, impls.toList())); + } } interimProvides = provides.toList(); } } }, - new AttributeReader(names.Version, V53, CLASS_ATTRIBUTE) { + new AttributeReader(names.ModuleVersion, V53, CLASS_ATTRIBUTE) { @Override protected boolean accepts(AttributeKind kind) { return super.accepts(kind) && allowModules; @@ -1480,7 +1571,7 @@ public class ClassReader { } else if (proxy.type.tsym == syms.repeatableType.tsym) { repeatable = proxy; } else if (proxy.type.tsym == syms.deprecatedType.tsym) { - sym.flags_field |= DEPRECATED; + sym.flags_field |= (DEPRECATED | DEPRECATED_ANNOTATION); for (Pair v : proxy.values) { if (v.fst == names.forRemoval && v.snd instanceof Attribute.Constant) { Attribute.Constant c = (Attribute.Constant) v.snd; @@ -1547,7 +1638,7 @@ public class ClassReader { // support preliminary jsr175-format class files if (buf[poolIdx[i]] == CONSTANT_Class) return readClassSymbol(i).type; - return readType(i); + return readTypeToProxy(i); } Type readEnumType(int i) { // support preliminary jsr175-format class files @@ -1555,11 +1646,25 @@ public class ClassReader { int length = getChar(index + 1); if (buf[index + length + 2] != ';') return enterClass(readName(i)).type; - return readType(i); + return readTypeToProxy(i); + } + Type readTypeToProxy(int i) { + if (currentModule.module_info == currentOwner) { + int index = poolIdx[i]; + return new ProxyType(Arrays.copyOfRange(buf, index + 3, index + 3 + getChar(index + 1))); + } else { + return readType(i); + } } CompoundAnnotationProxy readCompoundAnnotation() { - Type t = readTypeOrClassSymbol(nextChar()); + Type t; + if (currentModule.module_info == currentOwner) { + int index = poolIdx[nextChar()]; + t = new ProxyType(Arrays.copyOfRange(buf, index + 3, index + 3 + getChar(index + 1))); + } else { + t = readTypeOrClassSymbol(nextChar()); + } int numFields = nextChar(); ListBuffer> pairs = new ListBuffer<>(); for (int i=0; i l = new ListBuffer<>(); @@ -1817,6 +1922,7 @@ public class ClassReader { interface ProxyVisitor extends Attribute.Visitor { void visitEnumAttributeProxy(EnumAttributeProxy proxy); + void visitClassAttributeProxy(ClassAttributeProxy proxy); void visitArrayAttributeProxy(ArrayAttributeProxy proxy); void visitCompoundAnnotationProxy(CompoundAnnotationProxy proxy); } @@ -1836,6 +1942,19 @@ public class ClassReader { } } + static class ClassAttributeProxy extends Attribute { + Type classType; + public ClassAttributeProxy(Type classType) { + super(null); + this.classType = classType; + } + public void accept(Visitor v) { ((ProxyVisitor)v).visitClassAttributeProxy(this); } + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public String toString() { + return "/*proxy class*/" + classType + ".class"; + } + } + static class ArrayAttributeProxy extends Attribute { List values; ArrayAttributeProxy(List values) { @@ -1909,14 +2028,15 @@ public class ClassReader { } Attribute.Compound deproxyCompound(CompoundAnnotationProxy a) { + Type annotationType = resolvePossibleProxyType(a.type); ListBuffer> buf = new ListBuffer<>(); for (List> l = a.values; l.nonEmpty(); l = l.tail) { - MethodSymbol meth = findAccessMethod(a.type, l.head.fst); + MethodSymbol meth = findAccessMethod(annotationType, l.head.fst); buf.append(new Pair<>(meth, deproxy(meth.type.getReturnType(), l.head.snd))); } - return new Attribute.Compound(a.type, buf.toList()); + return new Attribute.Compound(annotationType, buf.toList()); } MethodSymbol findAccessMethod(Type container, Name name) { @@ -2000,7 +2120,8 @@ public class ClassReader { public void visitEnumAttributeProxy(EnumAttributeProxy proxy) { // type.tsym.flatName() should == proxy.enumFlatName - TypeSymbol enumTypeSym = proxy.enumType.tsym; + Type enumType = resolvePossibleProxyType(proxy.enumType); + TypeSymbol enumTypeSym = enumType.tsym; VarSymbol enumerator = null; CompletionFailure failure = null; try { @@ -2030,6 +2151,12 @@ public class ClassReader { } } + @Override + public void visitClassAttributeProxy(ClassAttributeProxy proxy) { + Type classType = resolvePossibleProxyType(proxy.classType); + result = new Attribute.Class(types, classType); + } + public void visitArrayAttributeProxy(ArrayAttributeProxy proxy) { int length = proxy.values.length(); Attribute[] ats = new Attribute[length]; @@ -2044,6 +2171,21 @@ public class ClassReader { public void visitCompoundAnnotationProxy(CompoundAnnotationProxy proxy) { result = deproxyCompound(proxy); } + + Type resolvePossibleProxyType(Type t) { + if (t instanceof ProxyType) { + Assert.check(requestingOwner.owner.kind == MDL); + ModuleSymbol prevCurrentModule = currentModule; + currentModule = (ModuleSymbol) requestingOwner.owner; + try { + return ((ProxyType) t).resolve(); + } finally { + currentModule = prevCurrentModule; + } + } else { + return t; + } + } } class AnnotationDefaultCompleter extends AnnotationDeproxy implements Runnable { @@ -2086,7 +2228,11 @@ public class ClassReader { AnnotationCompleter(Symbol sym, List l) { super(currentOwner.kind == MTH ? currentOwner.enclClass() : (ClassSymbol)currentOwner); - this.sym = sym; + if (sym.kind == TYP && sym.owner.kind == MDL) { + this.sym = sym.owner; + } else { + this.sym = sym; + } this.l = l; this.classFile = currentClassFile; } @@ -2097,6 +2243,18 @@ public class ClassReader { try { currentClassFile = classFile; List newList = deproxyCompoundList(l); + for (Attribute.Compound attr : newList) { + if (attr.type.tsym == syms.deprecatedType.tsym) { + sym.flags_field |= (DEPRECATED | DEPRECATED_ANNOTATION); + Attribute forRemoval = attr.member(names.forRemoval); + if (forRemoval instanceof Attribute.Constant) { + Attribute.Constant c = (Attribute.Constant) forRemoval; + if (c.type == syms.booleanType && ((Integer) c.value) != 0) { + sym.flags_field |= DEPRECATED_REMOVAL; + } + } + } + } if (sym.annotationsPendingCompletion()) { sym.setDeclarationAttributes(newList); } else { @@ -2407,15 +2565,22 @@ public class ClassReader { } } else { c.flags_field = flags; - Name modInfoName = readModuleInfoName(nextChar()); currentModule = (ModuleSymbol) c.owner; - if (currentModule.name.append('.', names.module_info) != modInfoName) { - //strip trailing .module-info, if exists: - int modInfoStart = modInfoName.length() - names.module_info.length(); - modInfoName = modInfoName.subName(modInfoStart, modInfoName.length()) == names.module_info && - modInfoName.charAt(modInfoStart - 1) == '.' ? - modInfoName.subName(0, modInfoStart - 1) : modInfoName; - throw badClassFile("module.name.mismatch", modInfoName, currentModule.name); + int this_class = nextChar(); + // FIXME: temporary compatibility code + if (this_class == 0) { + readNewModuleAttribute = true; + } else { + Name modInfoName = readModuleInfoName(this_class); + if (currentModule.name.append('.', names.module_info) != modInfoName) { + //strip trailing .module-info, if exists: + int modInfoStart = modInfoName.length() - names.module_info.length(); + modInfoName = modInfoName.subName(modInfoStart, modInfoName.length()) == names.module_info && + modInfoName.charAt(modInfoStart - 1) == '.' ? + modInfoName.subName(0, modInfoStart - 1) : modInfoName; + throw badClassFile("module.name.mismatch", modInfoName, currentModule.name); + } + readNewModuleAttribute = false; } } @@ -2500,7 +2665,7 @@ public class ClassReader { minorVersion = nextChar(); majorVersion = nextChar(); - int maxMajor = Version.MAX().major; + int maxMajor = 53; // Version.MAX().major; //******* TEMPORARY ******* int maxMinor = Version.MAX().minor; if (majorVersion > maxMajor || majorVersion * 1000 + minorVersion < @@ -2542,6 +2707,8 @@ public class ClassReader { List found = foundTypeVariables; missingTypeVariables = List.nil(); foundTypeVariables = List.nil(); + interimUses = List.nil(); + interimProvides = List.nil(); filling = false; ClassType ct = (ClassType)currentOwner.type; ct.supertype_field = @@ -2808,6 +2975,36 @@ public class ClassReader { } } + private class ProxyType extends Type { + + private final byte[] content; + + public ProxyType(byte[] content) { + super(syms.noSymbol, TypeMetadata.EMPTY); + this.content = content; + } + + @Override + public TypeTag getTag() { + return TypeTag.NONE; + } + + @Override + public Type cloneWithMetadata(TypeMetadata metadata) { + throw new UnsupportedOperationException(); + } + + public Type resolve() { + return sigToType(content, 0, content.length); + } + + @Override @DefinedBy(Api.LANGUAGE_MODEL) + public String toString() { + return ""; + } + + } + private static final class InterimUsesDirective { public final Name service; @@ -2819,11 +3016,11 @@ public class ClassReader { private static final class InterimProvidesDirective { public final Name service; - public final Name impl; + public final List impls; - public InterimProvidesDirective(Name service, Name impl) { + public InterimProvidesDirective(Name service, List impls) { this.service = service; - this.impl = impl; + this.impls = impls; } } @@ -2852,8 +3049,12 @@ public class ClassReader { currentModule.uses = uses.toList(); ListBuffer provides = new ListBuffer<>(); for (InterimProvidesDirective interim : interimProvidesCopy) { + ListBuffer impls = new ListBuffer<>(); + for (Name impl : interim.impls) { + impls.append(syms.enterClass(currentModule, impl)); + } ProvidesDirective d = new ProvidesDirective(syms.enterClass(currentModule, interim.service), - syms.enterClass(currentModule, interim.impl)); + impls.toList()); provides.add(d); directives.add(d); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java index 73b3803e892..659b7c5b056 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ClassWriter.java @@ -30,6 +30,7 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; import java.util.HashSet; +import java.util.LinkedHashSet; import javax.tools.JavaFileManager; import javax.tools.FileObject; @@ -952,6 +953,10 @@ public class ClassWriter extends ClassFile { ModuleSymbol m = (ModuleSymbol) c.owner; int alenIdx = writeAttr(names.Module); + + databuf.appendChar(pool.put(names.fromUtf(externalize(m.name)))); + databuf.appendChar(ModuleFlags.value(m.flags)); // module_flags + ListBuffer requires = new ListBuffer<>(); for (RequiresDirective r: m.requires) { if (!r.flags.contains(RequiresFlag.EXTRA)) @@ -959,7 +964,7 @@ public class ClassWriter extends ClassFile { } databuf.appendChar(requires.size()); for (RequiresDirective r: requires) { - databuf.appendChar(pool.put(r.module.name)); + databuf.appendChar(pool.put(names.fromUtf(externalize(r.module.name)))); databuf.appendChar(RequiresFlag.value(r.flags)); } @@ -967,12 +972,29 @@ public class ClassWriter extends ClassFile { databuf.appendChar(exports.size()); for (ExportsDirective e: exports) { databuf.appendChar(pool.put(names.fromUtf(externalize(e.packge.flatName())))); + databuf.appendChar(ExportsFlag.value(e.flags)); if (e.modules == null) { databuf.appendChar(0); } else { databuf.appendChar(e.modules.size()); - for (ModuleSymbol msym: e.modules) - databuf.appendChar(pool.put(msym.name)); + for (ModuleSymbol msym: e.modules) { + databuf.appendChar(pool.put(names.fromUtf(externalize(msym.name)))); + } + } + } + + List opens = m.opens; + databuf.appendChar(opens.size()); + for (OpensDirective o: opens) { + databuf.appendChar(pool.put(names.fromUtf(externalize(o.packge.flatName())))); + databuf.appendChar(OpensFlag.value(o.flags)); + if (o.modules == null) { + databuf.appendChar(0); + } else { + databuf.appendChar(o.modules.size()); + for (ModuleSymbol msym: o.modules) { + databuf.appendChar(pool.put(names.fromUtf(externalize(msym.name)))); + } } } @@ -982,12 +1004,19 @@ public class ClassWriter extends ClassFile { databuf.appendChar(pool.put(s.service)); } - List services = m.provides; - databuf.appendChar(services.size()); - for (ProvidesDirective s: services) { - databuf.appendChar(pool.put(s.service)); - databuf.appendChar(pool.put(s.impl)); + // temporary fix to merge repeated provides clause for same service; + // eventually this should be disallowed when analyzing the module, + // so that each service type only appears once. + Map> mergedProvides = new LinkedHashMap<>(); + for (ProvidesDirective p : m.provides) { + mergedProvides.computeIfAbsent(p.service, s -> new LinkedHashSet<>()).addAll(p.impls); } + databuf.appendChar(mergedProvides.size()); + mergedProvides.forEach((srvc, impls) -> { + databuf.appendChar(pool.put(srvc)); + databuf.appendChar(impls.size()); + impls.forEach(impl -> databuf.appendChar(pool.put(impl))); + }); endAttr(alenIdx); return 1; @@ -1688,7 +1717,11 @@ public class ClassWriter extends ClassFile { } databuf.appendChar(flags); - databuf.appendChar(pool.put(c)); + if (c.owner.kind == MDL) { + databuf.appendChar(0); + } else { + databuf.appendChar(pool.put(c)); + } databuf.appendChar(supertype.hasTag(CLASS) ? pool.put(supertype.tsym) : 0); databuf.appendChar(interfaces.length()); for (List l = interfaces; l.nonEmpty(); l = l.tail) @@ -1766,12 +1799,20 @@ public class ClassWriter extends ClassFile { acount += writeEnclosingMethodAttribute(c); if (c.owner.kind == MDL) { acount += writeModuleAttribute(c); + acount += writeFlagAttrs(c.owner.flags()); } acount += writeExtraClassAttributes(c); poolbuf.appendInt(JAVA_MAGIC); - poolbuf.appendChar(target.minorVersion); - poolbuf.appendChar(target.majorVersion); + + if (c.owner.kind == MDL) { + // temporarily overide to force use of v53 for module-info.class + poolbuf.appendChar(0); + poolbuf.appendChar(53); + } else { + poolbuf.appendChar(target.minorVersion); + poolbuf.appendChar(target.majorVersion); + } writePool(c.pool); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java index e8f4bb2dc18..bdb16206ba9 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/jvm/ModuleNameReader.java @@ -31,8 +31,6 @@ import java.nio.file.Path; import javax.tools.JavaFileObject; -import com.sun.tools.javac.jvm.ClassFile; - import static com.sun.tools.javac.jvm.ClassFile.*; @@ -93,11 +91,44 @@ public class ModuleNameReader { int minorVersion = nextChar(); int majorVersion = nextChar(); + if (majorVersion < 53) + throw new BadClassFile("bad major version number for module: " + majorVersion); indexPool(); - int accessflags = nextChar(); - return readModuleInfoName(nextChar()); + int access_flags = nextChar(); + if (access_flags != 0x8000) + throw new BadClassFile("invalid access flags for module: 0x" + Integer.toHexString(access_flags)); + + // FIXME: temporary compatibility code + int this_class = nextChar(); + if (this_class == 0) { + // new form + checkZero(nextChar(), "super_class"); + checkZero(nextChar(), "interface_count"); + checkZero(nextChar(), "fields_count"); + checkZero(nextChar(), "methods_count"); + int attributes_count = nextChar(); + for (int i = 0; i < attributes_count; i++) { + int attr_name = nextChar(); + int attr_length = nextInt(); + if (getUtf8Value(attr_name, false).equals("Module") && attr_length > 2) { + return getUtf8Value(nextChar(), true); + } else { + // skip over unknown attributes + bp += attr_length; + } + } + throw new BadClassFile("no Module attribute"); + } else { + // old form + return readModuleInfoName(this_class); + } + } + + void checkZero(int count, String name) throws BadClassFile { + if (count != 0) + throw new BadClassFile("invalid " + name + " for module: " + count); } /** Extract a character at position bp from buf. @@ -166,6 +197,20 @@ public class ModuleNameReader { } } + String getUtf8Value(int index, boolean internalize) throws BadClassFile { + int utf8Index = poolIdx[index]; + if (buf[utf8Index] == CONSTANT_Utf8) { + int len = getChar(utf8Index + 1); + int start = utf8Index + 3; + if (internalize) { + return new String(ClassFile.internalize(buf, start, len)); + } else { + return new String(buf, start, len); + } + } + throw new BadClassFile("bad name at index " + index); + } + /** Read the class name of a module-info.class file. * The name is stored in a CONSTANT_Class entry, where the * class name is of the form module-name/module-info. diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java index 9d52eff4027..09a5a7ec57e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Arguments.java @@ -608,8 +608,9 @@ public class Arguments { log.error(Errors.ProcessorpathNoProcessormodulepath); } - if (obsoleteOptionFound) + if (obsoleteOptionFound && lintOptions) { log.warning(LintCategory.OPTIONS, "option.obsolete.suppression"); + } SourceVersion sv = Source.toSourceVersion(source); validateAddExports(sv); @@ -617,6 +618,10 @@ public class Arguments { validateAddReads(sv); validateLimitModules(sv); + if (lintOptions && options.isSet(Option.ADD_OPENS)) { + log.warning(LintCategory.OPTIONS, Warnings.AddopensIgnored); + } + return !errors && (log.nerrors == 0); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java index 7dd835f82fb..29006d8c63e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java @@ -584,6 +584,8 @@ public enum Option { } }, + ADD_OPENS("--add-opens", null, null, HIDDEN, BASIC), + ADD_READS("--add-reads", "opt.arg.addReads", "opt.addReads", EXTENDED, BASIC) { @Override public boolean process(OptionHelper helper, String option, String arg) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java index 450f9492b50..eb43d8fd5cf 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/model/JavacElements.java @@ -375,7 +375,8 @@ public class JavacElements implements Elements { @DefinedBy(Api.LANGUAGE_MODEL) public boolean isDeprecated(Element e) { Symbol sym = cast(Symbol.class, e); - return (sym.flags() & Flags.DEPRECATED) != 0; + sym.complete(); + return sym.isDeprecated(); } @DefinedBy(Api.LANGUAGE_MODEL) diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java index e0f936983fe..7e786ce0b76 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java @@ -29,6 +29,7 @@ import java.util.*; import java.util.stream.Collectors; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; +import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.*; import com.sun.tools.javac.parser.Tokens.*; @@ -51,7 +52,6 @@ import static com.sun.tools.javac.parser.Tokens.TokenKind.GT; import static com.sun.tools.javac.parser.Tokens.TokenKind.IMPORT; import static com.sun.tools.javac.parser.Tokens.TokenKind.LT; import static com.sun.tools.javac.tree.JCTree.Tag.*; -import com.sun.tools.javac.util.JCDiagnostic.SimpleDiagnosticPosition; /** The parser maps a token sequence into an abstract syntax * tree. It operates by recursive descent, with code derived @@ -3105,65 +3105,78 @@ public class JavacParser implements Parser { Token firstToken = token; JCModifiers mods = null; boolean consumedToplevelDoc = false; + boolean seenImport = false; + boolean seenPackage = false; ListBuffer defs = new ListBuffer<>(); + if (token.kind == MONKEYS_AT) + mods = modifiersOpt(); - if (token.kind == IDENTIFIER && token.name() == names.module) { - defs.append(moduleDecl(token.comment(CommentStyle.JAVADOC))); + if (token.kind == PACKAGE) { + int packagePos = token.pos; + List annotations = List.nil(); + seenPackage = true; + if (mods != null) { + checkNoMods(mods.flags); + annotations = mods.annotations; + mods = null; + } + nextToken(); + JCExpression pid = qualident(false); + accept(SEMI); + JCPackageDecl pd = F.at(packagePos).PackageDecl(annotations, pid); + attach(pd, firstToken.comment(CommentStyle.JAVADOC)); consumedToplevelDoc = true; - } else { - boolean seenImport = false; - boolean seenPackage = false; - if (token.kind == MONKEYS_AT) - mods = modifiersOpt(); - - if (token.kind == PACKAGE) { - int packagePos = token.pos; - List annotations = List.nil(); - seenPackage = true; - if (mods != null) { - checkNoMods(mods.flags); - annotations = mods.annotations; - mods = null; - } - nextToken(); - JCExpression pid = qualident(false); - accept(SEMI); - JCPackageDecl pd = F.at(packagePos).PackageDecl(annotations, pid); - attach(pd, firstToken.comment(CommentStyle.JAVADOC)); - consumedToplevelDoc = true; - storeEnd(pd, token.pos); - defs.append(pd); - } - boolean checkForImports = true; - boolean firstTypeDecl = true; - while (token.kind != EOF) { - if (token.pos <= endPosTable.errorEndPos) { - // error recovery - skip(checkForImports, false, false, false); - if (token.kind == EOF) - break; - } - if (checkForImports && mods == null && token.kind == IMPORT) { - seenImport = true; - defs.append(importDeclaration()); - } else { - Comment docComment = token.comment(CommentStyle.JAVADOC); - if (firstTypeDecl && !seenImport && !seenPackage) { - docComment = firstToken.comment(CommentStyle.JAVADOC); - consumedToplevelDoc = true; - } - JCTree def = typeDeclaration(mods, docComment); - if (def instanceof JCExpressionStatement) - def = ((JCExpressionStatement)def).expr; - defs.append(def); - if (def instanceof JCClassDecl) - checkForImports = false; - mods = null; - firstTypeDecl = false; - } - } + storeEnd(pd, token.pos); + defs.append(pd); } + boolean checkForImports = true; + boolean firstTypeDecl = true; + while (token.kind != EOF) { + if (token.pos <= endPosTable.errorEndPos) { + // error recovery + skip(checkForImports, false, false, false); + if (token.kind == EOF) + break; + } + if (checkForImports && mods == null && token.kind == IMPORT) { + seenImport = true; + defs.append(importDeclaration()); + } else { + Comment docComment = token.comment(CommentStyle.JAVADOC); + if (firstTypeDecl && !seenImport && !seenPackage) { + docComment = firstToken.comment(CommentStyle.JAVADOC); + consumedToplevelDoc = true; + } + if (mods != null || token.kind != SEMI) + mods = modifiersOpt(mods); + if (firstTypeDecl && token.kind == IDENTIFIER) { + ModuleKind kind = ModuleKind.STRONG; + if (token.name() == names.open) { + kind = ModuleKind.OPEN; + nextToken(); + } + if (token.kind == IDENTIFIER && token.name() == names.module) { + if (mods != null) { + checkNoMods(mods.flags & ~Flags.DEPRECATED); + } + defs.append(moduleDecl(mods, kind, docComment)); + consumedToplevelDoc = true; + break; + } else if (kind != ModuleKind.STRONG) { + reportSyntaxError(token.pos, "expected.module"); + } + } + JCTree def = typeDeclaration(mods, docComment); + if (def instanceof JCExpressionStatement) + def = ((JCExpressionStatement)def).expr; + defs.append(def); + if (def instanceof JCClassDecl) + checkForImports = false; + mods = null; + firstTypeDecl = false; + } + } JCTree.JCCompilationUnit toplevel = F.at(firstToken.pos).TopLevel(defs.toList()); if (!consumedToplevelDoc) attach(toplevel, firstToken.comment(CommentStyle.JAVADOC)); @@ -3178,7 +3191,7 @@ public class JavacParser implements Parser { return toplevel; } - JCModuleDecl moduleDecl(Comment dc) { + JCModuleDecl moduleDecl(JCModifiers mods, ModuleKind kind, Comment dc) { int pos = token.pos; if (!allowModules) { log.error(pos, Errors.ModulesNotSupportedInSource(source.name)); @@ -3194,7 +3207,7 @@ public class JavacParser implements Parser { accept(RBRACE); accept(EOF); - JCModuleDecl result = toP(F.at(pos).ModuleDef(name, directives)); + JCModuleDecl result = toP(F.at(pos).ModuleDef(mods, kind, name, directives)); attach(result, dc); return result; } @@ -3205,15 +3218,38 @@ public class JavacParser implements Parser { int pos = token.pos; if (token.name() == names.requires) { nextToken(); - boolean isPublic = false; - if (token.kind == PUBLIC) { - isPublic = true; + boolean isTransitive = false; + boolean isStaticPhase = false; + loop: + while (true) { + switch (token.kind) { + case IDENTIFIER: + if (token.name() == names.transitive && !isTransitive) { + Token t1 = S.token(1); + if (t1.kind == SEMI || t1.kind == DOT) { + break loop; + } + isTransitive = true; + break; + } else { + break loop; + } + case STATIC: + if (isStaticPhase) { + error(token.pos, "repeated.modifier"); + } + isStaticPhase = true; + break; + default: + break loop; + } nextToken(); } JCExpression moduleName = qualident(false); accept(SEMI); - defs.append(toP(F.at(pos).Requires(isPublic, moduleName))); - } else if (token.name() == names.exports) { + defs.append(toP(F.at(pos).Requires(isTransitive, isStaticPhase, moduleName))); + } else if (token.name() == names.exports || token.name() == names.opens) { + boolean exports = token.name() == names.exports; nextToken(); JCExpression pkgName = qualident(false); List moduleNames = null; @@ -3222,15 +3258,21 @@ public class JavacParser implements Parser { moduleNames = qualidentList(false); } accept(SEMI); - defs.append(toP(F.at(pos).Exports(pkgName, moduleNames))); + JCDirective d; + if (exports) { + d = F.at(pos).Exports(pkgName, moduleNames); + } else { + d = F.at(pos).Opens(pkgName, moduleNames); + } + defs.append(toP(d)); } else if (token.name() == names.provides) { nextToken(); JCExpression serviceName = qualident(false); if (token.kind == IDENTIFIER && token.name() == names.with) { nextToken(); - JCExpression implName = qualident(false); + List implNames = qualidentList(false); accept(SEMI); - defs.append(toP(F.at(pos).Provides(serviceName, implName))); + defs.append(toP(F.at(pos).Provides(serviceName, implNames))); } else { error(token.pos, "expected", "'" + names.with + "'"); skip(false, false, false, false); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties index 0e173fc133d..9be06cb7c3c 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties @@ -872,6 +872,9 @@ compiler.err.operator.cant.be.applied.1=\ compiler.err.pkg.annotations.sb.in.package-info.java=\ package annotations should be in file package-info.java +compiler.err.no.pkg.in.module-info.java=\ + package clauses should not be in file module-info.java + # 0: symbol compiler.err.pkg.clashes.with.class.of.same.name=\ package {0} clashes with class of same name @@ -1462,6 +1465,14 @@ compiler.warn.has.been.deprecated=\ compiler.warn.has.been.deprecated.for.removal=\ {0} in {1} has been deprecated and marked for removal +# 0: symbol +compiler.warn.has.been.deprecated.module=\ + module {0} has been deprecated + +# 0: symbol +compiler.warn.has.been.deprecated.for.removal.module=\ + module {0} has been deprecated and marked for removal + # 0: symbol compiler.warn.sun.proprietary=\ {0} is internal proprietary API and may be removed in a future release @@ -1796,6 +1807,9 @@ compiler.err.premature.eof=\ reached end of file while parsing ## The following are related in form, but do not easily fit the above paradigm. +compiler.err.expected.module=\ + ''module'' expected + compiler.err.dot.class.expected=\ ''.class'' expected @@ -2747,8 +2761,23 @@ compiler.err.duplicate.requires=\ duplicate requires: {0} # 0: symbol -compiler.err.duplicate.exports=\ - duplicate export: {0} +compiler.err.conflicting.exports=\ + duplicate or conflicting exports: {0} + +# 0: symbol +compiler.err.conflicting.opens=\ + duplicate or conflicting opens: {0} + +# 0: symbol +compiler.err.conflicting.exports.to.module=\ + duplicate or conflicting exports to module: {0} + +# 0: symbol +compiler.err.conflicting.opens.to.module=\ + duplicate or conflicting opens to module: {0} + +compiler.err.no.opens.unless.strong=\ + ''opens'' only allowed in strong modules # 0: symbol, 1: symbol compiler.err.duplicate.provides=\ @@ -2763,7 +2792,11 @@ compiler.err.service.implementation.is.abstract=\ the service implementation is an abstract class: {0} compiler.err.service.implementation.must.be.subtype.of.service.interface=\ - the service implementation type must be a subtype of the service interface type + the service implementation type must be a subtype of the service interface type, or \ + have a public static no-args method named "provider" returning the service implementation + +compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface=\ + the "provider" method return type must be a subtype of the service interface type # 0: symbol compiler.err.service.implementation.is.inner=\ @@ -2799,6 +2832,14 @@ compiler.err.module.name.mismatch=\ compiler.misc.module.name.mismatch=\ module name {0} does not match expected name {1} +# 0: name +compiler.err.module.non.zero.opens=\ + open module {0} has non-zero opens_count + +# 0: name +compiler.misc.module.non.zero.opens=\ + open module {0} has non-zero opens_count + compiler.err.module.decl.sb.in.module-info.java=\ module declarations should be in a file named module-info.java @@ -2855,6 +2896,9 @@ compiler.warn.module.for.option.not.found=\ compiler.err.addmods.all.module.path.invalid=\ --add-modules ALL-MODULE-PATH can only be used when compiling the unnamed module +compiler.warn.addopens.ignored=\ + --add-opens has no effect at compile time + compiler.misc.locn.module_source_path=\ module source path @@ -2885,8 +2929,8 @@ compiler.warn.leaks.not.accessible=\ compiler.warn.leaks.not.accessible.unexported=\ {0} {1} in module {2} is not exported # 0: kind name, 1: symbol, 2: symbol -compiler.warn.leaks.not.accessible.not.required.public=\ - {0} {1} in module {2} is not indirectly exported using 'requires public' +compiler.warn.leaks.not.accessible.not.required.transitive=\ + {0} {1} in module {2} is not indirectly exported using 'requires transitive' # 0: kind name, 1: symbol, 2: symbol compiler.warn.leaks.not.accessible.unexported.qualified=\ {0} {1} in module {2} may not be visible to all clients that require this module diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties index 52f363e8959..fe8659b08ee 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_ja.properties @@ -841,7 +841,7 @@ compiler.err.class.public.should.be.in.file=\u30AF\u30E9\u30B9{0}\u306Fpublic\u3 ## All errors which do not refer to a particular line in the source code are ## preceded by this string. -compiler.err.error=\u30A8\u30E9\u30FC: +compiler.err.error=\u30A8\u30E9\u30FC: # The following error messages do not refer to a line in the source code. compiler.err.cant.read.file={0}\u3092\u8AAD\u307F\u8FBC\u3081\u307E\u305B\u3093 @@ -1021,7 +1021,7 @@ compiler.warn.warning=\u8B66\u544A: ## Warning messages may also include the following prefix to identify a ## lint option # 0: option name -compiler.warn.lintOption=[{0}] +compiler.warn.lintOption=[{0}] # 0: symbol compiler.warn.constant.SVUID=serialVersionUID\u306F\u30AF\u30E9\u30B9{0}\u306E\u5B9A\u6570\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059 diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties index b7de2bfb81d..becc7543eee 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties @@ -841,7 +841,7 @@ compiler.err.class.public.should.be.in.file=\u7C7B{0}\u662F\u516C\u5171\u7684, \ ## All errors which do not refer to a particular line in the source code are ## preceded by this string. -compiler.err.error=\u9519\u8BEF: +compiler.err.error=\u9519\u8BEF: # The following error messages do not refer to a line in the source code. compiler.err.cant.read.file=\u65E0\u6CD5\u8BFB\u53D6: {0} @@ -927,7 +927,7 @@ compiler.note.mref.stat=\u8F6C\u6362\u65B9\u6CD5\u5F15\u7528\n\u66FF\u4EE3 metaf # 0: boolean, 1: symbol compiler.note.mref.stat.1=\u8F6C\u6362\u65B9\u6CD5\u5F15\u7528\n\u66FF\u4EE3 metafactory = {0}\nbridge \u65B9\u6CD5 = {1} -compiler.note.note=\u6CE8: +compiler.note.note=\u6CE8: # 0: file name compiler.note.deprecated.filename={0}\u4F7F\u7528\u6216\u8986\u76D6\u4E86\u5DF2\u8FC7\u65F6\u7684 API\u3002 @@ -1016,12 +1016,12 @@ compiler.misc.resume.abort=\u7EE7\u7EED(R), \u653E\u5F03(A)> ## ## All warning messages are preceded by the following string. -compiler.warn.warning=\u8B66\u544A: +compiler.warn.warning=\u8B66\u544A: ## Warning messages may also include the following prefix to identify a ## lint option # 0: option name -compiler.warn.lintOption=[{0}] +compiler.warn.lintOption=[{0}] # 0: symbol compiler.warn.constant.SVUID=serialVersionUID \u5728\u7C7B{0}\u4E2D\u5FC5\u987B\u662F\u5E38\u91CF diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java index 58f62960322..9efc014582a 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java @@ -47,7 +47,10 @@ import static com.sun.tools.javac.tree.JCTree.Tag.*; import javax.tools.JavaFileManager.Location; +import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.Directive.ExportsDirective; +import com.sun.tools.javac.code.Directive.OpensDirective; +import com.sun.tools.javac.code.Type.ModuleType; /** * Root class for abstract syntax tree nodes. It provides definitions @@ -352,6 +355,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { MODULEDEF, EXPORTS, + OPENS, PROVIDES, REQUIRES, USES, @@ -527,6 +531,16 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { @DefinedBy(Api.COMPILER_TREE) public Kind getKind() { return Kind.COMPILATION_UNIT; } + public JCModuleDecl getModuleDecl() { + for (JCTree tree : defs) { + if (tree.hasTag(MODULEDEF)) { + return (JCModuleDecl) tree; + } + } + + return null; + } + @DefinedBy(Api.COMPILER_TREE) public JCPackageDecl getPackage() { // PackageDecl must be the first entry if it exists @@ -2619,11 +2633,17 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } public static class JCModuleDecl extends JCTree implements ModuleTree { + public JCModifiers mods; + public ModuleType type; + private final ModuleKind kind; public JCExpression qualId; public List directives; public ModuleSymbol sym; - protected JCModuleDecl(JCExpression qualId, List directives) { + protected JCModuleDecl(JCModifiers mods, ModuleKind kind, + JCExpression qualId, List directives) { + this.mods = mods; + this.kind = kind; this.qualId = qualId; this.directives = directives; } @@ -2636,6 +2656,16 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { return Kind.MODULE; } + @Override @DefinedBy(Api.COMPILER_TREE) + public List getAnnotations() { + return mods.annotations; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public ModuleKind getModuleType() { + return kind; + } + @Override @DefinedBy(Api.COMPILER_TREE) public JCExpression getName() { return qualId; @@ -2677,7 +2707,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } @Override @DefinedBy(Api.COMPILER_TREE) - public JCExpression getExportName() { + public JCExpression getPackageName() { return qualid; } @@ -2693,18 +2723,58 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { @Override public Tag getTag() { - return EXPORTS; + return Tag.EXPORTS; + } + } + + public static class JCOpens extends JCDirective + implements OpensTree { + public JCExpression qualid; + public List moduleNames; + public OpensDirective directive; + + protected JCOpens(JCExpression qualId, List moduleNames) { + this.qualid = qualId; + this.moduleNames = moduleNames; + } + + @Override + public void accept(Visitor v) { v.visitOpens(this); } + + @Override @DefinedBy(Api.COMPILER_TREE) + public Kind getKind() { + return Kind.OPENS; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public JCExpression getPackageName() { + return qualid; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public List getModuleNames() { + return moduleNames; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public R accept(TreeVisitor v, D d) { + return v.visitOpens(this, d); + } + + @Override + public Tag getTag() { + return Tag.OPENS; } } public static class JCProvides extends JCDirective implements ProvidesTree { public JCExpression serviceName; - public JCExpression implName; + public List implNames; - protected JCProvides(JCExpression serviceName, JCExpression implName) { + protected JCProvides(JCExpression serviceName, List implNames) { this.serviceName = serviceName; - this.implName = implName; + this.implNames = implNames; } @Override @@ -2726,8 +2796,8 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } @Override @DefinedBy(Api.COMPILER_TREE) - public JCExpression getImplementationName() { - return implName; + public List getImplementationNames() { + return implNames; } @Override @@ -2738,12 +2808,14 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public static class JCRequires extends JCDirective implements RequiresTree { - public boolean isPublic; + public boolean isTransitive; + public boolean isStaticPhase; public JCExpression moduleName; public RequiresDirective directive; - protected JCRequires(boolean isPublic, JCExpression moduleName) { - this.isPublic = isPublic; + protected JCRequires(boolean isTransitive, boolean isStaticPhase, JCExpression moduleName) { + this.isTransitive = isTransitive; + this.isStaticPhase = isStaticPhase; this.moduleName = moduleName; } @@ -2761,8 +2833,13 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } @Override @DefinedBy(Api.COMPILER_TREE) - public boolean isPublic() { - return isPublic; + public boolean isTransitive() { + return isTransitive; + } + + @Override @DefinedBy(Api.COMPILER_TREE) + public boolean isStatic() { + return isStaticPhase; } @Override @DefinedBy(Api.COMPILER_TREE) @@ -2946,10 +3023,11 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { JCAnnotation Annotation(JCTree annotationType, List args); JCModifiers Modifiers(long flags, List annotations); JCErroneous Erroneous(List errs); - JCModuleDecl ModuleDef(JCExpression qualId, List directives); + JCModuleDecl ModuleDef(JCModifiers mods, ModuleKind kind, JCExpression qualId, List directives); JCExports Exports(JCExpression qualId, List moduleNames); - JCProvides Provides(JCExpression serviceName, JCExpression implName); - JCRequires Requires(boolean isPublic, JCExpression qualId); + JCOpens Opens(JCExpression qualId, List moduleNames); + JCProvides Provides(JCExpression serviceName, List implNames); + JCRequires Requires(boolean isTransitive, boolean isStaticPhase, JCExpression qualId); JCUses Uses(JCExpression qualId); LetExpr LetExpr(List defs, JCExpression expr); } @@ -3013,6 +3091,7 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public void visitErroneous(JCErroneous that) { visitTree(that); } public void visitModuleDef(JCModuleDecl that) { visitTree(that); } public void visitExports(JCExports that) { visitTree(that); } + public void visitOpens(JCOpens that) { visitTree(that); } public void visitProvides(JCProvides that) { visitTree(that); } public void visitRequires(JCRequires that) { visitTree(that); } public void visitUses(JCUses that) { visitTree(that); } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java index e4a98d366c2..23fdbbeb164 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/Pretty.java @@ -28,6 +28,7 @@ package com.sun.tools.javac.tree; import java.io.*; import com.sun.source.tree.MemberReferenceTree.ReferenceMode; +import com.sun.source.tree.ModuleTree.ModuleKind; import com.sun.tools.javac.code.*; import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.util.*; @@ -441,6 +442,10 @@ public class Pretty extends JCTree.Visitor { @Override public void visitModuleDef(JCModuleDecl tree) { try { + printAnnotations(tree.mods.annotations); + if (tree.getModuleType() == ModuleKind.OPEN) { + print("open "); + } print("module "); printExpr(tree.qualId); if (tree.directives == null) { @@ -457,7 +462,11 @@ public class Pretty extends JCTree.Visitor { @Override public void visitExports(JCExports tree) { try { - print("exports "); + if (tree.hasTag(EXPORTS)) { + print("exports "); + } else { + print("opens "); + } printExpr(tree.qualid); if (tree.moduleNames != null) { print(" to "); @@ -475,7 +484,7 @@ public class Pretty extends JCTree.Visitor { print("provides "); printExpr(tree.serviceName); print(" with "); - printExpr(tree.implName); + printExprs(tree.implNames); print(";"); } catch (IOException e) { throw new UncheckedIOException(e); @@ -486,8 +495,10 @@ public class Pretty extends JCTree.Visitor { public void visitRequires(JCRequires tree) { try { print("requires "); - if (tree.isPublic) - print("public "); + if (tree.isStaticPhase) + print("static "); + if (tree.isTransitive) + print("transitive "); printExpr(tree.moduleName); print(";"); } catch (IOException e) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java index 6fa5dc85b42..f1aa04fa4cf 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeCopier.java @@ -26,6 +26,7 @@ package com.sun.tools.javac.tree; import com.sun.source.tree.*; +import com.sun.source.tree.Tree.Kind; import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.util.DefinedBy; import com.sun.tools.javac.util.DefinedBy.Api; @@ -508,9 +509,10 @@ public class TreeCopier

implements TreeVisitor { @Override @DefinedBy(Api.COMPILER_TREE) public JCTree visitModule(ModuleTree node, P p) { JCModuleDecl t = (JCModuleDecl) node; + JCModifiers mods = copy(t.mods, p); JCExpression qualId = copy(t.qualId); List directives = copy(t.directives); - return M.at(t.pos).ModuleDef(qualId, directives); + return M.at(t.pos).ModuleDef(mods, t.getModuleType(), qualId, directives); } @Override @DefinedBy(Api.COMPILER_TREE) @@ -521,19 +523,27 @@ public class TreeCopier

implements TreeVisitor { return M.at(t.pos).Exports(qualId, moduleNames); } + @Override @DefinedBy(Api.COMPILER_TREE) + public JCOpens visitOpens(OpensTree node, P p) { + JCOpens t = (JCOpens) node; + JCExpression qualId = copy(t.qualid, p); + List moduleNames = copy(t.moduleNames, p); + return M.at(t.pos).Opens(qualId, moduleNames); + } + @Override @DefinedBy(Api.COMPILER_TREE) public JCProvides visitProvides(ProvidesTree node, P p) { JCProvides t = (JCProvides) node; JCExpression serviceName = copy(t.serviceName, p); - JCExpression implName = copy(t.implName, p); - return M.at(t.pos).Provides(serviceName, implName); + List implNames = copy(t.implNames, p); + return M.at(t.pos).Provides(serviceName, implNames); } @Override @DefinedBy(Api.COMPILER_TREE) public JCRequires visitRequires(RequiresTree node, P p) { JCRequires t = (JCRequires) node; JCExpression moduleName = copy(t.moduleName, p); - return M.at(t.pos).Requires(t.isPublic, moduleName); + return M.at(t.pos).Requires(t.isTransitive, t.isStaticPhase, moduleName); } @Override @DefinedBy(Api.COMPILER_TREE) diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java index 5210067035c..b0f430b0862 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java @@ -378,6 +378,11 @@ public class TreeInfo { return Position.NOPOS; switch(tree.getTag()) { + case MODULEDEF: { + JCModuleDecl md = (JCModuleDecl)tree; + return md.mods.annotations.isEmpty() ? md.pos : + md.mods.annotations.head.pos; + } case PACKAGEDEF: { JCPackageDecl pd = (JCPackageDecl)tree; return pd.annotations.isEmpty() ? pd.pos : @@ -769,8 +774,9 @@ public class TreeInfo { switch (node.getTag()) { case TOPLEVEL: JCCompilationUnit cut = (JCCompilationUnit) node; - if (isModuleInfo(cut) && cut.defs.nonEmpty() && cut.defs.head.hasTag(MODULEDEF)) - return symbolFor(cut.defs.head); + JCModuleDecl moduleDecl = cut.getModuleDecl(); + if (isModuleInfo(cut) && moduleDecl != null) + return symbolFor(moduleDecl); return cut.packge; case MODULEDEF: return ((JCModuleDecl) node).sym; @@ -1076,6 +1082,11 @@ public class TreeInfo { case TYPE_ANNOTATION: return Tree.Kind.TYPE_ANNOTATION; + case EXPORTS: + return Tree.Kind.EXPORTS; + case OPENS: + return Tree.Kind.OPENS; + default: return null; } @@ -1158,7 +1169,7 @@ public class TreeInfo { public static boolean isModuleInfo(JCCompilationUnit tree) { return tree.sourcefile.isNameCompatible("module-info", JavaFileObject.Kind.SOURCE) - && tree.defs.nonEmpty() && tree.defs.head.hasTag(MODULEDEF); + && tree.getModuleDecl() != null; } public static JCModuleDecl getModule(JCCompilationUnit t) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java index 59d39453a51..83e3d5fc0de 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeMaker.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,6 +27,8 @@ package com.sun.tools.javac.tree; import java.util.Iterator; +import com.sun.source.tree.ModuleTree.ModuleKind; +import com.sun.source.tree.Tree.Kind; import com.sun.tools.javac.code.*; import com.sun.tools.javac.code.Symbol.*; import com.sun.tools.javac.code.Type.*; @@ -538,8 +540,9 @@ public class TreeMaker implements JCTree.Factory { } @Override - public JCModuleDecl ModuleDef(JCExpression qualid, List directives) { - JCModuleDecl tree = new JCModuleDecl(qualid, directives); + public JCModuleDecl ModuleDef(JCModifiers mods, ModuleKind kind, + JCExpression qualid, List directives) { + JCModuleDecl tree = new JCModuleDecl(mods, kind, qualid, directives); tree.pos = pos; return tree; } @@ -552,15 +555,22 @@ public class TreeMaker implements JCTree.Factory { } @Override - public JCProvides Provides(JCExpression serviceName, JCExpression implName) { - JCProvides tree = new JCProvides(serviceName, implName); + public JCOpens Opens(JCExpression qualId, List moduleNames) { + JCOpens tree = new JCOpens(qualId, moduleNames); tree.pos = pos; return tree; } @Override - public JCRequires Requires(boolean isPublic, JCExpression qualId) { - JCRequires tree = new JCRequires(isPublic, qualId); + public JCProvides Provides(JCExpression serviceName, List implNames) { + JCProvides tree = new JCProvides(serviceName, implNames); + tree.pos = pos; + return tree; + } + + @Override + public JCRequires Requires(boolean isTransitive, boolean isStaticPhase, JCExpression qualId) { + JCRequires tree = new JCRequires(isTransitive, isStaticPhase, qualId); tree.pos = pos; return tree; } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java index 506925c186a..68407febcab 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeScanner.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -73,6 +73,7 @@ public class TreeScanner extends Visitor { @Override public void visitModuleDef(JCModuleDecl tree) { + scan(tree.mods); scan(tree.qualId); scan(tree.directives); } @@ -83,10 +84,16 @@ public class TreeScanner extends Visitor { scan(tree.moduleNames); } + @Override + public void visitOpens(JCOpens tree) { + scan(tree.qualid); + scan(tree.moduleNames); + } + @Override public void visitProvides(JCProvides tree) { scan(tree.serviceName); - scan(tree.implName); + scan(tree.implNames); } @Override diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java index dd0315e837c..906c0ccf85b 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/ModuleHelper.java @@ -51,4 +51,5 @@ public class ModuleHelper { from.addExports(pack, to); } } -} \ No newline at end of file +} + diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java index 5d671decd07..3ac63d5953e 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java @@ -64,11 +64,14 @@ public class Names { public final Name _super; public final Name _this; public final Name exports; + public final Name opens; public final Name module; public final Name provides; public final Name requires; public final Name to; + public final Name transitive; public final Name uses; + public final Name open; public final Name with; // field and method names @@ -101,6 +104,7 @@ public class Names { public final Name length; public final Name next; public final Name ordinal; + public final Name provider; public final Name serialVersionUID; public final Name toString; public final Name value; @@ -146,6 +150,7 @@ public class Names { public final Name LocalVariableTypeTable; public final Name MethodParameters; public final Name Module; + public final Name ModuleVersion; public final Name RuntimeInvisibleAnnotations; public final Name RuntimeInvisibleParameterAnnotations; public final Name RuntimeInvisibleTypeAnnotations; @@ -160,7 +165,6 @@ public class Names { public final Name Synthetic; public final Name Value; public final Name Varargs; - public final Name Version; // members of java.lang.annotation.ElementType public final Name ANNOTATION_TYPE; @@ -168,6 +172,7 @@ public class Names { public final Name FIELD; public final Name LOCAL_VARIABLE; public final Name METHOD; + public final Name MODULE; public final Name PACKAGE; public final Name PARAMETER; public final Name TYPE; @@ -220,11 +225,14 @@ public class Names { _super = fromString("super"); _this = fromString("this"); exports = fromString("exports"); + opens = fromString("opens"); module = fromString("module"); provides = fromString("provides"); requires = fromString("requires"); to = fromString("to"); + transitive = fromString("transitive"); uses = fromString("uses"); + open = fromString("open"); with = fromString("with"); // field and method names @@ -257,6 +265,7 @@ public class Names { length = fromString("length"); next = fromString("next"); ordinal = fromString("ordinal"); + provider = fromString("provider"); serialVersionUID = fromString("serialVersionUID"); toString = fromString("toString"); value = fromString("value"); @@ -303,6 +312,7 @@ public class Names { LocalVariableTypeTable = fromString("LocalVariableTypeTable"); MethodParameters = fromString("MethodParameters"); Module = fromString("Module"); + ModuleVersion = fromString("ModuleVersion"); RuntimeInvisibleAnnotations = fromString("RuntimeInvisibleAnnotations"); RuntimeInvisibleParameterAnnotations = fromString("RuntimeInvisibleParameterAnnotations"); RuntimeInvisibleTypeAnnotations = fromString("RuntimeInvisibleTypeAnnotations"); @@ -317,7 +327,6 @@ public class Names { Synthetic = fromString("Synthetic"); Value = fromString("Value"); Varargs = fromString("Varargs"); - Version = fromString("Version"); // members of java.lang.annotation.ElementType ANNOTATION_TYPE = fromString("ANNOTATION_TYPE"); @@ -325,6 +334,7 @@ public class Names { FIELD = fromString("FIELD"); LOCAL_VARIABLE = fromString("LOCAL_VARIABLE"); METHOD = fromString("METHOD"); + MODULE = fromString("MODULE"); PACKAGE = fromString("PACKAGE"); PARAMETER = fromString("PARAMETER"); TYPE = fromString("TYPE"); diff --git a/langtools/src/jdk.compiler/share/classes/module-info.java b/langtools/src/jdk.compiler/share/classes/module-info.java index 0b66b4d2b1e..3f7051be71b 100644 --- a/langtools/src/jdk.compiler/share/classes/module-info.java +++ b/langtools/src/jdk.compiler/share/classes/module-info.java @@ -28,7 +28,7 @@ * and its command line equivalent, javac, as well as javah. */ module jdk.compiler { - requires public java.compiler; + requires transitive java.compiler; exports com.sun.source.doctree; exports com.sun.source.tree; diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java index 43bb4ecbebb..279f7e81e2c 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/doclet/package-info.java @@ -79,7 +79,7 @@ * module declaration, to create a module set to considered for documentation * as follows: *

    - *
  • public -- follows and expands all "requires public" edges in the module graph + *
  • transitive -- follows and expands all "requires transitive" edges in the module graph *
  • all -- follows and expands all "requires" edges in the module graph. * By default, only the specified modules will be considered, without expansion * of the module dependencies. diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java index ef7681cf115..905b0806ba3 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/DeprecatedListWriter.java @@ -28,11 +28,18 @@ package jdk.javadoc.internal.doclets.formats.html; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; +import java.util.SortedSet; +import javax.lang.model.element.Element; +import javax.lang.model.element.ModuleElement; +import javax.lang.model.element.PackageElement; + +import com.sun.source.doctree.DocTree; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag; import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree; +import jdk.javadoc.internal.doclets.formats.html.markup.StringContent; import jdk.javadoc.internal.doclets.toolkit.Content; import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder; import jdk.javadoc.internal.doclets.toolkit.util.DeprecatedAPIListBuilder.DeprElementKind; @@ -57,6 +64,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getAnchorName(DeprElementKind kind) { switch (kind) { + case MODULE: + return "module"; case PACKAGE: return "package"; case INTERFACE: @@ -88,6 +97,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getHeadingKey(DeprElementKind kind) { switch (kind) { + case MODULE: + return "doclet.Deprecated_Modules"; case PACKAGE: return "doclet.Deprecated_Packages"; case INTERFACE: @@ -119,6 +130,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getSummaryKey(DeprElementKind kind) { switch (kind) { + case MODULE: + return "doclet.deprecated_modules"; case PACKAGE: return "doclet.deprecated_packages"; case INTERFACE: @@ -150,6 +163,8 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { private String getHeaderKey(DeprElementKind kind) { switch (kind) { + case MODULE: + return "doclet.Module"; case PACKAGE: return "doclet.Package"; case INTERFACE: @@ -197,6 +212,7 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { writerMap = new EnumMap<>(DeprElementKind.class); for (DeprElementKind kind : DeprElementKind.values()) { switch (kind) { + case MODULE: case PACKAGE: case INTERFACE: case CLASS: @@ -268,12 +284,16 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { List memberTableHeader = new ArrayList<>(); memberTableHeader.add(resources.getText(getHeaderKey(kind))); memberTableHeader.add(resources.getText("doclet.Description")); - if (kind == DeprElementKind.PACKAGE) + if (kind == DeprElementKind.MODULE) { + addModuleDeprecatedAPI(deprapi.getSet(kind), + getHeadingKey(kind), memberTableSummary, memberTableHeader, div); + } else if (kind == DeprElementKind.PACKAGE) { addPackageDeprecatedAPI(deprapi.getSet(kind), getHeadingKey(kind), memberTableSummary, memberTableHeader, div); - else + } else { writerMap.get(kind).addDeprecatedAPI(deprapi.getSet(kind), getHeadingKey(kind), memberTableSummary, memberTableHeader, div); + } } } if (configuration.allowTag(HtmlTag.MAIN)) { @@ -373,4 +393,88 @@ public class DeprecatedListWriter extends SubWriterHolderWriter { Content li = HtmlTree.LI(HtmlStyle.navBarCell1Rev, contents.deprecatedLabel); return li; } + + /** + * Add module deprecation information to the documentation tree + * + * @param deprMdles list of deprecated modules + * @param headingKey the caption for the deprecated module table + * @param tableSummary the summary for the deprecated module table + * @param tableHeader table headers for the deprecated module table + * @param contentTree the content tree to which the deprecated module table will be added + */ + protected void addModuleDeprecatedAPI(SortedSet deprMdles, String headingKey, + String tableSummary, List tableHeader, Content contentTree) { + if (deprMdles.size() > 0) { + Content caption = getTableCaption(configuration.getContent(headingKey)); + Content table = (configuration.isOutputHtml5()) + ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption) + : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption); + table.addContent(getSummaryTableHeader(tableHeader, "col")); + Content tbody = new HtmlTree(HtmlTag.TBODY); + boolean altColor = true; + for (Element e : deprMdles) { + ModuleElement mdle = (ModuleElement) e; + HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, + getModuleLink(mdle, new StringContent(mdle.getQualifiedName()))); + HtmlTree tr = HtmlTree.TR(thRow); + HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); + tdDesc.addStyle(HtmlStyle.colLast); + List tags = utils.getDeprecatedTrees(mdle); + if (!tags.isEmpty()) { + addInlineDeprecatedComment(mdle, tags.get(0), tdDesc); + } + tr.addContent(tdDesc); + tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); + altColor = !altColor; + tbody.addContent(tr); + } + table.addContent(tbody); + Content li = HtmlTree.LI(HtmlStyle.blockList, table); + Content ul = HtmlTree.UL(HtmlStyle.blockList, li); + contentTree.addContent(ul); + } + } + + /** + * Add package deprecation information to the documentation tree + * + * @param deprPkgs list of deprecated packages + * @param headingKey the caption for the deprecated package table + * @param tableSummary the summary for the deprecated package table + * @param tableHeader table headers for the deprecated package table + * @param contentTree the content tree to which the deprecated package table will be added + */ + protected void addPackageDeprecatedAPI(SortedSet deprPkgs, String headingKey, + String tableSummary, List tableHeader, Content contentTree) { + if (deprPkgs.size() > 0) { + Content caption = getTableCaption(configuration.getContent(headingKey)); + Content table = (configuration.isOutputHtml5()) + ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption) + : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption); + table.addContent(getSummaryTableHeader(tableHeader, "col")); + Content tbody = new HtmlTree(HtmlTag.TBODY); + boolean altColor = true; + for (Element e : deprPkgs) { + PackageElement pkg = (PackageElement) e; + HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, + getPackageLink(pkg, getPackageName(pkg))); + HtmlTree tr = HtmlTree.TR(thRow); + HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); + tdDesc.addStyle(HtmlStyle.colLast); + List tags = utils.getDeprecatedTrees(pkg); + if (!tags.isEmpty()) { + addInlineDeprecatedComment(pkg, tags.get(0), tdDesc); + } + tr.addContent(tdDesc); + tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); + altColor = !altColor; + tbody.addContent(tr); + } + table.addContent(tbody); + Content li = HtmlTree.LI(HtmlStyle.blockList, table); + Content ul = HtmlTree.UL(HtmlStyle.blockList, li); + contentTree.addContent(ul); + } + } } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java index 3467dd452e6..c4b2b2b933a 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDocletWriter.java @@ -1045,48 +1045,6 @@ public class HtmlDocletWriter extends HtmlDocWriter { return new StringContent(packageName); } - /** - * Add package deprecation information to the documentation tree - * - * @param deprPkgs list of deprecated packages - * @param headingKey the caption for the deprecated package table - * @param tableSummary the summary for the deprecated package table - * @param tableHeader table headers for the deprecated package table - * @param contentTree the content tree to which the deprecated package table will be added - */ - protected void addPackageDeprecatedAPI(SortedSet deprPkgs, String headingKey, - String tableSummary, List tableHeader, Content contentTree) { - if (deprPkgs.size() > 0) { - Content caption = getTableCaption(configuration.getContent(headingKey)); - Content table = (configuration.isOutputHtml5()) - ? HtmlTree.TABLE(HtmlStyle.deprecatedSummary, caption) - : HtmlTree.TABLE(HtmlStyle.deprecatedSummary, tableSummary, caption); - table.addContent(getSummaryTableHeader(tableHeader, "col")); - Content tbody = new HtmlTree(HtmlTag.TBODY); - boolean altColor = true; - for (Element e : deprPkgs) { - PackageElement pkg = (PackageElement) e; - HtmlTree thRow = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, - getPackageLink(pkg, getPackageName(pkg))); - HtmlTree tr = HtmlTree.TR(thRow); - HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); - tdDesc.addStyle(HtmlStyle.colLast); - List tags = utils.getDeprecatedTrees(pkg); - if (!tags.isEmpty()) { - addInlineDeprecatedComment(pkg, tags.get(0), tdDesc); - } - tr.addContent(tdDesc); - tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); - altColor = !altColor; - tbody.addContent(tr); - } - table.addContent(tbody); - Content li = HtmlTree.LI(HtmlStyle.blockList, table); - Content ul = HtmlTree.UL(HtmlStyle.blockList, li); - contentTree.addContent(ul); - } - } - /** * Return the path to the class page for a typeElement. * diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java index bb1e9038e26..702d20c8402 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleWriterImpl.java @@ -114,6 +114,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW * * @param heading the heading for the section */ + @Override public Content getModuleHeader(String heading) { HtmlTree bodyTree = getBody(true, getWindowTitle(mdle.getQualifiedName().toString())); HtmlTree htmlTree = (configuration.allowTag(HtmlTag.HEADER)) @@ -126,6 +127,9 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW } HtmlTree div = new HtmlTree(HtmlTag.DIV); div.addStyle(HtmlStyle.header); + Content annotationContent = new HtmlTree(HtmlTag.P); + addAnnotationInfo(mdle, annotationContent); + div.addContent(annotationContent); Content tHeading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, true, HtmlStyle.title, contents.moduleLabel); tHeading.addContent(Contents.SPACE); @@ -143,6 +147,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * Get the content header. */ + @Override public Content getContentHeader() { HtmlTree div = new HtmlTree(HtmlTag.DIV); div.addStyle(HtmlStyle.contentContainer); @@ -152,6 +157,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * Get the summary section header. */ + @Override public Content getSummaryHeader() { HtmlTree li = new HtmlTree(HtmlTag.LI); li.addStyle(HtmlStyle.blockList); @@ -163,6 +169,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW * * @param summaryContentTree the content tree to be added to the summary tree. */ + @Override public Content getSummaryTree(Content summaryContentTree) { HtmlTree ul = HtmlTree.UL(HtmlStyle.blockList, summaryContentTree); return ul; @@ -225,7 +232,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW * Add the list of directives for the module. * * @param dirs the list of module directives - * @params tbody the content tree to which the list is added + * @param tbody the content tree to which the list is added */ public void addList(List dirs, Content tbody) { boolean altColor = true; @@ -238,6 +245,9 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW case EXPORTS: addExportedPackagesList((ModuleElement.ExportsDirective) direct, tbody, altColor); break; + case OPENS: + //XXX ignore for now + break; case USES: addUsesList((ModuleElement.UsesDirective) direct, tbody, altColor); break; @@ -254,6 +264,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} */ + @Override public void addModulesSummary(Content summaryContentTree) { List dirs = directiveMap.get(DirectiveKind.REQUIRES); if (dirs != null && !dirs.isEmpty()) { @@ -307,6 +318,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} */ + @Override public void addPackagesSummary(Content summaryContentTree) { List dirs = directiveMap.get(DirectiveKind.EXPORTS); if (dirs != null && !dirs.isEmpty()) { @@ -376,6 +388,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} */ + @Override public void addServicesSummary(Content summaryContentTree) { List usesDirs = directiveMap.get(DirectiveKind.USES); List providesDirs = directiveMap.get(DirectiveKind.PROVIDES); @@ -459,33 +472,60 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW * @param altColor true if altColor style should be used or false if rowColor style should be used */ public void addProvidesList(ModuleElement.ProvidesDirective direct, Content tbody, boolean altColor) { - TypeElement impl = direct.getImplementation(); - TypeElement srv = direct.getService(); - Content implLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)); - Content srvLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, srv)); - HtmlTree thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, srvLinkContent); - thType.addContent(new HtmlTree(HtmlTag.BR)); - thType.addContent("("); - HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation); - thType.addContent(implSpan); - thType.addContent(Contents.SPACE); - thType.addContent(implLinkContent); - thType.addContent(")"); - HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); - tdDesc.addStyle(HtmlStyle.colLast); - addSummaryComment(srv, tdDesc); - HtmlTree tr = HtmlTree.TR(thType); - tr.addContent(tdDesc); - tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); - tbody.addContent(tr); + List impls = direct.getImplementations(); + for (TypeElement impl : impls) { + TypeElement srv = direct.getService(); + Content implLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, impl)); + Content srvLinkContent = getLink(new LinkInfoImpl(configuration, LinkInfoImpl.Kind.PACKAGE, srv)); + HtmlTree thType = HtmlTree.TH_ROW_SCOPE(HtmlStyle.colFirst, srvLinkContent); + thType.addContent(new HtmlTree(HtmlTag.BR)); + thType.addContent("("); + HtmlTree implSpan = HtmlTree.SPAN(HtmlStyle.implementationLabel, contents.implementation); + thType.addContent(implSpan); + thType.addContent(Contents.SPACE); + thType.addContent(implLinkContent); + thType.addContent(")"); + HtmlTree tdDesc = new HtmlTree(HtmlTag.TD); + tdDesc.addStyle(HtmlStyle.colLast); + addSummaryComment(srv, tdDesc); + HtmlTree tr = HtmlTree.TR(thType); + tr.addContent(tdDesc); + tr.addStyle(altColor ? HtmlStyle.altColor : HtmlStyle.rowColor); + tbody.addContent(tr); + } + } + + /** + * Add the module deprecation information to the documentation tree. + * + * @param div the content tree to which the deprecation information will be added + */ + public void addDeprecationInfo(Content div) { + List deprs = utils.getBlockTags(mdle, DocTree.Kind.DEPRECATED); + if (utils.isDeprecated(mdle)) { + CommentHelper ch = utils.getCommentHelper(mdle); + HtmlTree deprDiv = new HtmlTree(HtmlTag.DIV); + deprDiv.addStyle(HtmlStyle.deprecatedContent); + Content deprPhrase = HtmlTree.SPAN(HtmlStyle.deprecatedLabel, contents.deprecatedPhrase); + deprDiv.addContent(deprPhrase); + if (!deprs.isEmpty()) { + List commentTags = ch.getDescription(configuration, deprs.get(0)); + if (!commentTags.isEmpty()) { + addInlineDeprecatedComment(mdle, deprs.get(0), deprDiv); + } + } + div.addContent(deprDiv); + } } /** * {@inheritDoc} */ + @Override public void addModuleDescription(Content moduleContentTree) { if (!utils.getFullBody(mdle).isEmpty()) { Content tree = configuration.allowTag(HtmlTag.SECTION) ? HtmlTree.SECTION() : moduleContentTree; + addDeprecationInfo(tree); tree.addContent(HtmlConstants.START_OF_MODULE_DESCRIPTION); tree.addContent(getMarkerAnchor(SectionName.MODULE_DESCRIPTION)); addInlineComment(mdle, tree); @@ -498,6 +538,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} */ + @Override public void addModuleTags(Content moduleContentTree) { Content tree = (configuration.allowTag(HtmlTag.SECTION)) ? HtmlTree.SECTION() @@ -513,6 +554,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW * * @param subDiv the content tree to which the summary detail links will be added */ + @Override protected void addSummaryDetailLinks(Content subDiv) { Content div = HtmlTree.DIV(getNavSummaryLinks()); subDiv.addContent(div); @@ -560,6 +602,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} */ + @Override public void addModuleContent(Content contentTree, Content moduleContentTree) { if (configuration.allowTag(HtmlTag.MAIN)) { mainTree.addContent(moduleContentTree); @@ -572,6 +615,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW /** * {@inheritDoc} */ + @Override public void addModuleFooter(Content contentTree) { Content htmlTree = (configuration.allowTag(HtmlTag.FOOTER)) ? HtmlTree.FOOTER() @@ -633,6 +677,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW * * @return a content tree for the previous link */ + @Override public Content getNavLinkPrevious() { Content li; if (prevModule == null) { @@ -649,6 +694,7 @@ public class ModuleWriterImpl extends HtmlDocletWriter implements ModuleSummaryW * * @return a content tree for the next link */ + @Override public Content getNavLinkNext() { Content li; if (nextModule == null) { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java index 35b8eedccc7..a4ff308eebd 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties index a69ac46a45f..00239a4fdd9 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard.properties @@ -71,6 +71,7 @@ doclet.see.class_or_package_not_found=Tag {0}: reference not found: {1} doclet.see.class_or_package_not_accessible=Tag {0}: reference not accessible: {1} doclet.tag.invalid_usage=invalid usage of tag {0} doclet.Deprecated_API=Deprecated API +doclet.Deprecated_Modules=Deprecated Modules doclet.Deprecated_Packages=Deprecated Packages doclet.Deprecated_Classes=Deprecated Classes doclet.Deprecated_Enums=Deprecated Enums @@ -83,6 +84,7 @@ doclet.Deprecated_Constructors=Deprecated Constructors doclet.Deprecated_Methods=Deprecated Methods doclet.Deprecated_Enum_Constants=Deprecated Enum Constants doclet.Deprecated_Annotation_Type_Members=Deprecated Annotation Type Elements +doclet.deprecated_modules=deprecated modules doclet.deprecated_packages=deprecated packages doclet.deprecated_classes=deprecated classes doclet.deprecated_enums=deprecated enums diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties index bae63666b76..0d0432aa7f5 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/resources/standard_ja.properties @@ -99,7 +99,7 @@ doclet.Subclasses=\u76F4\u7CFB\u306E\u65E2\u77E5\u306E\u30B5\u30D6\u30AF\u30E9\u doclet.Subinterfaces=\u65E2\u77E5\u306E\u30B5\u30D6\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306E\u30EA\u30B9\u30C8: doclet.Implementing_Classes=\u65E2\u77E5\u306E\u5B9F\u88C5\u30AF\u30E9\u30B9\u306E\u30EA\u30B9\u30C8: doclet.Functional_Interface=\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9 -doclet.Functional_Interface_Message=\u3053\u308C\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306A\u306E\u3067\u3001\u30E9\u30E0\u30C0\u5F0F\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u5272\u5F53\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 +doclet.Functional_Interface_Message=\u3053\u308C\u306F\u6A5F\u80FD\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9\u306A\u306E\u3067\u3001\u30E9\u30E0\u30C0\u5F0F\u307E\u305F\u306F\u30E1\u30BD\u30C3\u30C9\u53C2\u7167\u306E\u5272\u5F53\u3066\u30BF\u30FC\u30B2\u30C3\u30C8\u3068\u3057\u3066\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002 doclet.also=\u540C\u69D8\u306B doclet.Frames=\u30D5\u30EC\u30FC\u30E0 doclet.No_Frames=\u30D5\u30EC\u30FC\u30E0\u306A\u3057 diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java index 8dc83827f8a..5c423b3f771 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DeprecatedAPIListBuilder.java @@ -28,6 +28,7 @@ package jdk.javadoc.internal.doclets.toolkit.util; import java.util.*; import javax.lang.model.element.Element; +import javax.lang.model.element.ModuleElement; import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; @@ -51,6 +52,7 @@ public class DeprecatedAPIListBuilder { private final Configuration configuration; private final Utils utils; public static enum DeprElementKind { + MODULE, PACKAGE, INTERFACE, CLASS, @@ -82,12 +84,19 @@ public class DeprecatedAPIListBuilder { /** * Build the sorted list of all the deprecated APIs in this run. - * Build separate lists for deprecated packages, classes, constructors, + * Build separate lists for deprecated modules, packages, classes, constructors, * methods and fields. * * @param configuration the current configuration of the doclet. */ private void buildDeprecatedAPIInfo() { + SortedSet modules = configuration.modules; + SortedSet mset = deprecatedMap.get(DeprElementKind.MODULE); + for (Element me : modules) { + if (utils.isDeprecated(me)) { + mset.add(me); + } + } SortedSet packages = configuration.packages; SortedSet pset = deprecatedMap.get(DeprElementKind.PACKAGE); for (Element pe : packages) { @@ -95,7 +104,6 @@ public class DeprecatedAPIListBuilder { pset.add(pe); } } - deprecatedMap.put(DeprElementKind.PACKAGE, pset); for (Element e : configuration.docEnv.getIncludedTypeElements()) { TypeElement te = (TypeElement)e; SortedSet eset; diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java index d678e9a4490..c538d2259a1 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ElementsTable.java @@ -516,10 +516,10 @@ public class ElementsTable { private Set getModuleRequires(ModuleElement mdle, boolean isPublic) { Set result = new HashSet<>(); for (RequiresDirective rd : ElementFilter.requiresIn(mdle.getDirectives())) { - if (isPublic && rd.isPublic()) { + if (isPublic && rd.isTransitive()) { result.add(rd.getDependency()); } - if (!isPublic && !rd.isPublic()) { + if (!isPublic && !rd.isTransitive()) { result.add(rd.getDependency()); } } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java index 7f4ef90868b..18623cba1b3 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java @@ -479,7 +479,7 @@ public enum ToolOption { void setExpandRequires(ToolOption opt, String arg) throws OptionException { switch (arg) { - case "public": + case "transitive": jdtoolOpts.put(opt, AccessKind.PUBLIC); break; case "all": diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties index 89cfe162593..a720cf37fff 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/resources/javadoc.properties @@ -81,8 +81,8 @@ main.opt.expand.requires.arg=\ main.opt.expand.requires.desc=\ Instructs the tool to expand the set of modules to be\n\ documented. By default, only the modules given explicitly on\n\ - the command line will be documented. A value of "public" will\n\ - additionally include all "requires public" dependencies of\n\ + the command line will be documented. A value of "transitive" will\n\ + additionally include all "requires transitive" dependencies of\n\ those modules. A value of "all" will include all dependencies\n\ of those modules. diff --git a/langtools/src/jdk.javadoc/share/classes/module-info.java b/langtools/src/jdk.javadoc/share/classes/module-info.java index 89c5d728fdd..cbac558bf90 100644 --- a/langtools/src/jdk.javadoc/share/classes/module-info.java +++ b/langtools/src/jdk.javadoc/share/classes/module-info.java @@ -28,8 +28,8 @@ * and its command line equivalent, javadoc. */ module jdk.javadoc { - requires public java.compiler; - requires public jdk.compiler; + requires transitive java.compiler; + requires transitive jdk.compiler; requires java.xml; exports com.sun.javadoc; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java index fed0bed45fa..3cb8c1f8f9c 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Attribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -42,20 +42,22 @@ public abstract class Attribute { public static final String BootstrapMethods = "BootstrapMethods"; public static final String CharacterRangeTable = "CharacterRangeTable"; public static final String Code = "Code"; - public static final String ConcealedPackages = "ConcealedPackages"; public static final String ConstantValue = "ConstantValue"; public static final String CompilationID = "CompilationID"; public static final String Deprecated = "Deprecated"; public static final String EnclosingMethod = "EnclosingMethod"; public static final String Exceptions = "Exceptions"; - public static final String Hashes = "Hashes"; public static final String InnerClasses = "InnerClasses"; public static final String LineNumberTable = "LineNumberTable"; public static final String LocalVariableTable = "LocalVariableTable"; public static final String LocalVariableTypeTable = "LocalVariableTypeTable"; - public static final String MainClass = "MainClass"; public static final String MethodParameters = "MethodParameters"; public static final String Module = "Module"; + public static final String ModuleHashes = "ModuleHashes"; + public static final String ModuleMainClass = "ModuleMainClass"; + public static final String ModulePackages = "ModulePackages"; + public static final String ModuleTarget = "ModuleTarget"; + public static final String ModuleVersion = "ModuleVersion"; public static final String RuntimeVisibleAnnotations = "RuntimeVisibleAnnotations"; public static final String RuntimeInvisibleAnnotations = "RuntimeInvisibleAnnotations"; public static final String RuntimeVisibleParameterAnnotations = "RuntimeVisibleParameterAnnotations"; @@ -69,8 +71,6 @@ public abstract class Attribute { public static final String StackMap = "StackMap"; public static final String StackMapTable = "StackMapTable"; public static final String Synthetic = "Synthetic"; - public static final String TargetPlatform = "TargetPlatform"; - public static final String Version = "Version"; public static class Factory { public Factory() { @@ -115,19 +115,21 @@ public abstract class Attribute { standardAttributes.put(CharacterRangeTable, CharacterRangeTable_attribute.class); standardAttributes.put(Code, Code_attribute.class); standardAttributes.put(CompilationID, CompilationID_attribute.class); - standardAttributes.put(ConcealedPackages, ConcealedPackages_attribute.class); standardAttributes.put(ConstantValue, ConstantValue_attribute.class); standardAttributes.put(Deprecated, Deprecated_attribute.class); standardAttributes.put(EnclosingMethod, EnclosingMethod_attribute.class); standardAttributes.put(Exceptions, Exceptions_attribute.class); - standardAttributes.put(Hashes, Hashes_attribute.class); standardAttributes.put(InnerClasses, InnerClasses_attribute.class); standardAttributes.put(LineNumberTable, LineNumberTable_attribute.class); standardAttributes.put(LocalVariableTable, LocalVariableTable_attribute.class); standardAttributes.put(LocalVariableTypeTable, LocalVariableTypeTable_attribute.class); - standardAttributes.put(MainClass, MainClass_attribute.class); standardAttributes.put(MethodParameters, MethodParameters_attribute.class); standardAttributes.put(Module, Module_attribute.class); + standardAttributes.put(ModuleHashes, ModuleHashes_attribute.class); + standardAttributes.put(ModuleMainClass, ModuleMainClass_attribute.class); + standardAttributes.put(ModulePackages, ModulePackages_attribute.class); + standardAttributes.put(ModuleTarget, ModuleTarget_attribute.class); + standardAttributes.put(ModuleVersion, ModuleVersion_attribute.class); standardAttributes.put(RuntimeInvisibleAnnotations, RuntimeInvisibleAnnotations_attribute.class); standardAttributes.put(RuntimeInvisibleParameterAnnotations, RuntimeInvisibleParameterAnnotations_attribute.class); standardAttributes.put(RuntimeVisibleAnnotations, RuntimeVisibleAnnotations_attribute.class); @@ -141,8 +143,6 @@ public abstract class Attribute { standardAttributes.put(StackMap, StackMap_attribute.class); standardAttributes.put(StackMapTable, StackMapTable_attribute.class); standardAttributes.put(Synthetic, Synthetic_attribute.class); - standardAttributes.put(TargetPlatform, TargetPlatform_attribute.class); - standardAttributes.put(Version, Version_attribute.class); } private Map> standardAttributes; @@ -178,19 +178,21 @@ public abstract class Attribute { R visitCharacterRangeTable(CharacterRangeTable_attribute attr, P p); R visitCode(Code_attribute attr, P p); R visitCompilationID(CompilationID_attribute attr, P p); - R visitConcealedPackages(ConcealedPackages_attribute attr, P p); R visitConstantValue(ConstantValue_attribute attr, P p); R visitDeprecated(Deprecated_attribute attr, P p); R visitEnclosingMethod(EnclosingMethod_attribute attr, P p); R visitExceptions(Exceptions_attribute attr, P p); - R visitHashes(Hashes_attribute attr, P p); R visitInnerClasses(InnerClasses_attribute attr, P p); R visitLineNumberTable(LineNumberTable_attribute attr, P p); R visitLocalVariableTable(LocalVariableTable_attribute attr, P p); R visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, P p); - R visitMainClass(MainClass_attribute attr, P p); R visitMethodParameters(MethodParameters_attribute attr, P p); R visitModule(Module_attribute attr, P p); + R visitModuleHashes(ModuleHashes_attribute attr, P p); + R visitModuleMainClass(ModuleMainClass_attribute attr, P p); + R visitModulePackages(ModulePackages_attribute attr, P p); + R visitModuleTarget(ModuleTarget_attribute attr, P p); + R visitModuleVersion(ModuleVersion_attribute attr, P p); R visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, P p); R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p); R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p); @@ -204,7 +206,5 @@ public abstract class Attribute { R visitStackMap(StackMap_attribute attr, P p); R visitStackMapTable(StackMapTable_attribute attr, P p); R visitSynthetic(Synthetic_attribute attr, P p); - R visitTargetPlatform(TargetPlatform_attribute attr, P p); - R visitVersion(Version_attribute attr, P p); } } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java index b4fad8ac72d..c3b8d811276 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ClassWriter.java @@ -55,6 +55,9 @@ public class ClassWriter { /** * Write a ClassFile data structure to a file. + * @param classFile the classfile object to be written + * @param f the file + * @throws IOException if an error occurs while writing the file */ public void write(ClassFile classFile, File f) throws IOException { try (FileOutputStream f_out = new FileOutputStream(f)) { @@ -64,6 +67,9 @@ public class ClassWriter { /** * Write a ClassFile data structure to a stream. + * @param classFile the classfile object to be written + * @param s the stream + * @throws IOException if an error occurs while writing the file */ public void write(ClassFile classFile, OutputStream s) throws IOException { this.classFile = classFile; @@ -419,7 +425,7 @@ public class ClassWriter { } @Override - public Void visitConcealedPackages(ConcealedPackages_attribute attr, ClassOutputStream out) { + public Void visitModulePackages(ModulePackages_attribute attr, ClassOutputStream out) { out.writeShort(attr.packages_count); for (int i: attr.packages_index) out.writeShort(i); @@ -461,12 +467,15 @@ public class ClassWriter { } @Override - public Void visitHashes(Hashes_attribute attr, ClassOutputStream out) { + public Void visitModuleHashes(ModuleHashes_attribute attr, ClassOutputStream out) { out.writeShort(attr.algorithm_index); out.writeShort(attr.hashes_table.length); - for (Hashes_attribute.Entry e: attr.hashes_table) { - out.writeShort(e.requires_index); - out.writeShort(e.hash_index); + for (ModuleHashes_attribute.Entry e: attr.hashes_table) { + out.writeShort(e.module_name_index); + out.writeShort(e.hash.length); + for (byte b: e.hash) { + out.writeByte(b); + } } return null; } @@ -534,33 +543,54 @@ public class ClassWriter { } @Override - public Void visitMainClass(MainClass_attribute attr, ClassOutputStream out) { + public Void visitModuleMainClass(ModuleMainClass_attribute attr, ClassOutputStream out) { out.writeShort(attr.main_class_index); return null; } @Override public Void visitModule(Module_attribute attr, ClassOutputStream out) { + out.writeShort(attr.module_name); + out.writeShort(attr.module_flags); + out.writeShort(attr.requires.length); for (Module_attribute.RequiresEntry e: attr.requires) { out.writeShort(e.requires_index); out.writeShort(e.requires_flags); } + out.writeShort(attr.exports.length); for (Module_attribute.ExportsEntry e: attr.exports) { out.writeShort(e.exports_index); + out.writeShort(e.exports_flags); out.writeShort(e.exports_to_index.length); for (int index: e.exports_to_index) out.writeShort(index); } + + out.writeShort(attr.opens.length); + for (Module_attribute.OpensEntry e: attr.opens) { + out.writeShort(e.opens_index); + out.writeShort(e.opens_flags); + out.writeShort(e.opens_to_index.length); + for (int index: e.opens_to_index) + out.writeShort(index); + } + out.writeShort(attr.uses_index.length); - for (int index: attr.uses_index) + for (int index: attr.uses_index) { out.writeShort(index); + } + out.writeShort(attr.provides.length); for (Module_attribute.ProvidesEntry e: attr.provides) { out.writeShort(e.provides_index); - out.writeShort(e.with_index); + out.writeShort(e.with_count); + for (int with : e.with_index) { + out.writeShort(with); + } } + return null; } @@ -656,7 +686,7 @@ public class ClassWriter { } @Override - public Void visitTargetPlatform(TargetPlatform_attribute attr, ClassOutputStream out) { + public Void visitModuleTarget(ModuleTarget_attribute attr, ClassOutputStream out) { out.writeShort(attr.os_name_index); out.writeShort(attr.os_arch_index); out.writeShort(attr.os_version_index); @@ -668,7 +698,7 @@ public class ClassWriter { } @Override - public Void visitVersion(Version_attribute attr, ClassOutputStream out) { + public Void visitModuleVersion(ModuleVersion_attribute attr, ClassOutputStream out) { out.writeShort(attr.version_index); return null; } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Hashes_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java similarity index 67% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Hashes_attribute.java rename to langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java index a248ebce622..c227f3df8b7 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Hashes_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleHashes_attribute.java @@ -35,8 +35,8 @@ import java.io.IOException; * This code and its internal interfaces are subject to change or * deletion without notice. */ -public class Hashes_attribute extends Attribute { - Hashes_attribute(ClassReader cr, int name_index, int length) throws IOException { +public class ModuleHashes_attribute extends Attribute { + ModuleHashes_attribute(ClassReader cr, int name_index, int length) throws IOException { super(name_index, length); algorithm_index = cr.readUnsignedShort(); hashes_table_length = cr.readUnsignedShort(); @@ -45,13 +45,13 @@ public class Hashes_attribute extends Attribute { hashes_table[i] = new Entry(cr); } - public Hashes_attribute(ConstantPool constant_pool, int algorithm_index, Entry[] hashes_table) + public ModuleHashes_attribute(ConstantPool constant_pool, int algorithm_index, Entry[] hashes_table) throws ConstantPoolException { - this(constant_pool.getUTF8Index(Attribute.Hashes), algorithm_index, hashes_table); + this(constant_pool.getUTF8Index(Attribute.ModuleHashes), algorithm_index, hashes_table); } - public Hashes_attribute(int name_index, int algorithm_index, Entry[] hashes_table) { - super(name_index, 4 + hashes_table.length * Entry.length()); + public ModuleHashes_attribute(int name_index, int algorithm_index, Entry[] hashes_table) { + super(name_index, 2 + 2 + length(hashes_table)); this.algorithm_index = algorithm_index; this.hashes_table_length = hashes_table.length; this.hashes_table = hashes_table; @@ -59,7 +59,15 @@ public class Hashes_attribute extends Attribute { @Override public R accept(Visitor visitor, D data) { - return visitor.visitHashes(this, data); + return visitor.visitModuleHashes(this, data); + } + + private static int length(Entry[] hashes_table) { + int len = 0; + for (Entry e: hashes_table) { + len += e.length(); + } + return len; } public final int algorithm_index; @@ -68,16 +76,20 @@ public class Hashes_attribute extends Attribute { public static class Entry { Entry(ClassReader cr) throws IOException { - requires_index = cr.readUnsignedShort(); - hash_index = cr.readUnsignedShort(); + module_name_index = cr.readUnsignedShort(); + int hash_length = cr.readUnsignedShort(); + hash = new byte[hash_length]; + for (int i=0; i */ -public class MainClass_attribute extends Attribute { - MainClass_attribute(ClassReader cr, int name_index, int length) throws IOException { +public class ModuleMainClass_attribute extends Attribute { + ModuleMainClass_attribute(ClassReader cr, int name_index, int length) throws IOException { super(name_index, length); main_class_index = cr.readUnsignedShort(); } - public MainClass_attribute(ConstantPool constant_pool, int mainClass_index) + public ModuleMainClass_attribute(ConstantPool constant_pool, int mainClass_index) throws ConstantPoolException { - this(constant_pool.getUTF8Index(Attribute.Version), mainClass_index); + this(constant_pool.getUTF8Index(Attribute.ModuleMainClass), mainClass_index); } - public MainClass_attribute(int name_index, int mainClass_index) { + public ModuleMainClass_attribute(int name_index, int mainClass_index) { super(name_index, 2); this.main_class_index = mainClass_index; } @@ -57,7 +57,7 @@ public class MainClass_attribute extends Attribute { @Override public R accept(Visitor visitor, D data) { - return visitor.visitMainClass(this, data); + return visitor.visitModuleMainClass(this, data); } public final int main_class_index; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConcealedPackages_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java similarity index 82% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConcealedPackages_attribute.java rename to langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java index dc56d7b381a..a6eb2ffbfe7 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ConcealedPackages_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModulePackages_attribute.java @@ -35,8 +35,8 @@ import java.io.IOException; * This code and its internal interfaces are subject to change or * deletion without notice. */ -public class ConcealedPackages_attribute extends Attribute { - ConcealedPackages_attribute(ClassReader cr, int name_index, int length) +public class ModulePackages_attribute extends Attribute { + ModulePackages_attribute(ClassReader cr, int name_index, int length) throws IOException { super(name_index, length); packages_count = cr.readUnsignedShort(); @@ -45,15 +45,15 @@ public class ConcealedPackages_attribute extends Attribute { packages_index[i] = cr.readUnsignedShort(); } - public ConcealedPackages_attribute(ConstantPool constant_pool, - int[] packages_index) + public ModulePackages_attribute(ConstantPool constant_pool, + int[] packages_index) throws ConstantPoolException { - this(constant_pool.getUTF8Index(Attribute.ConcealedPackages), + this(constant_pool.getUTF8Index(Attribute.ModulePackages), packages_index); } - public ConcealedPackages_attribute(int name_index, - int[] packages_index) { + public ModulePackages_attribute(int name_index, + int[] packages_index) { super(name_index, 2 + packages_index.length * 2); this.packages_count = packages_index.length; this.packages_index = packages_index; @@ -66,7 +66,7 @@ public class ConcealedPackages_attribute extends Attribute { @Override public R accept(Visitor visitor, D data) { - return visitor.visitConcealedPackages(this, data); + return visitor.visitModulePackages(this, data); } public final int packages_count; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TargetPlatform_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java similarity index 90% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TargetPlatform_attribute.java rename to langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java index ad469a54524..630eac1bbf5 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/TargetPlatform_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleTarget_attribute.java @@ -35,8 +35,8 @@ import java.io.IOException; * This code and its internal interfaces are subject to change or * deletion without notice. */ -public class TargetPlatform_attribute extends Attribute { - TargetPlatform_attribute(ClassReader cr, int name_index, int length) throws IOException { +public class ModuleTarget_attribute extends Attribute { + ModuleTarget_attribute(ClassReader cr, int name_index, int length) throws IOException { super(name_index, length); os_name_index = cr.readUnsignedShort(); os_arch_index = cr.readUnsignedShort(); @@ -45,7 +45,7 @@ public class TargetPlatform_attribute extends Attribute { @Override public R accept(Visitor visitor, D data) { - return visitor.visitTargetPlatform(this, data); + return visitor.visitModuleTarget(this, data); } public final int os_name_index; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Version_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleVersion_attribute.java similarity index 80% rename from langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Version_attribute.java rename to langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleVersion_attribute.java index ed6b749b715..8415d791496 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Version_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/ModuleVersion_attribute.java @@ -35,25 +35,25 @@ import java.io.IOException; * This code and its internal interfaces are subject to change or * deletion without notice. */ -public class Version_attribute extends Attribute { - Version_attribute(ClassReader cr, int name_index, int length) throws IOException { +public class ModuleVersion_attribute extends Attribute { + ModuleVersion_attribute(ClassReader cr, int name_index, int length) throws IOException { super(name_index, length); version_index = cr.readUnsignedShort(); } - public Version_attribute(ConstantPool constant_pool, int version_index) + public ModuleVersion_attribute(ConstantPool constant_pool, int version_index) throws ConstantPoolException { - this(constant_pool.getUTF8Index(Attribute.Version), version_index); + this(constant_pool.getUTF8Index(Attribute.ModuleVersion), version_index); } - public Version_attribute(int name_index, int version_index) { + public ModuleVersion_attribute(int name_index, int version_index) { super(name_index, 2); this.version_index = version_index; } @Override public R accept(Visitor visitor, D data) { - return visitor.visitVersion(this, data); + return visitor.visitModuleVersion(this, data); } public final int version_index; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java index b20729fba91..85262fbd8fe 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile/Module_attribute.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -36,24 +36,38 @@ import java.io.IOException; * deletion without notice. */ public class Module_attribute extends Attribute { - public static final int ACC_PUBLIC = 0x20; - public static final int ACC_SYNTHETIC = 0x1000; - public static final int ACC_MANDATED = 0x8000; + public static final int ACC_TRANSITIVE = 0x10; + public static final int ACC_STATIC_PHASE = 0x20; + public static final int ACC_OPEN = 0x20; + public static final int ACC_SYNTHETIC = 0x1000; + public static final int ACC_MANDATED = 0x8000; Module_attribute(ClassReader cr, int name_index, int length) throws IOException { super(name_index, length); + + module_name = cr.readUnsignedShort(); + module_flags = cr.readUnsignedShort(); + requires_count = cr.readUnsignedShort(); requires = new RequiresEntry[requires_count]; for (int i = 0; i < requires_count; i++) requires[i] = new RequiresEntry(cr); + exports_count = cr.readUnsignedShort(); exports = new ExportsEntry[exports_count]; for (int i = 0; i < exports_count; i++) exports[i] = new ExportsEntry(cr); + + opens_count = cr.readUnsignedShort(); + opens = new OpensEntry[opens_count]; + for (int i = 0; i < opens_count; i++) + opens[i] = new OpensEntry(cr); + uses_count = cr.readUnsignedShort(); uses_index = new int[uses_count]; for (int i = 0; i < uses_count; i++) uses_index[i] = cr.readUnsignedShort(); + provides_count = cr.readUnsignedShort(); provides = new ProvidesEntry[provides_count]; for (int i = 0; i < provides_count; i++) @@ -61,20 +75,26 @@ public class Module_attribute extends Attribute { } public Module_attribute(int name_index, + int module_name, + int module_flags, RequiresEntry[] requires, ExportsEntry[] exports, + OpensEntry[] opens, int[] uses, ProvidesEntry[] provides) { super(name_index, 2); + this.module_name = module_name; + this.module_flags = module_flags; requires_count = requires.length; this.requires = requires; exports_count = exports.length; this.exports = exports; + opens_count = opens.length; + this.opens = opens; uses_count = uses.length; this.uses_index = uses; provides_count = provides.length; this.provides = provides; - } public String getUses(int index, ConstantPool constant_pool) throws ConstantPoolException { @@ -87,10 +107,14 @@ public class Module_attribute extends Attribute { return visitor.visitModule(this, data); } + public final int module_name; + public final int module_flags; public final int requires_count; public final RequiresEntry[] requires; public final int exports_count; public final ExportsEntry[] exports; + public final int opens_count; + public final OpensEntry[] opens; public final int uses_count; public final int[] uses_index; public final int provides_count; @@ -120,14 +144,16 @@ public class Module_attribute extends Attribute { public static class ExportsEntry { ExportsEntry(ClassReader cr) throws IOException { exports_index = cr.readUnsignedShort(); + exports_flags = cr.readUnsignedShort(); exports_to_count = cr.readUnsignedShort(); exports_to_index = new int[exports_to_count]; for (int i = 0; i < exports_to_count; i++) exports_to_index[i] = cr.readUnsignedShort(); } - public ExportsEntry(int index, int[] to) { + public ExportsEntry(int index, int flags, int[] to) { this.exports_index = index; + this.exports_flags = flags; this.exports_to_count = to.length; this.exports_to_index = to; } @@ -137,24 +163,57 @@ public class Module_attribute extends Attribute { } public final int exports_index; + public final int exports_flags; public final int exports_to_count; public final int[] exports_to_index; } + public static class OpensEntry { + OpensEntry(ClassReader cr) throws IOException { + opens_index = cr.readUnsignedShort(); + opens_flags = cr.readUnsignedShort(); + opens_to_count = cr.readUnsignedShort(); + opens_to_index = new int[opens_to_count]; + for (int i = 0; i < opens_to_count; i++) + opens_to_index[i] = cr.readUnsignedShort(); + } + + public OpensEntry(int index, int flags, int[] to) { + this.opens_index = index; + this.opens_flags = flags; + this.opens_to_count = to.length; + this.opens_to_index = to; + } + + public int length() { + return 4 + 2 * opens_to_index.length; + } + + public final int opens_index; + public final int opens_flags; + public final int opens_to_count; + public final int[] opens_to_index; + } + public static class ProvidesEntry { ProvidesEntry(ClassReader cr) throws IOException { provides_index = cr.readUnsignedShort(); - with_index = cr.readUnsignedShort(); + with_count = cr.readUnsignedShort(); + with_index = new int[with_count]; + for (int i = 0; i < with_count; i++) + with_index[i] = cr.readUnsignedShort(); } - public ProvidesEntry(int provides, int with) { + public ProvidesEntry(int provides, int[] with) { this.provides_index = provides; + this.with_count = with.length; this.with_index = with; } public static final int length = 4; public final int provides_index; - public final int with_index; + public final int with_count; + public final int[] with_index; } } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java index 562d419c2d1..45fc421b5ac 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/AttributeWriter.java @@ -34,7 +34,6 @@ import com.sun.tools.classfile.CharacterRangeTable_attribute; import com.sun.tools.classfile.CharacterRangeTable_attribute.Entry; import com.sun.tools.classfile.Code_attribute; import com.sun.tools.classfile.CompilationID_attribute; -import com.sun.tools.classfile.ConcealedPackages_attribute; import com.sun.tools.classfile.ConstantPool; import com.sun.tools.classfile.ConstantPoolException; import com.sun.tools.classfile.ConstantValue_attribute; @@ -42,15 +41,18 @@ import com.sun.tools.classfile.DefaultAttribute; import com.sun.tools.classfile.Deprecated_attribute; import com.sun.tools.classfile.EnclosingMethod_attribute; import com.sun.tools.classfile.Exceptions_attribute; -import com.sun.tools.classfile.Hashes_attribute; import com.sun.tools.classfile.InnerClasses_attribute; import com.sun.tools.classfile.InnerClasses_attribute.Info; import com.sun.tools.classfile.LineNumberTable_attribute; import com.sun.tools.classfile.LocalVariableTable_attribute; import com.sun.tools.classfile.LocalVariableTypeTable_attribute; -import com.sun.tools.classfile.MainClass_attribute; import com.sun.tools.classfile.MethodParameters_attribute; import com.sun.tools.classfile.Module_attribute; +import com.sun.tools.classfile.ModuleHashes_attribute; +import com.sun.tools.classfile.ModuleMainClass_attribute; +import com.sun.tools.classfile.ModulePackages_attribute; +import com.sun.tools.classfile.ModuleTarget_attribute; +import com.sun.tools.classfile.ModuleVersion_attribute; import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute; import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute; import com.sun.tools.classfile.RuntimeInvisibleTypeAnnotations_attribute; @@ -64,8 +66,6 @@ import com.sun.tools.classfile.SourceID_attribute; import com.sun.tools.classfile.StackMapTable_attribute; import com.sun.tools.classfile.StackMap_attribute; import com.sun.tools.classfile.Synthetic_attribute; -import com.sun.tools.classfile.TargetPlatform_attribute; -import com.sun.tools.classfile.Version_attribute; import static com.sun.tools.classfile.AccessFlags.*; @@ -237,7 +237,7 @@ public class AttributeWriter extends BasicWriter return null; } - private String getJavaPackage(ConcealedPackages_attribute attr, int index) { + private String getJavaPackage(ModulePackages_attribute attr, int index) { try { return getJavaName(attr.getPackage(index, constant_pool)); } catch (ConstantPoolException e) { @@ -246,8 +246,8 @@ public class AttributeWriter extends BasicWriter } @Override - public Void visitConcealedPackages(ConcealedPackages_attribute attr, Void ignore) { - println("ConcealedPackages: "); + public Void visitModulePackages(ModulePackages_attribute attr, Void ignore) { + println("ModulePackages: "); indent(+1); for (int i = 0; i < attr.packages_count; i++) { print("#" + attr.packages_index[i]); @@ -323,22 +323,24 @@ public class AttributeWriter extends BasicWriter } @Override - public Void visitHashes(Hashes_attribute attr, Void ignore) { - println("Hashes:"); + public Void visitModuleHashes(ModuleHashes_attribute attr, Void ignore) { + println("ModuleHashes:"); indent(+1); print("algorithm #" + attr.algorithm_index); tab(); println("// " + getAlgorithm(attr)); - for (Hashes_attribute.Entry e : attr.hashes_table) { - print("#" + e.requires_index + ", #" + e.hash_index); + for (ModuleHashes_attribute.Entry e : attr.hashes_table) { + print("#" + e.module_name_index); tab(); - println("// " + getRequires(e) + ": " + getHash(e)); + println("// " + getModuleName(e)); + println("hash_length: " + e.hash.length); + println("hash: [" + toHex(e.hash) + "]"); } indent(-1); return null; } - private String getAlgorithm(Hashes_attribute attr) { + private String getAlgorithm(ModuleHashes_attribute attr) { try { return constant_pool.getUTF8Value(attr.algorithm_index); } catch (ConstantPoolException e) { @@ -346,17 +348,9 @@ public class AttributeWriter extends BasicWriter } } - private String getRequires(Hashes_attribute.Entry entry) { + private String getModuleName(ModuleHashes_attribute.Entry entry) { try { - return constant_pool.getUTF8Value(entry.requires_index); - } catch (ConstantPoolException e) { - return report(e); - } - } - - private String getHash(Hashes_attribute.Entry entry) { - try { - return constant_pool.getUTF8Value(entry.hash_index); + return constant_pool.getUTF8Value(entry.module_name_index); } catch (ConstantPoolException e) { return report(e); } @@ -456,15 +450,15 @@ public class AttributeWriter extends BasicWriter } @Override - public Void visitMainClass(MainClass_attribute attr, Void ignore) { - print("MainClass: #" + attr.main_class_index); + public Void visitModuleMainClass(ModuleMainClass_attribute attr, Void ignore) { + print("ModuleMainClass: #" + attr.main_class_index); tab(); print("// " + getJavaClassName(attr)); println(); return null; } - private String getJavaClassName(MainClass_attribute a) { + private String getJavaClassName(ModuleMainClass_attribute a) { try { return getJavaName(a.getMainClassName(constant_pool)); } catch (ConstantPoolException e) { @@ -477,7 +471,6 @@ public class AttributeWriter extends BasicWriter @Override public Void visitMethodParameters(MethodParameters_attribute attr, Void ignore) { - final String header = String.format(format, "Name", "Flags"); println("MethodParameters:"); indent(+1); @@ -501,8 +494,25 @@ public class AttributeWriter extends BasicWriter public Void visitModule(Module_attribute attr, Void ignore) { println("Module:"); indent(+1); + + print(attr.module_name); + tab(); + println("// " + constantWriter.stringValue(attr.module_name)); + + print(String.format("%x", attr.module_flags)); + tab(); + print("// "); + if ((attr.module_flags & Module_attribute.ACC_OPEN) != 0) + print(" ACC_OPEN"); + if ((attr.module_flags & Module_attribute.ACC_MANDATED) != 0) + print(" ACC_MANDATED"); + if ((attr.module_flags & Module_attribute.ACC_SYNTHETIC) != 0) + print(" ACC_SYNTHETIC"); + println(); + printRequiresTable(attr); printExportsTable(attr); + printOpensTable(attr); printUsesTable(attr); printProvidesTable(attr); indent(-1); @@ -511,63 +521,107 @@ public class AttributeWriter extends BasicWriter protected void printRequiresTable(Module_attribute attr) { Module_attribute.RequiresEntry[] entries = attr.requires; - println(entries.length + "\t// " + "requires"); + print(entries.length); + tab(); + println("// " + "requires"); indent(+1); for (Module_attribute.RequiresEntry e: entries) { - print("#" + e.requires_index + "," + - String.format("%x", e.requires_flags)+ "\t// requires"); - if ((e.requires_flags & Module_attribute.ACC_PUBLIC) != 0) - print(" public"); + print("#" + e.requires_index + "," + String.format("%x", e.requires_flags)); + tab(); + print("// " + constantWriter.stringValue(e.requires_index)); + if ((e.requires_flags & Module_attribute.ACC_TRANSITIVE) != 0) + print(" ACC_TRANSITIVE"); + if ((e.requires_flags & Module_attribute.ACC_STATIC_PHASE) != 0) + print(" ACC_STATIC_PHASE"); if ((e.requires_flags & Module_attribute.ACC_SYNTHETIC) != 0) - print(" synthetic"); + print(" ACC_SYNTHETIC"); if ((e.requires_flags & Module_attribute.ACC_MANDATED) != 0) - print(" mandated"); - println(" " + constantWriter.stringValue(e.requires_index)); + print(" ACC_MANDATED"); + println(); } indent(-1); } protected void printExportsTable(Module_attribute attr) { Module_attribute.ExportsEntry[] entries = attr.exports; - println(entries.length + "\t// " + "exports"); + print(entries.length); + tab(); + println("// exports"); indent(+1); for (Module_attribute.ExportsEntry e: entries) { - print("#" + e.exports_index + "\t// exports"); - print(" " + constantWriter.stringValue(e.exports_index)); - if (e.exports_to_index.length == 0) { - println(); - } else { - println(" to ... " + e.exports_to_index.length); - indent(+1); - for (int to: e.exports_to_index) { - println("#" + to + "\t// ... to " + constantWriter.stringValue(to)); - } - indent(-1); - } + printExportOpenEntry(e.exports_index, e.exports_flags, e.exports_to_index); } indent(-1); } + protected void printOpensTable(Module_attribute attr) { + Module_attribute.OpensEntry[] entries = attr.opens; + print(entries.length); + tab(); + println("// opens"); + indent(+1); + for (Module_attribute.OpensEntry e: entries) { + printExportOpenEntry(e.opens_index, e.opens_flags, e.opens_to_index); + } + indent(-1); + } + + protected void printExportOpenEntry(int index, int flags, int[] to_index) { + print("#" + index + "," + String.format("%x", flags)); + tab(); + print("// "); + print(constantWriter.stringValue(index)); + if ((flags & Module_attribute.ACC_MANDATED) != 0) + print(" ACC_MANDATED"); + if ((flags & Module_attribute.ACC_SYNTHETIC) != 0) + print(" ACC_SYNTHETIC"); + if (to_index.length == 0) { + println(); + } else { + println(" to ... " + to_index.length); + indent(+1); + for (int to: to_index) { + print("#" + to); + tab(); + println("// ... to " + constantWriter.stringValue(to)); + } + indent(-1); + } + } + protected void printUsesTable(Module_attribute attr) { int[] entries = attr.uses_index; - println(entries.length + "\t// " + "uses services"); + print(entries.length); + tab(); + println("// " + "uses"); indent(+1); for (int e: entries) { - println("#" + e + "\t// uses " + constantWriter.stringValue(e)); + print("#" + e); + tab(); + println("// " + constantWriter.stringValue(e)); } indent(-1); } protected void printProvidesTable(Module_attribute attr) { Module_attribute.ProvidesEntry[] entries = attr.provides; - println(entries.length + "\t// " + "provides services"); + print(entries.length); + tab(); + println("// " + "provides"); indent(+1); for (Module_attribute.ProvidesEntry e: entries) { - print("#" + e.provides_index + ",#" + - e.with_index + "\t// provides "); + print("#" + e.provides_index); + tab(); + print("// "); print(constantWriter.stringValue(e.provides_index)); - print (" with "); - println(constantWriter.stringValue(e.with_index)); + println(" with ... " + e.with_count); + indent(+1); + for (int with : e.with_index) { + print("#" + with); + tab(); + println("// ... with " + constantWriter.stringValue(with)); + } + indent(-1); } indent(-1); } @@ -876,8 +930,8 @@ public class AttributeWriter extends BasicWriter } @Override - public Void visitTargetPlatform(TargetPlatform_attribute attr, Void ignore) { - println("TargetPlatform:"); + public Void visitModuleTarget(ModuleTarget_attribute attr, Void ignore) { + println("ModuleTarget:"); indent(+1); print("os_name: #" + attr.os_name_index); if (attr.os_name_index != 0) { @@ -901,7 +955,7 @@ public class AttributeWriter extends BasicWriter return null; } - private String getOSName(TargetPlatform_attribute attr) { + private String getOSName(ModuleTarget_attribute attr) { try { return constant_pool.getUTF8Value(attr.os_name_index); } catch (ConstantPoolException e) { @@ -909,7 +963,7 @@ public class AttributeWriter extends BasicWriter } } - private String getOSArch(TargetPlatform_attribute attr) { + private String getOSArch(ModuleTarget_attribute attr) { try { return constant_pool.getUTF8Value(attr.os_arch_index); } catch (ConstantPoolException e) { @@ -917,7 +971,7 @@ public class AttributeWriter extends BasicWriter } } - private String getOSVersion(TargetPlatform_attribute attr) { + private String getOSVersion(ModuleTarget_attribute attr) { try { return constant_pool.getUTF8Value(attr.os_version_index); } catch (ConstantPoolException e) { @@ -926,8 +980,8 @@ public class AttributeWriter extends BasicWriter } @Override - public Void visitVersion(Version_attribute attr, Void ignore) { - print("Version: #" + attr.version_index); + public Void visitModuleVersion(ModuleVersion_attribute attr, Void ignore) { + print("ModuleVersion: #" + attr.version_index); indent(+1); tab(); println("// " + getVersion(attr)); @@ -935,7 +989,7 @@ public class AttributeWriter extends BasicWriter return null; } - private String getVersion(Version_attribute attr) { + private String getVersion(ModuleVersion_attribute attr) { try { return constant_pool.getUTF8Value(attr.version_index); } catch (ConstantPoolException e) { @@ -962,6 +1016,14 @@ public class AttributeWriter extends BasicWriter return StringUtils.toUpperCase(s); } + static String toHex(byte[] ba) { + StringBuilder sb = new StringBuilder(ba.length); + for (byte b: ba) { + sb.append(String.format("%02x", b & 0xff)); + } + return sb.toString(); + } + private final AnnotationWriter annotationWriter; private final CodeWriter codeWriter; private final ConstantWriter constantWriter; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java index 4cf1b22aa52..0cfea172c93 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/ClassWriter.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -40,7 +40,7 @@ import com.sun.tools.classfile.ConstantPool; import com.sun.tools.classfile.ConstantPoolException; import com.sun.tools.classfile.ConstantValue_attribute; import com.sun.tools.classfile.Descriptor; -import com.sun.tools.classfile.DescriptorException; +import com.sun.tools.classfile.Descriptor.InvalidDescriptor; import com.sun.tools.classfile.Exceptions_attribute; import com.sun.tools.classfile.Field; import com.sun.tools.classfile.Method; @@ -157,21 +157,36 @@ public class ClassWriter extends BasicWriter { indent(-1); } - String name = getJavaName(classFile); AccessFlags flags = cf.access_flags; - writeModifiers(flags.getClassModifiers()); - if (classFile.access_flags.is(AccessFlags.ACC_MODULE) && name.endsWith(".module-info")) { - print("module "); - print(name.replace(".module-info", "")); + if (classFile.access_flags.is(AccessFlags.ACC_MODULE)) { + Attribute attr = classFile.attributes.get(Attribute.Module); + if (attr instanceof Module_attribute) { + Module_attribute modAttr = (Module_attribute) attr; + String name; + try { + name = getJavaName(constant_pool.getUTF8Value(modAttr.module_name)); + } catch (ConstantPoolException e) { + name = report(e); + } + if ((modAttr.module_flags & Module_attribute.ACC_OPEN) != 0) { + print("open "); + } + print("module "); + print(name); + } else { + // fallback for malformed class files + print("class "); + print(getJavaName(classFile)); + } } else { if (classFile.isClass()) print("class "); else if (classFile.isInterface()) print("interface "); - print(name); + print(getJavaName(classFile)); } Signature_attribute sigAttr = getSignature(cf.attributes); @@ -210,7 +225,23 @@ public class ClassWriter extends BasicWriter { indent(+1); println("minor version: " + cf.minor_version); println("major version: " + cf.major_version); - writeList("flags: ", flags.getClassFlags(), "\n"); + writeList(String.format("flags: (0x%04x) ", flags.flags), flags.getClassFlags(), "\n"); + print("this_class: #" + cf.this_class); + if (cf.this_class != 0) { + tab(); + print("// " + constantWriter.stringValue(cf.this_class)); + } + println(); + print("super_class: #" + cf.super_class); + if (cf.super_class != 0) { + tab(); + print("// " + constantWriter.stringValue(cf.super_class)); + } + println(); + print("interfaces: " + cf.interfaces.length); + print(", fields: " + cf.fields.length); + print(", methods: " + cf.methods.length); + println(", attributes: " + cf.attributes.attrs.length); indent(-1); constantWriter.writeConstantPool(); } else { @@ -249,17 +280,20 @@ public class ClassWriter extends BasicWriter { return builder.toString(); } + @Override public StringBuilder visitSimpleType(SimpleType type, StringBuilder sb) { sb.append(getJavaName(type.name)); return sb; } + @Override public StringBuilder visitArrayType(ArrayType type, StringBuilder sb) { append(sb, type.elemType); sb.append("[]"); return sb; } + @Override public StringBuilder visitMethodType(MethodType type, StringBuilder sb) { appendIfNotEmpty(sb, "<", type.typeParamTypes, "> "); append(sb, type.returnType); @@ -268,6 +302,7 @@ public class ClassWriter extends BasicWriter { return sb; } + @Override public StringBuilder visitClassSigType(ClassSigType type, StringBuilder sb) { appendIfNotEmpty(sb, "<", type.typeParamTypes, ">"); if (isInterface) { @@ -283,6 +318,7 @@ public class ClassWriter extends BasicWriter { return sb; } + @Override public StringBuilder visitClassType(ClassType type, StringBuilder sb) { if (type.outerType != null) { append(sb, type.outerType); @@ -293,6 +329,7 @@ public class ClassWriter extends BasicWriter { return sb; } + @Override public StringBuilder visitTypeParamType(TypeParamType type, StringBuilder sb) { sb.append(type.name); String sep = " extends "; @@ -312,6 +349,7 @@ public class ClassWriter extends BasicWriter { return sb; } + @Override public StringBuilder visitWildcardType(WildcardType type, StringBuilder sb) { switch (type.kind) { case UNBOUNDED: @@ -402,7 +440,7 @@ public class ClassWriter extends BasicWriter { println("descriptor: " + getValue(f.descriptor)); if (options.verbose) - writeList("flags: ", flags.getFieldFlags(), "\n"); + writeList(String.format("flags: (0x%04x) ", flags.flags), flags.getFieldFlags(), "\n"); if (options.showAllAttrs) { for (Attribute attr: f.attributes) @@ -459,16 +497,20 @@ public class ClassWriter extends BasicWriter { if (methodType != null) { print(new JavaTypePrinter(false).printTypeArgs(methodType.typeParamTypes)); } - if (getName(m).equals("")) { - print(getJavaName(classFile)); - print(getJavaParameterTypes(d, flags)); - } else if (getName(m).equals("")) { - print("{}"); - } else { - print(getJavaReturnType(d)); - print(" "); - print(getName(m)); - print(getJavaParameterTypes(d, flags)); + switch (getName(m)) { + case "": + print(getJavaName(classFile)); + print(getJavaParameterTypes(d, flags)); + break; + case "": + print("{}"); + break; + default: + print(getJavaReturnType(d)); + print(" "); + print(getName(m)); + print(getJavaParameterTypes(d, flags)); + break; } Attribute e_attr = m.attributes.get(Attribute.Exceptions); @@ -499,7 +541,7 @@ public class ClassWriter extends BasicWriter { } if (options.verbose) { - writeList("flags: ", flags.getMethodFlags(), "\n"); + writeList(String.format("flags: (0x%04x) ", flags.flags), flags.getMethodFlags(), "\n"); } Code_attribute code = null; @@ -555,15 +597,18 @@ public class ClassWriter extends BasicWriter { Module_attribute m = (Module_attribute) attr; for (Module_attribute.RequiresEntry entry: m.requires) { print("requires"); - if ((entry.requires_flags & Module_attribute.ACC_PUBLIC) != 0) - print(" public"); + if ((entry.requires_flags & Module_attribute.ACC_STATIC_PHASE) != 0) + print(" static"); + if ((entry.requires_flags & Module_attribute.ACC_TRANSITIVE) != 0) + print(" transitive"); print(" "); print(getUTF8Value(entry.requires_index).replace('/', '.')); println(";"); } for (Module_attribute.ExportsEntry entry: m.exports) { - print("exports "); + print("exports"); + print(" "); print(getUTF8Value(entry.exports_index).replace('/', '.')); boolean first = true; for (int i: entry.exports_to_index) { @@ -587,6 +632,32 @@ public class ClassWriter extends BasicWriter { indent(-1); } + for (Module_attribute.OpensEntry entry: m.opens) { + print("opens"); + print(" "); + print(getUTF8Value(entry.opens_index).replace('/', '.')); + boolean first = true; + for (int i: entry.opens_to_index) { + String mname; + try { + mname = classFile.constant_pool.getUTF8Value(i).replace('/', '.'); + } catch (ConstantPoolException e) { + mname = report(e); + } + if (first) { + println(" to"); + indent(+1); + first = false; + } else { + println(","); + } + print(mname); + } + println(";"); + if (!first) + indent(-1); + } + for (int entry: m.uses_index) { print("uses "); print(getClassName(entry).replace('/', '.')); @@ -594,13 +665,22 @@ public class ClassWriter extends BasicWriter { } for (Module_attribute.ProvidesEntry entry: m.provides) { - print("provides "); + print("provides "); print(getClassName(entry.provides_index).replace('/', '.')); - println(" with"); - indent(+1); - print(getClassName(entry.with_index).replace('/', '.')); + boolean first = true; + for (int i: entry.with_index) { + if (first) { + println(" with"); + indent(+1); + first = false; + } else { + println(","); + } + print(getClassName(i).replace('/', '.')); + } println(";"); - indent(-1); + if (!first) + indent(-1); } } @@ -679,7 +759,7 @@ public class ClassWriter extends BasicWriter { return getJavaName(d.getFieldType(constant_pool)); } catch (ConstantPoolException e) { return report(e); - } catch (DescriptorException e) { + } catch (InvalidDescriptor e) { return report(e); } } @@ -689,7 +769,7 @@ public class ClassWriter extends BasicWriter { return getJavaName(d.getReturnType(constant_pool)); } catch (ConstantPoolException e) { return report(e); - } catch (DescriptorException e) { + } catch (InvalidDescriptor e) { return report(e); } } @@ -699,7 +779,7 @@ public class ClassWriter extends BasicWriter { return getJavaName(adjustVarargs(flags, d.getParameterTypes(constant_pool))); } catch (ConstantPoolException e) { return report(e); - } catch (DescriptorException e) { + } catch (InvalidDescriptor e) { return report(e); } } @@ -766,12 +846,16 @@ public class ClassWriter extends BasicWriter { ConstantPool.CONSTANT_Integer_info info = (ConstantPool.CONSTANT_Integer_info) cpInfo; String t = d.getValue(constant_pool); - if (t.equals("C")) { // character - return getConstantCharValue((char) info.value); - } else if (t.equals("Z")) { // boolean - return String.valueOf(info.value == 1); - } else { // other: assume integer - return String.valueOf(info.value); + switch (t) { + case "C": + // character + return getConstantCharValue((char) info.value); + case "Z": + // boolean + return String.valueOf(info.value == 1); + default: + // other: assume integer + return String.valueOf(info.value); } } @@ -823,10 +907,10 @@ public class ClassWriter extends BasicWriter { } } - private Options options; - private AttributeWriter attrWriter; - private CodeWriter codeWriter; - private ConstantWriter constantWriter; + private final Options options; + private final AttributeWriter attrWriter; + private final CodeWriter codeWriter; + private final ConstantWriter constantWriter; private ClassFile classFile; private URI uri; private long lastModified; diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java index 0b65d9f8762..72e4e0637a7 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/TraverseProc.java @@ -136,7 +136,7 @@ public class TraverseProc extends AbstractProcessor { Set set = new HashSet<>(); for (ModuleElement m : mods) { for (ModuleElement.Directive dir : m.getDirectives()) { - if (dir.getKind() == ModuleElement.DirectiveKind.EXPORTS) { + if (dir.getKind() == ModuleElement.DirectiveKind.EXPORTS) { //XXX ModuleElement.ExportsDirective exp = (ModuleElement.ExportsDirective)dir; if (exp.getTargetModules() == null) { set.add(exp.getPackage()); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java index 9ad023c5df5..d1e07da066a 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ClassFileReader.java @@ -25,6 +25,7 @@ package com.sun.tools.jdeps; +import com.sun.tools.classfile.AccessFlags; import com.sun.tools.classfile.ClassFile; import com.sun.tools.classfile.ConstantPoolException; import com.sun.tools.classfile.Dependencies.ClassFileError; @@ -170,7 +171,9 @@ public class ClassFileReader implements Closeable { protected Set scan() { try { ClassFile cf = ClassFile.read(path); - return Collections.singleton(cf.getName()); + String name = cf.access_flags.is(AccessFlags.ACC_MODULE) + ? "module-info" : cf.getName(); + return Collections.singleton(name); } catch (ConstantPoolException|IOException e) { throw new ClassFileError(e); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java index fbcb9a0d955..71508e6e595 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DependencyFinder.java @@ -37,6 +37,7 @@ import com.sun.tools.classfile.Dependency.Location; import java.io.IOException; import java.io.UncheckedIOException; +import java.util.Collections; import java.util.Deque; import java.util.HashMap; import java.util.HashSet; @@ -175,6 +176,9 @@ class DependencyFinder { public Set call() throws Exception { Set targets = new HashSet<>(); for (ClassFile cf : archive.reader().getClassFiles()) { + if (cf.access_flags.is(AccessFlags.ACC_MODULE)) + continue; + String classFileName; try { classFileName = cf.getName(); @@ -216,9 +220,13 @@ class DependencyFinder { { ClassFile cf = archive.reader().getClassFile(name); if (cf == null) { - throw new IllegalArgumentException(archive.getName() + " does not contain " + name); + throw new IllegalArgumentException(archive.getName() + + " does not contain " + name); } + if (cf.access_flags.is(AccessFlags.ACC_MODULE)) + return Collections.emptySet(); + Set targets = new HashSet<>(); String cn; try { diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java index 1941c14bfc9..c33ac26b2fe 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java @@ -29,11 +29,9 @@ import com.sun.tools.classfile.Dependency.Location; import java.io.IOException; import java.util.ArrayList; import java.util.Deque; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentLinkedDeque; @@ -263,7 +261,7 @@ public class DepsAnalyzer { public static enum Info { REQUIRES, - REQUIRES_PUBLIC, + REQUIRES_TRANSITIVE, EXPORTED_API, MODULE_PRIVATE, QUALIFIED_EXPORTED_API, @@ -288,7 +286,7 @@ public class DepsAnalyzer { @Override public String toString() { StringBuilder sb = new StringBuilder(); - if (info != Info.REQUIRES && info != Info.REQUIRES_PUBLIC) + if (info != Info.REQUIRES && info != Info.REQUIRES_TRANSITIVE) sb.append(source).append("/"); sb.append(name); @@ -325,7 +323,7 @@ public class DepsAnalyzer { * Returns a graph of module dependences. * * Each Node represents a module and each edge is a dependence. - * No analysis on "requires public". + * No analysis on "requires transitive". */ public Graph moduleGraph() { Graph.Builder builder = new Graph.Builder<>(); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java index 5e9450c5eb5..85aa1c6ff7a 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Graph.java @@ -388,10 +388,10 @@ public final class Graph { } static void printEdges(PrintWriter out, Graph graph, - String node, Set requiresPublic) { + String node, Set requiresTransitive) { graph.adjacentNodes(node).forEach(dn -> { String attr = dn.equals("java.base") ? REQUIRES_BASE - : (requiresPublic.contains(dn) ? REEXPORTS : REQUIRES); + : (requiresTransitive.contains(dn) ? REEXPORTS : REQUIRES); out.format(" \"%s\" -> \"%s\" [%s];%n", node, dn, attr); }); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java index 44159653d95..1f887bb0e9f 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java @@ -38,6 +38,8 @@ import java.io.InputStream; import java.io.UncheckedIOException; import java.lang.module.Configuration; import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleDescriptor.Exports; +import java.lang.module.ModuleDescriptor.Opens; import java.lang.module.ModuleFinder; import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; @@ -408,7 +410,7 @@ public class JdepsConfiguration implements AutoCloseable { } @Override - public void close() throws IOException { + public void close() { } }; } @@ -421,12 +423,18 @@ public class JdepsConfiguration implements AutoCloseable { } private ModuleDescriptor dropHashes(ModuleDescriptor md) { - ModuleDescriptor.Builder builder = new ModuleDescriptor.Builder(md.name()); + ModuleDescriptor.Builder builder = ModuleDescriptor.module(md.name()); md.requires().forEach(builder::requires); md.exports().forEach(builder::exports); - md.provides().values().stream().forEach(builder::provides); + md.opens().forEach(builder::opens); + md.provides().stream().forEach(builder::provides); md.uses().stream().forEach(builder::uses); - builder.conceals(md.conceals()); + + Set concealed = new HashSet<>(md.packages()); + md.exports().stream().map(Exports::source).forEach(concealed::remove); + md.opens().stream().map(Opens::source).forEach(concealed::remove); + concealed.forEach(builder::contains); + return builder.build(); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java index 3ed77929c9c..6e2dfa44b08 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java @@ -154,6 +154,7 @@ class JdepsTask { ANALYZE_DEPS(""), GENERATE_DOT_FILE("-dotoutput", "--dot-output"), GENERATE_MODULE_INFO("--generate-module-info"), + GENERATE_OPEN_MODULE("--generate-open-module"), LIST_DEPS("--list-deps"), LIST_REDUCED_DEPS("--list-reduced-deps"), CHECK_MODULES("--check"); @@ -248,7 +249,15 @@ class JdepsTask { if (task.command != null) { throw new BadArgs("err.command.set", task.command, opt); } - task.command = task.genModuleInfo(Paths.get(arg)); + task.command = task.genModuleInfo(Paths.get(arg), false); + } + }, + new Option(true, CommandOption.GENERATE_OPEN_MODULE) { + void process(JdepsTask task, String opt, String arg) throws BadArgs { + if (task.command != null) { + throw new BadArgs("err.command.set", task.command, opt); + } + task.command = task.genModuleInfo(Paths.get(arg), true); } }, new Option(false, CommandOption.LIST_DEPS) { @@ -596,11 +605,11 @@ class JdepsTask { return new GenDotFile(dir); } - private GenModuleInfo genModuleInfo(Path dir) throws BadArgs { + private GenModuleInfo genModuleInfo(Path dir, boolean openModule) throws BadArgs { if (Files.exists(dir) && (!Files.isDirectory(dir) || !Files.isWritable(dir))) { throw new BadArgs("err.invalid.path", dir.toString()); } - return new GenModuleInfo(dir); + return new GenModuleInfo(dir, openModule); } private ListModuleDeps listModuleDeps(boolean reduced) throws BadArgs { @@ -823,9 +832,11 @@ class JdepsTask { class GenModuleInfo extends Command { final Path dir; - GenModuleInfo(Path dir) { + final boolean openModule; + GenModuleInfo(Path dir, boolean openModule) { super(CommandOption.GENERATE_MODULE_INFO); this.dir = dir; + this.openModule = openModule; } @Override @@ -866,7 +877,7 @@ class JdepsTask { } ModuleInfoBuilder builder - = new ModuleInfoBuilder(config, inputArgs, dir); + = new ModuleInfoBuilder(config, inputArgs, dir, openModule); boolean ok = builder.run(); if (!ok && !options.nowarning) { diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java index f00394a05a3..e49a7f7d47e 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/Module.java @@ -26,6 +26,8 @@ package com.sun.tools.jdeps; import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleDescriptor.Exports; +import java.lang.module.ModuleDescriptor.Opens; import java.net.URI; import java.util.Collections; import java.util.HashMap; @@ -240,18 +242,24 @@ class Module extends Archive { private StrictModule(Module m, Map requires) { super(m.name(), m.location, m.descriptor, m.exports, m.isSystem, m.reader()); - ModuleDescriptor.Builder builder = new ModuleDescriptor.Builder(m.name()); + ModuleDescriptor.Builder builder = ModuleDescriptor.module(m.name()); requires.keySet().forEach(mn -> { if (requires.get(mn).equals(Boolean.TRUE)) { - builder.requires(ModuleDescriptor.Requires.Modifier.PUBLIC, mn); + builder.requires(Set.of(ModuleDescriptor.Requires.Modifier.TRANSITIVE), mn); } else { builder.requires(mn); } }); m.descriptor.exports().forEach(e -> builder.exports(e)); + m.descriptor.opens().forEach(o -> builder.opens(o)); m.descriptor.uses().forEach(s -> builder.uses(s)); - m.descriptor.provides().values().forEach(p -> builder.provides(p)); - builder.conceals(m.descriptor.conceals()); + m.descriptor.provides().forEach(p -> builder.provides(p)); + + Set concealed = new HashSet<>(m.descriptor.packages()); + m.descriptor.exports().stream().map(Exports::source).forEach(concealed::remove); + m.descriptor.opens().stream().map(Opens::source).forEach(concealed::remove); + concealed.forEach(builder::contains); + this.md = builder.build(); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java index 9c0d65cfc1a..6da162878cd 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleAnalyzer.java @@ -87,8 +87,8 @@ public class ModuleAnalyzer { public boolean run() throws IOException { try { - // compute "requires public" dependences - modules.values().forEach(ModuleDeps::computeRequiresPublic); + // compute "requires transitive" dependences + modules.values().forEach(ModuleDeps::computeRequiresTransitive); modules.values().forEach(md -> { // compute "requires" dependences @@ -104,7 +104,7 @@ public class ModuleAnalyzer { class ModuleDeps { final Module root; - Set requiresPublic; + Set requiresTransitive; Set requires; Map> unusedQualifiedExports; @@ -113,15 +113,15 @@ public class ModuleAnalyzer { } /** - * Compute 'requires public' dependences by analyzing API dependencies + * Compute 'requires transitive' dependences by analyzing API dependencies */ - private void computeRequiresPublic() { - // record requires public - this.requiresPublic = computeRequires(true) + private void computeRequiresTransitive() { + // record requires transitive + this.requiresTransitive = computeRequires(true) .filter(m -> !m.name().equals(JAVA_BASE)) .collect(toSet()); - trace("requires public: %s%n", requiresPublic); + trace("requires transitive: %s%n", requiresTransitive); } private void computeRequires() { @@ -144,24 +144,24 @@ public class ModuleAnalyzer { } ModuleDescriptor descriptor() { - return descriptor(requiresPublic, requires); + return descriptor(requiresTransitive, requires); } - private ModuleDescriptor descriptor(Set requiresPublic, + private ModuleDescriptor descriptor(Set requiresTransitive, Set requires) { - ModuleDescriptor.Builder builder = new ModuleDescriptor.Builder(root.name()); + ModuleDescriptor.Builder builder = ModuleDescriptor.module(root.name()); if (!root.name().equals(JAVA_BASE)) - builder.requires(MANDATED, JAVA_BASE); + builder.requires(Set.of(MANDATED), JAVA_BASE); - requiresPublic.stream() + requiresTransitive.stream() .filter(m -> !m.name().equals(JAVA_BASE)) .map(Module::name) - .forEach(mn -> builder.requires(PUBLIC, mn)); + .forEach(mn -> builder.requires(Set.of(TRANSITIVE), mn)); requires.stream() - .filter(m -> !requiresPublic.contains(m)) + .filter(m -> !requiresTransitive.contains(m)) .filter(m -> !m.name().equals(JAVA_BASE)) .map(Module::name) .forEach(mn -> builder.requires(mn)); @@ -172,10 +172,10 @@ public class ModuleAnalyzer { private Graph buildReducedGraph() { ModuleGraphBuilder rpBuilder = new ModuleGraphBuilder(configuration); rpBuilder.addModule(root); - requiresPublic.stream() + requiresTransitive.stream() .forEach(m -> rpBuilder.addEdge(root, m)); - // requires public graph + // requires transitive graph Graph rbg = rpBuilder.build().reduce(); ModuleGraphBuilder gb = new ModuleGraphBuilder(configuration); @@ -198,7 +198,7 @@ public class ModuleAnalyzer { */ ModuleDescriptor reduced() { Graph g = buildReducedGraph(); - return descriptor(requiresPublic, g.adjacentNodes(root)); + return descriptor(requiresTransitive, g.adjacentNodes(root)); } /** @@ -309,16 +309,16 @@ public class ModuleAnalyzer { } private boolean matches(ModuleDescriptor md, ModuleDescriptor other) { - // build requires public from ModuleDescriptor - Set reqPublic = md.requires().stream() - .filter(req -> req.modifiers().contains(PUBLIC)) + // build requires transitive from ModuleDescriptor + Set reqTransitive = md.requires().stream() + .filter(req -> req.modifiers().contains(TRANSITIVE)) .collect(toSet()); - Set otherReqPublic = other.requires().stream() - .filter(req -> req.modifiers().contains(PUBLIC)) + Set otherReqTransitive = other.requires().stream() + .filter(req -> req.modifiers().contains(TRANSITIVE)) .collect(toSet()); - if (!reqPublic.equals(otherReqPublic)) { - trace("mismatch requires public: %s%n", reqPublic); + if (!reqTransitive.equals(otherReqTransitive)) { + trace("mismatch requires transitive: %s%n", reqTransitive); return false; } @@ -365,12 +365,12 @@ public class ModuleAnalyzer { .sorted(Comparator.comparing(ModuleDescriptor::name)) .forEach(md -> { String mn = md.name(); - Set requiresPublic = md.requires().stream() - .filter(d -> d.modifiers().contains(PUBLIC)) + Set requiresTransitive = md.requires().stream() + .filter(d -> d.modifiers().contains(TRANSITIVE)) .map(d -> d.name()) .collect(toSet()); - DotGraph.printEdges(out, graph, mn, requiresPublic); + DotGraph.printEdges(out, graph, mn, requiresTransitive); }); out.println("}"); @@ -380,20 +380,20 @@ public class ModuleAnalyzer { /** * Returns a Graph of the given Configuration after transitive reduction. * - * Transitive reduction of requires public edge and requires edge have - * to be applied separately to prevent the requires public edges + * Transitive reduction of requires transitive edge and requires edge have + * to be applied separately to prevent the requires transitive edges * (e.g. U -> V) from being reduced by a path (U -> X -> Y -> V) * in which V would not be re-exported from U. */ private Graph gengraph(Set modules) { - // build a Graph containing only requires public edges + // build a Graph containing only requires transitive edges // with transitive reduction. Graph.Builder rpgbuilder = new Graph.Builder<>(); for (Module module : modules) { ModuleDescriptor md = module.descriptor(); String mn = md.name(); md.requires().stream() - .filter(d -> d.modifiers().contains(PUBLIC)) + .filter(d -> d.modifiers().contains(TRANSITIVE)) .map(d -> d.name()) .forEach(d -> rpgbuilder.addEdge(mn, d)); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java index 8d7b82094a1..056b53f2436 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleExportsAnalyzer.java @@ -178,7 +178,7 @@ public class ModuleExportsAnalyzer extends DepsAnalyzer { RootModule(String name) { super(name); - ModuleDescriptor.Builder builder = new ModuleDescriptor.Builder(name); + ModuleDescriptor.Builder builder = ModuleDescriptor.module(name); this.descriptor = builder.build(); } diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java index 4352963049b..812f9be0d68 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleGraphBuilder.java @@ -98,7 +98,7 @@ public class ModuleGraphBuilder extends Graph.Builder { }); }); - // read requires public from ModuleDescriptor + // read requires transitive from ModuleDescriptor Module source; while ((source = deque.poll()) != null) { if (visited.contains(source)) @@ -107,7 +107,7 @@ public class ModuleGraphBuilder extends Graph.Builder { visited.add(source); builder.addNode(source); Module from = source; - requiresPublic(from).forEach(m -> { + requiresTransitive(from).forEach(m -> { deque.add(m); builder.addEdge(from, m); }); @@ -116,13 +116,13 @@ public class ModuleGraphBuilder extends Graph.Builder { } /* - * Returns a stream of modules upon which the given module `requires public` + * Returns a stream of modules upon which the given module `requires transitive` */ - public Stream requiresPublic(Module m) { - // find requires public + public Stream requiresTransitive(Module m) { + // find requires transitive return m.descriptor() .requires().stream() - .filter(req -> req.modifiers().contains(PUBLIC)) + .filter(req -> req.modifiers().contains(TRANSITIVE)) .map(ModuleDescriptor.Requires::name) .map(config::findModule) .flatMap(Optional::stream); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java index ab493a61977..06a31cd6f45 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/ModuleInfoBuilder.java @@ -47,13 +47,14 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.function.Function; -import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.util.stream.Collectors.*; public class ModuleInfoBuilder { final JdepsConfiguration configuration; final Path outputdir; + final boolean open; final DependencyFinder dependencyFinder; final Analyzer analyzer; @@ -63,9 +64,11 @@ public class ModuleInfoBuilder { final Map automaticToExplicitModule; public ModuleInfoBuilder(JdepsConfiguration configuration, List args, - Path outputdir) { + Path outputdir, + boolean open) { this.configuration = configuration; this.outputdir = outputdir; + this.open = open; this.dependencyFinder = new DependencyFinder(configuration, DEFAULT_FILTER); this.analyzer = new Analyzer(configuration, Type.CLASS, DEFAULT_FILTER); @@ -73,13 +76,13 @@ public class ModuleInfoBuilder { // add targets to modulepath if it has module-info.class List paths = args.stream() .map(fn -> Paths.get(fn)) - .collect(Collectors.toList()); + .collect(toList()); // automatic module to convert to explicit module this.automaticToExplicitModule = ModuleFinder.of(paths.toArray(new Path[0])) .findAll().stream() .map(configuration::toModule) - .collect(Collectors.toMap(Function.identity(), Function.identity())); + .collect(toMap(Function.identity(), Function.identity())); Optional om = automaticToExplicitModule.keySet().stream() .filter(m -> !m.descriptor().isAutomatic()) @@ -96,7 +99,7 @@ public class ModuleInfoBuilder { public boolean run() throws IOException { try { // pass 1: find API dependencies - Map> requiresPublic = computeRequiresPublic(); + Map> requiresTransitive = computeRequiresTransitive(); // pass 2: analyze all class dependences dependencyFinder.parse(automaticModules().stream()); @@ -105,13 +108,13 @@ public class ModuleInfoBuilder { boolean missingDeps = false; for (Module m : automaticModules()) { - Set apiDeps = requiresPublic.containsKey(m) - ? requiresPublic.get(m) + Set apiDeps = requiresTransitive.containsKey(m) + ? requiresTransitive.get(m) : Collections.emptySet(); Path file = outputdir.resolve(m.name()).resolve("module-info.java"); - // computes requires and requires public + // computes requires and requires transitive Module explicitModule = toExplicitModule(m, apiDeps); if (explicitModule != null) { automaticToExplicitModule.put(m, explicitModule); @@ -136,7 +139,7 @@ public class ModuleInfoBuilder { return m == NOT_FOUND || m == REMOVED_JDK_INTERNALS; } - private Module toExplicitModule(Module module, Set requiresPublic) + private Module toExplicitModule(Module module, Set requiresTransitive) throws IOException { // done analysis @@ -148,7 +151,7 @@ public class ModuleInfoBuilder { } Map requires = new HashMap<>(); - requiresPublic.stream() + requiresTransitive.stream() .map(Archive::getModule) .forEach(m -> requires.put(m.name(), Boolean.TRUE)); @@ -183,53 +186,60 @@ public class ModuleInfoBuilder { }); } - void writeModuleInfo(Path file, ModuleDescriptor descriptor) { + void writeModuleInfo(Path file, ModuleDescriptor md) { try { Files.createDirectories(file.getParent()); try (PrintWriter pw = new PrintWriter(Files.newOutputStream(file))) { - printModuleInfo(pw, descriptor); + printModuleInfo(pw, md); } } catch (IOException e) { throw new UncheckedIOException(e); } } - private void printModuleInfo(PrintWriter writer, ModuleDescriptor descriptor) { - writer.format("module %s {%n", descriptor.name()); + private void printModuleInfo(PrintWriter writer, ModuleDescriptor md) { + writer.format("%smodule %s {%n", open ? "open " : "", md.name()); Map modules = configuration.getModules(); // first print the JDK modules - descriptor.requires().stream() - .filter(req -> !req.name().equals("java.base")) // implicit requires - .sorted(Comparator.comparing(Requires::name)) - .forEach(req -> writer.format(" requires %s;%n", req)); + md.requires().stream() + .filter(req -> !req.name().equals("java.base")) // implicit requires + .sorted(Comparator.comparing(Requires::name)) + .forEach(req -> writer.format(" requires %s;%n", req)); - descriptor.exports().stream() - .peek(exp -> { - if (exp.targets().size() > 0) - throw new InternalError(descriptor.name() + " qualified exports: " + exp); - }) - .sorted(Comparator.comparing(Exports::source)) - .forEach(exp -> writer.format(" exports %s;%n", exp.source())); + if (!open) { + md.exports().stream() + .peek(exp -> { + if (exp.targets().size() > 0) + throw new InternalError(md.name() + " qualified exports: " + exp); + }) + .sorted(Comparator.comparing(Exports::source)) + .forEach(exp -> writer.format(" exports %s;%n", exp.source())); + } - descriptor.provides().values().stream() - .sorted(Comparator.comparing(Provides::service)) - .forEach(p -> p.providers().stream() - .sorted() - .forEach(impl -> writer.format(" provides %s with %s;%n", p.service(), impl))); + md.provides().stream() + .sorted(Comparator.comparing(Provides::service)) + .map(p -> p.providers().stream() + .map(impl -> " " + impl.replace('$', '.')) + .collect(joining(",\n", + String.format(" provides %s with%n", + p.service().replace('$', '.')), + ";"))) + .forEach(writer::println); writer.println("}"); } - private Set automaticModules() { return automaticToExplicitModule.keySet(); } /** - * Compute 'requires public' dependences by analyzing API dependencies + * Compute 'requires transitive' dependences by analyzing API dependencies */ - private Map> computeRequiresPublic() throws IOException { + private Map> computeRequiresTransitive() + throws IOException + { // parse the input modules dependencyFinder.parseExportedAPIs(automaticModules().stream()); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties index 4189ae86745..7a57f64cbe6 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/jdeps.properties @@ -125,6 +125,13 @@ main.opt.generate-module-info=\ \ --generate-module-info Generate module-info.java under the specified\n\ \ directory. The specified JAR files will be\n\ \ analyzed. This option cannot be used with\n\ +\ --dot-output or --class-path. Use \n\ +\ --generate-open-module option for open modules. + +main.opt.generate-open-module=\ +\ --generate-open-module Generate module-info.java for the specified\n\ +\ JAR files under the specified directory as\n\ +\ open modules. This option cannot be used with\n\ \ --dot-output or --class-path. main.opt.check=\ diff --git a/langtools/src/jdk.jdeps/share/classes/module-info.java b/langtools/src/jdk.jdeps/share/classes/module-info.java index 7c1240dd907..87e2135dd7d 100644 --- a/langtools/src/jdk.jdeps/share/classes/module-info.java +++ b/langtools/src/jdk.jdeps/share/classes/module-info.java @@ -33,9 +33,7 @@ module jdk.jdeps { exports com.sun.tools.classfile to jdk.jlink; - provides java.util.spi.ToolProvider - with com.sun.tools.javap.Main.JavapToolProvider; - - provides java.util.spi.ToolProvider - with com.sun.tools.jdeps.Main.JDepsToolProvider; + provides java.util.spi.ToolProvider with + com.sun.tools.javap.Main.JavapToolProvider, + com.sun.tools.jdeps.Main.JDepsToolProvider; } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties index b4d93350c14..055b044bb27 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties +++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/resources/l10n_ja.properties @@ -126,7 +126,7 @@ jshell.err.retained.mode.failure = \u4FDD\u6301\u3055\u308C\u305F\u30E2\u30FC\u3 jshell.console.see.more = <\u8A73\u7D30\u306F\u3001\u30BF\u30D6\u3092\u62BC\u3057\u3066\u304F\u3060\u3055\u3044> jshell.console.do.nothing = \u4F55\u3082\u3057\u306A\u3044 -jshell.console.choice = \u9078\u629E: +jshell.console.choice = \u9078\u629E: jshell.console.create.variable = \u5909\u6570\u306E\u4F5C\u6210 jshell.console.resolvable = \n\u8B58\u5225\u5B50\u306F\u3053\u306E\u30B3\u30F3\u30C6\u30AD\u30B9\u30C8\u3067\u89E3\u6C7A\u3067\u304D\u307E\u3059\u3002 jshell.console.no.candidate = \n\u30A4\u30F3\u30DD\u30FC\u30C8\u3059\u308B\u5019\u88DC\u306E\u5B8C\u5168\u4FEE\u98FE\u3055\u308C\u305F\u540D\u524D\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3002 diff --git a/langtools/src/jdk.jshell/share/classes/module-info.java b/langtools/src/jdk.jshell/share/classes/module-info.java index f8d812255f7..fedd6287d11 100644 --- a/langtools/src/jdk.jshell/share/classes/module-info.java +++ b/langtools/src/jdk.jshell/share/classes/module-info.java @@ -29,7 +29,7 @@ * Read-Eval-Print Loops (REPLs). */ module jdk.jshell { - requires public java.compiler; + requires transitive java.compiler; requires java.prefs; requires jdk.compiler; requires jdk.internal.le; diff --git a/langtools/test/TEST.ROOT b/langtools/test/TEST.ROOT index dc236a5fd39..43aafaddba5 100644 --- a/langtools/test/TEST.ROOT +++ b/langtools/test/TEST.ROOT @@ -14,8 +14,8 @@ keys=intermittent randomness # Group definitions groups=TEST.groups -# Tests using jtreg 4.2 b03 features -requiredVersion=4.2 b03 +# Tests using jtreg 4.2 b04 features +requiredVersion=4.2 b04 # Use new module options useNewOptions=true diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java index 12703fa145a..d36d7e35290 100644 --- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java +++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 + * @bug 8154119 8154262 8156077 8157987 8154261 8154817 8135291 8155995 8162363 8168766 * @summary Test modules support in javadoc. * @author bpatel * @library ../lib @@ -181,6 +181,34 @@ public class TestModules extends JavadocTester { checkModuleFilesAndLinks(true); } + /** + * Test generated module pages for a deprecated module. + */ + @Test + void testModuleDeprecation() { + javadoc("-d", "out-moduledepr", + "-tag", "regular:a:Regular Tag:", + "-tag", "moduletag:s:Module Tag:", + "--module-source-path", testSrc, + "--module", "module1,module2,moduletags", + "testpkgmdl1", "testpkgmdl2", "testpkgmdltags"); + checkExit(Exit.OK); + checkModuleDeprecation(true); + } + + /** + * Test annotations on modules. + */ + @Test + void testModuleAnnotation() { + javadoc("-d", "out-moduleanno", + "--module-source-path", testSrc, + "--module", "module1,module2", + "testpkgmdl1", "testpkgmdl2"); + checkExit(Exit.OK); + checkModuleAnnotation(); + } + void checkDescription(boolean found) { checkOutput("module1-summary.html", found, "\n" @@ -218,6 +246,9 @@ public class TestModules extends JavadocTester { void checkHtml5Description(boolean found) { checkOutput("module1-summary.html", found, "
    \n" + + "
    Deprecated.\n" + + "
    This module is deprecated.
    \n" + + "
    \n" + "\n" + "\n" + "\n" @@ -556,4 +587,37 @@ public class TestModules extends JavadocTester { + "
     
    \n" + ""); } + + void checkModuleDeprecation(boolean found) { + checkOutput("module1-summary.html", found, + "
    Deprecated.\n" + + "
    This module is deprecated.
    \n" + + "
    "); + checkOutput("deprecated-list.html", found, + "    ", + "\n" + + "module1\n" + + "\n" + + "
    This module is deprecated.
    \n" + + "\n" + + ""); + checkOutput("module2-summary.html", !found, + "
    Deprecated.\n" + + "
    This module is deprecated using just the javadoc tag.
    "); + checkOutput("moduletags-summary.html", found, + "

    @Deprecated\n" + + "

    ", + "
    Deprecated.
    "); + } + + void checkModuleAnnotation() { + checkOutput("module2-summary.html", true, + "

    @AnnotationType(optional=\"Module Annotation\",\n" + + " required=2016)\n" + + "

    "); + checkOutput("module2-summary.html", false, + "@AnnotationTypeUndocumented"); +} } diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module1/module-info.java b/langtools/test/jdk/javadoc/doclet/testModules/module1/module-info.java index 90b3107c125..c5e1fba0d3f 100644 --- a/langtools/test/jdk/javadoc/doclet/testModules/module1/module-info.java +++ b/langtools/test/jdk/javadoc/doclet/testModules/module1/module-info.java @@ -25,7 +25,10 @@ /** * This is a test description for the module1 module. Search phrase {@index "search phrase" with description}. + * + * @deprecated This module is deprecated. */ +@Deprecated module module1 { requires module2; diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/module-info.java b/langtools/test/jdk/javadoc/doclet/testModules/module2/module-info.java index d499edab22c..fea478d2104 100644 --- a/langtools/test/jdk/javadoc/doclet/testModules/module2/module-info.java +++ b/langtools/test/jdk/javadoc/doclet/testModules/module2/module-info.java @@ -25,7 +25,11 @@ /** * This is a test description for the module2 module. Search word {@index search_word} with no description. + * + * @deprecated This module is deprecated using just the javadoc tag. */ +@testpkgmdl2.AnnotationType(optional="Module Annotation", required=2016) +@testpkgmdl2.AnnotationTypeUndocumented(optional="Module Annotation", required=2016) module module2 { exports testpkgmdl2; diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationType.java b/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationType.java new file mode 100644 index 00000000000..5a0a219dd44 --- /dev/null +++ b/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationType.java @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package testpkgmdl2; + +import java.lang.annotation.*; + +/** + * This is a test annotation type. + */ +@Documented public @interface AnnotationType { + + /** + * The copyright holder. + * + * @return a string. + */ + String optional() default "unknown"; + + /** + * The year of the copyright. + * + * @return an int. + */ + int required(); +} diff --git a/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationTypeUndocumented.java b/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationTypeUndocumented.java new file mode 100644 index 00000000000..757e587dcba --- /dev/null +++ b/langtools/test/jdk/javadoc/doclet/testModules/module2/testpkgmdl2/AnnotationTypeUndocumented.java @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package testpkgmdl2; + +import java.lang.annotation.*; + +/** + * This is a test annotation type this is not documented because it + * is missing the @Documented tag. + */ +public @interface AnnotationTypeUndocumented { + + /** + * The copyright holder. + * + * @return a string. + */ + String optional() default "unknown"; + + /** + * The year of the copyright. + * + * @return an int. + */ + int required(); +} diff --git a/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java b/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java index 6265256a570..ecd34736968 100644 --- a/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java +++ b/langtools/test/jdk/javadoc/doclet/testModules/moduletags/module-info.java @@ -37,6 +37,7 @@ * @moduletag Just a simple module tag. * @version 1.0 */ +@Deprecated module moduletags { requires module2; diff --git a/langtools/test/jdk/javadoc/tool/modules/Modules.java b/langtools/test/jdk/javadoc/tool/modules/Modules.java index 39f94b666bf..2af3ba81d9d 100644 --- a/langtools/test/jdk/javadoc/tool/modules/Modules.java +++ b/langtools/test/jdk/javadoc/tool/modules/Modules.java @@ -393,14 +393,14 @@ public class Modules extends ModuleTestBase { * Module M : test module, with variable requires * * Module N : - * requires public O ---> Module O: - * requires J ----> Module J: - * exports openO exports openJ + * requires transitive O ---> Module O: + * requires J ----> Module J: + * exports openO exports openJ * * * Module L : - * requires public P ---> Module P: - * exports openP + * requires transitive P ---> Module P: + * exports openP * * */ @@ -431,14 +431,14 @@ public class Modules extends ModuleTestBase { } @Test - public void testExpandRequiresPublic(Path base) throws Exception { + public void testExpandRequiresTransitive(Path base) throws Exception { Path src = base.resolve("src"); createAuxiliaryModules(src); new ModuleBuilder(tb, "M") .comment("The M module.") - .requiresPublic("N", src) + .requiresTransitive("N", src) .requires("L", src) .exports("p") .classes("package p; public class Main { openO.O o; openN.N n; openL.L l; }") @@ -446,7 +446,7 @@ public class Modules extends ModuleTestBase { execTask("--module-source-path", src.toString(), "--module", "M", - "--expand-requires", "public"); + "--expand-requires", "transitive"); checkModulesSpecified("M", "N", "O"); checkModulesIncluded("M", "N", "O"); @@ -462,7 +462,7 @@ public class Modules extends ModuleTestBase { new ModuleBuilder(tb, "M") .comment("The M module.") - .requiresPublic("N", src) + .requiresTransitive("N", src) .requires("L", src) .requires("O", src) .exports("p") @@ -490,7 +490,7 @@ public class Modules extends ModuleTestBase { new ModuleBuilder(tb, "M") .comment("The M module.") - .requiresPublic("N", src) + .requiresTransitive("N", src) .requires("L", src) .requires("O", src) .exports("p") @@ -512,7 +512,7 @@ public class Modules extends ModuleTestBase { new ModuleBuilder(tb, "M") .comment("The M module.") - .requiresPublic("N", src) + .requiresTransitive("N", src) .requires("L", src) .requires("O", src) .exports("p") @@ -538,7 +538,7 @@ public class Modules extends ModuleTestBase { new ModuleBuilder(tb, "L") .comment("The L module.") .exports("openL") - .requiresPublic("P") + . requiresTransitive("P") .classes("package openL; /** Class L open */ public class L { }") .classes("package closedL; /** Class L closed */ public class L { }") .write(src); @@ -546,7 +546,7 @@ public class Modules extends ModuleTestBase { new ModuleBuilder(tb, "N") .comment("The N module.") .exports("openN") - .requiresPublic("O") + .requiresTransitive("O") .classes("package openN; /** Class N open */ public class N { }") .classes("package closedN; /** Class N closed */ public class N { }") .write(src); diff --git a/langtools/test/jdk/jshell/CompletionSuggestionTest.java b/langtools/test/jdk/jshell/CompletionSuggestionTest.java index 8e355a1bd2b..6b068bc1234 100644 --- a/langtools/test/jdk/jshell/CompletionSuggestionTest.java +++ b/langtools/test/jdk/jshell/CompletionSuggestionTest.java @@ -29,6 +29,7 @@ * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main * jdk.jdeps/com.sun.tools.javap + * jdk.jshell/jdk.jshell:open * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask * @build KullaTesting TestingInputStream Compiler * @run testng CompletionSuggestionTest diff --git a/langtools/test/jdk/jshell/ComputeFQNsTest.java b/langtools/test/jdk/jshell/ComputeFQNsTest.java index 84b053a30ab..5a826529372 100644 --- a/langtools/test/jdk/jshell/ComputeFQNsTest.java +++ b/langtools/test/jdk/jshell/ComputeFQNsTest.java @@ -28,6 +28,7 @@ * @library /tools/lib * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main + * jdk.jshell/jdk.jshell:open * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask * @build KullaTesting TestingInputStream Compiler * @run testng ComputeFQNsTest diff --git a/langtools/test/jdk/jshell/HistoryTest.java b/langtools/test/jdk/jshell/HistoryTest.java index 2dfc9a36a4d..cbad5b2b319 100644 --- a/langtools/test/jdk/jshell/HistoryTest.java +++ b/langtools/test/jdk/jshell/HistoryTest.java @@ -26,7 +26,7 @@ * @bug 8166744 * @summary Test Completion * @modules jdk.internal.le/jdk.internal.jline.extra - * jdk.jshell/jdk.internal.jshell.tool + * jdk.jshell/jdk.internal.jshell.tool:+open * @build HistoryTest * @run testng HistoryTest */ diff --git a/langtools/test/jdk/jshell/JavadocTest.java b/langtools/test/jdk/jshell/JavadocTest.java index d1b36bd3d81..5fc847b98f2 100644 --- a/langtools/test/jdk/jshell/JavadocTest.java +++ b/langtools/test/jdk/jshell/JavadocTest.java @@ -28,7 +28,7 @@ * @library /tools/lib * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main - * jdk.jshell + * jdk.jshell/jdk.jshell:open * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask * @build KullaTesting TestingInputStream Compiler * @run testng JavadocTest diff --git a/langtools/test/jdk/jshell/PipeInputStreamTest.java b/langtools/test/jdk/jshell/PipeInputStreamTest.java index c062028e3ba..ba097b18694 100644 --- a/langtools/test/jdk/jshell/PipeInputStreamTest.java +++ b/langtools/test/jdk/jshell/PipeInputStreamTest.java @@ -25,7 +25,7 @@ * @test 8167461 * @summary Verify PipeInputStream works. * @modules jdk.compiler/com.sun.tools.javac.util - * jdk.jshell + * jdk.jshell/jdk.jshell.execution:open * @run testng PipeInputStreamTest */ diff --git a/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java b/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java index 4a8ccea3a96..480e380c68d 100644 --- a/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java +++ b/langtools/test/lib/annotations/annotations/classfile/ClassfileInspector.java @@ -1188,7 +1188,7 @@ public class ClassfileInspector { } @Override - public Void visitConcealedPackages(ConcealedPackages_attribute attr, T p) { + public Void visitModulePackages(ModulePackages_attribute attr, T p) { return null; } @@ -1238,7 +1238,7 @@ public class ClassfileInspector { } @Override - public Void visitHashes(Hashes_attribute attr, T p) { + public Void visitModuleHashes(ModuleHashes_attribute attr, T p) { return null; } @@ -1263,7 +1263,7 @@ public class ClassfileInspector { } @Override - public Void visitMainClass(MainClass_attribute attr, T p) { + public Void visitModuleMainClass(ModuleMainClass_attribute attr, T p) { return null; } @@ -1343,12 +1343,12 @@ public class ClassfileInspector { } @Override - public Void visitTargetPlatform(TargetPlatform_attribute attr, T p) { + public Void visitModuleTarget(ModuleTarget_attribute attr, T p) { return null; } @Override - public Void visitVersion(Version_attribute attr, T p) { + public Void visitModuleVersion(ModuleVersion_attribute attr, T p) { return null; } diff --git a/langtools/test/tools/javac/6304921/TestLog.java b/langtools/test/tools/javac/6304921/TestLog.java index 4c245dcb622..a2c2dfb69f8 100644 --- a/langtools/test/tools/javac/6304921/TestLog.java +++ b/langtools/test/tools/javac/6304921/TestLog.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -28,7 +28,7 @@ * @modules jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.parser * jdk.compiler/com.sun.tools.javac.tree - * jdk.compiler/com.sun.tools.javac.util + * jdk.compiler/com.sun.tools.javac.util:+open */ import java.lang.reflect.Field; import java.io.InputStream; diff --git a/langtools/test/tools/javac/6410653/T6410653.java b/langtools/test/tools/javac/6410653/T6410653.java index ff0d89a60e6..090d9ce3716 100644 --- a/langtools/test/tools/javac/6410653/T6410653.java +++ b/langtools/test/tools/javac/6410653/T6410653.java @@ -27,7 +27,7 @@ * @summary REGRESSION: javac crashes if -d or -s argument is a file * @author Peter von der Ah\u00e9 * @modules java.compiler - * jdk.compiler/com.sun.tools.javac.util + * jdk.compiler/com.sun.tools.javac.util:open */ import java.lang.reflect.Field; diff --git a/langtools/test/tools/javac/MethodParameters/AnnotationTest.java b/langtools/test/tools/javac/MethodParameters/AnnotationTest.java index 2505ddb8449..68ef14f5b93 100644 --- a/langtools/test/tools/javac/MethodParameters/AnnotationTest.java +++ b/langtools/test/tools/javac/MethodParameters/AnnotationTest.java @@ -26,7 +26,7 @@ * @bug 8006582 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters AnnotationTest.java * @run main MethodParametersTester AnnotationTest AnnotationTest.out */ diff --git a/langtools/test/tools/javac/MethodParameters/AnonymousClass.java b/langtools/test/tools/javac/MethodParameters/AnonymousClass.java index f76bd11b966..42acefe6be9 100644 --- a/langtools/test/tools/javac/MethodParameters/AnonymousClass.java +++ b/langtools/test/tools/javac/MethodParameters/AnonymousClass.java @@ -26,7 +26,7 @@ * @bug 8006582 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters AnonymousClass.java * @run main MethodParametersTester AnonymousClass AnonymousClass.out */ diff --git a/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java b/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java index f189fe39813..85e6f105632 100644 --- a/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java +++ b/langtools/test/tools/javac/MethodParameters/AttributeVisitor.java @@ -34,19 +34,21 @@ class AttributeVisitor implements Attribute.Visitor { public R visitCharacterRangeTable(CharacterRangeTable_attribute attr, P p) { return null; } public R visitCode(Code_attribute attr, P p) { return null; } public R visitCompilationID(CompilationID_attribute attr, P p) { return null; } - public R visitConcealedPackages(ConcealedPackages_attribute attr, P p) { return null; } public R visitConstantValue(ConstantValue_attribute attr, P p) { return null; } public R visitDeprecated(Deprecated_attribute attr, P p) { return null; } public R visitEnclosingMethod(EnclosingMethod_attribute attr, P p) { return null; } public R visitExceptions(Exceptions_attribute attr, P p) { return null; } - public R visitHashes(Hashes_attribute attr, P p) { return null; } public R visitInnerClasses(InnerClasses_attribute attr, P p) { return null; } public R visitLineNumberTable(LineNumberTable_attribute attr, P p) { return null; } public R visitLocalVariableTable(LocalVariableTable_attribute attr, P p) { return null; } public R visitLocalVariableTypeTable(LocalVariableTypeTable_attribute attr, P p) { return null; } - public R visitMainClass(MainClass_attribute attr, P p) { return null; } public R visitMethodParameters(MethodParameters_attribute attr, P p) { return null; } public R visitModule(Module_attribute attr, P p) { return null; } + public R visitModuleHashes(ModuleHashes_attribute attr, P p) { return null; } + public R visitModuleMainClass(ModuleMainClass_attribute attr, P p) { return null; } + public R visitModulePackages(ModulePackages_attribute attr, P p) { return null; } + public R visitModuleTarget(ModuleTarget_attribute attr, P p) { return null; } + public R visitModuleVersion(ModuleVersion_attribute attr, P p) { return null; } public R visitRuntimeVisibleAnnotations(RuntimeVisibleAnnotations_attribute attr, P p) { return null; } public R visitRuntimeInvisibleAnnotations(RuntimeInvisibleAnnotations_attribute attr, P p) { return null; } public R visitRuntimeVisibleParameterAnnotations(RuntimeVisibleParameterAnnotations_attribute attr, P p) { return null; } @@ -60,6 +62,4 @@ class AttributeVisitor implements Attribute.Visitor { public R visitStackMap(StackMap_attribute attr, P p) { return null; } public R visitStackMapTable(StackMapTable_attribute attr, P p) { return null; } public R visitSynthetic(Synthetic_attribute attr, P p) { return null; } - public R visitTargetPlatform(TargetPlatform_attribute attr, P p) { return null; } - public R visitVersion(Version_attribute attr, P p) { return null; } } diff --git a/langtools/test/tools/javac/MethodParameters/Constructors.java b/langtools/test/tools/javac/MethodParameters/Constructors.java index 02b360ed7c5..b7629ce98fb 100644 --- a/langtools/test/tools/javac/MethodParameters/Constructors.java +++ b/langtools/test/tools/javac/MethodParameters/Constructors.java @@ -26,7 +26,7 @@ * @bug 8006582 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters Constructors.java * @run main MethodParametersTester Constructors Constructors.out */ diff --git a/langtools/test/tools/javac/MethodParameters/EnumTest.java b/langtools/test/tools/javac/MethodParameters/EnumTest.java index 7ff37392b24..3c7bdd6e6a7 100644 --- a/langtools/test/tools/javac/MethodParameters/EnumTest.java +++ b/langtools/test/tools/javac/MethodParameters/EnumTest.java @@ -26,7 +26,7 @@ * @bug 8006582 8008658 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters EnumTest.java * @run main MethodParametersTester EnumTest EnumTest.out */ diff --git a/langtools/test/tools/javac/MethodParameters/InstanceMethods.java b/langtools/test/tools/javac/MethodParameters/InstanceMethods.java index 8da1cb6aa53..980cee378c3 100644 --- a/langtools/test/tools/javac/MethodParameters/InstanceMethods.java +++ b/langtools/test/tools/javac/MethodParameters/InstanceMethods.java @@ -26,7 +26,7 @@ * @bug 8006582 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters InstanceMethods.java * @run main MethodParametersTester InstanceMethods InstanceMethods.out */ diff --git a/langtools/test/tools/javac/MethodParameters/LambdaTest.java b/langtools/test/tools/javac/MethodParameters/LambdaTest.java index 0fb92b67721..66ec67c7fa4 100644 --- a/langtools/test/tools/javac/MethodParameters/LambdaTest.java +++ b/langtools/test/tools/javac/MethodParameters/LambdaTest.java @@ -26,7 +26,7 @@ * @bug 8006582 8037546 8138729 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters LambdaTest.java * @run main MethodParametersTester LambdaTest LambdaTest.out */ diff --git a/langtools/test/tools/javac/MethodParameters/LocalClassTest.java b/langtools/test/tools/javac/MethodParameters/LocalClassTest.java index 593daea4803..21d141f7a6e 100644 --- a/langtools/test/tools/javac/MethodParameters/LocalClassTest.java +++ b/langtools/test/tools/javac/MethodParameters/LocalClassTest.java @@ -26,7 +26,7 @@ * @bug 8006582 8008658 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters LocalClassTest.java * @run main MethodParametersTester LocalClassTest LocalClassTest.out */ diff --git a/langtools/test/tools/javac/MethodParameters/MemberClassTest.java b/langtools/test/tools/javac/MethodParameters/MemberClassTest.java index a2caf36a6b5..04e3cf79326 100644 --- a/langtools/test/tools/javac/MethodParameters/MemberClassTest.java +++ b/langtools/test/tools/javac/MethodParameters/MemberClassTest.java @@ -26,7 +26,7 @@ * @bug 8006582 8008658 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters MemberClassTest.java * @run main MethodParametersTester MemberClassTest MemberClassTest.out */ diff --git a/langtools/test/tools/javac/MethodParameters/StaticMethods.java b/langtools/test/tools/javac/MethodParameters/StaticMethods.java index 9848bcca1ca..186d6b5b640 100644 --- a/langtools/test/tools/javac/MethodParameters/StaticMethods.java +++ b/langtools/test/tools/javac/MethodParameters/StaticMethods.java @@ -26,7 +26,7 @@ * @bug 8006582 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters StaticMethods.java * @run main MethodParametersTester StaticMethods StaticMethods.out */ diff --git a/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java b/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java index 445d77412b7..ab6dbc38841 100644 --- a/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java +++ b/langtools/test/tools/javac/MethodParameters/UncommonParamNames.java @@ -26,7 +26,7 @@ * @bug 8006582 * @summary javac should generate method parameters correctly. * @modules jdk.jdeps/com.sun.tools.classfile - * @build MethodParametersTester + * @build MethodParametersTester ClassFileVisitor ReflectionVisitor * @compile -parameters UncommonParamNames.java * @run main MethodParametersTester UncommonParamNames UncommonParamNames.out */ diff --git a/langtools/test/tools/javac/T6435291/T6435291.java b/langtools/test/tools/javac/T6435291/T6435291.java index 85a33459cb8..3bd60980032 100644 --- a/langtools/test/tools/javac/T6435291/T6435291.java +++ b/langtools/test/tools/javac/T6435291/T6435291.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/langtools/test/tools/javac/api/6400303/T6400303.java b/langtools/test/tools/javac/api/6400303/T6400303.java index 3b866733f59..4feeb994fc4 100644 --- a/langtools/test/tools/javac/api/6400303/T6400303.java +++ b/langtools/test/tools/javac/api/6400303/T6400303.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/langtools/test/tools/javac/api/TestResolveIdent.java b/langtools/test/tools/javac/api/TestResolveIdent.java index bb0fd0b9710..c72f652ce3e 100644 --- a/langtools/test/tools/javac/api/TestResolveIdent.java +++ b/langtools/test/tools/javac/api/TestResolveIdent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java index a5a8f840a0b..fca688aa8c7 100644 --- a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java +++ b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTest.java @@ -24,8 +24,9 @@ /* * @test * @summary Module attribute tests - * @bug 8080878 - * @modules jdk.compiler/com.sun.tools.javac.api + * @bug 8080878 8161906 8162713 + * @modules java.compiler + * jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main * jdk.compiler/com.sun.tools.javac.util * jdk.jdeps/com.sun.tools.classfile @@ -56,7 +57,7 @@ public class ModuleTest extends ModuleTestBase { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") .exports("pack") .write(base); - tb.writeJavaFiles(base, "package pack; public class C extends java.util.ArrayList{}"); + tb.writeJavaFiles(base, "package pack; public class C extends java.util.ArrayList{ }"); compile(base); testModuleAttribute(base, moduleDescriptor); } @@ -67,11 +68,15 @@ public class ModuleTest extends ModuleTestBase { .exports("pack") .exports("pack2") .exports("pack3") + .exports("pack4") + .exports("pack5") .write(base); tb.writeJavaFiles(base, - "package pack; public class A {}", - "package pack2; public class B {}", - "package pack3; public class C {}"); + "package pack; public class A { }", + "package pack2; public class B { }", + "package pack3; public class C { }", + "package pack4; public class C { }", + "package pack5; public class C { }"); compile(base); testModuleAttribute(base, moduleDescriptor); } @@ -81,7 +86,17 @@ public class ModuleTest extends ModuleTestBase { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") .exportsTo("pack", "jdk.compiler") .write(base); - tb.writeJavaFiles(base, "package pack; public class A {}"); + tb.writeJavaFiles(base, "package pack; public class A { }"); + compile(base); + testModuleAttribute(base, moduleDescriptor); + } + + @Test + public void testQualifiedDynamicExports(Path base) throws Exception { + ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") + .exportsTo("pack", "jdk.compiler") + .write(base); + tb.writeJavaFiles(base, "package pack; public class A { }"); compile(base); testModuleAttribute(base, moduleDescriptor); } @@ -89,14 +104,18 @@ public class ModuleTest extends ModuleTestBase { @Test public void testSeveralQualifiedExports(Path base) throws Exception { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") - .exportsTo("pack", "jdk.compiler, java.xml") - .exportsTo("pack2", "java.xml") + .exportsTo("pack", "jdk.compiler, jdk.jdeps") + .exportsTo("pack2", "jdk.jdeps") .exportsTo("pack3", "jdk.compiler") + .exportsTo("pack4", "jdk.compiler, jdk.jdeps") + .exportsTo("pack5", "jdk.compiler") .write(base); tb.writeJavaFiles(base, "package pack; public class A {}", "package pack2; public class B {}", - "package pack3; public class C {}"); + "package pack3; public class C {}", + "package pack4; public class C {}", + "package pack5; public class C {}"); compile(base); testModuleAttribute(base, moduleDescriptor); } @@ -111,9 +130,18 @@ public class ModuleTest extends ModuleTestBase { } @Test - public void testRequiresPublic(Path base) throws Exception { + public void testRequiresTransitive(Path base) throws Exception { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") - .requiresPublic("java.xml") + .requires("jdk.jdeps", RequiresFlag.TRANSITIVE) + .write(base); + compile(base); + testModuleAttribute(base, moduleDescriptor); + } + + @Test + public void testRequiresStatic(Path base) throws Exception { + ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") + .requires("jdk.jdeps", RequiresFlag.STATIC) .write(base); compile(base); testModuleAttribute(base, moduleDescriptor); @@ -122,13 +150,20 @@ public class ModuleTest extends ModuleTestBase { @Test public void testSeveralRequires(Path base) throws Exception { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") - .requiresPublic("java.xml") - .requires("java.compiler") + .requires("jdk.jdeps", RequiresFlag.TRANSITIVE) .requires("jdk.compiler") - .requiresPublic("jdk.scripting.nashorn") - .write(base); - compile(base); - testModuleAttribute(base, moduleDescriptor); + .requires("m2", RequiresFlag.STATIC) + .requires("m3") + .requires("m4", RequiresFlag.TRANSITIVE) + .requires("m5", RequiresFlag.STATIC, RequiresFlag.TRANSITIVE) + .write(base.resolve("m1")); + tb.writeJavaFiles(base.resolve("m2"), "module m2 { }"); + tb.writeJavaFiles(base.resolve("m3"), "module m3 { }"); + tb.writeJavaFiles(base.resolve("m4"), "module m4 { }"); + tb.writeJavaFiles(base.resolve("m5"), "module m5 { }"); + compile(base, "--module-source-path", base.toString(), + "-d", base.toString()); + testModuleAttribute(base.resolve("m1"), moduleDescriptor); } @Test @@ -136,7 +171,7 @@ public class ModuleTest extends ModuleTestBase { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") .provides("java.util.Collection", "pack2.D") .write(base); - tb.writeJavaFiles(base, "package pack2; public class D extends java.util.ArrayList{}"); + tb.writeJavaFiles(base, "package pack2; public class D extends java.util.ArrayList{ }"); compile(base); testModuleAttribute(base, moduleDescriptor); } @@ -146,15 +181,11 @@ public class ModuleTest extends ModuleTestBase { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") .provides("java.util.Collection", "pack2.D") .provides("java.util.List", "pack2.D") - .requires("java.logging") - .provides("java.util.logging.Logger", "pack2.C") + .requires("jdk.compiler") + .provides("com.sun.tools.javac.Main", "pack2.C") .write(base); - tb.writeJavaFiles(base, "package pack2; public class D extends java.util.ArrayList{}", - "package pack2; public class C extends java.util.logging.Logger{ " + - "public C() { super(\"\",\"\"); } \n" + - "C(String a,String b){" + - " super(a,b);" + - "}}"); + tb.writeJavaFiles(base, "package pack2; public class D extends java.util.ArrayList{ }", + "package pack2; public class C extends com.sun.tools.javac.Main{ }"); compile(base); testModuleAttribute(base, moduleDescriptor); } @@ -173,8 +204,8 @@ public class ModuleTest extends ModuleTestBase { ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") .uses("java.util.List") .uses("java.util.Collection") - .requires("java.logging") - .uses("java.util.logging.Logger") + .requires("jdk.compiler") + .uses("javax.tools.JavaCompiler") .write(base); compile(base); testModuleAttribute(base, moduleDescriptor); @@ -182,26 +213,44 @@ public class ModuleTest extends ModuleTestBase { @Test public void testComplex(Path base) throws Exception { + Path m1 = base.resolve("m1"); ModuleDescriptor moduleDescriptor = new ModuleDescriptor("m1") .exports("pack1") - .exportsTo("packTo1", "java.xml") + .exports("pack3") + .exportsTo("packTo1", "m2") + .exportsTo("packTo3", "m3") .requires("jdk.compiler") - .requiresPublic("java.xml") - .provides("java.util.List", "pack1.C") + .requires("m2", RequiresFlag.TRANSITIVE) + .requires("m3", RequiresFlag.STATIC) + .requires("m4", RequiresFlag.TRANSITIVE, RequiresFlag.STATIC) + .provides("java.util.List", "pack1.C", "pack2.D") .uses("java.util.List") .uses("java.nio.file.Path") - .provides("java.util.List", "pack2.D") - .requiresPublic("java.desktop") + .requires("jdk.jdeps", RequiresFlag.STATIC, RequiresFlag.TRANSITIVE) + .requires("m5", RequiresFlag.STATIC) + .requires("m6", RequiresFlag.TRANSITIVE) .requires("java.compiler") + .exportsTo("packTo4", "java.compiler") .exportsTo("packTo2", "java.compiler") + .exports("pack4") .exports("pack2") - .write(base); - tb.writeJavaFiles(base, "package pack1; public class C extends java.util.ArrayList{}", - "package pack2; public class D extends java.util.ArrayList{}"); - tb.writeJavaFiles(base, + .write(m1); + tb.writeJavaFiles(m1, "package pack1; public class C extends java.util.ArrayList{ }", + "package pack2; public class D extends java.util.ArrayList{ }", + "package pack3; public class D extends java.util.ArrayList{ }", + "package pack4; public class D extends java.util.ArrayList{ }"); + tb.writeJavaFiles(m1, "package packTo1; public class T1 {}", - "package packTo2; public class T2 {}"); - compile(base); - testModuleAttribute(base, moduleDescriptor); + "package packTo2; public class T2 {}", + "package packTo3; public class T3 {}", + "package packTo4; public class T4 {}"); + tb.writeJavaFiles(base.resolve("m2"), "module m2 { }"); + tb.writeJavaFiles(base.resolve("m3"), "module m3 { }"); + tb.writeJavaFiles(base.resolve("m4"), "module m4 { }"); + tb.writeJavaFiles(base.resolve("m5"), "module m5 { }"); + tb.writeJavaFiles(base.resolve("m6"), "module m6 { }"); + compile(base, "--module-source-path", base.toString(), + "-d", base.toString()); + testModuleAttribute(m1, moduleDescriptor); } } diff --git a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java index b48942dea73..9762afd8c8e 100644 --- a/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java +++ b/langtools/test/tools/javac/classfiles/attributes/Module/ModuleTestBase.java @@ -38,6 +38,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.regex.Pattern; @@ -86,7 +87,8 @@ public class ModuleTestBase { List> actualRequires = new ArrayList<>(); for (Module_attribute.RequiresEntry require : module.requires) { actualRequires.add(Pair.of( - require.getRequires(constantPool), require.requires_flags)); + require.getRequires(constantPool).replace('/', '.'), + require.requires_flags)); } tr.checkContains(actualRequires, moduleDescriptor.requires, "Lists of requires don't match"); } @@ -96,11 +98,13 @@ public class ModuleTestBase { for (Module_attribute.ExportsEntry export : module.exports) { String pkg = constantPool.getUTF8Value(export.exports_index); if (tr.checkTrue(moduleDescriptor.exports.containsKey(pkg), "Unexpected export " + pkg)) { - List expectedTo = moduleDescriptor.exports.get(pkg); + Export expectedExport = moduleDescriptor.exports.get(pkg); + tr.checkEquals(expectedExport.mask, export.exports_flags, "Wrong export flags"); + List expectedTo = expectedExport.to; tr.checkEquals(export.exports_to_count, expectedTo.size(), "Wrong amount of exports to"); List actualTo = new ArrayList<>(); for (int toIdx : export.exports_to_index) { - actualTo.add(constantPool.getUTF8Value(toIdx)); + actualTo.add(constantPool.getUTF8Value(toIdx).replace('/', '.')); } tr.checkContains(actualTo, expectedTo, "Lists of \"exports to\" don't match."); } @@ -118,14 +122,24 @@ public class ModuleTestBase { } private void testProvides(ModuleDescriptor moduleDescriptor, Module_attribute module, ConstantPool constantPool) throws ConstantPoolException { - tr.checkEquals(module.provides_count, moduleDescriptor.provides.size(), "Wrong amount of provides."); - List> actualProvides = new ArrayList<>(); + int moduleProvidesCount = Arrays.asList(module.provides).stream() + .mapToInt(e -> e.with_index.length) + .sum(); + int moduleDescriptorProvidesCount = moduleDescriptor.provides.values().stream() + .mapToInt(impls -> impls.size()) + .sum(); + tr.checkEquals(moduleProvidesCount, moduleDescriptorProvidesCount, "Wrong amount of provides."); + Map> actualProvides = new HashMap<>(); for (Module_attribute.ProvidesEntry provide : module.provides) { String provides = constantPool.getClassInfo(provide.provides_index).getBaseName().replace('/', '.'); - String with = constantPool.getClassInfo(provide.with_index).getBaseName().replace('/', '.'); - actualProvides.add(Pair.of(provides, with)); + List impls = new ArrayList<>(); + for (int i = 0; i < provide.with_count; i++) { + String with = constantPool.getClassInfo(provide.with_index[i]).getBaseName().replace('/', '.'); + impls.add(with); + } + actualProvides.put(provides, impls); } - tr.checkContains(actualProvides, moduleDescriptor.provides, "Lists of provides don't match"); + tr.checkContains(actualProvides.entrySet(), moduleDescriptor.provides.entrySet(), "Lists of provides don't match"); } protected void compile(Path base, String... options) throws IOException { @@ -145,7 +159,57 @@ public class ModuleTestBase { @interface Test { } - class ModuleDescriptor { + interface Mask { + int getMask(); + } + + public enum RequiresFlag implements Mask { + TRANSITIVE("transitive", Module_attribute.ACC_TRANSITIVE), + STATIC("static", Module_attribute.ACC_STATIC_PHASE); + + private final String token; + private final int mask; + + RequiresFlag(String token, int mask) { + this.token = token; + this.mask = mask; + } + + @Override + public int getMask() { + return mask; + } + } + + public enum ExportFlag implements Mask { + SYNTHETIC("", Module_attribute.ACC_SYNTHETIC); + + private final String token; + private final int mask; + + ExportFlag(String token, int mask) { + this.token = token; + this.mask = mask; + } + + @Override + public int getMask() { + return mask; + } + } + + private class Export { + String pkg; + int mask; + List to = new ArrayList<>(); + + public Export(String pkg, int mask) { + this.pkg = pkg; + this.mask = mask; + } + } + + protected class ModuleDescriptor { private final String name; //pair is name of module and flag(public,mandated,synthetic) @@ -155,10 +219,10 @@ public class ModuleTestBase { requires.add(new Pair<>("java.base", Module_attribute.ACC_MANDATED)); } - private final Map> exports = new HashMap<>(); + private final Map exports = new HashMap<>(); //List of service and implementation - private final List> provides = new ArrayList<>(); + private final Map> provides = new LinkedHashMap<>(); private final List uses = new ArrayList<>(); private static final String LINE_END = ";\n"; @@ -170,43 +234,58 @@ public class ModuleTestBase { content.append(name).append('{').append('\n'); } - public ModuleDescriptor requires(String... requires) { - for (String require : requires) { - this.requires.add(Pair.of(require, 0)); - content.append(" requires ").append(require).append(LINE_END); - } + public ModuleDescriptor requires(String module) { + this.requires.add(Pair.of(module, 0)); + content.append(" requires ").append(module).append(LINE_END); + return this; } - public ModuleDescriptor requiresPublic(String... requiresPublic) { - for (String require : requiresPublic) { - this.requires.add(new Pair<>(require, Module_attribute.ACC_PUBLIC)); - content.append(" requires public ").append(require).append(LINE_END); + public ModuleDescriptor requires(String module, RequiresFlag... flags) { + this.requires.add(new Pair<>(module, computeMask(flags))); + + content.append(" requires "); + for (RequiresFlag flag : flags) { + content.append(flag.token).append(" "); } + content.append(module).append(LINE_END); + return this; } - public ModuleDescriptor exports(String... exports) { - for (String export : exports) { - this.exports.putIfAbsent(export, new ArrayList<>()); - content.append(" exports ").append(export).append(LINE_END); + public ModuleDescriptor exports(String pkg, ExportFlag... flags) { + this.exports.putIfAbsent(pkg, new Export(pkg, computeMask(flags))); + content.append(" exports "); + for (ExportFlag flag : flags) { + content.append(flag.token).append(" "); } + content.append(pkg).append(LINE_END); return this; } - public ModuleDescriptor exportsTo(String exports, String to) { + public ModuleDescriptor exportsTo(String pkg, String to, ExportFlag... flags) { List tos = Pattern.compile(",") .splitAsStream(to) .map(String::trim) .collect(Collectors.toList()); - this.exports.computeIfAbsent(exports, k -> new ArrayList<>()).addAll(tos); - content.append(" exports ").append(exports).append(" to ").append(to).append(LINE_END); + this.exports.computeIfAbsent(pkg, k -> new Export(pkg, computeMask(flags))) + .to.addAll(tos); + + content.append(" exports "); + for (ExportFlag flag : flags) { + content.append(flag.token).append(" "); + } + content.append(pkg).append(" to ").append(to).append(LINE_END); return this; } - public ModuleDescriptor provides(String provides, String with) { - this.provides.add(Pair.of(provides, with)); - content.append(" provides ").append(provides).append(" with ").append(with).append(LINE_END); + public ModuleDescriptor provides(String provides, String... with) { + this.provides.put(provides, Arrays.asList(with)); + content.append(" provides ") + .append(provides) + .append(" with ") + .append(String.join(",", with)) + .append(LINE_END); return this; } @@ -225,5 +304,12 @@ public class ModuleTestBase { tb.writeJavaFiles(path, src); return this; } + + private int computeMask(Mask[] masks) { + return Arrays.stream(masks) + .map(Mask::getMask) + .reduce((a, b) -> a | b) + .orElseGet(() -> 0); + } } } diff --git a/langtools/test/tools/javac/defaultMethods/BadClassfile.java b/langtools/test/tools/javac/defaultMethods/BadClassfile.java index b7db500fa1f..9633ef3b3b2 100644 --- a/langtools/test/tools/javac/defaultMethods/BadClassfile.java +++ b/langtools/test/tools/javac/defaultMethods/BadClassfile.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it diff --git a/langtools/test/tools/javac/diags/examples.not-yet.txt b/langtools/test/tools/javac/diags/examples.not-yet.txt index a2018762ca8..f13f1e7de02 100644 --- a/langtools/test/tools/javac/diags/examples.not-yet.txt +++ b/langtools/test/tools/javac/diags/examples.not-yet.txt @@ -69,6 +69,8 @@ compiler.misc.incompatible.eq.lower.bounds # cannot happen? compiler.misc.module.name.mismatch compiler.misc.no.unique.minimal.instance.exists compiler.misc.no.unique.maximal.instance.exists # cannot happen? +compiler.err.module.non.zero.opens # bad class file +compiler.misc.module.non.zero.opens # bad class file compiler.misc.resume.abort # prompt for a response compiler.misc.source.unavailable # DiagnosticSource compiler.misc.token.bad-symbol diff --git a/langtools/test/tools/javac/diags/examples/AddOpensIgnored.java b/langtools/test/tools/javac/diags/examples/AddOpensIgnored.java new file mode 100644 index 00000000000..839e7438c3f --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/AddOpensIgnored.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +// key: compiler.warn.addopens.ignored +// options: --add-opens anything + +class Dummy { } + diff --git a/langtools/test/tools/javac/diags/examples/DuplicateExports/exported/Class.java b/langtools/test/tools/javac/diags/examples/ConflictingExports/exported/Class.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/DuplicateExports/exported/Class.java rename to langtools/test/tools/javac/diags/examples/ConflictingExports/exported/Class.java diff --git a/langtools/test/tools/javac/diags/examples/DuplicateExports/module-info.java b/langtools/test/tools/javac/diags/examples/ConflictingExports/module-info.java similarity index 94% rename from langtools/test/tools/javac/diags/examples/DuplicateExports/module-info.java rename to langtools/test/tools/javac/diags/examples/ConflictingExports/module-info.java index 4c3b2903508..7ce18dcf59d 100644 --- a/langtools/test/tools/javac/diags/examples/DuplicateExports/module-info.java +++ b/langtools/test/tools/javac/diags/examples/ConflictingExports/module-info.java @@ -21,9 +21,9 @@ * questions. */ -// key: compiler.err.duplicate.exports +// key: compiler.err.conflicting.exports -module DuplicateExports { +module ConflictingExports { exports exported; exports exported; } diff --git a/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java b/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java new file mode 100644 index 00000000000..31f14202663 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/exported/Class.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package exported; + +public class Class { +} diff --git a/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java b/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java new file mode 100644 index 00000000000..1c66f00435a --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ConflictingExportsToModule/module-info.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +// key: compiler.err.conflicting.exports.to.module + +module ConflictingExports { + exports exported to java.base, java.base; +} diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpens/exported/Class.java b/langtools/test/tools/javac/diags/examples/ConflictingOpens/exported/Class.java new file mode 100644 index 00000000000..15d4133712a --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ConflictingOpens/exported/Class.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package opened; + +public class Class { +} diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpens/module-info.java b/langtools/test/tools/javac/diags/examples/ConflictingOpens/module-info.java new file mode 100644 index 00000000000..40e39f9f557 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ConflictingOpens/module-info.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +// key: compiler.err.conflicting.opens + +module ConflictingOpens { + opens opened; + opens opened; +} diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java b/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java new file mode 100644 index 00000000000..0bf650846b4 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/module-info.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +// key: compiler.err.conflicting.opens.to.module + +module ConflictingOpens { + opens opened to java.base, java.base; +} diff --git a/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java b/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java new file mode 100644 index 00000000000..15d4133712a --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ConflictingOpensToModule/opened/Class.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package opened; + +public class Class { +} diff --git a/langtools/test/tools/javac/diags/examples/ExpectedModule.java b/langtools/test/tools/javac/diags/examples/ExpectedModule.java new file mode 100644 index 00000000000..2e350e2d9ee --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ExpectedModule.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +// key: compiler.err.expected.module + +open class ExpectedModule { } diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java new file mode 100644 index 00000000000..06fea802872 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/HasBeenDeprecatedModule.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +//key: compiler.warn.has.been.deprecated.module +//options: -Xlint:deprecation diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1/module-info.java new file mode 100644 index 00000000000..f3b75a9eaea --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m1/module-info.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +@Deprecated +module m1 {} diff --git a/langtools/test/tools/jdeps/modules/src/m2/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2/module-info.java similarity index 93% rename from langtools/test/tools/jdeps/modules/src/m2/module-info.java rename to langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2/module-info.java index 8a5d623982c..7e4179d1bb4 100644 --- a/langtools/test/tools/jdeps/modules/src/m2/module-info.java +++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedModule/modulesourcepath/m2/module-info.java @@ -22,7 +22,5 @@ */ module m2 { - requires public m1; - exports p2; - exports p2.internal to m3; + requires m1; } diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java new file mode 100644 index 00000000000..cc32db06c10 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/HasBeenDeprecatedRemovalModule.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +//key: compiler.warn.has.been.deprecated.for.removal.module diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1/module-info.java new file mode 100644 index 00000000000..1623fb5482c --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m1/module-info.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +@Deprecated(forRemoval=true) +module m1 {} diff --git a/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2/module-info.java new file mode 100644 index 00000000000..7e4179d1bb4 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/HasBeenDeprecatedRemovalModule/modulesourcepath/m2/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +module m2 { + requires m1; +} diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/LeaksNotAccessibleNotRequiredPublic.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java similarity index 94% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/LeaksNotAccessibleNotRequiredPublic.java rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java index 242f168dfca..52fdc5894c3 100644 --- a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/LeaksNotAccessibleNotRequiredPublic.java +++ b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/LeaksNotAccessibleNotRequiredTransitive.java @@ -21,5 +21,5 @@ * questions. */ -// key: compiler.warn.leaks.not.accessible.not.required.public +// key: compiler.warn.leaks.not.accessible.not.required.transitive // options: -Xlint:exports diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/api1/Api1.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/api1/Api1.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/api1/Api1.java rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/api1/Api1.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m1/module-info.java rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m1/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/api2/Api2.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/api2/Api2.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/api2/Api2.java rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/api2/Api2.java diff --git a/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/module-info.java b/langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/module-info.java similarity index 100% rename from langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredPublic/modulesourcepath/m2/module-info.java rename to langtools/test/tools/javac/diags/examples/LeaksNotAccessibleNotRequiredTransitive/modulesourcepath/m2/module-info.java diff --git a/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java b/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java new file mode 100644 index 00000000000..31f14202663 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/exported/Class.java @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package exported; + +public class Class { +} diff --git a/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java b/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java new file mode 100644 index 00000000000..480ecef3dc8 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/NoOpensUnlessStrong/module-info.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +// key: compiler.err.no.opens.unless.strong + +open module ConflictingExports { + opens exported; +} diff --git a/langtools/test/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java b/langtools/test/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java new file mode 100644 index 00000000000..1fbd517474c --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/NoPkgInModuleInfoJava/module-info.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +//key: compiler.err.no.pkg.in.module-info.java + +package p; + +module m { +} diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java b/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java new file mode 100644 index 00000000000..10a9dc7fe5f --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf.java @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +// key: compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java b/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java new file mode 100644 index 00000000000..8f417bfdae7 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/impl/Impl.java @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package impl; + +public class Impl { + public static Impl provider() { + return null; + } +} diff --git a/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java b/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java new file mode 100644 index 00000000000..1b7506fcdf0 --- /dev/null +++ b/langtools/test/tools/javac/diags/examples/ServiceImplProviderReturnMustBeSubtypeOfServiceIntf/modulesourcepath/m/module-info.java @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +module m { + provides java.lang.String with impl.Impl; +} diff --git a/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java b/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java index 39d90491eb5..6b93de44682 100644 --- a/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java +++ b/langtools/test/tools/javac/fatalErrors/NoJavaLangTest.java @@ -83,10 +83,13 @@ public class NoJavaLangTest { // need to ensure there is an empty java.base to avoid different error message Files.createDirectories(Paths.get("modules/java.base")); new JavacTask(tb) - .sources("module java.base { }") + .sources("module java.base { }", + "package java.lang; public class Object {}") .outdir("modules/java.base") .run(); + Files.delete(Paths.get("modules", "java.base", "java", "lang", "Object.class")); + // ideally we'd have a better message for this case String[] mpOpts = { "--system", "none", "--module-path", "modules" }; test(mpOpts, compilerErrorMessage); diff --git a/langtools/test/tools/javac/modules/AnnotationProcessing.java b/langtools/test/tools/javac/modules/AnnotationProcessing.java index 63b29ae8e1a..bcd8b4dd60c 100644 --- a/langtools/test/tools/javac/modules/AnnotationProcessing.java +++ b/langtools/test/tools/javac/modules/AnnotationProcessing.java @@ -245,7 +245,7 @@ public class AnnotationProcessing extends ModuleTestBase { List provides = ElementFilter.providesIn(modle.getDirectives()); assertEquals(1, provides.size()); assertEquals("api.Api", provides.iterator().next().getService().getQualifiedName().toString()); - assertEquals("impl.Impl", provides.iterator().next().getImplementation().getQualifiedName().toString()); + assertEquals("impl.Impl", provides.iterator().next().getImplementations().get(0).getQualifiedName().toString()); return false; } diff --git a/langtools/test/tools/javac/modules/AnnotationsOnModules.java b/langtools/test/tools/javac/modules/AnnotationsOnModules.java new file mode 100644 index 00000000000..454ad9e5833 --- /dev/null +++ b/langtools/test/tools/javac/modules/AnnotationsOnModules.java @@ -0,0 +1,405 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/** + * @test + * @summary Test --add-modules and --limit-modules; also test the "enabled" modules. + * @library /tools/lib + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile + * @build toolbox.ToolBox toolbox.JarTask toolbox.JavacTask toolbox.JavaTask ModuleTestBase + * @run main AnnotationsOnModules + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; + +import javax.annotation.processing.AbstractProcessor; +import javax.annotation.processing.RoundEnvironment; +import javax.annotation.processing.SupportedAnnotationTypes; +import javax.annotation.processing.SupportedOptions; +import javax.lang.model.element.AnnotationMirror; +import javax.lang.model.element.ModuleElement; +import javax.lang.model.element.TypeElement; + +import com.sun.tools.classfile.Attribute; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute; +import com.sun.tools.classfile.RuntimeVisibleAnnotations_attribute; +import toolbox.JavacTask; +import toolbox.Task.OutputKind; + +public class AnnotationsOnModules extends ModuleTestBase { + + public static void main(String... args) throws Exception { + AnnotationsOnModules t = new AnnotationsOnModules(); + t.runTests(); + } + + @Test + public void testSimpleAnnotation(Path base) throws Exception { + Path moduleSrc = base.resolve("module-src"); + Path m1 = moduleSrc.resolve("m1"); + + tb.writeJavaFiles(m1, + "@Deprecated module m1 { }"); + + Path modulePath = base.resolve("module-path"); + + Files.createDirectories(modulePath); + + new JavacTask(tb) + .options("--module-source-path", moduleSrc.toString()) + .outdir(modulePath) + .files(findJavaFiles(m1)) + .run() + .writeAll(); + + ClassFile cf = ClassFile.read(modulePath.resolve("m1").resolve("module-info.class")); + RuntimeVisibleAnnotations_attribute annotations = (RuntimeVisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeVisibleAnnotations); + + if (annotations == null || annotations.annotations.length != 1) { + throw new AssertionError("Annotations not correct!"); + } + } + + @Test + public void testAnnotationWithImport(Path base) throws Exception { + Path moduleSrc = base.resolve("module-src"); + Path m1 = moduleSrc.resolve("m1"); + + tb.writeJavaFiles(m1, + "import m1.A; @A module m1 { }", + "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A {}"); + + Path modulePath = base.resolve("module-path"); + + Files.createDirectories(modulePath); + + new JavacTask(tb) + .options("--module-source-path", moduleSrc.toString()) + .outdir(modulePath) + .files(findJavaFiles(m1)) + .run() + .writeAll(); + + ClassFile cf = ClassFile.read(modulePath.resolve("m1").resolve("module-info.class")); + RuntimeInvisibleAnnotations_attribute annotations = (RuntimeInvisibleAnnotations_attribute) cf.attributes.map.get(Attribute.RuntimeInvisibleAnnotations); + + if (annotations == null || annotations.annotations.length != 1) { + throw new AssertionError("Annotations not correct!"); + } + } + + @Test + public void testModuleInfoAnnotationsInAPI(Path base) throws Exception { + Path moduleSrc = base.resolve("module-src"); + Path m1 = moduleSrc.resolve("m1"); + + tb.writeJavaFiles(m1, + "import m1.*; @A @Deprecated @E @E module m1 { }", + "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface A {}", + "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) @Repeatable(C.class) public @interface E {}", + "package m1; import java.lang.annotation.*; @Target(ElementType.MODULE) public @interface C { public E[] value(); }"); + + Path modulePath = base.resolve("module-path"); + + Files.createDirectories(modulePath); + + new JavacTask(tb) + .options("--module-source-path", moduleSrc.toString(), + "-processor", AP.class.getName()) + .outdir(modulePath) + .files(findJavaFiles(m1)) + .run() + .writeAll(); + + Path src = base.resolve("src"); + + tb.writeJavaFiles(src, + "class T {}"); + + Path out = base.resolve("out"); + + Files.createDirectories(out); + + new JavacTask(tb) + .options("--module-path", modulePath.toString(), + "--add-modules", "m1", + "-processor", AP.class.getName()) + .outdir(out) + .files(findJavaFiles(src)) + .run() + .writeAll(); + + new JavacTask(tb) + .options("--module-path", modulePath.toString() + File.pathSeparator + out.toString(), + "--add-modules", "m1", + "-processor", AP.class.getName(), + "-proc:only") + .classes("m1/m1.A") + .files(findJavaFiles(src)) + .run() + .writeAll(); + } + + @SupportedAnnotationTypes("*") + public static final class AP extends AbstractProcessor { + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + ModuleElement m1 = processingEnv.getElementUtils().getModuleElement("m1"); + Set actualAnnotations = new HashSet<>(); + Set expectedAnnotations = + new HashSet<>(Arrays.asList("@m1.A", "@java.lang.Deprecated", "@m1.C({@m1.E, @m1.E})")); + + for (AnnotationMirror am : m1.getAnnotationMirrors()) { + actualAnnotations.add(am.toString()); + } + + if (!expectedAnnotations.equals(actualAnnotations)) { + throw new AssertionError("Incorrect annotations: " + actualAnnotations); + } + + return false; + } + + } + + @Test + public void testModuleDeprecation(Path base) throws Exception { + Path moduleSrc = base.resolve("module-src"); + Path m1 = moduleSrc.resolve("m1"); + + tb.writeJavaFiles(m1, + "@Deprecated module m1 { }"); + + Path m2 = moduleSrc.resolve("m2"); + + tb.writeJavaFiles(m2, + "@Deprecated module m2 { }"); + + Path m3 = moduleSrc.resolve("m3"); + + Path modulePath = base.resolve("module-path"); + + Files.createDirectories(modulePath); + + List actual; + List expected; + + for (String suppress : new String[] {"", "@Deprecated ", "@SuppressWarnings(\"deprecation\") "}) { + tb.writeJavaFiles(m3, + suppress + "module m3 {\n" + + " requires m1;\n" + + " exports api to m1, m2;\n" + + "}", + "package api; public class Api { }"); + System.err.println("compile m3"); + actual = new JavacTask(tb) + .options("--module-source-path", moduleSrc.toString(), + "-XDrawDiagnostics") + .outdir(modulePath) + .files(findJavaFiles(moduleSrc)) + .run() + .writeAll() + .getOutputLines(OutputKind.DIRECT); + + if (suppress.isEmpty()) { + expected = Arrays.asList( + "- compiler.note.deprecated.filename: module-info.java", + "- compiler.note.deprecated.recompile"); + } else { + expected = Arrays.asList(""); + } + + if (!expected.equals(actual)) { + throw new AssertionError("Unexpected output: " + actual + "; suppress: " + suppress); + } + + System.err.println("compile m3 with -Xlint:-deprecation"); + actual = new JavacTask(tb) + .options("--module-source-path", moduleSrc.toString(), + "-XDrawDiagnostics", + "-Xlint:deprecation") + .outdir(modulePath) + .files(findJavaFiles(moduleSrc)) + .run() + .writeAll() + .getOutputLines(OutputKind.DIRECT); + + if (suppress.isEmpty()) { + expected = Arrays.asList( + "module-info.java:2:14: compiler.warn.has.been.deprecated.module: m1", + "1 warning"); + } else { + expected = Arrays.asList(""); + } + + if (!expected.equals(actual)) { + throw new AssertionError("Unexpected output: " + actual + "; suppress: " + suppress); + } + + //load the deprecated module-infos from classfile: + System.err.println("compile m3 with -Xlint:-deprecation, loading deprecated modules from classes"); + actual = new JavacTask(tb) + .options("--module-path", modulePath.toString(), + "-XDrawDiagnostics", + "-Xlint:deprecation") + .outdir(modulePath.resolve("m3")) + .files(findJavaFiles(moduleSrc.resolve("m3"))) + .run() + .writeAll() + .getOutputLines(OutputKind.DIRECT); + + if (!expected.equals(actual)) { + throw new AssertionError("Unexpected output: " + actual + "; suppress: " + suppress); + } + } + } + + @Test + public void testAttributeValues(Path base) throws Exception { + class TestCase { + public final String extraDecl; + public final String decl; + public final String use; + public final String expectedAnnotations; + + public TestCase(String extraDecl, String decl, String use, String expectedAnnotations) { + this.extraDecl = extraDecl; + this.decl = decl; + this.use = use; + this.expectedAnnotations = expectedAnnotations; + } + } + + TestCase[] testCases = new TestCase[] { + new TestCase("package test; public enum E {A, B;}", + "public E value();", + "test.E.A", + "@test.A(test.E.A)"), + new TestCase("package test; public enum E {A, B;}", + "public E[] value();", + "{test.E.A, test.E.B}", + "@test.A({test.E.A, test.E.B})"), + new TestCase("package test; public class Extra {}", + "public Class value();", + "test.Extra.class", + "@test.A(test.Extra.class)"), + new TestCase("package test; public class Extra {}", + "public Class[] value();", + "{test.Extra.class, String.class}", + "@test.A({test.Extra.class, java.lang.String.class})"), + new TestCase("package test; public @interface Extra { public Class value(); }", + "public test.Extra value();", + "@test.Extra(String.class)", + "@test.A(@test.Extra(java.lang.String.class))"), + new TestCase("package test; public @interface Extra { public Class value(); }", + "public test.Extra[] value();", + "{@test.Extra(String.class), @test.Extra(Integer.class)}", + "@test.A({@test.Extra(java.lang.String.class), @test.Extra(java.lang.Integer.class)})"), + new TestCase("package test; public class Any { }", + "public int value();", + "1", + "@test.A(1)"), + new TestCase("package test; public class Any { }", + "public int[] value();", + "{1, 2}", + "@test.A({1, 2})"), + }; + + Path extraSrc = base.resolve("extra-src"); + tb.writeJavaFiles(extraSrc, + "class Any {}"); + + int count = 0; + + for (TestCase tc : testCases) { + Path testBase = base.resolve(String.valueOf(count)); + Path moduleSrc = testBase.resolve("module-src"); + Path m = moduleSrc.resolve("m"); + + tb.writeJavaFiles(m, + "@test.A(" + tc.use + ") module m { }", + "package test; @java.lang.annotation.Target(java.lang.annotation.ElementType.MODULE) public @interface A { " + tc.decl + "}", + tc.extraDecl); + + Path modulePath = testBase.resolve("module-path"); + + Files.createDirectories(modulePath); + + new JavacTask(tb) + .options("--module-source-path", moduleSrc.toString()) + .outdir(modulePath) + .files(findJavaFiles(moduleSrc)) + .run() + .writeAll(); + + Path classes = testBase.resolve("classes"); + + Files.createDirectories(classes); + + new JavacTask(tb) + .options("--module-path", modulePath.toString(), + "--add-modules", "m", + "-processorpath", System.getProperty("test.classes"), + "-processor", ProxyTypeValidator.class.getName(), + "-A" + OPT_EXPECTED_ANNOTATIONS + "=" + tc.expectedAnnotations) + .outdir(classes) + .files(findJavaFiles(extraSrc)) + .run() + .writeAll(); + } + } + + private static final String OPT_EXPECTED_ANNOTATIONS = "expectedAnnotations"; + + @SupportedAnnotationTypes("*") + @SupportedOptions(OPT_EXPECTED_ANNOTATIONS) + public static final class ProxyTypeValidator extends AbstractProcessor { + + @Override + public boolean process(Set annotations, RoundEnvironment roundEnv) { + ModuleElement m = processingEnv.getElementUtils().getModuleElement("m"); + String actualTypes = m.getAnnotationMirrors() + .stream() + .map(am -> am.toString()) + .collect(Collectors.joining(", ")); + if (!Objects.equals(actualTypes, processingEnv.getOptions().get(OPT_EXPECTED_ANNOTATIONS))) { + throw new IllegalStateException("Expected annotations not found, actual: " + actualTypes); + } + return false; + } + + } + +} diff --git a/langtools/test/tools/javac/modules/AutomaticModules.java b/langtools/test/tools/javac/modules/AutomaticModules.java index 5cb2ea3eb87..53beb76ab00 100644 --- a/langtools/test/tools/javac/modules/AutomaticModules.java +++ b/langtools/test/tools/javac/modules/AutomaticModules.java @@ -193,7 +193,7 @@ public class AutomaticModules extends ModuleTestBase { Files.createDirectories(depClasses); tb.writeJavaFiles(depSrc, - "module m1 { requires public automatic; }", + "module m1 { requires transitive automatic; }", "package dep; public class Dep { api.Api api; }"); new JavacTask(tb) @@ -261,7 +261,7 @@ public class AutomaticModules extends ModuleTestBase { Path moduleSrc = base.resolve("module-src"); tb.writeJavaFiles(moduleSrc.resolve("m1"), - "module m1 { requires automaticA; }", + "module m1 { requires static automaticA; }", "package impl; public class Impl { apiA.Api a; apiB.Api b; m2.M2 m;}"); tb.writeJavaFiles(moduleSrc.resolve("m2"), @@ -308,4 +308,54 @@ public class AutomaticModules extends ModuleTestBase { throw new Exception("expected output not found: " + log); } } + + @Test + public void testDropTrailingVersion(Path base) throws Exception { + Path legacySrc = base.resolve("legacy-src"); + tb.writeJavaFiles(legacySrc, + "package api; public class Api {}"); + Path legacyClasses = base.resolve("legacy-classes"); + Files.createDirectories(legacyClasses); + + String log = new JavacTask(tb) + .options() + .outdir(legacyClasses) + .files(findJavaFiles(legacySrc)) + .run() + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + if (!log.isEmpty()) { + throw new Exception("unexpected output: " + log); + } + + Path modulePath = base.resolve("module-path"); + + Files.createDirectories(modulePath); + + Path jar = modulePath.resolve("test1.jar"); + + new JarTask(tb, jar) + .baseDir(legacyClasses) + .files("api/Api.class") + .run(); + + Path moduleSrc = base.resolve("module-src"); + Path m = moduleSrc.resolve("m"); + + Path classes = base.resolve("classes"); + + Files.createDirectories(classes); + + tb.writeJavaFiles(m, + "module m { requires test; }", + "package impl; public class Impl { public void e(api.Api api) { } }"); + + new JavacTask(tb) + .options("--module-source-path", moduleSrc.toString(), "--module-path", modulePath.toString()) + .outdir(classes) + .files(findJavaFiles(moduleSrc)) + .run() + .writeAll(); + } } diff --git a/langtools/test/tools/javac/modules/EdgeCases.java b/langtools/test/tools/javac/modules/EdgeCases.java index 1997a3da2c8..86242983f66 100644 --- a/langtools/test/tools/javac/modules/EdgeCases.java +++ b/langtools/test/tools/javac/modules/EdgeCases.java @@ -206,7 +206,7 @@ public class EdgeCases extends ModuleTestBase { Files.createDirectories(modulePath); - Path automaticJar = modulePath.resolve("m1-1.0.jar"); + Path automaticJar = modulePath.resolve("a-1.0.jar"); new JarTask(tb, automaticJar) .baseDir(automaticClasses) @@ -216,11 +216,11 @@ public class EdgeCases extends ModuleTestBase { Path src = base.resolve("src"); Path src_m2 = src.resolve("m2"); tb.writeJavaFiles(src_m2, - "module m2 { requires m1; exports api2; }", + "module m2 { requires a; exports api2; }", "package api2; public class Api2 { public static api1.Api1 get() { return null; } }"); Path src_m3 = src.resolve("m3"); tb.writeJavaFiles(src_m3, - "module m3 { requires m1; requires m2; }", + "module m3 { requires a; requires m2; }", "package test; public class Test { { api2.Api2.get(); api1.Api1 a1; } }"); Path classes = base.resolve("classes"); tb.createDirectories(classes); @@ -459,4 +459,29 @@ public class EdgeCases extends ModuleTestBase { syms.java_base.getDirectives(); } + + @Test + public void testPackageInModuleInfo(Path base) throws Exception { + Path src = base.resolve("src"); + Files.createDirectories(src); + tb.writeJavaFiles(src, "package p; module foo { }"); + Path classes = base.resolve("classes"); + tb.createDirectories(classes); + + List log = new JavacTask(tb) + .options("-XDrawDiagnostics", "-XDshould-stop.ifError=FLOW") + .outdir(classes) + .files(findJavaFiles(src)) + .run(Expect.FAIL) + .writeAll() + .getOutputLines(OutputKind.DIRECT); + + List expected = Arrays.asList( + "module-info.java:1:1: compiler.err.no.pkg.in.module-info.java", + "1 error"); + + if (!expected.equals(log)) { + throw new AssertionError("Unexpected output: " + log); + } + } } diff --git a/langtools/test/tools/javac/modules/ExportsUnexported.java b/langtools/test/tools/javac/modules/ExportsUnexported.java index 93cd3118d67..691eaea0760 100644 --- a/langtools/test/tools/javac/modules/ExportsUnexported.java +++ b/langtools/test/tools/javac/modules/ExportsUnexported.java @@ -169,7 +169,7 @@ public class ExportsUnexported extends ModuleTestBase { " exports api;\n" + " exports qapi1 to qual1;\n" + " exports qapi2 to qual1, qual2;\n" + - " requires public lib1;\n" + + " requires transitive lib1;\n" + " requires lib2;\n" + "}\n", "package api;\n" + @@ -209,7 +209,7 @@ public class ExportsUnexported extends ModuleTestBase { .getOutputLines(Task.OutputKind.DIRECT); List expected = Arrays.asList( - "Api.java:4:16: compiler.warn.leaks.not.accessible.not.required.public: kindname.class, lib2.Lib2, lib2", + "Api.java:4:16: compiler.warn.leaks.not.accessible.not.required.transitive: kindname.class, lib2.Lib2, lib2", "Api.java:5:17: compiler.warn.leaks.not.accessible.unexported.qualified: kindname.class, qapi1.QApi1, api", "Api.java:6:16: compiler.warn.leaks.not.accessible.unexported: kindname.class, impl.Impl, api", "- compiler.err.warnings.and.werror", diff --git a/langtools/test/tools/javac/modules/GraphsTest.java b/langtools/test/tools/javac/modules/GraphsTest.java index 26118fff60b..e26a859c5df 100644 --- a/langtools/test/tools/javac/modules/GraphsTest.java +++ b/langtools/test/tools/javac/modules/GraphsTest.java @@ -55,19 +55,19 @@ public class GraphsTest extends ModuleTestBase { /** * Tests diamond graph with an automatic module added in. - * +-------------+ +--------------------+ +------------------+ - * | module M | | module N | | module O | - * | | -----> | | ---> | | --> J.jar - * | require N | | requires public O | | | - * | require L | | | +------------------+ - * +-------------+ +--------------------+ ^ + * +-------------+ +-----------------------+ +------------------+ + * | module M | | module N | | module O | + * | | -----> | | ---> | | --> J.jar + * | require N | | requires transitive O | | | + * | require L | | | +------------------+ + * +-------------+ +-----------------------+ ^ * | | - * | +--------------------+ | - * ------------------>| module L | | - * | |------------------ - * | requires public O | - * | | - * +--------------------+ + * | +-----------------------+ | + * ------------------>| module L | | + * | |------------------ + * | requires transitive O | + * | | + * +-----------------------+ * */ @Test @@ -92,18 +92,18 @@ public class GraphsTest extends ModuleTestBase { new ModuleBuilder(tb, "O") .exports("openO") - .requiresPublic("J", jarModules) + .requiresTransitive("J", jarModules) .classes("package openO; public class O { openJ.J j; }") .classes("package closedO; public class O { }") .build(modSrc, modules); new ModuleBuilder(tb, "N") - .requiresPublic("O", modules, jarModules) + .requiresTransitive("O", modules, jarModules) .exports("openN") .classes("package openN; public class N { }") .classes("package closedN; public class N { }") .build(modSrc, modules); new ModuleBuilder(tb, "L") - .requiresPublic("O", modules, jarModules) + .requiresTransitive("O", modules, jarModules) .exports("openL") .classes("package openL; public class L { }") .classes("package closedL; public class L { }") @@ -171,18 +171,18 @@ public class GraphsTest extends ModuleTestBase { /** * Tests graph where module M reexport package of N, but N export the package only to M. * - +-------------+ +--------------------+ +---------------+ - | module L | | module M | | module N | - | | -----> | | -----> | | - | requires M | | requires public N | | exports P to M| - +-------------+ | | +---------------+ - +--------------------+ + +-------------+ +------------------------+ +---------------+ + | module L | | module M | | module N | + | | -----> | | -----> | | + | requires M | | requires transitive N | | exports P to M| + +-------------+ | | +---------------+ + +------------------------+ */ @Test public void reexportOfQualifiedExport(Path base) throws Exception { Path modSrc = base.resolve("modSrc"); new ModuleBuilder(tb, "M") - .requiresPublic("N") + .requiresTransitive("N") .write(modSrc); new ModuleBuilder(tb, "N") .exportsTo("pack", "M") diff --git a/langtools/test/tools/javac/modules/InvalidModuleDirective/module-info.java b/langtools/test/tools/javac/modules/InvalidModuleDirective/module-info.java index fc20ece6833..652b2d1ccfe 100644 --- a/langtools/test/tools/javac/modules/InvalidModuleDirective/module-info.java +++ b/langtools/test/tools/javac/modules/InvalidModuleDirective/module-info.java @@ -8,8 +8,8 @@ module java.transaction { requires java.base; resuires javax.interceptor.javax.interceptor.api; - requires public javax.enterprise.cdi.api; - requires public java.sql; - requires public java.rmi; + requires transitive javax.enterprise.cdi.api; + requires transitive java.sql; + requires transitive java.rmi; export javax.transaction; } diff --git a/langtools/test/tools/javac/modules/ModuleInfoTest.java b/langtools/test/tools/javac/modules/ModuleInfoTest.java index 62200b0e6f4..7adec9b85fe 100644 --- a/langtools/test/tools/javac/modules/ModuleInfoTest.java +++ b/langtools/test/tools/javac/modules/ModuleInfoTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8158123 + * @bug 8158123 8161906 8162713 * @summary tests for module declarations * @library /tools/lib * @modules @@ -34,6 +34,7 @@ * @run main ModuleInfoTest */ +import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.Arrays; @@ -203,12 +204,12 @@ public class ModuleInfoTest extends ModuleTestBase { * Verify that a multi-module loop is detected. */ @Test - public void testRequiresPublicLoop(Path base) throws Exception { + public void testRequiresTransitiveLoop(Path base) throws Exception { Path src = base.resolve("src"); Path src_m1 = src.resolve("m1"); tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { requires m2; }"); Path src_m2 = src.resolve("m2"); - tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { requires public m3; }"); + tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { requires transitive m3; }"); Path src_m3 = src.resolve("m3"); tb.writeFile(src_m3.resolve("module-info.java"), "module m3 { requires m1; }"); @@ -223,7 +224,7 @@ public class ModuleInfoTest extends ModuleTestBase { .writeAll() .getOutput(Task.OutputKind.DIRECT); - if (!log.contains("module-info.java:1:29: compiler.err.cyclic.requires: m3")) + if (!log.contains("module-info.java:1:33: compiler.err.cyclic.requires: m3")) throw new Exception("expected output not found"); } @@ -254,36 +255,15 @@ public class ModuleInfoTest extends ModuleTestBase { } /** - * Verify that duplicate exported packages are detected. + * Verify that duplicate requires are detected. */ @Test - public void testDuplicateExports_packages(Path base) throws Exception { + public void testDuplicateRequiresTransitiveStatic(Path base) throws Exception { Path src = base.resolve("src"); - tb.writeJavaFiles(src, "module m1 { exports p; exports p; }"); - - Path classes = base.resolve("classes"); - Files.createDirectories(classes); - - String log = new JavacTask(tb) - .options("-XDrawDiagnostics") - .outdir(classes) - .files(findJavaFiles(src)) - .run(Task.Expect.FAIL) - .writeAll() - .getOutput(Task.OutputKind.DIRECT); - - if (!log.contains("module-info.java:1:32: compiler.err.duplicate.exports: p")) - throw new Exception("expected output not found"); - } - - /** - * Verify that duplicate exported packages are detected. - */ - @Test - public void testDuplicateExports_packages2(Path base) throws Exception { - Path src = base.resolve("src"); - tb.writeJavaFiles(src.resolve("m1"), "module m1 { exports p; exports p to m2; }"); - tb.writeJavaFiles(src.resolve("m2"), "module m2 { }"); + Path src_m1 = src.resolve("m1"); + tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { }"); + Path src_m2 = src.resolve("m2"); + tb.writeFile(src_m2.resolve("module-info.java"), "module m2 { requires transitive m1; requires static m1; }"); Path classes = base.resolve("classes"); Files.createDirectories(classes); @@ -296,15 +276,115 @@ public class ModuleInfoTest extends ModuleTestBase { .writeAll() .getOutput(Task.OutputKind.DIRECT); - if (!log.contains("module-info.java:1:32: compiler.err.duplicate.exports: p")) + if (!log.contains("module-info.java:1:53: compiler.err.duplicate.requires: m1")) throw new Exception("expected output not found"); } + /** + * Verify that duplicate exported packages are detected correctly. + */ + @Test + public void testConflictingExports_packages(Path base) throws Exception { + verifyConflictingExports_packages(base, + "exports p; exports q;", + null); + verifyConflictingExports_packages(base, + "exports p; exports p;", + "module-info.java:1:32: compiler.err.conflicting.exports: p"); + verifyConflictingExports_packages(base, + "exports p; opens p;", + null); + verifyConflictingExports_packages(base, + "exports p; exports p to m2;", + "module-info.java:1:32: compiler.err.conflicting.exports: p"); + verifyConflictingExports_packages(base, + "exports p; opens p to m2;", + null); + verifyConflictingExports_packages(base, + "opens p; exports p;", + null); + verifyConflictingExports_packages(base, + "opens p; opens p;", + "module-info.java:1:28: compiler.err.conflicting.opens: p"); + verifyConflictingExports_packages(base, + "opens p; exports p to m2;", + null); + verifyConflictingExports_packages(base, + "opens p; opens p to m2;", + "module-info.java:1:28: compiler.err.conflicting.opens: p"); + verifyConflictingExports_packages(base, + "exports p to m2; exports p;", + "module-info.java:1:38: compiler.err.conflicting.exports: p"); + verifyConflictingExports_packages(base, + "exports p to m2; opens p;", + null); + verifyConflictingExports_packages(base, + "exports p to m2; exports p to m2;", + "module-info.java:1:43: compiler.err.conflicting.exports.to.module: m2"); + verifyConflictingExports_packages(base, + "exports p to m2; opens p to m2;", + null); + verifyConflictingExports_packages(base, + "opens p to m2; exports p;", + null); + verifyConflictingExports_packages(base, + "opens p to m2; opens p;", + "module-info.java:1:34: compiler.err.conflicting.opens: p"); + verifyConflictingExports_packages(base, + "opens p to m2; exports p to m2;", + null); + verifyConflictingExports_packages(base, + "opens p to m2; opens p to m2;", + "module-info.java:1:34: compiler.err.conflicting.opens: p"); + verifyConflictingExports_packages(base, + "exports p to m2; exports p to m3;", + "module-info.java:1:38: compiler.err.conflicting.exports: p"); + verifyConflictingExports_packages(base, + "exports p to m2; opens p to m3;", + null); + verifyConflictingExports_packages(base, + "opens p to m2; exports p to m3;", + null); + verifyConflictingExports_packages(base, + "opens p to m2; opens p to m3;", + "module-info.java:1:34: compiler.err.conflicting.opens: p"); + } + + private void verifyConflictingExports_packages(Path base, String code, String expected) throws Exception { + Files.createDirectories(base); + tb.cleanDirectory(base); + + Path src = base.resolve("src"); + tb.writeJavaFiles(src.resolve("m1"), + "module m1 { " + code + " }", + "package p; public class P {}", + "package q; public class Q {}"); + tb.writeJavaFiles(src.resolve("m2"), + "module m2 { requires m1; }"); + tb.writeJavaFiles(src.resolve("m3"), + "module m3 { requires m1; }"); + + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + String log = new JavacTask(tb) + .options("-XDrawDiagnostics", + "--module-source-path", src.toString()) + .outdir(classes) + .files(findJavaFiles(src)) + .run(expected != null ? Task.Expect.FAIL : Task.Expect.SUCCESS) + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + if (expected != null && !log.contains(expected)) + throw new Exception("expected output not found, actual output: " + log); + } + /** * Verify that duplicate exported packages are detected. */ @Test - public void testDuplicateExports_modules(Path base) throws Exception { + public void testConflictingExports_modules(Path base) throws Exception { Path src = base.resolve("src"); Path src_m1 = src.resolve("m1"); tb.writeFile(src_m1.resolve("module-info.java"), "module m1 { }"); @@ -322,7 +402,7 @@ public class ModuleInfoTest extends ModuleTestBase { .writeAll() .getOutput(Task.OutputKind.DIRECT); - if (!log.contains("module-info.java:1:30: compiler.err.duplicate.exports: m1")) + if (!log.contains("module-info.java:1:30: compiler.err.conflicting.exports.to.module: m1")) throw new Exception("expected output not found"); } @@ -363,8 +443,12 @@ public class ModuleInfoTest extends ModuleTestBase { .writeAll() .getOutput(Task.OutputKind.DIRECT); - if (!log.matches("(?s)^module\\-info\\.java:\\d+:\\d+: compiler\\.err\\.expected: token\\.identifier.*")) - throw new Exception("expected output not found"); + String expect_prefix = "(?s)^module\\-info\\.java:\\d+:\\d+: "; + String expect_message = "compiler\\.err\\.expected: token\\.identifier"; + String expect_suffix = ".*"; + String expect = expect_prefix + expect_message + expect_suffix; + if (!log.matches(expect)) + throw new Exception("expected output not found for: " + moduleInfo + "; actual: " + log); } } } diff --git a/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java b/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java index 7e0917c9f81..3cd1e783f20 100644 --- a/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java +++ b/langtools/test/tools/javac/modules/ModuleInfoTreeAccess.java @@ -85,4 +85,29 @@ public class ModuleInfoTreeAccess extends ModuleTestBase { assertNotNull("docCommentTree", docCommentTree); } } + + @Test + public void testTreePathForModuleDeclWithImport(Path base) throws Exception { + JavaCompiler compiler = ToolProvider.getSystemJavaCompiler(); + try (StandardJavaFileManager fm = compiler.getStandardFileManager(null, null, null)) { + Path src = base.resolve("src"); + tb.writeJavaFiles(src, "import java.lang.Deprecated; /** Test module */ @Deprecated module m1 {}"); + + Iterable files = fm.getJavaFileObjects(findJavaFiles(src)); + JavacTask task = (JavacTask) compiler.getTask(null, fm, null, null, null, files); + + task.analyze(); + JavacTrees trees = JavacTrees.instance(task); + ModuleElement mdle = (ModuleElement) task.getElements().getModuleElement("m1"); + + TreePath path = trees.getPath(mdle); + assertNotNull("path", path); + + ModuleElement mdle1 = (ModuleElement) trees.getElement(path); + assertNotNull("mdle1", mdle1); + + DocCommentTree docCommentTree = trees.getDocCommentTree(mdle); + assertNotNull("docCommentTree", docCommentTree); + } + } } diff --git a/langtools/test/tools/javac/modules/ModulePathTest.java b/langtools/test/tools/javac/modules/ModulePathTest.java index ba7c48db7ab..e5efb2b720e 100644 --- a/langtools/test/tools/javac/modules/ModulePathTest.java +++ b/langtools/test/tools/javac/modules/ModulePathTest.java @@ -178,7 +178,7 @@ public class ModulePathTest extends ModuleTestBase { .run() .writeAll(); - Path moduleJar = base.resolve("m1.jar"); + Path moduleJar = base.resolve("a.jar"); new JarTask(tb, moduleJar) .baseDir(jarClasses) .files("p/CC.class") @@ -191,7 +191,7 @@ public class ModulePathTest extends ModuleTestBase { new JavacTask(tb, Task.Mode.CMDLINE) .outdir(classes) - .options("--module-path", moduleJar.toString(), "--add-modules", "m1") + .options("--module-path", moduleJar.toString(), "--add-modules", "a") .files(findJavaFiles(src)) .run() .writeAll(); diff --git a/langtools/test/tools/javac/modules/OpenModulesTest.java b/langtools/test/tools/javac/modules/OpenModulesTest.java new file mode 100644 index 00000000000..9d477fbf9b4 --- /dev/null +++ b/langtools/test/tools/javac/modules/OpenModulesTest.java @@ -0,0 +1,287 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + * @test + * @summary tests for multi-module mode compilation + * @library /tools/lib + * @modules jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * jdk.jdeps/com.sun.tools.classfile + * jdk.jdeps/com.sun.tools.javap + * @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase + * @run main OpenModulesTest + */ + +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; + +import com.sun.tools.classfile.Attribute; +import com.sun.tools.classfile.Attributes; +import com.sun.tools.classfile.ClassFile; +import com.sun.tools.classfile.ClassWriter; +import com.sun.tools.classfile.Module_attribute; +import toolbox.JavacTask; +import toolbox.JavapTask; +import toolbox.Task; +import toolbox.Task.Expect; +import toolbox.Task.OutputKind; + +public class OpenModulesTest extends ModuleTestBase { + + public static void main(String... args) throws Exception { + new OpenModulesTest().runTests(); + } + + @Test + public void testStrongModule(Path base) throws Exception { + Path m1 = base.resolve("m1"); + tb.writeJavaFiles(m1, + "module m1 { exports api1; opens api2; }", + "package api1; public class Api1 {}", + "package api2; public class Api2 {}", + "package impl; public class Impl {}"); + Path classes = base.resolve("classes"); + Path m1Classes = classes.resolve("m1"); + tb.createDirectories(m1Classes); + + String log = new JavacTask(tb) + .outdir(m1Classes) + .files(findJavaFiles(m1)) + .run() + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + if (!log.isEmpty()) + throw new Exception("expected output not found: " + log); + + String decompiled = new JavapTask(tb) + .options("--system", "none", "-bootclasspath", "") + .classes(m1Classes.resolve("module-info.class").toString()) + .run() + .writeAll() + .getOutput(OutputKind.DIRECT) + .replace(System.getProperty("line.separator"), "\n"); + + String expected = "module m1 {\n" + + " requires java.base;\n" + + " exports api1;\n" + + " opens api2;\n" + + "}"; + + if (!decompiled.contains(expected)) { + throw new Exception("expected output not found: " + decompiled); + } + + //compiling against a strong module read from binary: + Path m2 = base.resolve("m2"); + tb.writeJavaFiles(m2, + "module m2 { requires m1; }", + "package test; public class Test { api1.Api1 a1; api2.Api2 a2; }"); + Path m2Classes = classes.resolve("m2"); + tb.createDirectories(m2Classes); + + List log2 = new JavacTask(tb) + .options("--module-path", m1Classes.toString(), + "-XDrawDiagnostics") + .outdir(m2Classes) + .files(findJavaFiles(m2)) + .run(Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + List expected2 = Arrays.asList("Test.java:1:53: compiler.err.doesnt.exist: api2", + "1 error"); + if (!Objects.equals(log2, expected2)) + throw new Exception("expected output not found: " + log2); + } + + @Test + public void testOpenModule(Path base) throws Exception { + Path m1 = base.resolve("m1"); + tb.writeJavaFiles(m1, + "open module m1 { exports api1; }", + "package api1; public class Api1 {}", + "package api2; public class Api2 {}", + "package impl; public class Impl {}"); + Path classes = base.resolve("classes"); + Path m1Classes = classes.resolve("m1"); + tb.createDirectories(m1Classes); + + String log = new JavacTask(tb) + .outdir(m1Classes) + .files(findJavaFiles(m1)) + .run() + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + if (!log.isEmpty()) + throw new Exception("expected output not found: " + log); + + String decompiled = new JavapTask(tb) + .options("--system", "none", "-bootclasspath", "") + .classes(m1Classes.resolve("module-info.class").toString()) + .run() + .writeAll() + .getOutput(OutputKind.DIRECT) + .replace(System.getProperty("line.separator"), "\n"); + + String expected = "open module m1 {\n" + + " requires java.base;\n" + + " exports api1;\n" + + "}"; + + if (!decompiled.contains(expected)) { + throw new Exception("expected output not found: " + decompiled); + } + + //compiling against a ordinary module read from binary: + Path m2 = base.resolve("m2"); + tb.writeJavaFiles(m2, + "module m2 { requires m1; }", + "package test; public class Test { api1.Api1 a1; api2.Api2 a2; }"); + Path m2Classes = classes.resolve("m2"); + tb.createDirectories(m2Classes); + + List log2 = new JavacTask(tb) + .options("--module-path", m1Classes.toString(), + "-XDrawDiagnostics") + .outdir(m2Classes) + .files(findJavaFiles(m2)) + .run(Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + List expected2 = Arrays.asList("Test.java:1:53: compiler.err.doesnt.exist: api2", + "1 error"); + if (!Objects.equals(log2, expected2)) + throw new Exception("expected output not found: " + log2); + } + + @Test + public void testOpenModuleNoOpens(Path base) throws Exception { + Path m1 = base.resolve("m1"); + tb.writeJavaFiles(m1, + "open module m1 { exports api1; opens api2; }", + "package api1; public class Api1 {}", + "package api2; public class Api2 {}", + "package impl; public class Impl {}"); + Path classes = base.resolve("classes"); + Path m1Classes = classes.resolve("m1"); + tb.createDirectories(m1Classes); + + List log = new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(m1Classes) + .files(findJavaFiles(m1)) + .run(Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + List expected = Arrays.asList("module-info.java:1:32: compiler.err.no.opens.unless.strong", + "1 error"); + + if (!expected.equals(log)) + throw new Exception("expected output not found: " + log); + + } + + @Test + public void testNonZeroOpensInOpen(Path base) throws Exception { + Path m1 = base.resolve("m1"); + tb.writeJavaFiles(m1, + "module m1 { opens api; }", + "package api; public class Api {}"); + Path classes = base.resolve("classes"); + Path m1Classes = classes.resolve("m1"); + tb.createDirectories(m1Classes); + + new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(m1Classes) + .files(findJavaFiles(m1)) + .run(Expect.SUCCESS) + .writeAll(); + + Path miClass = m1Classes.resolve("module-info.class"); + ClassFile cf = ClassFile.read(miClass); + Module_attribute module = (Module_attribute) cf.attributes.map.get(Attribute.Module); + Module_attribute newModule = new Module_attribute(module.attribute_name_index, + module.module_name, + module.module_flags | Module_attribute.ACC_OPEN, + module.requires, + module.exports, + module.opens, + module.uses_index, + module.provides); + Map attrs = new HashMap<>(cf.attributes.map); + + attrs.put(Attribute.Module, newModule); + + Attributes newAttributes = new Attributes(attrs); + ClassFile newClassFile = new ClassFile(cf.magic, + cf.minor_version, + cf.major_version, + cf.constant_pool, + cf.access_flags, + cf.this_class, + cf.super_class, + cf.interfaces, + cf.fields, + cf.methods, + newAttributes); + + try (OutputStream out = Files.newOutputStream(miClass)) { + new ClassWriter().write(newClassFile, out); + } + + Path test = base.resolve("test"); + tb.writeJavaFiles(test, + "package impl; public class Impl extends api.Api {}"); + Path testClasses = base.resolve("test-classes"); + tb.createDirectories(testClasses); + + List log = new JavacTask(tb) + .options("-XDrawDiagnostics", + "--module-path", classes.toString(), + "--add-modules", "m1") + .outdir(testClasses) + .files(findJavaFiles(test)) + .run(Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + List expected = Arrays.asList("- compiler.err.cant.access: m1.module-info, (compiler.misc.bad.class.file.header: module-info.class, (compiler.misc.module.non.zero.opens: m1))", + "1 error"); + + if (!expected.equals(log)) + throw new Exception("expected output not found: " + log); + } + +} diff --git a/langtools/test/tools/javac/modules/PatchModulesTest.java b/langtools/test/tools/javac/modules/PatchModulesTest.java index 648ba4901ac..dde0c53a613 100644 --- a/langtools/test/tools/javac/modules/PatchModulesTest.java +++ b/langtools/test/tools/javac/modules/PatchModulesTest.java @@ -28,7 +28,7 @@ * @library /tools/lib * @modules * jdk.compiler/com.sun.tools.javac.api - * jdk.compiler/com.sun.tools.javac.file + * jdk.compiler/com.sun.tools.javac.file:+open * jdk.compiler/com.sun.tools.javac.main * @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase * @run main PatchModulesTest diff --git a/langtools/test/tools/javac/modules/ProvidesTest.java b/langtools/test/tools/javac/modules/ProvidesTest.java index cef2f522d9b..b3aaa06048c 100644 --- a/langtools/test/tools/javac/modules/ProvidesTest.java +++ b/langtools/test/tools/javac/modules/ProvidesTest.java @@ -41,7 +41,6 @@ import java.util.List; import toolbox.JavacTask; import toolbox.Task; import toolbox.Task.Expect; -import toolbox.ToolBox; public class ProvidesTest extends ModuleTestBase { public static void main(String... args) throws Exception { @@ -426,4 +425,96 @@ public class ProvidesTest extends ModuleTestBase { .run(Expect.SUCCESS) .writeAll(); } + + @Test + public void testFactory(Path base) throws Exception { + Path src = base.resolve("src"); + tb.writeJavaFiles(src, + "module m { exports p1; provides p1.C1 with p2.C2; }", + "package p1; public interface C1 { }", + "package p2; public class C2 { public static p1.C1 provider() { return null; } }"); + + new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(Files.createDirectories(base.resolve("classes"))) + .files(findJavaFiles(src)) + .run() + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + List output; + List expected; + + tb.writeJavaFiles(src, + "package p2; public class C2 { public p1.C1 provider() { return null; } }"); + + output = new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(Files.createDirectories(base.resolve("classes"))) + .files(findJavaFiles(src)) + .run(Task.Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.must.be.subtype.of.service.interface", + "1 error"); + + if (!expected.equals(output)) { + throw new Exception("Expected output not found. Output: " + output); + } + + tb.writeJavaFiles(src, + "package p2; public class C2 { static p1.C1 provider() { return null; } }"); + + output = new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(Files.createDirectories(base.resolve("classes"))) + .files(findJavaFiles(src)) + .run(Task.Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.must.be.subtype.of.service.interface", + "1 error"); + + if (!expected.equals(output)) { + throw new Exception("Expected output not found. Output: " + output); + } + + tb.writeJavaFiles(src, + "package p2; public class C2 { public static Object provider() { return null; } }"); + + output = new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(Files.createDirectories(base.resolve("classes"))) + .files(findJavaFiles(src)) + .run(Task.Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.provider.return.must.be.subtype.of.service.interface", + "1 error"); + + if (!expected.equals(output)) { + throw new Exception("Expected output not found. Output: " + output); + } + + tb.writeJavaFiles(src, + "package p2; public class C2 { public static p1.C1 provider = new p1.C1() {}; }"); + + output = new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(Files.createDirectories(base.resolve("classes"))) + .files(findJavaFiles(src)) + .run(Task.Expect.FAIL) + .writeAll() + .getOutputLines(Task.OutputKind.DIRECT); + + expected = Arrays.asList("module-info.java:1:46: compiler.err.service.implementation.must.be.subtype.of.service.interface", + "1 error"); + + if (!expected.equals(output)) { + throw new Exception("Expected output not found. Output: " + output); + } + } } diff --git a/langtools/test/tools/javac/modules/RepeatedUsesAndProvidesTest.java b/langtools/test/tools/javac/modules/RepeatedUsesAndProvidesTest.java index da1f5c8814e..b365edbc268 100644 --- a/langtools/test/tools/javac/modules/RepeatedUsesAndProvidesTest.java +++ b/langtools/test/tools/javac/modules/RepeatedUsesAndProvidesTest.java @@ -82,7 +82,7 @@ public class RepeatedUsesAndProvidesTest extends ModuleTestBase { .run(Task.Expect.FAIL) .writeAll() .getOutput(Task.OutputKind.DIRECT); - if (!log.contains("module-info.java:1:39: compiler.err.duplicate.provides")) + if (!log.contains("module-info.java:1:61: compiler.err.duplicate.provides")) throw new Exception("expected output not found"); } } diff --git a/langtools/test/tools/javac/modules/ReportNonExistentPackageTest.java b/langtools/test/tools/javac/modules/ReportNonExistentPackageTest.java index b36944b196c..8d76c9ec473 100644 --- a/langtools/test/tools/javac/modules/ReportNonExistentPackageTest.java +++ b/langtools/test/tools/javac/modules/ReportNonExistentPackageTest.java @@ -22,7 +22,7 @@ */ /** - * @test 8144342 8149658 + * @test 8144342 8149658 8162713 * @summary javac doesn't report errors if module exports non-existent package * @library /tools/lib * @modules @@ -103,4 +103,45 @@ public class ReportNonExistentPackageTest extends ModuleTestBase { if (!log.contains("module-info.java:1:20: compiler.err.package.empty.or.not.found: p1")) throw new Exception("expected output not found"); } + + @Test + public void testExportPrivateEmptyPackage(Path base) throws Exception { + Path src = base.resolve("src"); + tb.writeJavaFiles(src, + "module m { opens p; }"); + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + String log = new JavacTask(tb) + .options("-XDrawDiagnostics") + .outdir(classes) + .files(findJavaFiles(src)) + .run(Task.Expect.FAIL) + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + if (!log.contains("module-info.java:1:18: compiler.err.package.empty.or.not.found: p")) + throw new Exception("expected output not found, actual output: " + log); + } + + @Test + public void testExportPrivateOnlyWithResources(Path base) throws Exception { + Path src = base.resolve("src"); + tb.writeJavaFiles(src, + "module m { opens p; }"); + Path resource = src.resolve("p").resolve("resource.properties"); + Files.createDirectories(resource.getParent()); + Files.newOutputStream(resource).close(); + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + String log = new JavacTask(tb) + .sourcepath(src.toString()) + .outdir(classes) + .files(findJavaFiles(src)) + .run() + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + if (!log.equals("")) + throw new Exception("expected output not found, actual output: " + log); + } } diff --git a/langtools/test/tools/javac/modules/RequiresStaticTest.java b/langtools/test/tools/javac/modules/RequiresStaticTest.java new file mode 100644 index 00000000000..5a96bb25fe9 --- /dev/null +++ b/langtools/test/tools/javac/modules/RequiresStaticTest.java @@ -0,0 +1,391 @@ +/* + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + * @test + * @bug 8161906 8161596 + * @summary tests for "requires static" + * @library /tools/lib + * @modules + * jdk.compiler/com.sun.tools.javac.api + * jdk.compiler/com.sun.tools.javac.main + * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase + * @run main RequiresStaticTest + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; + +import toolbox.JavaTask; +import toolbox.JavacTask; +import toolbox.Task; +import toolbox.Task.OutputKind; + +public class RequiresStaticTest extends ModuleTestBase { + + public static void main(String... args) throws Exception { + RequiresStaticTest t = new RequiresStaticTest(); + t.runTests(); + } + + @Test + public void testJavaSE_OK(Path base) throws Exception { + Path src = base.resolve("src"); + tb.writeJavaFiles(src, + "module m { requires static java.se; }", + "import java.awt.Frame;\n" // in java.se + + "class Test {\n" + + " Frame f;\n" + + "}"); + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .files(findJavaFiles(src)) + .outdir(classes) + .run() + .writeAll(); + } + + @Test + public void testJavaSE_Fail(Path base) throws Exception { + Path src = base.resolve("src"); + tb.writeJavaFiles(src, + "module m { requires static java.se; }", + "import com.sun.source.tree.Tree;\n" // not in java.se (in jdk.compiler) + + "class Test {\n" + + " Tree t;\n" + + "}"); + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + String log = new JavacTask(tb, Task.Mode.CMDLINE) + .options("-XDrawDiagnostics") + .files(findJavaFiles(src)) + .outdir(classes) + .run(Task.Expect.FAIL) + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + if (!log.contains("Test.java:1:27: compiler.err.doesnt.exist: com.sun.source.tree")) + throw new Exception("expected output not found"); + } + + @Test + public void testComplex_OK(Path base) throws Exception { + Path src = getComplexSrc(base, "", ""); + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .options("--module-source-path", src.toString()) + .files(findJavaFiles(src)) + .outdir(classes) + .run() + .writeAll(); + } + + @Test + public void testComplex_Fail(Path base) throws Exception { + Path src = getComplexSrc(base, + "import p5.C5; import p6.C6; import p7.C7; import p8.C8;\n", + "C5 c5; C6 c6; C7 c7; C8 c8;\n"); + Path classes = base.resolve("classes"); + Files.createDirectories(classes); + + String log = new JavacTask(tb, Task.Mode.CMDLINE) + .options("-XDrawDiagnostics", + "--module-source-path", src.toString()) + .files(findJavaFiles(src)) + .outdir(classes) + .run(Task.Expect.FAIL) + .writeAll() + .getOutput(Task.OutputKind.DIRECT); + + String[] expect = { + "C1.java:5:10: compiler.err.not.def.access.package.cant.access: p5.C5, p5", + "C1.java:5:24: compiler.err.not.def.access.package.cant.access: p6.C6, p6", + "C1.java:5:38: compiler.err.not.def.access.package.cant.access: p7.C7, p7", + "C1.java:5:52: compiler.err.not.def.access.package.cant.access: p8.C8, p8", + "C1.java:8:1: compiler.err.cant.resolve.location: kindname.class, C5, , , " + + "(compiler.misc.location: kindname.class, p1.C1, null)", + "C1.java:8:8: compiler.err.cant.resolve.location: kindname.class, C6, , , " + + "(compiler.misc.location: kindname.class, p1.C1, null)", + "C1.java:8:15: compiler.err.cant.resolve.location: kindname.class, C7, , , " + + "(compiler.misc.location: kindname.class, p1.C1, null)", + "C1.java:8:22: compiler.err.cant.resolve.location: kindname.class, C8, , , " + + "(compiler.misc.location: kindname.class, p1.C1, null)" + }; + + for (String e: expect) { + if (!log.contains(e)) + throw new Exception("expected output not found: " + e); + } + } + + /* + * Set up the following module graph + * m1 -> m2 => m3 -=-> m4 --> m5 + * \ / + * \ / + * v v + * m6 => m7 --> m8 + * where -> is requires, => is requires transitive, --> is requires static, -=-> is requires transitive static + */ + Path getComplexSrc(Path base, String m1_extraImports, String m1_extraUses) throws Exception { + Path src = base.resolve("src"); + + Path src_m1 = src.resolve("m1"); + tb.writeJavaFiles(src_m1, + "module m1 { requires m2; }", + "package p1;\n" + + "import p2.C2;\n" + + "import p3.C3;\n" + + "import p4.C4;\n" + + m1_extraImports + + "class C1 {\n" + + " C2 c2; C3 c3; C4 c4;\n" + + m1_extraUses + + "}\n"); + + Path src_m2 = src.resolve("m2"); + tb.writeJavaFiles(src_m2, + "module m2 {\n" + + " requires transitive m3;\n" + + " requires static m6;\n" + + " exports p2;\n" + + "}", + "package p2;\n" + + "public class C2 {p7.C7 c7; p6.C6 c6; p4.C4 c4;}\n"); + + Path src_m3 = src.resolve("m3"); + tb.writeJavaFiles(src_m3, + "module m3 { requires transitive static m4; exports p3; }", + "package p3;\n" + + "public class C3 { }\n"); + + Path src_m4 = src.resolve("m4"); + tb.writeJavaFiles(src_m4, + "module m4 { requires m5; requires static m6; exports p4; }", + "package p4;\n" + + "public class C4 { p6.C6 c6; p7.C7 c7;}\n"); + + Path src_m5 = src.resolve("m5"); + tb.writeJavaFiles(src_m5, + "module m5 { exports p5; }", + "package p5;\n" + + "public class C5 { }\n"); + + Path src_m6 = src.resolve("m6"); + tb.writeJavaFiles(src_m6, + "module m6 { requires transitive m7; exports p6; }", + "package p6;\n" + + "public class C6 { p7.C7 c7; }\n"); + + Path src_m7 = src.resolve("m7"); + tb.writeJavaFiles(src_m7, + "module m7 { requires static m8; exports p7; }", + "package p7;\n" + + "public class C7 { p8.C8 c8; }\n"); + + Path src_m8 = src.resolve("m8"); + tb.writeJavaFiles(src_m8, + "module m8 { exports p8; }", + "package p8;\n" + + "public class C8 { }\n"); + + return src; + } + + @Test + public void testRequiresStatic(Path base) throws Exception { + Path src = base.resolve("src"); + Path m1 = src.resolve("m1"); + tb.writeJavaFiles(m1, + "module m1 { exports m1; }", + "package m1;" + + "public class Api { }\n"); + + Path classes = base.resolve("classes"); + Path m1Classes = classes.resolve("m1"); + Files.createDirectories(m1Classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .files(findJavaFiles(m1)) + .outdir(m1Classes) + .run() + .writeAll(); + + Path m3 = src.resolve("m3"); + tb.writeJavaFiles(m3, + "module m3 { requires static m1; }", + "package m3;\n" + + "public class Test {\n" + + " public static void main(String... args) {\n" + + " try {\n" + + " Class.forName(\"m1.Api\");\n" + + " } catch (ClassNotFoundException e) {\n" + + " System.err.println(\"ok\");\n" + + " }\n" + + " }\n" + + "}", + "package m3;\n" + + "public class ApiUse{\n" + + " m1.Api api;\n" + + "}"); + + Path m3Classes = classes.resolve("m3"); + Files.createDirectories(m3Classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .options("--module-path", m1Classes.toString()) + .files(findJavaFiles(m3)) + .outdir(m3Classes) + .run() + .writeAll(); + + String log = new JavaTask(tb) + .vmOptions("--module-path", m3Classes.toString(), "--add-modules", "m3") + .className("m3.Test") + .run() + .writeAll() + .getOutput(OutputKind.STDERR); + + String expected = "ok" + System.getProperty("line.separator"); + + if (!expected.equals(log)) { + throw new AssertionError("Unexpected output: " + log); + } + } + + @Test + public void testRequiresTransitiveStatic(Path base) throws Exception { + Path src = base.resolve("src"); + Path m1 = src.resolve("m1"); + tb.writeJavaFiles(m1, + "module m1 { exports m1; }", + "package m1;" + + "public class Api { }\n"); + + Path classes = base.resolve("classes"); + Path m1Classes = classes.resolve("m1"); + Files.createDirectories(m1Classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .files(findJavaFiles(m1)) + .outdir(m1Classes) + .run() + .writeAll(); + + Path m2 = src.resolve("m2"); + tb.writeJavaFiles(m2, + "module m2 { requires transitive static m1; }"); + + Path m2Classes = classes.resolve("m2"); + Files.createDirectories(m2Classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .options("--module-path", m1Classes.toString()) + .files(findJavaFiles(m2)) + .outdir(m2Classes) + .run() + .writeAll(); + + Path m3 = src.resolve("m3"); + tb.writeJavaFiles(m3, + "module m3 { requires m2; }", + "package m3;\n" + + "public class Test {\n" + + " public static void main(String... args) {\n" + + " try {\n" + + " Class.forName(\"m1.Api\");\n" + + " } catch (ClassNotFoundException e) {\n" + + " System.err.println(\"ok\");\n" + + " }\n" + + " }\n" + + "}", + "package m3;\n" + + "public class ApiUse{\n" + + " m1.Api api;\n" + + "}"); + + Path m3Classes = classes.resolve("m3"); + Files.createDirectories(m3Classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .options("--module-path", m1Classes.toString() + File.pathSeparator + m2Classes.toString()) + .files(findJavaFiles(m3)) + .outdir(m3Classes) + .run() + .writeAll(); + + String log = new JavaTask(tb) + .vmOptions("--module-path", m2Classes.toString() + File.pathSeparator + m3Classes.toString(), + "--add-modules", "m3") + .className("m3.Test") + .run() + .writeAll() + .getOutput(OutputKind.STDERR); + + String expected = "ok" + System.getProperty("line.separator"); + + if (!expected.equals(log)) { + throw new AssertionError("Unexpected output: " + log); + } + } + + @Test + public void testRequiresStaticTransitive(Path base) throws Exception { + Path src = base.resolve("src"); + Path m1 = src.resolve("m1"); + tb.writeJavaFiles(m1, + "module m1 { exports m1; }", + "package m1;" + + "public class Api { }\n"); + + Path classes = base.resolve("classes"); + Path m1Classes = classes.resolve("m1"); + Files.createDirectories(m1Classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .files(findJavaFiles(m1)) + .outdir(m1Classes) + .run() + .writeAll(); + + Path m2 = src.resolve("m2"); + tb.writeJavaFiles(m2, + "module m2 { requires transitive static m1; }"); + + Path m2Classes = classes.resolve("m2"); + Files.createDirectories(m2Classes); + + new JavacTask(tb, Task.Mode.CMDLINE) + .options("--module-path", m1Classes.toString()) + .files(findJavaFiles(m2)) + .outdir(m2Classes) + .run() + .writeAll(); + } +} diff --git a/langtools/test/tools/javac/modules/RequiresPublicTest.java b/langtools/test/tools/javac/modules/RequiresTransitiveTest.java similarity index 94% rename from langtools/test/tools/javac/modules/RequiresPublicTest.java rename to langtools/test/tools/javac/modules/RequiresTransitiveTest.java index 68184db8f09..44e1c243375 100644 --- a/langtools/test/tools/javac/modules/RequiresPublicTest.java +++ b/langtools/test/tools/javac/modules/RequiresTransitiveTest.java @@ -23,13 +23,13 @@ /* * @test - * @summary tests for "requires public" + * @summary tests for "requires transitive" * @library /tools/lib * @modules * jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main * @build toolbox.ToolBox toolbox.JavacTask ModuleTestBase - * @run main RequiresPublicTest + * @run main RequiresTransitiveTest */ import java.nio.file.Files; @@ -39,10 +39,10 @@ import toolbox.JavacTask; import toolbox.Task; import toolbox.ToolBox; -public class RequiresPublicTest extends ModuleTestBase { +public class RequiresTransitiveTest extends ModuleTestBase { public static void main(String... args) throws Exception { - RequiresPublicTest t = new RequiresPublicTest(); + RequiresTransitiveTest t = new RequiresTransitiveTest(); t.runTests(); } @@ -142,7 +142,7 @@ public class RequiresPublicTest extends ModuleTestBase { * Set up the following module graph * m1 -> m2 => m3 => m4 -> m5 * -> m6 => m7 - * where -> is requires, => is requires public + * where -> is requires, => is requires transitive */ Path getComplexSrc(Path base, String m1_extraImports, String m1_extraUses) throws Exception { Path src = base.resolve("src"); @@ -163,7 +163,7 @@ public class RequiresPublicTest extends ModuleTestBase { Path src_m2 = src.resolve("m2"); tb.writeJavaFiles(src_m2, "module m2 {\n" - + " requires public m3;\n" + + " requires transitive m3;\n" + " requires m6;\n" + " exports p2;\n" + "}", @@ -172,7 +172,7 @@ public class RequiresPublicTest extends ModuleTestBase { Path src_m3 = src.resolve("m3"); tb.writeJavaFiles(src_m3, - "module m3 { requires public m4; exports p3; }", + "module m3 { requires transitive m4; exports p3; }", "package p3;\n" + "public class C3 { }\n"); @@ -190,7 +190,7 @@ public class RequiresPublicTest extends ModuleTestBase { Path src_m6 = src.resolve("m6"); tb.writeJavaFiles(src_m6, - "module m6 { requires public m7; exports p6; }", + "module m6 { requires transitive m7; exports p6; }", "package p6;\n" + "public class C6 { }\n"); diff --git a/langtools/test/tools/javac/modules/T8158224/Processor.java b/langtools/test/tools/javac/modules/T8158224/Processor.java index abcc222a764..6b8b7172dfc 100644 --- a/langtools/test/tools/javac/modules/T8158224/Processor.java +++ b/langtools/test/tools/javac/modules/T8158224/Processor.java @@ -37,4 +37,4 @@ public class Processor extends AbstractProcessor { public boolean process(Set tE, RoundEnvironment env) { return true; } -} \ No newline at end of file +} diff --git a/langtools/test/tools/javac/modules/T8168854/pack1/Outer.java b/langtools/test/tools/javac/modules/T8168854/pack1/Outer.java index ff272d594dd..1f3ab6af5fd 100644 --- a/langtools/test/tools/javac/modules/T8168854/pack1/Outer.java +++ b/langtools/test/tools/javac/modules/T8168854/pack1/Outer.java @@ -28,4 +28,4 @@ package pack1; public class Outer { public class Inter { } -} \ No newline at end of file +} diff --git a/langtools/test/tools/javac/modules/T8168854/pack1/Outer1.java b/langtools/test/tools/javac/modules/T8168854/pack1/Outer1.java index 2710e62d3a3..6b9a5074da1 100644 --- a/langtools/test/tools/javac/modules/T8168854/pack1/Outer1.java +++ b/langtools/test/tools/javac/modules/T8168854/pack1/Outer1.java @@ -31,4 +31,4 @@ public class Outer1 { new Outer().super(); } } -} \ No newline at end of file +} diff --git a/langtools/test/tools/javac/options/release/ReleaseOptionClashes.java b/langtools/test/tools/javac/options/release/ReleaseOptionClashes.java index 80c8f6c4d8d..7f26a033968 100644 --- a/langtools/test/tools/javac/options/release/ReleaseOptionClashes.java +++ b/langtools/test/tools/javac/options/release/ReleaseOptionClashes.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @bug 8072480 * @summary Verify option clash between --release and -source is reported correctly. - * @modules jdk.compiler/com.sun.tools.javac.util + * @modules jdk.compiler/com.sun.tools.javac.util:open */ import java.io.ByteArrayOutputStream; diff --git a/langtools/test/tools/javac/parser/JavacParserTest.java b/langtools/test/tools/javac/parser/JavacParserTest.java index 05fced223cf..43e8d31d00e 100644 --- a/langtools/test/tools/javac/parser/JavacParserTest.java +++ b/langtools/test/tools/javac/parser/JavacParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -370,7 +370,7 @@ public class JavacParserTest extends TestCase { } @Test - void testCorrectWilcardPositions1() throws IOException { + void testCorrectWildcardPositions1() throws IOException { performWildcardPositionsTest("package test; import java.util.List; " + "class Test { private void method() { List> l; } }", @@ -385,7 +385,7 @@ public class JavacParserTest extends TestCase { } @Test - void testCorrectWilcardPositions2() throws IOException { + void testCorrectWildcardPositions2() throws IOException { performWildcardPositionsTest("package test; import java.util.List; " + "class Test { private void method() { List> l; } }", Arrays.asList("List> l;", @@ -399,7 +399,7 @@ public class JavacParserTest extends TestCase { } @Test - void testCorrectWilcardPositions3() throws IOException { + void testCorrectWildcardPositions3() throws IOException { performWildcardPositionsTest("package test; import java.util.List; " + "class Test { private void method() { List> l; } }", @@ -413,7 +413,7 @@ public class JavacParserTest extends TestCase { } @Test - void testCorrectWilcardPositions4() throws IOException { + void testCorrectWildcardPositions4() throws IOException { performWildcardPositionsTest("package test; import java.util.List; " + "class Test { private void method() { " + "List>> l; } }", @@ -432,7 +432,7 @@ public class JavacParserTest extends TestCase { } @Test - void testCorrectWilcardPositions5() throws IOException { + void testCorrectWildcardPositions5() throws IOException { performWildcardPositionsTest("package test; import java.util.List; " + "class Test { private void method() { " + "List>> l; } }", @@ -701,7 +701,7 @@ public class JavacParserTest extends TestCase { } }.scan(cut, null); - assertEquals("testSwitchError: The Erroneous tree " + assertEquals("testOperatorMissingError: The Erroneous tree " + "error values: " + values + " do not match expected error values: " + expectedValues, values, expectedValues); @@ -726,7 +726,7 @@ public class JavacParserTest extends TestCase { } }.scan(cut, null); - assertEquals("testSwitchError: The Erroneous tree " + assertEquals("testMissingParenthesisError: The Erroneous tree " + "error values: " + values + " do not match expected error values: " + expectedValues, values, expectedValues); @@ -751,7 +751,7 @@ public class JavacParserTest extends TestCase { } }.scan(cut, null); - assertEquals("testSwitchError: The Erroneous tree " + assertEquals("testMissingClassError: The Erroneous tree " + "error values: " + values + " do not match expected error values: " + expectedValues, values, expectedValues); diff --git a/langtools/test/tools/javac/platform/PlatformProviderTest.java b/langtools/test/tools/javac/platform/PlatformProviderTest.java index 2481d02d2dd..9ff0c2374bf 100644 --- a/langtools/test/tools/javac/platform/PlatformProviderTest.java +++ b/langtools/test/tools/javac/platform/PlatformProviderTest.java @@ -30,7 +30,7 @@ * @modules jdk.compiler/com.sun.tools.javac.api * jdk.compiler/com.sun.tools.javac.main * jdk.compiler/com.sun.tools.javac.platform - * jdk.compiler/com.sun.tools.javac.util + * jdk.compiler/com.sun.tools.javac.util:+open * @build toolbox.ToolBox PlatformProviderTest * @run main/othervm PlatformProviderTest */ @@ -99,7 +99,7 @@ public class PlatformProviderTest implements PlatformProvider { .outdir(".") .options("-J--class-path=" + System.getProperty("test.classes"), "-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED", - "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", + "-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", "-XDrawDiagnostics", "--release", platformSpec, @@ -134,7 +134,7 @@ public class PlatformProviderTest implements PlatformProvider { .outdir(".") .options("-J--class-path=" + System.getProperty("test.classes"), "-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED", - "-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", + "-J--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED", "--release", "fail", System.getProperty("test.src") + "/PlatformProviderTestSource.java") diff --git a/langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.java b/langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.java index 9f8a3977305..a75305771e7 100644 --- a/langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.java +++ b/langtools/test/tools/javac/processing/model/LocalClasses/LocalClassesModel.java @@ -70,4 +70,4 @@ public class LocalClassesModel extends AbstractProcessor { public SourceVersion getSupportedSourceVersion() { return SourceVersion.latestSupported(); } -} \ No newline at end of file +} diff --git a/langtools/test/tools/javac/processing/model/TestSymtabItems.java b/langtools/test/tools/javac/processing/model/TestSymtabItems.java index 38720522730..e1f80686cb9 100644 --- a/langtools/test/tools/javac/processing/model/TestSymtabItems.java +++ b/langtools/test/tools/javac/processing/model/TestSymtabItems.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -25,7 +25,7 @@ * @test * @bug 7021183 7025809 * @summary 269: assertion failure getting enclosing element of an undefined name - * @modules jdk.compiler/com.sun.tools.javac.code + * @modules jdk.compiler/com.sun.tools.javac.code:+open * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.main * jdk.compiler/com.sun.tools.javac.model diff --git a/langtools/test/tools/javac/scope/DupUnsharedTest.java b/langtools/test/tools/javac/scope/DupUnsharedTest.java index 309cd94a090..6eff7538775 100644 --- a/langtools/test/tools/javac/scope/DupUnsharedTest.java +++ b/langtools/test/tools/javac/scope/DupUnsharedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,7 +24,7 @@ /* * @test * @summary WriteableScope.dupUnshared not working properly for shared Scopes. - * @modules jdk.compiler/com.sun.tools.javac.code + * @modules jdk.compiler/com.sun.tools.javac.code:+open * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.util */ diff --git a/langtools/test/tools/javac/scope/HashCollisionTest.java b/langtools/test/tools/javac/scope/HashCollisionTest.java index 1793799c257..b22b43eb77c 100644 --- a/langtools/test/tools/javac/scope/HashCollisionTest.java +++ b/langtools/test/tools/javac/scope/HashCollisionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -27,7 +27,7 @@ * @summary Ensure Scope impl can cope with hash collisions * @library /tools/javac/lib * @modules jdk.compiler/com.sun.tools.javac.api - * jdk.compiler/com.sun.tools.javac.code + * jdk.compiler/com.sun.tools.javac.code:+open * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.tree * jdk.compiler/com.sun.tools.javac.util diff --git a/langtools/test/tools/javac/scope/IterateAndRemove.java b/langtools/test/tools/javac/scope/IterateAndRemove.java index fab5ea52d97..f560b8fca48 100644 --- a/langtools/test/tools/javac/scope/IterateAndRemove.java +++ b/langtools/test/tools/javac/scope/IterateAndRemove.java @@ -103,4 +103,4 @@ public class IterateAndRemove { } } } -} \ No newline at end of file +} diff --git a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java index 1d1bc2cc0df..dd16b5afdc0 100644 --- a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java +++ b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java @@ -53,6 +53,7 @@ import com.sun.source.tree.Tree; import com.sun.source.util.TreeScanner; import com.sun.tools.javac.tree.JCTree; import com.sun.tools.javac.tree.JCTree.JCCompilationUnit; +import com.sun.tools.javac.tree.JCTree.JCModuleDecl; import com.sun.tools.javac.tree.JCTree.TypeBoundKind; import com.sun.tools.javac.util.List; @@ -145,7 +146,13 @@ public class SourceTreeScannerTest extends AbstractTreeScannerTest { } try { //System.err.println("FIELD: " + f.getName()); - reflectiveScan(f.get(tree)); + if (tree instanceof JCModuleDecl && f.getName().equals("mods")) { + // The modifiers will not found by TreeScanner, + // but the embedded annotations will be. + reflectiveScan(((JCModuleDecl) tree).mods.annotations); + } else { + reflectiveScan(f.get(tree)); + } } catch (IllegalAccessException e) { error(e.toString()); } diff --git a/langtools/test/tools/javac/tree/TreeKindTest.java b/langtools/test/tools/javac/tree/TreeKindTest.java index e285e44e1f8..518190d49bd 100644 --- a/langtools/test/tools/javac/tree/TreeKindTest.java +++ b/langtools/test/tools/javac/tree/TreeKindTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -114,6 +114,14 @@ public class TreeKindTest { ok = ok & verify(k, i, i == AnnotationTree.class); break; + case EXPORTS: + ok = ok & verify(k, i, i == ExportsTree.class); + break; + + case OPENS: + ok = ok & verify(k, i, i == OpensTree.class); + break; + case OTHER: ok = ok & verify(k, i, i == null); break; diff --git a/langtools/test/tools/javac/types/ScopeListenerTest.java b/langtools/test/tools/javac/types/ScopeListenerTest.java index 9173ac42447..cd12fbad5ae 100644 --- a/langtools/test/tools/javac/types/ScopeListenerTest.java +++ b/langtools/test/tools/javac/types/ScopeListenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -26,7 +26,7 @@ * @bug 8039262 * @summary Ensure that using Types.membersClosure does not increase the number of listeners on the * class's members Scope. - * @modules jdk.compiler/com.sun.tools.javac.code + * @modules jdk.compiler/com.sun.tools.javac.code:+open * jdk.compiler/com.sun.tools.javac.file * jdk.compiler/com.sun.tools.javac.util */ diff --git a/langtools/test/tools/javap/4870651/T4870651.java b/langtools/test/tools/javap/4870651/T4870651.java index 73e8851002d..dd1536db859 100644 --- a/langtools/test/tools/javap/4870651/T4870651.java +++ b/langtools/test/tools/javap/4870651/T4870651.java @@ -46,8 +46,8 @@ public class T4870651 { "v1(java.lang.String...)"); verify("Test$Enum", - "flags: ACC_FINAL, ACC_SUPER, ACC_ENUM", - "flags: ACC_PUBLIC, ACC_STATIC, ACC_FINAL, ACC_ENUM"); + "flags: (0x4030) ACC_FINAL, ACC_SUPER, ACC_ENUM", + "flags: (0x4019) ACC_PUBLIC, ACC_STATIC, ACC_FINAL, ACC_ENUM"); if (errors > 0) throw new Error(errors + " found."); diff --git a/langtools/test/tools/javap/MethodParameters.java b/langtools/test/tools/javap/MethodParameters.java index 6052f631b37..aed82fcb8a6 100644 --- a/langtools/test/tools/javap/MethodParameters.java +++ b/langtools/test/tools/javap/MethodParameters.java @@ -45,7 +45,7 @@ public class MethodParameters { static final String Init0_expected = (" Foo();\n" + " descriptor: ()V\n" + - " flags:\n" + + " flags: (0x0000)\n" + " Code:\n" + " stack=1, locals=1, args_size=1\n" + " 0: aload_0\n" + @@ -57,7 +57,7 @@ public class MethodParameters { static final String Init1_expected = (" Foo(int);\n" + " descriptor: (I)V\n" + - " flags:\n" + + " flags: (0x0000)\n" + " Code:\n" + " stack=1, locals=2, args_size=2\n" + " 0: aload_0\n" + @@ -72,7 +72,7 @@ public class MethodParameters { static final String foo0_expected = (" void foo0();\n" + " descriptor: ()V\n" + - " flags:\n" + + " flags: (0x0000)\n" + " Code:\n" + " stack=0, locals=1, args_size=1\n" + " 0: return\n" + @@ -82,7 +82,7 @@ public class MethodParameters { static final String foo2_expected = (" void foo2(int, int);\n" + " descriptor: (II)V\n" + - " flags:\n" + + " flags: (0x0000)\n" + " Code:\n" + " stack=0, locals=3, args_size=3\n" + " 0: return\n" + diff --git a/langtools/test/tools/javap/T4975569.java b/langtools/test/tools/javap/T4975569.java index ae117c63a67..c43598b41db 100644 --- a/langtools/test/tools/javap/T4975569.java +++ b/langtools/test/tools/javap/T4975569.java @@ -42,12 +42,12 @@ public class T4975569 { } void run() { - verify(Anno.class.getName(), "flags: ACC_INTERFACE, ACC_ABSTRACT, ACC_ANNOTATION"); - verify(E.class.getName(), "flags: ACC_FINAL, ACC_SUPER, ACC_ENUM"); - verify(S.class.getName(), "flags: ACC_BRIDGE, ACC_SYNTHETIC", + verify(Anno.class.getName(), "flags: \\(0x2600\\) ACC_INTERFACE, ACC_ABSTRACT, ACC_ANNOTATION"); + verify(E.class.getName(), "flags: \\(0x4030\\) ACC_FINAL, ACC_SUPER, ACC_ENUM"); + verify(S.class.getName(), "flags: \\(0x1040\\) ACC_BRIDGE, ACC_SYNTHETIC", "InnerClasses:\n static [# =\\w]+; +// "); verify(V.class.getName(), "void m\\(java.lang.String...\\)", - "flags: ACC_VARARGS"); + "flags: \\(0x0080\\) ACC_VARARGS"); verify(Prot.class.getName(), "InnerClasses:\n protected [# =\\w]+; +// "); verify(Priv.class.getName(), new String[]{"-p"}, "InnerClasses:\n private [# =\\w]+; +// "); diff --git a/langtools/test/tools/jdeps/lib/ModuleMetaData.java b/langtools/test/tools/jdeps/lib/ModuleMetaData.java index f37c3a729ee..3ae3cddc4ce 100644 --- a/langtools/test/tools/jdeps/lib/ModuleMetaData.java +++ b/langtools/test/tools/jdeps/lib/ModuleMetaData.java @@ -70,8 +70,8 @@ public class ModuleMetaData { return this; } - ModuleMetaData requiresPublic(String name) { - requires.put(name, new ModuleRequires(name, PUBLIC)); + ModuleMetaData requiresTransitive(String name) { + requires.put(name, new ModuleRequires(name, TRANSITIVE)); return this; } diff --git a/langtools/test/tools/jdeps/modules/CheckModuleTest.java b/langtools/test/tools/jdeps/modules/CheckModuleTest.java index 2b7bea5fe90..96a6d1f6ce0 100644 --- a/langtools/test/tools/jdeps/modules/CheckModuleTest.java +++ b/langtools/test/tools/jdeps/modules/CheckModuleTest.java @@ -54,7 +54,7 @@ public class CheckModuleTest { // m4 and m5 are analyzed. Others are compiled to make sure they are present // on the module path for analysis - private static final Set modules = Set.of("unsafe", "m4", "m5", "m6", "m7", "m8"); + private static final Set modules = Set.of("unsafe", "m4", "m5", "mVI", "mVII", "m8"); private static final String JAVA_BASE = "java.base"; @@ -100,10 +100,10 @@ public class CheckModuleTest { { "m4", new ModuleMetaData[] { // original new ModuleMetaData("m4") - .requiresPublic("java.compiler") + .requiresTransitive("java.compiler") .requires("java.logging") // unnused exports - .exports("p4.internal", Set.of("m6", "m7")), + .exports("p4.internal", Set.of("mVI", "mVII")), // suggested version new ModuleMetaData("m4") .requires("java.compiler"), @@ -115,21 +115,21 @@ public class CheckModuleTest { { "m5", new ModuleMetaData[] { // original new ModuleMetaData("m5") - .requiresPublic("java.compiler") - .requiresPublic("java.logging") + .requiresTransitive("java.compiler") + .requiresTransitive("java.logging") .requires("java.sql") - .requiresPublic("m4"), + .requiresTransitive("m4"), // suggested version new ModuleMetaData("m5") - .requiresPublic("java.compiler") + .requiresTransitive("java.compiler") .requires("java.logging") - .requiresPublic("java.sql") - .requiresPublic("m4"), + .requiresTransitive("java.sql") + .requiresTransitive("m4"), // reduced version new ModuleMetaData("m5") - .requiresPublic("java.compiler") - .requiresPublic("java.sql") - .requiresPublic("m4"), + .requiresTransitive("java.compiler") + .requiresTransitive("java.sql") + .requiresTransitive("m4"), } }, }; diff --git a/langtools/test/tools/jdeps/modules/GenModuleInfo.java b/langtools/test/tools/jdeps/modules/GenModuleInfo.java index 22ef46da6fb..b9e2a397ca7 100644 --- a/langtools/test/tools/jdeps/modules/GenModuleInfo.java +++ b/langtools/test/tools/jdeps/modules/GenModuleInfo.java @@ -30,14 +30,17 @@ * @run testng GenModuleInfo */ -import java.io.*; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; import java.lang.module.ModuleDescriptor; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.Arrays; +import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -51,7 +54,6 @@ import static org.testng.Assert.assertTrue; public class GenModuleInfo { private static final String MODULE_INFO = "module-info.class"; private static final String TEST_SRC = System.getProperty("test.src"); - private static final String TEST_CLASSES = System.getProperty("test.classes"); private static final Path SRC_DIR = Paths.get(TEST_SRC, "src"); private static final Path MODS_DIR = Paths.get("mods"); @@ -60,8 +62,85 @@ public class GenModuleInfo { private static final Path NEW_MODS_DIR = Paths.get("new_mods"); // the names of the modules in this test - private static final String UNSUPPORTED = "unsupported"; - private static String[] modules = new String[] {"m1", "m2", "m3", UNSUPPORTED}; + public static final String UNSUPPORTED = "unsupported"; + public static final Set MODULES = Set.of( + "mI", "mII", "mIII", "provider", UNSUPPORTED + ); + + /** + * Compile modules + */ + public static void compileModules(Path dest) { + assertTrue(CompilerUtils.compileModule(SRC_DIR, dest, UNSUPPORTED, + "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED)); + MODULES.stream() + .filter(mn -> !mn.equals(UNSUPPORTED)) + .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, dest, mn))); + } + + /** + * Create JAR files with no module-info.class + */ + public static List createJARFiles(Path mods, Path libs) throws IOException { + Files.createDirectory(libs); + + for (String mn : MODULES) { + Path root = mods.resolve(mn); + Path msrc = SRC_DIR.resolve(mn); + Path metaInf = msrc.resolve("META-INF"); + if (Files.exists(metaInf)) { + try (Stream resources = Files.find(metaInf, Integer.MAX_VALUE, + (p, attr) -> { return attr.isRegularFile();})) { + resources.forEach(file -> { + try { + Path path = msrc.relativize(file); + Files.createDirectories(root.resolve(path).getParent()); + Files.copy(file, root.resolve(path)); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }); + } + } + // copy all entries except module-info.class + try (Stream stream = Files.find(root, Integer.MAX_VALUE, + (p, attr) -> { return attr.isRegularFile();})) { + Stream entries = stream.filter(f -> { + String fn = f.getFileName().toString(); + if (fn.endsWith(".class")) { + return !fn.equals("module-info.class"); + } else { + return true; + } + }); + + JdepsUtil.createJar(libs.resolve(mn + ".jar"), root, entries); + } + } + + return MODULES.stream() + .map(mn -> LIBS_DIR.resolve(mn + ".jar")) + .collect(Collectors.toList()); + } + + /** + * compile the generated module-info.java + */ + public static void compileNewGenModuleInfo(Path source, Path dest) { + + assertTrue(CompilerUtils.compileModule(source, dest, UNSUPPORTED, + "-p", dest.toString(), + "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED)); + + MODULES.stream() + .filter(mn -> !mn.equals(UNSUPPORTED)) + .forEach(mn -> assertTrue( + CompilerUtils.compileModule(source, dest, + mn, "-p", dest.toString())) + ); + + } + /** * Compiles all modules used by the test */ @@ -72,29 +151,14 @@ public class GenModuleInfo { CompilerUtils.cleanDir(DEST_DIR); CompilerUtils.cleanDir(NEW_MODS_DIR); - assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED, - "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED)); - Arrays.asList("m1", "m2", "m3") - .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn))); + compileModules(MODS_DIR); - Files.createDirectory(LIBS_DIR); - Files.createDirectory(DEST_DIR); - - for (String mn : modules) { - Path root = MODS_DIR.resolve(mn); - try (Stream stream = Files.walk(root, Integer.MAX_VALUE)) { - Stream entries = stream.filter(f -> { - String fn = f.getFileName().toString(); - return fn.endsWith(".class") && !fn.equals("module-info.class"); - }); - JdepsUtil.createJar(LIBS_DIR.resolve(mn + ".jar"), root, entries); - } - } + createJARFiles(MODS_DIR, LIBS_DIR); } @Test - public void jdeps() throws IOException { - Stream files = Arrays.stream(modules) + public void automaticModules() throws IOException { + Stream files = MODULES.stream() .map(mn -> LIBS_DIR.resolve(mn + ".jar")) .map(Path::toString); JdepsRunner.run(Stream.concat(Stream.of("-cp"), files).toArray(String[]::new)); @@ -102,43 +166,27 @@ public class GenModuleInfo { @Test public void test() throws IOException { - Stream files = Arrays.stream(modules) + Files.createDirectory(DEST_DIR); + + Stream files = MODULES.stream() .map(mn -> LIBS_DIR.resolve(mn + ".jar")) .map(Path::toString); - JdepsRunner.run(Stream.concat(Stream.of("--generate-module-info", DEST_DIR.toString()), - files).toArray(String[]::new)); + Stream options = Stream.concat( + Stream.of("--generate-module-info", DEST_DIR.toString()), files); + JdepsRunner.run(options.toArray(String[]::new)); // check file exists - Arrays.stream(modules) - .map(mn -> DEST_DIR.resolve(mn).resolve("module-info.java")) - .forEach(f -> assertTrue(Files.exists(f))); + MODULES.stream() + .map(mn -> DEST_DIR.resolve(mn).resolve("module-info.java")) + .forEach(f -> assertTrue(Files.exists(f))); - // copy classes except the original module-info.class - try (Stream stream = Files.walk(MODS_DIR, Integer.MAX_VALUE)) { - stream.filter(path -> !path.getFileName().toString().equals(MODULE_INFO) && - path.getFileName().toString().endsWith(".class")) - .map(path -> MODS_DIR.relativize(path)) - .forEach(path -> { - try { - Path newFile = NEW_MODS_DIR.resolve(path); - Files.createDirectories(newFile.getParent()); - Files.copy(MODS_DIR.resolve(path), newFile); - } catch (IOException e) { - throw new UncheckedIOException(e); - } - }); - } + // copy classes to a temporary directory + // and then compile new module-info.java + copyClasses(MODS_DIR, NEW_MODS_DIR); + compileNewGenModuleInfo(DEST_DIR, NEW_MODS_DIR); - // compile new module-info.java - assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, UNSUPPORTED, - "-p", NEW_MODS_DIR.toString(), "-verbose", - "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED)); - Arrays.asList("m1", "m2", "m3") - .forEach(mn -> assertTrue(CompilerUtils.compileModule(DEST_DIR, NEW_MODS_DIR, - mn, "-p", NEW_MODS_DIR.toString()))); - - for (String mn : modules) { + for (String mn : MODULES) { Path p1 = NEW_MODS_DIR.resolve(mn).resolve(MODULE_INFO); Path p2 = MODS_DIR.resolve(mn).resolve(MODULE_INFO); @@ -150,6 +198,30 @@ public class GenModuleInfo { } } + /** + * Copy classes except the module-info.class to the destination directory + */ + public static void copyClasses(Path from, Path dest) throws IOException { + try (Stream stream = Files.walk(from, Integer.MAX_VALUE)) { + stream.filter(path -> !path.getFileName().toString().equals(MODULE_INFO) && + path.getFileName().toString().endsWith(".class")) + .map(path -> from.relativize(path)) + .forEach(path -> { + try { + Path newFile = dest.resolve(path); + Files.createDirectories(newFile.getParent()); + Files.copy(from.resolve(path), newFile); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + }); + } + } + + /** + * Verify the generated module-info.java is equivalent to module-info.class + * compiled from source. + */ private void verify(ModuleDescriptor md1, ModuleDescriptor md2) { System.out.println("verifying: " + md1.name()); assertEquals(md1.name(), md2.name()); @@ -158,6 +230,14 @@ public class GenModuleInfo { assertEquals(md1.exports().stream() .map(ModuleDescriptor.Exports::source) .collect(Collectors.toSet()), md2.packages()); + if (!md1.opens().isEmpty()) { + throw new RuntimeException("unexpected opens: " + + md1.opens().stream() + .map(o -> o.toString()) + .collect(Collectors.joining(","))); + } + + assertEquals(md1.provides(), md2.provides()); } private Set packages(Path dir) { diff --git a/langtools/test/tools/jdeps/modules/GenOpenModule.java b/langtools/test/tools/jdeps/modules/GenOpenModule.java new file mode 100644 index 00000000000..b45204bdc10 --- /dev/null +++ b/langtools/test/tools/jdeps/modules/GenOpenModule.java @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +/* + * @test + * @summary Tests jdeps --generate-open-module option + * @library ../lib + * @build CompilerUtils JdepsUtil JdepsRunner + * @modules jdk.jdeps/com.sun.tools.jdeps + * @run testng GenOpenModule + */ + +import java.io.IOException; +import java.io.InputStream; +import java.lang.module.ModuleDescriptor; + +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import java.util.stream.Stream; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +public class GenOpenModule extends GenModuleInfo { + private static final String MODULE_INFO = "module-info.class"; + + private static final Path MODS_DIR = Paths.get("mods"); + private static final Path LIBS_DIR = Paths.get("libs"); + private static final Path DEST_DIR = Paths.get("moduleinfosrc"); + private static final Path NEW_MODS_DIR = Paths.get("new_mods"); + + /** + * Compiles all modules used by the test + */ + @BeforeTest + public void compileAll() throws Exception { + + compileModules(MODS_DIR); + + createJARFiles(MODS_DIR, LIBS_DIR); + } + + @Test + public void test() throws IOException { + Stream files = MODULES.stream() + .map(mn -> LIBS_DIR.resolve(mn + ".jar")) + .map(Path::toString); + + Stream options = Stream.concat( + Stream.of("--generate-open-module", DEST_DIR.toString()), files); + JdepsRunner.run(options.toArray(String[]::new)); + + // check file exists + MODULES.stream() + .map(mn -> DEST_DIR.resolve(mn).resolve("module-info.java")) + .forEach(f -> assertTrue(Files.exists(f))); + + // copy classes to a temporary directory + // and then compile new module-info.java + copyClasses(MODS_DIR, NEW_MODS_DIR); + compileNewGenModuleInfo(DEST_DIR, NEW_MODS_DIR); + + for (String mn : MODULES) { + Path p1 = NEW_MODS_DIR.resolve(mn).resolve(MODULE_INFO); + Path p2 = MODS_DIR.resolve(mn).resolve(MODULE_INFO); + + try (InputStream in1 = Files.newInputStream(p1); + InputStream in2 = Files.newInputStream(p2)) { + verify(ModuleDescriptor.read(in1), + ModuleDescriptor.read(in2)); + } + } + } + + /* + * Verify the dependences + */ + private void verify(ModuleDescriptor openModule, ModuleDescriptor md) { + System.out.println("verifying: " + openModule.name()); + assertTrue(openModule.isOpen()); + assertTrue(!md.isOpen()); + assertEquals(openModule.name(), md.name()); + assertEquals(openModule.requires(), md.requires()); + assertTrue(openModule.exports().isEmpty()); + assertEquals(openModule.provides(), md.provides()); + } +} diff --git a/langtools/test/tools/jdeps/modules/InverseDeps.java b/langtools/test/tools/jdeps/modules/InverseDeps.java index 884651d83f9..b9bd916dd0d 100644 --- a/langtools/test/tools/jdeps/modules/InverseDeps.java +++ b/langtools/test/tools/jdeps/modules/InverseDeps.java @@ -61,7 +61,7 @@ public class InverseDeps { private static final Path LIBS_DIR = Paths.get("libs"); private static final Set modules = new LinkedHashSet( - List.of("unsafe", "m4", "m5", "m6", "m7") + List.of("unsafe", "m4", "m5", "mVI", "mVII") ); /** @@ -108,8 +108,8 @@ public class InverseDeps { } }, { "jdk.unsupported", new String[][] { - new String[] {"jdk.unsupported", "unsafe", "m6", "m7"}, - new String[] {"jdk.unsupported", "unsafe", "m7"} + new String[] {"jdk.unsupported", "unsafe", "mVI", "mVII"}, + new String[] {"jdk.unsupported", "unsafe", "mVII"} } }, }; @@ -155,8 +155,8 @@ public class InverseDeps { } }, { "sun.misc", new String[][] { - new String[] {"jdk.unsupported", "unsafe", "m6", "m7"}, - new String[] {"jdk.unsupported", "unsafe", "m7"} + new String[] {"jdk.unsupported", "unsafe", "mVI", "mVII"}, + new String[] {"jdk.unsupported", "unsafe", "mVII"} } } }; @@ -180,13 +180,13 @@ public class InverseDeps { return new Object[][] { // -regex and result { "org.safe.Lib", new String[][] { - new String[] { "unsafe", "m7"}, - new String[] { "unsafe", "m6", "m7"}, + new String[] { "unsafe", "mVII"}, + new String[] { "unsafe", "mVI", "mVII"}, } }, { "java.util.logging.*|org.safe.Lib", new String[][] { - new String[] { "unsafe", "m7"}, - new String[] { "unsafe", "m6", "m7"}, + new String[] { "unsafe", "mVII"}, + new String[] { "unsafe", "mVI", "mVII"}, new String[] { "java.logging", "m5"}, } } @@ -212,18 +212,18 @@ public class InverseDeps { return new Object[][] { // -regex and result { "sun.misc.Unsafe", new String[][] { - new String[] {"jdk.unsupported", "unsafe.jar", "m6.jar", "m7.jar"}, - new String[] {"jdk.unsupported", "unsafe.jar", "m7.jar"} + new String[] {"jdk.unsupported", "unsafe.jar", "mVI.jar", "mVII.jar"}, + new String[] {"jdk.unsupported", "unsafe.jar", "mVII.jar"} } }, { "org.safe.Lib", new String[][] { - new String[] { "unsafe.jar", "m7.jar"}, - new String[] { "unsafe.jar", "m6.jar", "m7.jar"}, + new String[] { "unsafe.jar", "mVII.jar"}, + new String[] { "unsafe.jar", "mVI.jar", "mVII.jar"}, } }, { "java.util.logging.*|org.safe.Lib", new String[][] { - new String[] { "unsafe.jar", "m7.jar"}, - new String[] { "unsafe.jar", "m6.jar", "m7.jar"}, + new String[] { "unsafe.jar", "mVII.jar"}, + new String[] { "unsafe.jar", "mVI.jar", "mVII.jar"}, new String[] { "java.logging", "m5.jar"}, } } @@ -234,11 +234,11 @@ public class InverseDeps { public void testClassPath(String name, String[][] expected) throws Exception { // -classpath String cpath = modules.stream() - .filter(mn -> !mn.equals("m7")) + .filter(mn -> !mn.equals("mVII")) .map(mn -> LIBS_DIR.resolve(mn + ".jar").toString()) .collect(Collectors.joining(File.pathSeparator)); - Path jarfile = LIBS_DIR.resolve("m7.jar"); + Path jarfile = LIBS_DIR.resolve("mVII.jar"); String cmd1 = String.format("jdeps --inverse -classpath %s -regex %s %s%n", cpath, name, jarfile); diff --git a/langtools/test/tools/jdeps/modules/ModuleTest.java b/langtools/test/tools/jdeps/modules/ModuleTest.java index 77c13672656..cf58b028035 100644 --- a/langtools/test/tools/jdeps/modules/ModuleTest.java +++ b/langtools/test/tools/jdeps/modules/ModuleTest.java @@ -58,7 +58,7 @@ public class ModuleTest { // the names of the modules in this test private static final String UNSUPPORTED = "unsupported"; - private static String[] modules = new String[] {"m1", "m2", "m3", "m4", UNSUPPORTED}; + private static String[] modules = new String[] {"mI", "mII", "mIII", "m4", UNSUPPORTED}; /** * Compiles all modules used by the test */ @@ -70,37 +70,37 @@ public class ModuleTest { assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, UNSUPPORTED, "--add-exports", "java.base/jdk.internal.perf=" + UNSUPPORTED)); // m4 is not referenced - Arrays.asList("m1", "m2", "m3", "m4") + Arrays.asList("mI", "mII", "mIII", "m4") .forEach(mn -> assertTrue(CompilerUtils.compileModule(SRC_DIR, MODS_DIR, mn))); - assertTrue(CompilerUtils.compile(SRC_DIR.resolve("m3"), UNNAMED_DIR, "-p", MODS_DIR.toString())); + assertTrue(CompilerUtils.compile(SRC_DIR.resolve("mIII"), UNNAMED_DIR, "-p", MODS_DIR.toString())); Files.delete(UNNAMED_DIR.resolve("module-info.class")); } @DataProvider(name = "modules") public Object[][] expected() { return new Object[][]{ - { "m3", new ModuleMetaData("m3").requiresPublic("java.sql") - .requiresPublic("m2") + { "mIII", new ModuleMetaData("mIII").requiresTransitive("java.sql") + .requiresTransitive("mII") .requires("java.logging") - .requiresPublic("m1") + .requiresTransitive("mI") .reference("p3", "java.lang", "java.base") .reference("p3", "java.sql", "java.sql") .reference("p3", "java.util.logging", "java.logging") - .reference("p3", "p1", "m1") - .reference("p3", "p2", "m2") - .qualified("p3", "p2.internal", "m2") + .reference("p3", "p1", "mI") + .reference("p3", "p2", "mII") + .qualified("p3", "p2.internal", "mII") }, - { "m2", new ModuleMetaData("m2").requiresPublic("m1") + { "mII", new ModuleMetaData("mII").requiresTransitive("mI") .reference("p2", "java.lang", "java.base") - .reference("p2", "p1", "m1") + .reference("p2", "p1", "mI") .reference("p2.internal", "java.lang", "java.base") .reference("p2.internal", "java.io", "java.base") }, - { "m1", new ModuleMetaData("m1").requires("unsupported") + { "mI", new ModuleMetaData("mI").requires("unsupported") .reference("p1", "java.lang", "java.base") .reference("p1.internal", "java.lang", "java.base") - .reference("p1.internal", "p1", "m1") + .reference("p1.internal", "p1", "mI") .reference("p1.internal", "q", "unsupported") }, { "unsupported", new ModuleMetaData("unsupported") @@ -115,7 +115,7 @@ public class ModuleTest { // jdeps --module-path mods -m runTest(data, MODS_DIR.toString(), Set.of(name)); - // jdeps --module-path libs/m1.jar:.... -m + // jdeps --module-path libs/mI.jar:.... -m String mp = Arrays.stream(modules) .filter(mn -> !mn.equals(name)) .map(mn -> MODS_DIR.resolve(mn).toString()) @@ -129,21 +129,21 @@ public class ModuleTest { { "unnamed", new ModuleMetaData("unnamed", false) .depends("java.sql") .depends("java.logging") - .depends("m1") - .depends("m2") + .depends("mI") + .depends("mII") .reference("p3", "java.lang", "java.base") .reference("p3", "java.sql", "java.sql") .reference("p3", "java.util.logging", "java.logging") - .reference("p3", "p1", "m1") - .reference("p3", "p2", "m2") - .internal("p3", "p2.internal", "m2") + .reference("p3", "p1", "mI") + .reference("p3", "p2", "mII") + .internal("p3", "p2.internal", "mII") }, }; } @Test(dataProvider = "unnamed") public void unnamedTest(String name, ModuleMetaData data) throws IOException { - runTest(data, MODS_DIR.toString(), Set.of("m1", "m2"), UNNAMED_DIR); + runTest(data, MODS_DIR.toString(), Set.of("mI", "mII"), UNNAMED_DIR); } private void runTest(ModuleMetaData data, String modulepath, diff --git a/langtools/test/tools/jdeps/modules/TransitiveDeps.java b/langtools/test/tools/jdeps/modules/TransitiveDeps.java index 2bc1f206adb..b5f33bd570f 100644 --- a/langtools/test/tools/jdeps/modules/TransitiveDeps.java +++ b/langtools/test/tools/jdeps/modules/TransitiveDeps.java @@ -58,7 +58,7 @@ public class TransitiveDeps { private static final Path LIBS_DIR = Paths.get("libs"); // the names of the modules in this test - private static String[] modules = new String[] {"unsafe", "m6", "m7"}; + private static String[] modules = new String[] {"unsafe", "mVI", "mVII"}; /** * Compiles all modules used by the test */ @@ -86,15 +86,15 @@ public class TransitiveDeps { @DataProvider(name = "modules") public Object[][] expected1() { return new Object[][]{ - { "m7", - List.of(new ModuleMetaData("m7") - .requires("m6") + { "mVII", + List.of(new ModuleMetaData("mVII") + .requires("mVI") .requires("unsafe") .reference("p7.Main", "java.lang.Object", "java.base") .reference("p7.Main", "java.lang.String", "java.base") .reference("p7.Main", "org.safe.Lib", "unsafe") - .reference("p7.Main", "p6.safe.Lib", "m6"), - new ModuleMetaData("m6") + .reference("p7.Main", "p6.safe.Lib", "mVI"), + new ModuleMetaData("mVI") .requires("unsafe") .reference("p6.indirect.UnsafeRef", "java.lang.Object", "java.base") .reference("p6.indirect.UnsafeRef", "org.unsafe.UseUnsafe ", "unsafe") @@ -121,7 +121,7 @@ public class TransitiveDeps { @Test(dataProvider = "modules") public void testModulePath(String name, List data) throws IOException { - Set roots = Set.of("m6", "unsafe"); + Set roots = Set.of("mVI", "unsafe"); String cmd1 = String.format("jdeps --module-path %s --add-modules %s -m %s%n", MODS_DIR, roots.stream().collect(Collectors.joining(",")), name); @@ -152,13 +152,13 @@ public class TransitiveDeps { @DataProvider(name = "jars") public Object[][] expected2() { return new Object[][]{ - { "m7", List.of(new ModuleMetaData("m7.jar") - .requires("m6.jar") + { "mVII", List.of(new ModuleMetaData("mVII.jar") + .requires("mVI.jar") .requires("unsafe.jar") .reference("p7.Main", "java.lang.Object", "java.base") .reference("p7.Main", "java.lang.String", "java.base") .reference("p7.Main", "org.safe.Lib", "unsafe.jar") - .reference("p7.Main", "p6.safe.Lib", "m6.jar")) + .reference("p7.Main", "p6.safe.Lib", "mVI.jar")) }, }; } @@ -185,15 +185,15 @@ public class TransitiveDeps { @DataProvider(name = "compileTimeView") public Object[][] expected3() { return new Object[][] { - {"m7", - List.of(new ModuleMetaData("m7.jar") - .requires("m6.jar") + {"mVII", + List.of(new ModuleMetaData("mVII.jar") + .requires("mVI.jar") .requires("unsafe.jar") .reference("p7.Main", "java.lang.Object", "java.base") .reference("p7.Main", "java.lang.String", "java.base") .reference("p7.Main", "org.safe.Lib", "unsafe.jar") - .reference("p7.Main", "p6.safe.Lib", "m6.jar"), - new ModuleMetaData("m6.jar") + .reference("p7.Main", "p6.safe.Lib", "mVI.jar"), + new ModuleMetaData("mVI.jar") .requires("unsafe.jar") .reference("p6.indirect.UnsafeRef", "java.lang.Object", "java.base") .reference("p6.indirect.UnsafeRef", "org.unsafe.UseUnsafe ", "unsafe.jar") @@ -240,15 +240,15 @@ public class TransitiveDeps { @DataProvider(name = "recursiveDeps") public Object[][] expected4() { return new Object[][] { - {"m7", - List.of(new ModuleMetaData("m7.jar") - .requires("m6.jar") + {"mVII", + List.of(new ModuleMetaData("mVII.jar") + .requires("mVI.jar") .requires("unsafe.jar") .reference("p7.Main", "java.lang.Object", "java.base") .reference("p7.Main", "java.lang.String", "java.base") .reference("p7.Main", "org.safe.Lib", "unsafe.jar") - .reference("p7.Main", "p6.safe.Lib", "m6.jar"), - new ModuleMetaData("m6.jar") + .reference("p7.Main", "p6.safe.Lib", "mVI.jar"), + new ModuleMetaData("mVI.jar") .requires("unsafe.jar") .reference("p6.safe.Lib", "java.io.PrintStream", "java.base") .reference("p6.safe.Lib", "java.lang.Class", "java.base") diff --git a/langtools/test/tools/jdeps/modules/src/m4/module-info.java b/langtools/test/tools/jdeps/modules/src/m4/module-info.java index d49490919a4..38288bf3be0 100644 --- a/langtools/test/tools/jdeps/modules/src/m4/module-info.java +++ b/langtools/test/tools/jdeps/modules/src/m4/module-info.java @@ -23,7 +23,7 @@ module m4 { // not used in signature - requires public java.compiler; + requires transitive java.compiler; // unused dependence requires java.logging; @@ -31,5 +31,5 @@ module m4 { exports p4; // unuused qualified exports - exports p4.internal to m6,m7; + exports p4.internal to mVI,mVII; } diff --git a/langtools/test/tools/jdeps/modules/src/m5/module-info.java b/langtools/test/tools/jdeps/modules/src/m5/module-info.java index ccdfccd37ac..f8d05e479dd 100644 --- a/langtools/test/tools/jdeps/modules/src/m5/module-info.java +++ b/langtools/test/tools/jdeps/modules/src/m5/module-info.java @@ -22,15 +22,15 @@ */ module m5 { - // m4 requires public java.compiler - requires public m4; - requires public java.compiler; + // m4 requires transitive java.compiler + requires transitive m4; + requires transitive java.compiler; - // java.sql should be requires public + // java.sql should be requires transitive requires java.sql; // java.logging is used for implementation only - requires public java.logging; + requires transitive java.logging; exports p5; diff --git a/langtools/test/tools/jdeps/modules/src/m1/module-info.java b/langtools/test/tools/jdeps/modules/src/mI/module-info.java similarity index 98% rename from langtools/test/tools/jdeps/modules/src/m1/module-info.java rename to langtools/test/tools/jdeps/modules/src/mI/module-info.java index 9d2c8be592e..46e4d6b49c4 100644 --- a/langtools/test/tools/jdeps/modules/src/m1/module-info.java +++ b/langtools/test/tools/jdeps/modules/src/mI/module-info.java @@ -21,7 +21,7 @@ * questions. */ -module m1 { +module mI { requires unsupported; exports p1; } diff --git a/langtools/test/tools/jdeps/modules/src/m1/p1/Goo.java b/langtools/test/tools/jdeps/modules/src/mI/p1/Goo.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m1/p1/Goo.java rename to langtools/test/tools/jdeps/modules/src/mI/p1/Goo.java diff --git a/langtools/test/tools/jdeps/modules/src/m1/p1/Lib.java b/langtools/test/tools/jdeps/modules/src/mI/p1/Lib.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m1/p1/Lib.java rename to langtools/test/tools/jdeps/modules/src/mI/p1/Lib.java diff --git a/langtools/test/tools/jdeps/modules/src/m1/p1/S.java b/langtools/test/tools/jdeps/modules/src/mI/p1/S.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m1/p1/S.java rename to langtools/test/tools/jdeps/modules/src/mI/p1/S.java diff --git a/langtools/test/tools/jdeps/modules/src/m1/p1/internal/Impl.java b/langtools/test/tools/jdeps/modules/src/mI/p1/internal/Impl.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m1/p1/internal/Impl.java rename to langtools/test/tools/jdeps/modules/src/mI/p1/internal/Impl.java diff --git a/langtools/test/tools/jdeps/modules/src/mII/module-info.java b/langtools/test/tools/jdeps/modules/src/mII/module-info.java new file mode 100644 index 00000000000..511cee48393 --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/mII/module-info.java @@ -0,0 +1,28 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +module mII { + requires transitive mI; + exports p2; + exports p2.internal to mIII; +} diff --git a/langtools/test/tools/jdeps/modules/src/m2/p2/Bar.java b/langtools/test/tools/jdeps/modules/src/mII/p2/Bar.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m2/p2/Bar.java rename to langtools/test/tools/jdeps/modules/src/mII/p2/Bar.java diff --git a/langtools/test/tools/jdeps/modules/src/m2/p2/internal/T2.java b/langtools/test/tools/jdeps/modules/src/mII/p2/internal/T2.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m2/p2/internal/T2.java rename to langtools/test/tools/jdeps/modules/src/mII/p2/internal/T2.java diff --git a/langtools/test/tools/jdeps/modules/src/m3/module-info.java b/langtools/test/tools/jdeps/modules/src/mIII/module-info.java similarity index 91% rename from langtools/test/tools/jdeps/modules/src/m3/module-info.java rename to langtools/test/tools/jdeps/modules/src/mIII/module-info.java index 62557e8f0b6..4677ed57a15 100644 --- a/langtools/test/tools/jdeps/modules/src/m3/module-info.java +++ b/langtools/test/tools/jdeps/modules/src/mIII/module-info.java @@ -21,10 +21,10 @@ * questions. */ -module m3 { - requires public java.sql; - requires public m2; +module mIII { + requires transitive java.sql; + requires transitive mII; requires java.logging; // TODO: --generate-module-info to do transitive reduction - requires public m1; + requires transitive mI; exports p3; } diff --git a/langtools/test/tools/jdeps/modules/src/m3/p3/Foo.java b/langtools/test/tools/jdeps/modules/src/mIII/p3/Foo.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m3/p3/Foo.java rename to langtools/test/tools/jdeps/modules/src/mIII/p3/Foo.java diff --git a/langtools/test/tools/jdeps/modules/src/m3/p3/Main.java b/langtools/test/tools/jdeps/modules/src/mIII/p3/Main.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m3/p3/Main.java rename to langtools/test/tools/jdeps/modules/src/mIII/p3/Main.java diff --git a/langtools/test/tools/jdeps/modules/src/m6/module-info.java b/langtools/test/tools/jdeps/modules/src/mVI/module-info.java similarity index 98% rename from langtools/test/tools/jdeps/modules/src/m6/module-info.java rename to langtools/test/tools/jdeps/modules/src/mVI/module-info.java index 374fbfa1c6b..40ea7626192 100644 --- a/langtools/test/tools/jdeps/modules/src/m6/module-info.java +++ b/langtools/test/tools/jdeps/modules/src/mVI/module-info.java @@ -21,7 +21,7 @@ * questions. */ -module m6 { +module mVI { requires unsafe; // no dependency on sun.misc.Unsafe directly or indirectly diff --git a/langtools/test/tools/jdeps/modules/src/m6/p6/indirect/UnsafeRef.java b/langtools/test/tools/jdeps/modules/src/mVI/p6/indirect/UnsafeRef.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m6/p6/indirect/UnsafeRef.java rename to langtools/test/tools/jdeps/modules/src/mVI/p6/indirect/UnsafeRef.java diff --git a/langtools/test/tools/jdeps/modules/src/m6/p6/safe/Lib.java b/langtools/test/tools/jdeps/modules/src/mVI/p6/safe/Lib.java similarity index 100% rename from langtools/test/tools/jdeps/modules/src/m6/p6/safe/Lib.java rename to langtools/test/tools/jdeps/modules/src/mVI/p6/safe/Lib.java diff --git a/langtools/test/tools/jdeps/modules/src/m7/module-info.java b/langtools/test/tools/jdeps/modules/src/mVII/module-info.java similarity index 97% rename from langtools/test/tools/jdeps/modules/src/m7/module-info.java rename to langtools/test/tools/jdeps/modules/src/mVII/module-info.java index 408efc216d4..5a7dc37d301 100644 --- a/langtools/test/tools/jdeps/modules/src/m7/module-info.java +++ b/langtools/test/tools/jdeps/modules/src/mVII/module-info.java @@ -21,9 +21,9 @@ * questions. */ -module m7 { +module mVII { // only use classes that have no direct or indirect dependency // to sun.misc.Unsafe requires unsafe; - requires m6; + requires mVI; } diff --git a/langtools/test/tools/jdeps/modules/src/m7/p7/Main.java b/langtools/test/tools/jdeps/modules/src/mVII/p7/Main.java similarity index 95% rename from langtools/test/tools/jdeps/modules/src/m7/p7/Main.java rename to langtools/test/tools/jdeps/modules/src/mVII/p7/Main.java index 789cdb9a0a7..5f48b040c03 100644 --- a/langtools/test/tools/jdeps/modules/src/m7/p7/Main.java +++ b/langtools/test/tools/jdeps/modules/src/mVII/p7/Main.java @@ -23,7 +23,7 @@ package p7; -// Only use classes in unsafe and m6 modules with no +// Only use classes in unsafe and mVI modules with no // direct or indirect dependency on sun.misc.Unsafe public class Main { public static void main(String... args) { diff --git a/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider b/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider new file mode 100644 index 00000000000..b102354a2c8 --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/java.util.spi.ToolProvider @@ -0,0 +1,3 @@ +q.ProviderImpl3 +q.ProviderImpl2 +q.ProviderImpl1 diff --git a/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J b/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J new file mode 100644 index 00000000000..eb6238cc896 --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/META-INF/services/p.Service$I$J @@ -0,0 +1 @@ +p.Provider$Impl diff --git a/langtools/test/tools/jdeps/modules/src/provider/module-info.java b/langtools/test/tools/jdeps/modules/src/provider/module-info.java new file mode 100644 index 00000000000..27e49222a8b --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/module-info.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +module provider { + provides java.util.spi.ToolProvider with + q.ProviderImpl3, + q.ProviderImpl2, + q.ProviderImpl1; + + uses p.Service.I.J; + + // nested types + provides p.Service.I.J with p.Provider.Impl; +} diff --git a/langtools/test/tools/jdeps/modules/src/provider/p/Provider.java b/langtools/test/tools/jdeps/modules/src/provider/p/Provider.java new file mode 100644 index 00000000000..cb1fa2669cf --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/p/Provider.java @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package p; + +public class Provider { + public static class Impl implements Service.I.J { + } +} diff --git a/langtools/test/tools/jdeps/modules/src/provider/p/Service.java b/langtools/test/tools/jdeps/modules/src/provider/p/Service.java new file mode 100644 index 00000000000..4164c482181 --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/p/Service.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package p; + +public class Service { + public static class I { + public static interface J {} + } +} + diff --git a/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl1.java b/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl1.java new file mode 100644 index 00000000000..f68eb7aa11e --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl1.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package q; + +import java.io.*; +import java.util.spi.ToolProvider; + +public class ProviderImpl1 implements ToolProvider { + public String name() { + return "provider1"; + } + + public int run(PrintWriter out, PrintWriter err, String... args) { + return 0; + } +} diff --git a/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl2.java b/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl2.java new file mode 100644 index 00000000000..72a3dbbf0d6 --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl2.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package q; + +import java.io.*; +import java.util.spi.ToolProvider; + +public class ProviderImpl2 implements ToolProvider { + public String name() { + return "provider2"; + } + + public int run(PrintWriter out, PrintWriter err, String... args) { + return 0; + } +} diff --git a/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl3.java b/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl3.java new file mode 100644 index 00000000000..d6f456c011c --- /dev/null +++ b/langtools/test/tools/jdeps/modules/src/provider/q/ProviderImpl3.java @@ -0,0 +1,37 @@ +/* + * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. + * 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. + */ + +package q; + +import java.io.*; +import java.util.spi.ToolProvider; + +public class ProviderImpl3 implements ToolProvider { + public String name() { + return "provider3"; + } + + public int run(PrintWriter out, PrintWriter err, String... args) { + return 0; + } +} diff --git a/langtools/test/tools/lib/toolbox/ModuleBuilder.java b/langtools/test/tools/lib/toolbox/ModuleBuilder.java index 8c7390261a2..f1ece37fce3 100644 --- a/langtools/test/tools/lib/toolbox/ModuleBuilder.java +++ b/langtools/test/tools/lib/toolbox/ModuleBuilder.java @@ -72,31 +72,94 @@ public class ModuleBuilder { } /** - * Adds a "requires public" directive to the declaration. - * @param requires the name of the module that is required + * Adds a "requires" directive to the declaration. + * @param module the name of the module that is required + * @param modulePath a path in while to locate the modules + * if the declaration is compiled + * @return this builder + */ + public ModuleBuilder requires(String module, Path... modulePath) { + addDirective(requires, "requires " + module + ";"); + this.modulePath.addAll(Arrays.asList(modulePath)); + return this; + + } + + /** + * Adds a "requires static" directive to the declaration. + * @param module the name of the module that is required * @param modulePath a path in which to locate the modules * if the declaration is compiled * @return this builder */ - public ModuleBuilder requiresPublic(String requires, Path... modulePath) { - this.requires.add("requires public " + requires + ";"); + public ModuleBuilder requiresStatic(String module, Path... modulePath) { + addDirective(requires, "requires static " + module + ";"); this.modulePath.addAll(Arrays.asList(modulePath)); return this; } /** - * Adds a "requires" directive to the declaration. - * @param requires the name of the module that is required - * @param modulePath a path in while to locate the modules + * Adds a "requires transitive" directive to the declaration. + * @param module the name of the module that is required + * @param modulePath a path in which to locate the modules * if the declaration is compiled * @return this builder */ - public ModuleBuilder requires(String requires, Path... modulePath) { - this.requires.add("requires " + requires + ";"); + public ModuleBuilder requiresTransitive(String module, Path... modulePath) { + addDirective(requires, "requires transitive " + module + ";"); this.modulePath.addAll(Arrays.asList(modulePath)); return this; } + /** + * Adds a "requires static transitive" directive to the declaration. + * @param module the name of the module that is required + * @param modulePath a path in which to locate the modules + * if the declaration is compiled + * @return this builder + */ + public ModuleBuilder requiresStaticTransitive(String module, Path... modulePath) { + addDirective(requires, "requires static transitive " + module + ";"); + this.modulePath.addAll(Arrays.asList(modulePath)); + return this; + } + + /** + * Adds an unqualified "exports" directive to the declaration. + * @param pkg the name of the package to be exported + * @return this builder + */ + public ModuleBuilder exports(String pkg) { + return addDirective(exports, "exports " + pkg + ";"); + } + + /** + * Adds an unqualified "exports dynamic" directive to the declaration. + * @param pkg the name of the package to be exported + * @return this builder + */ + public ModuleBuilder exportsDynamic(String pkg) { + return addDirective(exports, "exports dynamic " + pkg + ";"); + } + + /** + * Adds an unqualified "exports private" directive to the declaration. + * @param pkg the name of the package to be exported + * @return this builder + */ + public ModuleBuilder exportsPrivate(String pkg) { + return addDirective(exports, "exports private " + pkg + ";"); + } + + /** + * Adds an unqualified "exports dynamic private" directive to the declaration. + * @param pkg the name of the package to be exported + * @return this builder + */ + public ModuleBuilder exportsDynamicPrivate(String pkg) { + return addDirective(exports, "exports dynamic private " + pkg + ";"); + } + /** * Adds a qualified "exports" directive to the declaration. * @param pkg the name of the package to be exported @@ -104,19 +167,37 @@ public class ModuleBuilder { * @return this builder */ public ModuleBuilder exportsTo(String pkg, String module) { - this.exports.add("exports " + pkg + " to " + module + ";"); - return this; + return addDirective(exports, "exports " + pkg + " to " + module + ";"); } /** - * Adds an unqualified "exports" directive to the declaration. + * Adds a qualified "exports dynamic" directive to the declaration. * @param pkg the name of the package to be exported * @param module the name of the module to which it is to be exported * @return this builder */ - public ModuleBuilder exports(String pkg) { - this.exports.add("exports " + pkg + ";"); - return this; + public ModuleBuilder exportsDynamicTo(String pkg, String module) { + return addDirective(exports, "exports dynamic " + pkg + " to " + module + ";"); + } + + /** + * Adds a qualified "exports private" directive to the declaration. + * @param pkg the name of the package to be exported + * @param module the name of the module to which it is to be exported + * @return this builder + */ + public ModuleBuilder exportsPrivateTo(String pkg, String module) { + return addDirective(exports, "exports private " + pkg + " to " + module + ";"); + } + + /** + * Adds a qualified "exports dynamic private" directive to the declaration. + * @param pkg the name of the package to be exported + * @param module the name of the module to which it is to be exported + * @return this builder + */ + public ModuleBuilder exportsDynamicPrivateTo(String pkg, String module) { + return addDirective(exports, "exports dynamic private " + pkg + " to " + module + ";"); } /** @@ -125,8 +206,7 @@ public class ModuleBuilder { * @return this builder */ public ModuleBuilder uses(String service) { - this.uses.add("uses " + service + ";"); - return this; + return addDirective(uses, "uses " + service + ";"); } /** @@ -136,7 +216,11 @@ public class ModuleBuilder { * @return this builder */ public ModuleBuilder provides(String service, String implementation) { - this.provides.add("provides " + service + " with " + implementation + ";"); + return addDirective(provides, "provides " + service + " with " + implementation + ";"); + } + + private ModuleBuilder addDirective(List directives, String directive) { + directives.add(directive); return this; } diff --git a/langtools/test/tools/sjavac/Serialization.java b/langtools/test/tools/sjavac/Serialization.java index 58d0cefd135..8d6e5243bc1 100644 --- a/langtools/test/tools/sjavac/Serialization.java +++ b/langtools/test/tools/sjavac/Serialization.java @@ -61,7 +61,7 @@ public class Serialization { Option.SRC.arg, "root", Option.SOURCEPATH.arg, "sourcepath", Option.CLASSPATH.arg, "classpath", - Option.MODULEPATH.arg, "modulepath", + Option.MODULE_PATH.arg, "modulepath", Option.PERMIT_SOURCES_WITHOUT_PACKAGE.arg, Option.PERMIT_UNIDENTIFIED_ARTIFACTS.arg, Option.TR.arg, ".prop=" + CompileJavaPackages.class.getName(),