diff --git a/jdk/make/copy/Copy-java.base.gmk b/jdk/make/copy/Copy-java.base.gmk index 07fe8f3d56e..2f26a834718 100644 --- a/jdk/make/copy/Copy-java.base.gmk +++ b/jdk/make/copy/Copy-java.base.gmk @@ -100,8 +100,7 @@ else # Allow override by ALT_JVMCFG_SRC if it exists JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC)) endif -JVMCFG_DIR := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR) -JVMCFG := $(JVMCFG_DIR)/jvm.cfg +JVMCFG := $(LIB_DST_DIR)/jvm.cfg # To do: should this also support -zeroshark? diff --git a/jdk/make/copy/Copy-java.desktop.gmk b/jdk/make/copy/Copy-java.desktop.gmk index 51db98a356a..49d6b86aeb2 100644 --- a/jdk/make/copy/Copy-java.desktop.gmk +++ b/jdk/make/copy/Copy-java.desktop.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 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 @@ -64,7 +64,7 @@ ifneq ($(FREETYPE_BUNDLE_LIB_PATH), ) ifeq ($(OPENJDK_TARGET_OS), windows) FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype) else - FREETYPE_TARGET_LIB := $(LIB_DST_DIR)$(OPENJDK_TARGET_CPU_LIBDIR)/$(call SHARED_LIBRARY,freetype).6 + FREETYPE_TARGET_LIB := $(LIB_DST_DIR)/$(call SHARED_LIBRARY,freetype).6 endif # We can't use $(install-file) in this rule because it preserves symbolic links and diff --git a/jdk/make/launcher/Launcher-java.base.gmk b/jdk/make/launcher/Launcher-java.base.gmk index 4d4b981c097..f70d90029a6 100644 --- a/jdk/make/launcher/Launcher-java.base.gmk +++ b/jdk/make/launcher/Launcher-java.base.gmk @@ -74,7 +74,7 @@ $(eval $(call SetupBuildLauncher, keytool, \ BUILD_JEXEC := BUILD_JEXEC_SRC := BUILD_JEXEC_INC := -BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) +BUILD_JEXEC_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base # # UNHANDLED: @@ -138,7 +138,7 @@ endif BUILD_JSPAWNHELPER := BUILD_JSPAWNHELPER_SRC := $(JDK_TOPDIR)/src/java.base/unix/native/jspawnhelper JSPAWNHELPER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/unix/native/libjava -BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR) +BUILD_JSPAWNHELPER_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/java.base LINK_JSPAWNHELPER_OBJECTS := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o BUILD_JSPAWNHELPER_LDFLAGS := diff --git a/jdk/make/launcher/Launcher-jdk.aot.gmk b/jdk/make/launcher/Launcher-jdk.aot.gmk new file mode 100644 index 00000000000..a827a66bc35 --- /dev/null +++ b/jdk/make/launcher/Launcher-jdk.aot.gmk @@ -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. 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. +# + +include LauncherCommon.gmk + +$(eval $(call SetupBuildLauncher, jaotc, \ + MAIN_CLASS := jdk.tools.jaotc.Main, \ + JAVA_ARGS := -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI \ + -XX:+UseAOT \ + -Djvmci.UseProfilingInformation=false \ + -Dgraal.UseExceptionProbability=false \ + -Djvmci.Compiler=graal \ + --add-modules ALL-DEFAULT \ + , \ +)) diff --git a/jdk/make/launcher/LauncherCommon.gmk b/jdk/make/launcher/LauncherCommon.gmk index 1bef88f8a42..a4178039d6e 100644 --- a/jdk/make/launcher/LauncherCommon.gmk +++ b/jdk/make/launcher/LauncherCommon.gmk @@ -32,13 +32,13 @@ else ifeq ($(OPENJDK_TARGET_OS), windows) DISABLE_MAPFILES := true endif - ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli) + ORIGIN_ARG := $(call SET_EXECUTABLE_ORIGIN,/../lib/jli) # Applications expect to be able to link against libjawt without invoking # System.loadLibrary("jawt") first. This was the behaviour described in the # devloper documentation of JAWT and what worked with OpenJDK6. ifneq ($(findstring $(OPENJDK_TARGET_OS), linux solaris), ) - ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,/../lib$(OPENJDK_TARGET_CPU_LIBDIR)) + ORIGIN_ARG += $(call SET_EXECUTABLE_ORIGIN,/../lib) endif endif @@ -190,9 +190,9 @@ define SetupBuildLauncherBody $$(ORIGIN_ARG) \ $$($1_LDFLAGS), \ LDFLAGS_linux := \ - -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \ LDFLAGS_solaris := $$($1_LDFLAGS_solaris) \ - -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base$(OPENJDK_TARGET_CPU_LIBDIR)/jli, \ + -L$(SUPPORT_OUTPUTDIR)/modules_libs/java.base/jli, \ MAPFILE := $$($1_MAPFILE), \ LIBS := $(JDKEXE_LIBS) $$($1_LIBS), \ LIBS_unix := $$($1_LIBS_unix), \ diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index 09423e4d770..670434669af 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -418,6 +418,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \ DISABLED_WARNINGS_gcc := format-nonliteral type-limits misleading-indentation, \ DISABLED_WARNINGS_clang := tautological-compare, \ DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ + DISABLED_WARNINGS_microsoft := 4819, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -681,7 +682,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBFONTMANAGER, \ DISABLED_WARNINGS_CXX_solstudio := \ truncwarn wvarhidenmem wvarhidemem wbadlkginit identexpected \ hidevf w_novirtualdescr arrowrtn2, \ - DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334, \ + DISABLED_WARNINGS_microsoft := 4267 4244 4018 4090 4996 4146 4334 4819, \ MAPFILE := $(BUILD_LIBFONTMANAGER_MAPFILE), \ LDFLAGS := $(subst -Wl$(COMMA)-z$(COMMA)defs,,$(LDFLAGS_JDKLIB)) $(LDFLAGS_CXX_JDK) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/make/lib/CoreLibraries.gmk b/jdk/make/lib/CoreLibraries.gmk index 27dad3553ee..6fba2fa6ab3 100644 --- a/jdk/make/lib/CoreLibraries.gmk +++ b/jdk/make/lib/CoreLibraries.gmk @@ -340,9 +340,6 @@ endif LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS)) -# Append defines depending on target platform -LIBJLI_CFLAGS += $(OPENJDK_TARGET_CPU_JLI_CFLAGS) - ifneq ($(USE_EXTERNAL_LIBZ), true) LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS) LIBJLI_EXTRA_FILES += \ diff --git a/jdk/make/mapfiles/libjava/mapfile-vers b/jdk/make/mapfiles/libjava/mapfile-vers index 5d7cc4a655f..65336defa6d 100644 --- a/jdk/make/mapfiles/libjava/mapfile-vers +++ b/jdk/make/mapfiles/libjava/mapfile-vers @@ -150,7 +150,6 @@ SUNWprivate_1.1 { Java_java_lang_StrictMath_atan; Java_java_lang_StrictMath_atan2; Java_java_lang_StrictMath_cos; - Java_java_lang_StrictMath_exp; Java_java_lang_StrictMath_log; Java_java_lang_StrictMath_log10; Java_java_lang_StrictMath_sin; diff --git a/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java b/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java index 3b81f6b421f..99f6d0f8bd7 100644 --- a/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java +++ b/jdk/make/src/classes/build/tools/jigsaw/GenGraphs.java @@ -26,6 +26,7 @@ package build.tools.jigsaw; import java.io.IOException; +import java.io.OutputStream; import java.io.PrintStream; import java.lang.module.Configuration; import java.lang.module.ModuleDescriptor; @@ -44,7 +45,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.function.Function; -import java.util.stream.Collectors; + +import static java.util.stream.Collectors.*; import static java.lang.module.ModuleDescriptor.Requires.Modifier.TRANSITIVE; /** @@ -69,42 +71,25 @@ public class GenGraphs { .map(ModuleReference::descriptor) .filter(m -> (m.name().startsWith("java.") && !m.name().equals("java.smartcardio"))) - .collect(Collectors.toSet())); + .collect(toSet())); Set jdkModules = new TreeSet<>(finder.findAll().stream() .map(ModuleReference::descriptor) .filter(m -> !javaSEModules.contains(m)) - .collect(Collectors.toSet())); + .collect(toSet())); - GenGraphs genGraphs = new GenGraphs(javaSEModules, jdkModules); + GenGraphs genGraphs = new GenGraphs(dir, javaSEModules, jdkModules); Set mods = new HashSet<>(); for (ModuleReference mref: finder.findAll()) { - ModuleDescriptor descriptor = mref.descriptor(); - String name = descriptor.name(); - mods.add(name); - Configuration cf = Configuration.empty() - .resolveRequires(finder, - ModuleFinder.of(), - Set.of(name)); - genGraphs.genDotFile(dir, name, cf); + mods.add(mref.descriptor().name()); + genGraphs.genDotFile(mref); } - Configuration cf = Configuration.empty() - .resolveRequires(finder, - ModuleFinder.of(), - mods); - genGraphs.genDotFile(dir, "jdk", cf); + // all modules + genGraphs.genDotFile("jdk", mods); } - private final Set javaGroup; - private final Set jdkGroup; - - GenGraphs(Set javaGroup, Set jdkGroup) { - this.javaGroup = Collections.unmodifiableSet(javaGroup); - this.jdkGroup = Collections.unmodifiableSet(jdkGroup); - } - private static final String ORANGE = "#e76f00"; private static final String BLUE = "#437291"; private static final String GRAY = "#dddddd"; @@ -145,23 +130,70 @@ public class GenGraphs { } - private void genDotFile(Path dir, String name, Configuration cf) throws IOException { - try (PrintStream out - = new PrintStream(Files.newOutputStream(dir.resolve(name + ".dot")))) { + private final Path dir; + private final Set javaGroup; + private final Set jdkGroup; - Map nameToModule; - if (name.equals("java.se.ee")) { - nameToModule = cf.modules().stream() - .map(ResolvedModule::reference) - .map(ModuleReference::descriptor) - .filter(md -> !md.name().startsWith("jdk.")) - .collect(Collectors.toMap(ModuleDescriptor::name, Function.identity())); - } else { - nameToModule = cf.modules().stream() - .map(ResolvedModule::reference) - .map(ModuleReference::descriptor) - .collect(Collectors.toMap(ModuleDescriptor::name, Function.identity())); + GenGraphs(Path dir, Set javaGroup, Set jdkGroup) { + this.dir = dir; + this.javaGroup = Collections.unmodifiableSet(javaGroup); + this.jdkGroup = Collections.unmodifiableSet(jdkGroup); + } + + /** + * Generates a dot file for the given module reference as the root. + */ + void genDotFile(ModuleReference mref) throws IOException { + String name = mref.descriptor().name(); + genDotFile(name, Set.of(name)); + } + + /** + * Generates a dot file for the given set of root modules. + */ + void genDotFile(String name, Set roots) throws IOException { + Configuration cf = + Configuration.empty().resolveRequires(ModuleFinder.ofSystem(), + ModuleFinder.of(), + roots); + + Set mds = cf.modules().stream() + .map(ResolvedModule::reference) + .map(ModuleReference::descriptor) + .collect(toSet()); + + // generate a dot file for the resolved graph + try (OutputStream os = Files.newOutputStream(dir.resolve(name + ".dot")); + PrintStream out = new PrintStream(os)) { + printGraph(out, name, gengraph(cf), + mds.stream() + .collect(toMap(ModuleDescriptor::name, Function.identity())) + ); + } + + if (name.equals("java.se") || name.equals("java.se.ee")) { + // generate a dot file for Java SE module graph + try (OutputStream os = Files.newOutputStream(dir.resolve(name + "-spec.dot")); + PrintStream out = new PrintStream(os)) { + // transitive reduction on the graph of `requires transitive` edges + // filter out jdk.* modules which are implementation dependences + Graph graph = requiresTransitiveGraph(cf, true); + printGraph(out, name, graph, + mds.stream() + .filter(md -> !md.name().startsWith("jdk.") && + graph.nodes().contains(md.name())) + .collect(toMap(ModuleDescriptor::name, Function.identity())) + ); } + } + } + + private void printGraph(PrintStream out, + String name, + Graph graph, + Map nameToModule) + throws IOException + { Set descriptors = new TreeSet<>(nameToModule.values()); out.format("digraph \"%s\" {%n", name); @@ -182,13 +214,13 @@ public class GenGraphs { // same ranks ranks.stream() - .forEach(group -> out.format("{rank=same %s}%n", - descriptors.stream() - .map(ModuleDescriptor::name) - .filter(group::contains) - .map(mn -> "\"" + mn + "\"") - .collect(Collectors.joining(",")) - )); + .map(group -> descriptors.stream() + .map(ModuleDescriptor::name) + .filter(group::contains) + .map(mn -> "\"" + mn + "\"") + .collect(joining(","))) + .filter(group -> group.length() > 0) + .forEach(group -> out.format("{rank=same %s}%n", group)); descriptors.stream() .filter(jdkGroup::contains) @@ -196,30 +228,28 @@ public class GenGraphs { .forEach(mn -> out.format(" \"%s\" [fontcolor=\"%s\", group=%s];%n", mn, BLUE, "jdk")); - // transitive reduction - Graph graph = gengraph(cf); - descriptors.forEach(md -> { - String mn = md.name(); - Set requiresTransitive = md.requires().stream() - .filter(d -> d.modifiers().contains(TRANSITIVE)) - .map(d -> d.name()) - .collect(Collectors.toSet()); + descriptors.stream() + .forEach(md -> { + String mn = md.name(); + Set requiresTransitive = md.requires().stream() + .filter(d -> d.modifiers().contains(TRANSITIVE)) + .map(d -> d.name()) + .collect(toSet()); - graph.adjacentNodes(mn) - .stream() - .filter(nameToModule::containsKey) - .forEach(dn -> { - String attr = dn.equals("java.base") ? REQUIRES_BASE - : (requiresTransitive.contains(dn) ? REEXPORTS : REQUIRES); - int w = weightOf(mn, dn); - if (w > 1) - attr += "weight=" + w; - out.format(" \"%s\" -> \"%s\" [%s];%n", mn, dn, attr); - }); - }); + graph.adjacentNodes(mn) + .stream() + .filter(nameToModule::containsKey) + .forEach(dn -> { + String attr = dn.equals("java.base") ? REQUIRES_BASE + : (requiresTransitive.contains(dn) ? REEXPORTS : REQUIRES); + int w = weightOf(mn, dn); + if (w > 1) + attr += "weight=" + w; + out.format(" \"%s\" -> \"%s\" [%s];%n", mn, dn, attr); + }); + }); out.println("}"); - } } /** @@ -239,7 +269,7 @@ public class GenGraphs { .map(ResolvedModule::name) .forEach(target -> builder.addEdge(mn, target)); } - Graph rpg = requiresTransitiveGraph(cf); + Graph rpg = requiresTransitiveGraph(cf, false); return builder.build().reduce(rpg); } @@ -247,13 +277,14 @@ public class GenGraphs { * Returns a Graph containing only requires transitive edges * with transitive reduction. */ - private Graph requiresTransitiveGraph(Configuration cf) { + private Graph requiresTransitiveGraph(Configuration cf, boolean includeBase) { Graph.Builder builder = new Graph.Builder<>(); for (ResolvedModule resolvedModule : cf.modules()) { ModuleDescriptor descriptor = resolvedModule.reference().descriptor(); String mn = descriptor.name(); descriptor.requires().stream() - .filter(d -> d.modifiers().contains(TRANSITIVE)) + .filter(d -> d.modifiers().contains(TRANSITIVE) + || (includeBase && d.name().equals("java.base"))) .map(d -> d.name()) .forEach(d -> builder.addEdge(mn, d)); } diff --git a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c index c6c36594a9d..f21201ced6a 100644 --- a/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c +++ b/jdk/src/java.base/macosx/native/libjli/java_md_macosx.c @@ -171,8 +171,6 @@ struct NSAppArgs { * Main */ -#define GetArch() GetArchPath(CURRENT_DATA_MODEL) - /* Store the name of the executable once computed */ static char *execname = NULL; @@ -184,16 +182,6 @@ GetExecName() { return execname; } -const char * -GetArchPath(int nbits) -{ - switch(nbits) { - default: - return LIBARCHNAME; - } -} - - /* * Exports the JNI interface from libjli * @@ -211,7 +199,7 @@ static InvocationFunctions *GetExportedJNIFunctions() { if (sExportedJNIFunctions != NULL) return sExportedJNIFunctions; char jrePath[PATH_MAX]; - jboolean gotJREPath = GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE); + jboolean gotJREPath = GetJREPath(jrePath, sizeof(jrePath), JNI_FALSE); if (!gotJREPath) { JLI_ReportErrorMessage("Failed to GetJREPath()"); return NULL; @@ -229,7 +217,7 @@ static InvocationFunctions *GetExportedJNIFunctions() { } char jvmPath[PATH_MAX]; - jboolean gotJVMPath = GetJVMPath(jrePath, preferredJVM, jvmPath, sizeof(jvmPath), GetArch(), CURRENT_DATA_MODEL); + jboolean gotJVMPath = GetJVMPath(jrePath, preferredJVM, jvmPath, sizeof(jvmPath), CURRENT_DATA_MODEL); if (!gotJVMPath) { JLI_ReportErrorMessage("Failed to GetJVMPath()"); return NULL; @@ -390,7 +378,6 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, /* Check data model flags, and exec process, if needed */ { - char *arch = (char *)GetArch(); /* like sparc or sparcv9 */ char * jvmtype = NULL; int argc = *pargc; char **argv = *pargv; @@ -462,7 +449,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, jvmpath does not exist */ if (wanted == running) { /* Find out where the JRE is that we will be using. */ - if (!GetJREPath(jrepath, so_jrepath, arch, JNI_FALSE) ) { + if (!GetJREPath(jrepath, so_jrepath, JNI_FALSE) ) { JLI_ReportErrorMessage(JRE_ERROR1); exit(2); } @@ -481,7 +468,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, exit(4); } - if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, wanted)) { + if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, wanted)) { JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath); exit(4); } @@ -502,7 +489,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, #if defined(DUAL_MODE) if (running != wanted) { /* Find out where the JRE is that we will be using. */ - if (!GetJREPath(jrepath, so_jrepath, GetArchPath(wanted), JNI_TRUE)) { + if (!GetJREPath(jrepath, so_jrepath, JNI_TRUE)) { /* give up and let other code report error message */ JLI_ReportErrorMessage(JRE_ERROR2, wanted); exit(1); @@ -526,7 +513,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, } /* exec child can do error checking on the existence of the path */ - jvmpathExists = GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, GetArchPath(wanted), wanted); + jvmpathExists = GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, wanted); } #else /* ! DUAL_MODE */ JLI_ReportErrorMessage(JRE_ERROR2, wanted); @@ -579,7 +566,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, */ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype, - char *jvmpath, jint jvmpathsize, const char * arch, int bitsWanted) + char *jvmpath, jint jvmpathsize, int bitsWanted) { struct stat s; @@ -613,7 +600,7 @@ GetJVMPath(const char *jrepath, const char *jvmtype, * Find path to JRE based on .exe's location or registry settings. */ static jboolean -GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) +GetJREPath(char *path, jint pathsize, jboolean speculative) { char libjava[MAXPATHLEN]; @@ -841,7 +828,7 @@ static void* hSplashLib = NULL; void* SplashProcAddress(const char* name) { if (!hSplashLib) { char jrePath[PATH_MAX]; - if (!GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE)) { + if (!GetJREPath(jrePath, sizeof(jrePath), JNI_FALSE)) { JLI_ReportErrorMessage(JRE_ERROR1); return NULL; } diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java index 203fde39335..fa36c3feda4 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackerImpl.java @@ -317,7 +317,7 @@ public class PackerImpl extends TLGlobals implements Pack200.Packer { this(null, je); } boolean isClassFile() { - if (!name.endsWith(".class")) { + if (!name.endsWith(".class") || name.endsWith("module-info.class")) { return false; } for (String prefix = name;;) { diff --git a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties index 14bc2ad8831..c31b1a03a50 100644 --- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties +++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties @@ -14,15 +14,6 @@ pack.code.attribute.CharacterRangeTable = NH[PHPOHIIH] pack.class.attribute.SourceID = RUH pack.class.attribute.CompilationID = RUH -# Module attributes, supported by the tool and not JSR-200 -pack.class.attribute.Module = RUHFHNH[RUHFH]NH[RUHFHNH[RUH]]NH[RUHFHNH[RUH]]NH[RCH]NH[RCHNH[RCH]] -pack.class.attribute.ModulePackages = NH[RUH] -pack.class.attribute.ModuleVersion = RUH -pack.class.attribute.ModuleMainClass = RCH -pack.class.attribute.ModuleTarget = RUHRUHRUH -pack.class.attribute.ModuleHashes = RUHNH[RUHNH[B]] - - # Note: Zero-length ("marker") attributes do not need to be specified here. # They are automatically defined to have an empty layout. #pack.class.attribute.Deprecated = diff --git a/jdk/src/java.base/share/classes/java/lang/FdLibm.java b/jdk/src/java.base/share/classes/java/lang/FdLibm.java index dfecf79bb18..e1d3085ba70 100644 --- a/jdk/src/java.base/share/classes/java/lang/FdLibm.java +++ b/jdk/src/java.base/share/classes/java/lang/FdLibm.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -79,7 +79,8 @@ class FdLibm { */ private static double __LO(double x, int low) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L)|low ); + return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L) | + (low & 0x0000_0000_FFFF_FFFFL)); } /** @@ -96,7 +97,8 @@ class FdLibm { */ private static double __HI(double x, int high) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL)|( ((long)high)) << 32 ); + return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL) | + ( ((long)high)) << 32 ); } /** @@ -580,4 +582,152 @@ class FdLibm { return s * z; } } + + /** + * Returns the exponential of x. + * + * Method + * 1. Argument reduction: + * Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658. + * Given x, find r and integer k such that + * + * x = k*ln2 + r, |r| <= 0.5*ln2. + * + * Here r will be represented as r = hi-lo for better + * accuracy. + * + * 2. Approximation of exp(r) by a special rational function on + * the interval [0,0.34658]: + * Write + * R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ... + * We use a special Reme algorithm on [0,0.34658] to generate + * a polynomial of degree 5 to approximate R. The maximum error + * of this polynomial approximation is bounded by 2**-59. In + * other words, + * R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5 + * (where z=r*r, and the values of P1 to P5 are listed below) + * and + * | 5 | -59 + * | 2.0+P1*z+...+P5*z - R(z) | <= 2 + * | | + * The computation of exp(r) thus becomes + * 2*r + * exp(r) = 1 + ------- + * R - r + * r*R1(r) + * = 1 + r + ----------- (for better accuracy) + * 2 - R1(r) + * where + * 2 4 10 + * R1(r) = r - (P1*r + P2*r + ... + P5*r ). + * + * 3. Scale back to obtain exp(x): + * From step 1, we have + * exp(x) = 2^k * exp(r) + * + * Special cases: + * exp(INF) is INF, exp(NaN) is NaN; + * exp(-INF) is 0, and + * for finite argument, only exp(0)=1 is exact. + * + * Accuracy: + * according to an error analysis, the error is always less than + * 1 ulp (unit in the last place). + * + * Misc. info. + * For IEEE double + * if x > 7.09782712893383973096e+02 then exp(x) overflow + * if x < -7.45133219101941108420e+02 then exp(x) underflow + * + * Constants: + * The hexadecimal values are the intended ones for the following + * constants. The decimal values may be used, provided that the + * compiler will convert from decimal to binary accurately enough + * to produce the hexadecimal values shown. + */ + static class Exp { + private static final double one = 1.0; + private static final double[] half = {0.5, -0.5,}; + private static final double huge = 1.0e+300; + private static final double twom1000= 0x1.0p-1000; // 9.33263618503218878990e-302 = 2^-1000 + private static final double o_threshold= 0x1.62e42fefa39efp9; // 7.09782712893383973096e+02 + private static final double u_threshold= -0x1.74910d52d3051p9; // -7.45133219101941108420e+02; + private static final double[] ln2HI ={ 0x1.62e42feep-1, // 6.93147180369123816490e-01 + -0x1.62e42feep-1}; // -6.93147180369123816490e-01 + private static final double[] ln2LO ={ 0x1.a39ef35793c76p-33, // 1.90821492927058770002e-10 + -0x1.a39ef35793c76p-33}; // -1.90821492927058770002e-10 + private static final double invln2 = 0x1.71547652b82fep0; // 1.44269504088896338700e+00 + + private static final double P1 = 0x1.555555555553ep-3; // 1.66666666666666019037e-01 + private static final double P2 = -0x1.6c16c16bebd93p-9; // -2.77777777770155933842e-03 + private static final double P3 = 0x1.1566aaf25de2cp-14; // 6.61375632143793436117e-05 + private static final double P4 = -0x1.bbd41c5d26bf1p-20; // -1.65339022054652515390e-06 + private static final double P5 = 0x1.6376972bea4d0p-25; // 4.13813679705723846039e-08 + + // should be able to forgo strictfp due to controlled over/underflow + public static strictfp double compute(double x) { + double y; + double hi = 0.0; + double lo = 0.0; + double c; + double t; + int k = 0; + int xsb; + /*unsigned*/ int hx; + + hx = __HI(x); /* high word of x */ + xsb = (hx >> 31) & 1; /* sign bit of x */ + hx &= 0x7fffffff; /* high word of |x| */ + + /* filter out non-finite argument */ + if (hx >= 0x40862E42) { /* if |x| >= 709.78... */ + if (hx >= 0x7ff00000) { + if (((hx & 0xfffff) | __LO(x)) != 0) + return x + x; /* NaN */ + else + return (xsb == 0) ? x : 0.0; /* exp(+-inf) = {inf, 0} */ + } + if (x > o_threshold) + return huge * huge; /* overflow */ + if (x < u_threshold) // unsigned compare needed here? + return twom1000 * twom1000; /* underflow */ + } + + /* argument reduction */ + if (hx > 0x3fd62e42) { /* if |x| > 0.5 ln2 */ + if(hx < 0x3FF0A2B2) { /* and |x| < 1.5 ln2 */ + hi = x - ln2HI[xsb]; + lo=ln2LO[xsb]; + k = 1 - xsb - xsb; + } else { + k = (int)(invln2 * x + half[xsb]); + t = k; + hi = x - t*ln2HI[0]; /* t*ln2HI is exact here */ + lo = t*ln2LO[0]; + } + x = hi - lo; + } else if (hx < 0x3e300000) { /* when |x|<2**-28 */ + if (huge + x > one) + return one + x; /* trigger inexact */ + } else { + k = 0; + } + + /* x is now in primary range */ + t = x * x; + c = x - t*(P1 + t*(P2 + t*(P3 + t*(P4 + t*P5)))); + if (k == 0) + return one - ((x*c)/(c - 2.0) - x); + else + y = one - ((lo - (x*c)/(2.0 - c)) - hi); + + if(k >= -1021) { + y = __HI(y, __HI(y) + (k << 20)); /* add k to y's exponent */ + return y; + } else { + y = __HI(y, __HI(y) + ((k + 1000) << 20)); /* add k to y's exponent */ + return y * twom1000; + } + } + } } diff --git a/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java b/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java index 98536259a92..d95ea5ef826 100644 --- a/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java +++ b/jdk/src/java.base/share/classes/java/lang/StackTraceElement.java @@ -26,10 +26,13 @@ package java.lang; import jdk.internal.loader.BuiltinClassLoader; -import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.VM; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleReferenceImpl; +import java.lang.module.ModuleDescriptor.Version; +import java.lang.module.ModuleReference; +import java.lang.module.ResolvedModule; import java.lang.reflect.Layer; import java.lang.reflect.Module; import java.util.HashSet; @@ -477,13 +480,16 @@ public final class StackTraceElement implements java.io.Serializable { static Set HASHED_MODULES = hashedModules(); static Set hashedModules() { - Module javaBase = Layer.boot().findModule("java.base").get(); - Optional ohashes = - SharedSecrets.getJavaLangModuleAccess() - .hashes(javaBase.getDescriptor()); - if (ohashes.isPresent()) { - Set names = new HashSet<>(ohashes.get().names()); + Optional resolvedModule = Layer.boot() + .configuration() + .findModule("java.base"); + assert resolvedModule.isPresent(); + ModuleReference mref = resolvedModule.get().reference(); + assert mref instanceof ModuleReferenceImpl; + ModuleHashes hashes = ((ModuleReferenceImpl)mref).recordedHashes(); + if (hashes != null) { + Set names = new HashSet<>(hashes.names()); names.add("java.base"); return names; } diff --git a/jdk/src/java.base/share/classes/java/lang/StrictMath.java b/jdk/src/java.base/share/classes/java/lang/StrictMath.java index 1491a8478bc..63d895fa13c 100644 --- a/jdk/src/java.base/share/classes/java/lang/StrictMath.java +++ b/jdk/src/java.base/share/classes/java/lang/StrictMath.java @@ -227,7 +227,9 @@ public final class StrictMath { * @return the value e{@code a}, * where e is the base of the natural logarithms. */ - public static native double exp(double a); + public static double exp(double a) { + return FdLibm.Exp.compute(a); + } /** * Returns the natural logarithm (base e) of a {@code double} diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index 0c9da2c9e80..d195d3d3db8 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -172,6 +172,7 @@ public class MethodHandles { * @throws IllegalAccessException if the access check specified above fails * @throws SecurityException if denied by the security manager * @since 9 + * @see Lookup#dropLookupMode */ public static Lookup privateLookupIn(Class targetClass, Lookup lookup) throws IllegalAccessException { SecurityManager sm = System.getSecurityManager(); @@ -691,10 +692,15 @@ public class MethodHandles { * A lookup object on a new lookup class * {@linkplain java.lang.invoke.MethodHandles.Lookup#in created from a previous lookup object} * may have some mode bits set to zero. + * Mode bits can also be + * {@linkplain java.lang.invoke.MethodHandles.Lookup#dropLookupMode directly cleared}. + * Once cleared, mode bits cannot be restored from the downgraded lookup object. * The purpose of this is to restrict access via the new lookup object, * so that it can access only names which can be reached by the original * lookup object, and also by the new lookup class. * @return the lookup modes, which limit the kinds of access performed by this lookup object + * @see #in + * @see #dropLookupMode */ public int lookupModes() { return allowedModes & ALL_MODES; @@ -748,7 +754,8 @@ public class MethodHandles { * which may change due to this operation. * * @param requestedLookupClass the desired lookup class for the new lookup object - * @return a lookup object which reports the desired lookup class + * @return a lookup object which reports the desired lookup class, or the same object + * if there is no change * @throws NullPointerException if the argument is null */ public Lookup in(Class requestedLookupClass) { @@ -788,6 +795,40 @@ public class MethodHandles { return new Lookup(requestedLookupClass, newModes); } + + /** + * Creates a lookup on the same lookup class which this lookup object + * finds members, but with a lookup mode that has lost the given lookup mode. + * The lookup mode to drop is one of {@link #PUBLIC PUBLIC}, {@link #MODULE + * MODULE}, {@link #PACKAGE PACKAGE}, {@link #PROTECTED PROTECTED} or {@link #PRIVATE PRIVATE}. + * {@link #PROTECTED PROTECTED} is always dropped and so the resulting lookup + * mode will never have this access capability. When dropping {@code PACKAGE} + * then the resulting lookup will not have {@code PACKAGE} or {@code PRIVATE} + * access. When dropping {@code MODULE} then the resulting lookup will not + * have {@code MODULE}, {@code PACKAGE}, or {@code PRIVATE} access. If {@code + * PUBLIC} is dropped then the resulting lookup has no access. + * @param modeToDrop the lookup mode to drop + * @return a lookup object which lacks the indicated mode, or the same object if there is no change + * @throws IllegalArgumentException if {@code modeToDrop} is not one of {@code PUBLIC}, + * {@code MODULE}, {@code PACKAGE}, {@code PROTECTED} or {@code PRIVATE} + * @since 9 + * @see MethodHandles#privateLookupIn + */ + public Lookup dropLookupMode(int modeToDrop) { + int oldModes = lookupModes(); + int newModes = oldModes & ~(modeToDrop | PROTECTED); + switch (modeToDrop) { + case PUBLIC: newModes &= ~(ALL_MODES); break; + case MODULE: newModes &= ~(PACKAGE | PRIVATE); break; + case PACKAGE: newModes &= ~(PRIVATE); break; + case PROTECTED: + case PRIVATE: break; + default: throw new IllegalArgumentException(modeToDrop + " is not a valid mode to drop"); + } + if (newModes == oldModes) return this; // return self if no change + return new Lookup(lookupClass(), newModes); + } + // Make sure outer class is initialized first. static { IMPL_NAMES.getClass(); } diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java index b527ffaeafb..b10d986ade9 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java +++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleDescriptor.java @@ -29,7 +29,6 @@ import java.io.InputStream; import java.io.IOException; import java.io.PrintStream; import java.io.UncheckedIOException; -import java.net.URI; import java.nio.ByteBuffer; import java.nio.file.Path; import java.util.ArrayList; @@ -38,7 +37,6 @@ import java.util.Collections; import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Objects; @@ -52,7 +50,7 @@ import static jdk.internal.module.Checks.*; import static java.util.Objects.*; import jdk.internal.module.Checks; -import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo; /** @@ -123,8 +121,9 @@ public class ModuleDescriptor private final Set mods; private final String name; + private final Version compiledVersion; - private Requires(Set ms, String mn) { + private Requires(Set ms, String mn, Version v) { if (ms.isEmpty()) { ms = Collections.emptySet(); } else { @@ -132,11 +131,13 @@ public class ModuleDescriptor } this.mods = ms; this.name = mn; + this.compiledVersion = v; } - private Requires(Set ms, String mn, boolean unused) { + private Requires(Set ms, String mn, Version v, boolean unused) { this.mods = ms; this.name = mn; + this.compiledVersion = v; } /** @@ -157,13 +158,27 @@ public class ModuleDescriptor return name; } + /** + * Returns the version of the module if recorded at compile-time. + * + * @return The version of the module if recorded at compile-time + */ + public Optional compiledVersion() { + return Optional.ofNullable(compiledVersion); + } + /** * Compares this module dependence to another. * *

Two {@code Requires} objects are compared by comparing their * module name lexicographically. Where the module names are equal then * the sets of modifiers are compared based on a value computed from the - * ordinal of each modifier.

+ * ordinal of each modifier. Where the module names are equal and the + * set of modifiers are equal then the version of the modules recorded + * at compile-time are compared. When comparing the versions recorded + * at compile-time then a dependence that has a recorded version is + * considered to succeed a dependence that does not have a recorded + * version.

* * @return A negative integer, zero, or a positive integer if this module * dependence is less than, equal to, or greater than the given @@ -174,8 +189,24 @@ public class ModuleDescriptor int c = this.name().compareTo(that.name()); if (c != 0) return c; - // same name, compare by modifiers - return Long.compare(this.modsValue(), that.modsValue()); + + // modifiers + c = Long.compare(this.modsValue(), that.modsValue()); + if (c != 0) + return c; + + // compiledVersion + if (this.compiledVersion != null) { + if (that.compiledVersion != null) + c = this.compiledVersion.compareTo(that.compiledVersion); + else + c = 1; + } else { + if (that.compiledVersion != null) + c = -1; + } + + return c; } /** @@ -195,7 +226,9 @@ public class ModuleDescriptor * *

If the given object is not a {@code Requires} then this method * returns {@code false}. Two module dependence objects are equal if - * the module names are equal and set of modifiers are equal.

+ * the module names are equal, set of modifiers are equal, and the + * compiled version of both modules is equal or not recorded for + * both modules.

* *

This method satisfies the general contract of the {@link * java.lang.Object#equals(Object) Object.equals} method.

@@ -211,21 +244,25 @@ public class ModuleDescriptor if (!(ob instanceof Requires)) return false; Requires that = (Requires)ob; - return (name.equals(that.name) && mods.equals(that.mods)); + return name.equals(that.name) && mods.equals(that.mods) + && Objects.equals(compiledVersion, that.compiledVersion); } /** * Computes a hash code for this module dependence. * - *

The hash code is based upon the module name and modifiers. It - * satisfies the general contract of the {@link Object#hashCode - * Object.hashCode} method.

+ *

The hash code is based upon the module name, modifiers, and the + * module version if recorded at compile time. It satisfies the general + * contract of the {@link Object#hashCode Object.hashCode} method.

* * @return The hash-code value for this module dependence */ @Override public int hashCode() { - return name.hashCode() * 43 + mods.hashCode(); + int hash = name.hashCode() * 43 + mods.hashCode(); + if (compiledVersion != null) + hash = hash * 43 + compiledVersion.hashCode(); + return hash; } /** @@ -235,7 +272,13 @@ public class ModuleDescriptor */ @Override public String toString() { - return ModuleDescriptor.toString(mods, name); + String what; + if (compiledVersion != null) { + what = name() + " (@" + compiledVersion + ")"; + } else { + what = name(); + } + return ModuleDescriptor.toString(mods, what); } } @@ -967,9 +1010,8 @@ public class ModuleDescriptor } - - // From module declarations private final String name; + private final Version version; private final boolean open; // Indicates if synthesised for a JAR file found on the module path @@ -984,17 +1026,16 @@ public class ModuleDescriptor private final Set uses; private final Set provides; - // "Extended" information, added post-compilation by tools - private final Version version; + // Added post-compilation by tools + private final Set packages; private final String mainClass; private final String osName; private final String osArch; private final String osVersion; - private final Set packages; - private final ModuleHashes hashes; private ModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -1003,16 +1044,14 @@ public class ModuleDescriptor Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, - String osVersion, - Set packages, - ModuleHashes hashes) + String osVersion) { - this.name = name; + this.version = version; this.open = open; this.automatic = automatic; this.synthetic = synthetic; @@ -1020,18 +1059,16 @@ public class ModuleDescriptor assert (requires.stream().map(Requires::name).distinct().count() == requires.size()); this.requires = emptyOrUnmodifiableSet(requires); - this.exports = emptyOrUnmodifiableSet(exports); this.opens = emptyOrUnmodifiableSet(opens); this.uses = emptyOrUnmodifiableSet(uses); this.provides = emptyOrUnmodifiableSet(provides); - this.version = version; + + this.packages = emptyOrUnmodifiableSet(packages); this.mainClass = mainClass; this.osName = osName; this.osArch = osArch; this.osVersion = osVersion; - this.hashes = hashes; - this.packages = emptyOrUnmodifiableSet(packages); } /** @@ -1039,6 +1076,7 @@ public class ModuleDescriptor */ ModuleDescriptor(ModuleDescriptor md, Set pkgs) { this.name = md.name; + this.version = md.version; this.open = md.open; this.automatic = md.automatic; this.synthetic = md.synthetic; @@ -1049,16 +1087,14 @@ public class ModuleDescriptor this.uses = md.uses; this.provides = md.provides; - this.version = md.version; + Set packages = new HashSet<>(md.packages); + packages.addAll(pkgs); + this.packages = emptyOrUnmodifiableSet(packages); + this.mainClass = md.mainClass; this.osName = md.osName; this.osArch = md.osArch; this.osVersion = md.osVersion; - this.hashes = null; // need to ignore - - Set packages = new HashSet<>(md.packages); - packages.addAll(pkgs); - this.packages = emptyOrUnmodifiableSet(packages); } /** @@ -1066,6 +1102,7 @@ public class ModuleDescriptor * The arguments are pre-validated and sets are unmodifiable sets. */ ModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -1074,16 +1111,15 @@ public class ModuleDescriptor Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, String osVersion, - Set packages, - ModuleHashes hashes, int hashCode, boolean unused) { this.name = name; + this.version = version; this.open = open; this.automatic = automatic; this.synthetic = synthetic; @@ -1093,12 +1129,10 @@ public class ModuleDescriptor this.uses = uses; this.provides = provides; this.packages = packages; - this.version = version; this.mainClass = mainClass; this.osName = osName; this.osArch = osArch; this.osVersion = osVersion; - this.hashes = hashes; this.hash = hashCode; } @@ -1284,13 +1318,6 @@ public class ModuleDescriptor return packages; } - /** - * Returns the object with the hashes of other modules - */ - Optional hashes() { - return Optional.ofNullable(hashes); - } - /** * A builder used for building {@link ModuleDescriptor} objects. @@ -1317,15 +1344,13 @@ public class ModuleDescriptor public static final class Builder { final String name; final boolean strict; // true if module names are checked - boolean open; + final boolean open; + final boolean synthetic; boolean automatic; - boolean synthetic; final Map requires = new HashMap<>(); - final Map exports = new HashMap<>(); final Map opens = new HashMap<>(); final Set concealedPackages = new HashSet<>(); - final Set uses = new HashSet<>(); final Map provides = new HashMap<>(); Version version; @@ -1333,7 +1358,6 @@ public class ModuleDescriptor String osArch; String osVersion; String mainClass; - ModuleHashes hashes; /** * Initializes a new builder with the given module name. @@ -1341,14 +1365,11 @@ public class ModuleDescriptor * @param strict * Indicates whether module names are checked or not */ - Builder(String name, boolean strict) { - this.strict = strict; + Builder(String name, boolean strict, boolean open, boolean synthetic) { this.name = (strict) ? requireModuleName(name) : name; - } - - /* package */ Builder open(boolean open) { + this.strict = strict; this.open = open; - return this; + this.synthetic = synthetic; } /* package */ Builder automatic(boolean automatic) { @@ -1356,10 +1377,20 @@ public class ModuleDescriptor return this; } - /* package */ boolean isOpen() { return open; } + /** + * Returns the set of packages that are exported (unconditionally or + * unconditionally). + */ + /* package */ Set exportedPackages() { + return exports.keySet(); + } - /* package */ boolean isAutomatic() { - return automatic; + /** + * Returns the set of packages that are opened (unconditionally or + * unconditionally). + */ + /* package */Set openPackages() { + return opens.keySet(); } /** @@ -1387,6 +1418,36 @@ public class ModuleDescriptor return this; } + /** + * Adds a dependence on a module with the given (and possibly empty) + * set of modifiers. The dependence includes the version of the + * module that that was recorded at compile-time. + * + * @param ms + * The set of modifiers + * @param mn + * The module name + * @param compiledVersion + * The version of the module recorded at compile-time + * + * @return This builder + * + * @throws IllegalArgumentException + * If the module name is {@code null}, is not a legal Java + * identifier, or is equal to the module name that this builder + * was initialized to build + * @throws IllegalStateException + * If the dependence on the module has already been declared + */ + public Builder requires(Set ms, + String mn, + Version compiledVersion) { + Objects.requireNonNull(compiledVersion); + if (strict) + mn = requireModuleName(mn); + return requires(new Requires(ms, mn, compiledVersion)); + } + /** * Adds a dependence on a module with the given (and possibly empty) * set of modifiers. @@ -1408,7 +1469,7 @@ public class ModuleDescriptor public Builder requires(Set ms, String mn) { if (strict) mn = requireModuleName(mn); - return requires(new Requires(ms, mn)); + return requires(new Requires(ms, mn, null)); } /** @@ -1705,17 +1766,6 @@ public class ModuleDescriptor return opens(Collections.emptySet(), pn); } - - // Used by ModuleInfo, after a packageFinder is invoked - /* package */ Set exportedAndOpenPackages() { - if (opens.isEmpty()) - return exports.keySet(); - Set result = new HashSet<>(); - result.addAll(exports.keySet()); - result.addAll(opens.keySet()); - return result; - } - /** * Adds a service dependence. * @@ -1789,7 +1839,6 @@ public class ModuleDescriptor if (providerNames.isEmpty()) throw new IllegalArgumentException("Empty providers set"); providerNames.forEach(Checks::requireServiceProviderName); - provides.put(service, p); return this; } @@ -1914,7 +1963,7 @@ public class ModuleDescriptor * If {@code mainClass} is null or is not a legal Java identifier */ public Builder mainClass(String mc) { - mainClass = requireJavaIdentifier("main class name", mc); + mainClass = requireBinaryName("main class name", mc); return this; } @@ -1972,16 +2021,6 @@ public class ModuleDescriptor return this; } - /* package */ Builder hashes(ModuleHashes hashes) { - this.hashes = hashes; - return this; - } - - /* package */ Builder synthetic(boolean v) { - this.synthetic = v; - return this; - } - /** * Builds and returns a {@code ModuleDescriptor} from its components. * @@ -1990,7 +2029,9 @@ public class ModuleDescriptor public ModuleDescriptor build() { Set requires = new HashSet<>(this.requires.values()); - Set packages = new HashSet<>(exportedAndOpenPackages()); + Set packages = new HashSet<>(); + packages.addAll(exports.keySet()); + packages.addAll(opens.keySet()); packages.addAll(concealedPackages); Set exports = new HashSet<>(this.exports.values()); @@ -1999,6 +2040,7 @@ public class ModuleDescriptor Set provides = new HashSet<>(this.provides.values()); return new ModuleDescriptor(name, + version, open, automatic, synthetic, @@ -2007,13 +2049,11 @@ public class ModuleDescriptor opens, uses, provides, - version, + packages, mainClass, osName, osArch, - osVersion, - packages, - hashes); + osVersion); } } @@ -2088,8 +2128,7 @@ public class ModuleDescriptor && Objects.equals(osName, that.osName) && Objects.equals(osArch, that.osArch) && Objects.equals(osVersion, that.osVersion) - && Objects.equals(packages, that.packages) - && Objects.equals(hashes, that.hashes)); + && Objects.equals(packages, that.packages)); } private transient int hash; // cached hash code @@ -2122,7 +2161,6 @@ public class ModuleDescriptor hc = hc * 43 + Objects.hashCode(osArch); hc = hc * 43 + Objects.hashCode(osVersion); hc = hc * 43 + Objects.hashCode(packages); - hc = hc * 43 + Objects.hashCode(hashes); if (hc == 0) hc = -1; hash = hc; @@ -2145,7 +2183,7 @@ public class ModuleDescriptor if (!requires.isEmpty()) sb.append(", ").append(requires); if (!uses.isEmpty()) - sb.append(", ").append(uses); + sb.append(", uses: ").append(uses); if (!exports.isEmpty()) sb.append(", exports: ").append(exports); if (!opens.isEmpty()) @@ -2171,7 +2209,7 @@ public class ModuleDescriptor * identifier */ public static Builder module(String name) { - return new Builder(name, true); + return new Builder(name, true, false, false); } /** @@ -2199,7 +2237,7 @@ public class ModuleDescriptor * identifier */ public static Builder openModule(String name) { - return new Builder(name, true).open(true); + return new Builder(name, true, true, false); } /** @@ -2221,7 +2259,7 @@ public class ModuleDescriptor * @see ModuleFinder#of(Path[]) */ public static Builder automaticModule(String name) { - return new Builder(name, true).automatic(true); + return new Builder(name, true, false, false).automatic(true); } @@ -2263,7 +2301,7 @@ public class ModuleDescriptor Supplier> packageFinder) throws IOException { - return ModuleInfo.read(in, requireNonNull(packageFinder)); + return ModuleInfo.read(in, requireNonNull(packageFinder)).descriptor(); } /** @@ -2281,7 +2319,7 @@ public class ModuleDescriptor * If an I/O error occurs reading from the input stream */ public static ModuleDescriptor read(InputStream in) throws IOException { - return ModuleInfo.read(in, null); + return ModuleInfo.read(in, null).descriptor(); } /** @@ -2320,7 +2358,7 @@ public class ModuleDescriptor public static ModuleDescriptor read(ByteBuffer bb, Supplier> packageFinder) { - return ModuleInfo.read(bb, requireNonNull(packageFinder)); + return ModuleInfo.read(bb, requireNonNull(packageFinder)).descriptor(); } /** @@ -2336,7 +2374,7 @@ public class ModuleDescriptor * If an invalid module descriptor is detected */ public static ModuleDescriptor read(ByteBuffer bb) { - return ModuleInfo.read(bb, null); + return ModuleInfo.read(bb, null).descriptor(); } private static Map emptyOrUnmodifiableMap(Map map) { @@ -2377,18 +2415,26 @@ public class ModuleDescriptor jdk.internal.misc.SharedSecrets .setJavaLangModuleAccess(new jdk.internal.misc.JavaLangModuleAccess() { @Override - public Builder newModuleBuilder(String mn, boolean strict) { - return new Builder(mn, strict); + public Builder newModuleBuilder(String mn, + boolean strict, + boolean open, + boolean synthetic) { + return new Builder(mn, strict, open, synthetic); } @Override - public Builder newOpenModuleBuilder(String mn, boolean strict) { - return new Builder(mn, strict).open(true); + public Set exportedPackages(ModuleDescriptor.Builder builder) { + return builder.exportedPackages(); } @Override - public Requires newRequires(Set ms, String mn) { - return new Requires(ms, mn, true); + public Set openPackages(ModuleDescriptor.Builder builder) { + return builder.openPackages(); + } + + @Override + public Requires newRequires(Set ms, String mn, Version v) { + return new Requires(ms, mn, v, true); } @Override @@ -2433,6 +2479,7 @@ public class ModuleDescriptor @Override public ModuleDescriptor newModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -2441,15 +2488,14 @@ public class ModuleDescriptor Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, String osVersion, - Set packages, - ModuleHashes hashes, int hashCode) { return new ModuleDescriptor(name, + version, open, automatic, synthetic, @@ -2458,22 +2504,15 @@ public class ModuleDescriptor opens, uses, provides, - version, + packages, mainClass, osName, osArch, osVersion, - packages, - hashes, hashCode, false); } - @Override - public Optional hashes(ModuleDescriptor descriptor) { - return descriptor.hashes(); - } - @Override public Configuration resolveRequiresAndUses(ModuleFinder finder, Collection roots, @@ -2482,20 +2521,6 @@ public class ModuleDescriptor { return Configuration.resolveRequiresAndUses(finder, roots, check, traceOutput); } - - @Override - public ModuleReference newPatchedModule(ModuleDescriptor descriptor, - URI location, - Supplier s) { - return new ModuleReference(descriptor, location, s, true, null); - } - - @Override - public ModuleFinder newModulePath(Runtime.Version version, - boolean isLinkPhase, - Path... entries) { - return new ModulePath(version, isLinkPhase, entries); - } }); } diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java index 4b98bf48416..5d01f698806 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java +++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleFinder.java @@ -42,6 +42,8 @@ import java.util.Objects; import java.util.Optional; import java.util.Set; +import jdk.internal.module.ModulePath; +import jdk.internal.module.SystemModuleFinder; import sun.security.action.GetPropertyAction; /** @@ -137,7 +139,7 @@ public interface ModuleFinder { /** * Returns a module finder that locates the system modules. The - * system modules are typically linked into the Java run-time image. + * system modules are the modules in the Java run-time image. * The module finder will always find {@code java.base}. * *

If there is a security manager set then its {@link @@ -166,7 +168,7 @@ public interface ModuleFinder { Path modules = Paths.get(home, "lib", "modules"); if (Files.isRegularFile(modules)) { - return new SystemModuleFinder(); + return SystemModuleFinder.getInstance(); } else { Path mlib = Paths.get(home, "modules"); if (Files.isDirectory(mlib)) { diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java b/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java index cbf84cf938d..09a5acec219 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java +++ b/jdk/src/java.base/share/classes/java/lang/module/ModuleReference.java @@ -26,96 +26,42 @@ package java.lang.module; import java.io.IOException; -import java.io.UncheckedIOException; import java.net.URI; import java.util.Objects; import java.util.Optional; -import java.util.function.Supplier; - -import jdk.internal.module.ModuleHashes.HashSupplier; /** * A reference to a module's content. * - *

A module reference contains the module's descriptor and its location, if - * known. It also has the ability to create a {@link ModuleReader} in order to - * access the module's content, which may be inside the Java run-time system - * itself or in an artifact such as a modular JAR file. + *

A module reference is a concrete implementation of this class that + * implements the abstract methods defined by this class. It contains the + * module's descriptor and its location, if known. It also has the ability to + * create a {@link ModuleReader} in order to access the module's content, which + * may be inside the Java run-time system itself or in an artifact such as a + * modular JAR file. * * @see ModuleFinder * @see ModuleReader * @since 9 */ -public final class ModuleReference { +public abstract class ModuleReference { private final ModuleDescriptor descriptor; private final URI location; - private final Supplier readerSupplier; - - // true if this is a reference to a patched module - private boolean patched; - - // the function that computes the hash of this module reference - private final HashSupplier hasher; - - // cached hash to avoid needing to compute it many times - private byte[] cachedHash; - /** * Constructs a new instance of this class. - */ - ModuleReference(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier, - boolean patched, - HashSupplier hasher) - - { - this.descriptor = Objects.requireNonNull(descriptor); - this.location = location; - this.readerSupplier = Objects.requireNonNull(readerSupplier); - this.patched = patched; - this.hasher = hasher; - } - - /** - * Constructs a new instance of this class. - */ - ModuleReference(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier, - HashSupplier hasher) - - { - this(descriptor, location, readerSupplier, false, hasher); - } - - - /** - * Constructs a new instance of this class. - * - *

The {@code readSupplier} parameter is the supplier of the {@link - * ModuleReader} that may be used to read the module content. Its {@link - * Supplier#get() get()} method throws {@link UncheckedIOException} if an - * I/O error occurs opening the module content. The {@code get()} method - * throws {@link SecurityException} if opening the module is denied by the - * security manager. * * @param descriptor * The module descriptor * @param location * The module location or {@code null} if not known - * @param readerSupplier - * The {@code Supplier} of the {@code ModuleReader} */ - public ModuleReference(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier) - { - this(descriptor, location, readerSupplier, false, null); + protected ModuleReference(ModuleDescriptor descriptor, URI location) { + this.descriptor = Objects.requireNonNull(descriptor); + this.location = location; } /** @@ -123,11 +69,10 @@ public final class ModuleReference { * * @return The module descriptor */ - public ModuleDescriptor descriptor() { + public final ModuleDescriptor descriptor() { return descriptor; } - /** * Returns the location of this module's content, if known. * @@ -139,18 +84,13 @@ public final class ModuleReference { * * @return The location or an empty {@code Optional} if not known */ - public Optional location() { + public final Optional location() { return Optional.ofNullable(location); } - /** * Opens the module content for reading. * - *

This method opens the module content by invoking the {@link - * Supplier#get() get()} method of the {@code readSupplier} specified at - * construction time.

- * * @return A {@code ModuleReader} to read the module * * @throws IOException @@ -158,113 +98,5 @@ public final class ModuleReference { * @throws SecurityException * If denied by the security manager */ - public ModuleReader open() throws IOException { - try { - return readerSupplier.get(); - } catch (UncheckedIOException e) { - throw e.getCause(); - } - - } - - - /** - * Returns {@code true} if this module has been patched via --patch-module. - */ - boolean isPatched() { - return patched; - } - - /** - * Returns the hash supplier for this module. - */ - HashSupplier hasher() { - return hasher; - } - - /** - * Computes the hash of this module. Returns {@code null} if the hash - * cannot be computed. - * - * @throws java.io.UncheckedIOException if an I/O error occurs - */ - byte[] computeHash(String algorithm) { - byte[] result = cachedHash; - if (result != null) - return result; - if (hasher == null) - return null; - cachedHash = result = hasher.generate(algorithm); - return result; - } - - /** - * Computes a hash code for this module reference. - * - *

The hash code is based upon the components of the reference, and - * satisfies the general contract of the {@link Object#hashCode - * Object.hashCode} method.

- * - * @return The hash-code value for this module reference - */ - @Override - public int hashCode() { - int hc = hash; - if (hc == 0) { - hc = descriptor.hashCode(); - hc = 43 * hc + readerSupplier.hashCode(); - hc = 43 * hc + Objects.hashCode(location); - hc = 43 * hc + Objects.hashCode(hasher); - hc = 43 * hc + Boolean.hashCode(patched); - if (hc == 0) - hc = -1; - hash = hc; - } - return hc; - } - - private int hash; - - /** - * Tests this module reference for equality with the given object. - * - *

If the given object is not a {@code ModuleReference} then this - * method returns {@code false}. Two module references are equal if their - * module descriptors are equal, their locations are equal or both unknown, - * and were created with equal supplier objects to access the module - * content.

- * - *

This method satisfies the general contract of the {@link - * java.lang.Object#equals(Object) Object.equals} method.

- * - * @param ob - * the object to which this object is to be compared - * - * @return {@code true} if, and only if, the given object is a module - * reference that is equal to this module reference - */ - @Override - public boolean equals(Object ob) { - if (!(ob instanceof ModuleReference)) - return false; - ModuleReference that = (ModuleReference)ob; - - return Objects.equals(this.descriptor, that.descriptor) - && Objects.equals(this.location, that.location) - && Objects.equals(this.readerSupplier, that.readerSupplier) - && Objects.equals(this.hasher, that.hasher) - && this.patched == that.patched; - } - - /** - * Returns a string describing this module reference. - * - * @return A string describing this module reference - */ - @Override - public String toString() { - return ("[module " + descriptor().name() - + ", location=" + location + "]"); - } - + public abstract ModuleReader open() throws IOException; } diff --git a/jdk/src/java.base/share/classes/java/lang/module/Resolver.java b/jdk/src/java.base/share/classes/java/lang/module/Resolver.java index 5f716b131b7..d2aafdc5d87 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/Resolver.java +++ b/jdk/src/java.base/share/classes/java/lang/module/Resolver.java @@ -46,6 +46,7 @@ import java.util.StringJoiner; import java.util.stream.Collectors; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleReferenceImpl; /** * The resolver used by {@link Configuration#resolveRequires} and @@ -438,24 +439,32 @@ final class Resolver { */ private void checkHashes() { for (ModuleReference mref : nameToReference.values()) { - ModuleDescriptor descriptor = mref.descriptor(); - // get map of module hashes - Optional ohashes = descriptor.hashes(); - if (!ohashes.isPresent()) + // get the recorded hashes, if any + if (!(mref instanceof ModuleReferenceImpl)) + continue; + ModuleHashes hashes = ((ModuleReferenceImpl)mref).recordedHashes(); + if (hashes == null) continue; - ModuleHashes hashes = ohashes.get(); + ModuleDescriptor descriptor = mref.descriptor(); String algorithm = hashes.algorithm(); for (String dn : hashes.names()) { - ModuleReference other = nameToReference.get(dn); - if (other == null) { + ModuleReference mref2 = nameToReference.get(dn); + if (mref2 == null) { ResolvedModule resolvedModule = findInParent(dn); if (resolvedModule != null) - other = resolvedModule.reference(); + mref2 = resolvedModule.reference(); + } + if (mref2 == null) + continue; + + if (!(mref2 instanceof ModuleReferenceImpl)) { + fail("Unable to compute the hash of module %s", dn); } // skip checking the hash if the module has been patched + ModuleReferenceImpl other = (ModuleReferenceImpl)mref2; if (other != null && !other.isPatched()) { byte[] recordedHash = hashes.hashFor(dn); byte[] actualHash = other.computeHash(algorithm); diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java index a046a748f7c..f585b476504 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java @@ -28,9 +28,11 @@ package java.lang.reflect; import java.lang.annotation.Annotation; import java.security.AccessController; +import jdk.internal.misc.VM; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; import jdk.internal.reflect.ReflectionFactory; +import sun.security.action.GetPropertyAction; /** * The AccessibleObject class is the base class for Field, Method and @@ -172,8 +174,10 @@ public class AccessibleObject implements AnnotatedElement { // package is open to caller String pn = packageName(declaringClass); - if (declaringModule.isOpen(pn, callerModule)) + if (declaringModule.isOpen(pn, callerModule)) { + printStackTraceIfOpenedReflectively(declaringModule, pn, callerModule); return; + } // package is exported to caller and class/member is public boolean isExported = declaringModule.isExported(pn, callerModule); @@ -185,8 +189,10 @@ public class AccessibleObject implements AnnotatedElement { modifiers = ((Field) this).getModifiers(); } boolean isMemberPublic = Modifier.isPublic(modifiers); - if (isExported && isClassPublic && isMemberPublic) + if (isExported && isClassPublic && isMemberPublic) { + printStackTraceIfExportedReflectively(declaringModule, pn, callerModule); return; + } // not accessible String msg = "Unable to make "; @@ -198,7 +204,44 @@ public class AccessibleObject implements AnnotatedElement { else msg += "opens"; msg += " " + pn + "\" to " + callerModule; - Reflection.throwInaccessibleObjectException(msg); + InaccessibleObjectException e = new InaccessibleObjectException(msg); + if (Reflection.printStackTraceWhenAccessFails()) { + e.printStackTrace(System.err); + } + throw e; + } + + private void printStackTraceIfOpenedReflectively(Module module, + String pn, + Module other) { + printStackTraceIfExposedReflectively(module, pn, other, true); + } + + private void printStackTraceIfExportedReflectively(Module module, + String pn, + Module other) { + printStackTraceIfExposedReflectively(module, pn, other, false); + } + + private void printStackTraceIfExposedReflectively(Module module, + String pn, + Module other, + boolean open) + { + if (Reflection.printStackTraceWhenAccessSucceeds() + && !module.isStaticallyExportedOrOpen(pn, other, open)) + { + String msg = other + " allowed to invoke setAccessible on "; + if (this instanceof Field) + msg += "field "; + msg += this; + new Exception(msg) { + private static final long serialVersionUID = 42L; + public String toString() { + return "WARNING: " + getMessage(); + } + }.printStackTrace(System.err); + } } /** diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java b/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java index 7466c57ae22..df48c1e707a 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Layer.java @@ -245,7 +245,6 @@ public final class Layer { * @see Module#addOpens */ public Controller addOpens(Module source, String pn, Module target) { - Objects.requireNonNull(source); Objects.requireNonNull(source); Objects.requireNonNull(target); ensureInLayer(source); @@ -541,7 +540,7 @@ public final class Layer { * {@link ClassLoader#registerAsParallelCapable parallel-capable} so as to * avoid deadlocks during class loading. In addition, the entity creating * a new layer with this method should arrange that the class loaders are - * ready to load from these module before there are any attempts to load + * ready to load from these modules before there are any attempts to load * classes or resources. * *

Creating a {@code Layer} can fail for the following reasons:

diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Module.java b/jdk/src/java.base/share/classes/java/lang/reflect/Module.java index 29f21cc0108..a71b4b320ab 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Module.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Module.java @@ -559,7 +559,7 @@ public final class Module implements AnnotatedElement { * Returns {@code true} if this module exports or opens a package to * the given module via its module declaration. */ - private boolean isStaticallyExportedOrOpen(String pn, Module other, boolean open) { + boolean isStaticallyExportedOrOpen(String pn, Module other, boolean open) { // package is open to everyone or Map> openPackages = this.openPackages; if (openPackages != null) { @@ -643,6 +643,12 @@ public final class Module implements AnnotatedElement { * open) to the given module. It also has no effect if * invoked on an {@link ModuleDescriptor#isOpen open} module.

* + * @apiNote As specified in section 5.4.3 of the The Java™ + * Virtual Machine Specification , if an attempt to resolve a + * symbolic reference fails because of a linkage error, then subsequent + * attempts to resolve the reference always fail with the same error that + * was thrown as a result of the initial resolution attempt. + * * @param pn * The package name * @param other @@ -656,6 +662,7 @@ public final class Module implements AnnotatedElement { * @throws IllegalStateException * If this is a named module and the caller is not this module * + * @jvms 5.4.3 Resolution * @see #isExported(String,Module) */ @CallerSensitive @@ -676,8 +683,8 @@ public final class Module implements AnnotatedElement { } /** - * If the caller's module is this module then update this module to - * open the given package to the given module. + * If this module has opened a package to at least the caller + * module then update this module to open the package to the given module. * Opening a package with this method allows all types in the package, * and all their members, not just public types and their public members, * to be reflected on by the given module when using APIs that support @@ -699,7 +706,8 @@ public final class Module implements AnnotatedElement { * If {@code pn} is {@code null}, or this is a named module and the * package {@code pn} is not a package in this module * @throws IllegalStateException - * If this is a named module and the caller is not this module + * If this is a named module and this module has not opened the + * package to at least the caller * * @see #isOpen(String,Module) * @see AccessibleObject#setAccessible(boolean) @@ -713,9 +721,8 @@ public final class Module implements AnnotatedElement { if (isNamed() && !descriptor.isOpen()) { Module caller = Reflection.getCallerClass().getModule(); - if (caller != this) { - throw new IllegalStateException(caller + " != " + this); - } + if (caller != this && !isOpen(pn, caller)) + throw new IllegalStateException(pn + " is not open to " + caller); implAddExportsOrOpens(pn, other, /*open*/true, /*syncVM*/true); } @@ -1568,6 +1575,10 @@ public final class Module implements AnnotatedElement { public Stream layers(ClassLoader loader) { return Layer.layers(loader); } + @Override + public boolean isStaticallyExported(Module module, String pn, Module other) { + return module.isStaticallyExportedOrOpen(pn, other, false); + } }); } } diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java index 300265cbcd4..2c724f73a67 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLEngine.java @@ -27,6 +27,8 @@ package javax.net.ssl; import java.nio.ByteBuffer; import java.nio.ReadOnlyBufferException; +import java.util.List; +import java.util.function.BiFunction; /** @@ -1332,4 +1334,89 @@ public abstract class SSLEngine { public String getHandshakeApplicationProtocol() { throw new UnsupportedOperationException(); } + + /** + * Registers a callback function that selects an application protocol + * value for a SSL/TLS/DTLS handshake. + * The function overrides any values set using + * {@link SSLParameters#setApplicationProtocols + * SSLParameters.setApplicationProtocols} and it supports the following + * type parameters: + *
+ *
+ *
{@code SSLEngine} + *
The function's first argument allows the current {@code SSLEngine} + * to be inspected, including the handshake session and configuration + * settings. + *
{@code List} + *
The function's second argument lists the application protocol names + * advertised by the TLS peer. + *
{@code String} + *
The function's result is an application protocol name, or null to + * indicate that none of the advertised names are acceptable. + * If the return value is null (no value chosen) or is a value that + * was not advertised by the peer, the underlying protocol will + * determine what action to take. (For example, ALPN will send a + * "no_application_protocol" alert and terminate the connection.) + *
+ *
+ * + * For example, the following call registers a callback function that + * examines the TLS handshake parameters and selects an application protocol + * name: + * 
{@code
+     *     serverEngine.setHandshakeApplicationProtocolSelector(
+     *         (serverEngine, clientProtocols) -> {
+     *             SSLSession session = serverEngine.getHandshakeSession();
+     *             return chooseApplicationProtocol(
+     *                 serverEngine,
+     *                 clientProtocols,
+     *                 session.getProtocol(),
+     *                 session.getCipherSuite());
+     *         });
+     * }
+ * + * @apiNote + * This method should be called by TLS server applications before the TLS + * handshake begins. Also, this {@code SSLEngine} should be configured with + * parameters that are compatible with the application protocol selected by + * the callback function. For example, enabling a poor choice of cipher + * suites could result in no suitable application protocol. + * See {@link SSLParameters}. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @param selector the callback function, or null to disable the callback + * functionality. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + throw new UnsupportedOperationException(); + } + + /** + * Retrieves the callback function that selects an application protocol + * value during a SSL/TLS/DTLS handshake. + * See {@link #setHandshakeApplicationProtocolSelector + * setHandshakeApplicationProtocolSelector} + * for the function's type parameters. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @return the callback function, or null if none has been set. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public BiFunction, String> + getHandshakeApplicationProtocolSelector() { + throw new UnsupportedOperationException(); + } } diff --git a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java index daaefe08ec7..ebbc9d9eb8d 100644 --- a/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java +++ b/jdk/src/java.base/share/classes/javax/net/ssl/SSLSocket.java @@ -28,6 +28,8 @@ package javax.net.ssl; import java.io.IOException; import java.net.*; +import java.util.List; +import java.util.function.BiFunction; /** * This class extends Sockets and provides secure @@ -742,4 +744,89 @@ public abstract class SSLSocket extends Socket public String getHandshakeApplicationProtocol() { throw new UnsupportedOperationException(); } + + + /** + * Registers a callback function that selects an application protocol + * value for a SSL/TLS/DTLS handshake. + * The function overrides any values set using + * {@link SSLParameters#setApplicationProtocols + * SSLParameters.setApplicationProtocols} and it supports the following + * type parameters: + *
+ *
+ *
{@code SSLSocket} + *
The function's first argument allows the current {@code SSLSocket} + * to be inspected, including the handshake session and configuration + * settings. + *
{@code List} + *
The function's second argument lists the application protocol names + * advertised by the TLS peer. + *
{@code String} + *
The function's result is an application protocol name, or null to + * indicate that none of the advertised names are acceptable. + * If the return value is null (no value chosen) or is a value that + * was not advertised by the peer, the underlying protocol will + * determine what action to take. (For example, ALPN will send a + * "no_application_protocol" alert and terminate the connection.) + *
+ *
+ * + * For example, the following call registers a callback function that + * examines the TLS handshake parameters and selects an application protocol + * name: + * 
{@code
+     *     serverSocket.setHandshakeApplicationProtocolSelector(
+     *         (serverSocket, clientProtocols) -> {
+     *             SSLSession session = serverSocket.getHandshakeSession();
+     *             return chooseApplicationProtocol(
+     *                 serverSocket,
+     *                 clientProtocols,
+     *                 session.getProtocol(),
+     *                 session.getCipherSuite());
+     *         });
+     * }
+ * + * @apiNote + * This method should be called by TLS server applications before the TLS + * handshake begins. Also, this {@code SSLSocket} should be configured with + * parameters that are compatible with the application protocol selected by + * the callback function. For example, enabling a poor choice of cipher + * suites could result in no suitable application protocol. + * See {@link SSLParameters}. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @param selector the callback function, or null to de-register. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + throw new UnsupportedOperationException(); + } + + /** + * Retrieves the callback function that selects an application protocol + * value during a SSL/TLS/DTLS handshake. + * See {@link #setHandshakeApplicationProtocolSelector + * setHandshakeApplicationProtocolSelector} + * for the function's type parameters. + * + * @implSpec + * The implementation in this class throws + * {@code UnsupportedOperationException} and performs no other action. + * + * @return the callback function, or null if none has been set. + * @throws UnsupportedOperationException if the underlying provider + * does not implement the operation. + * @since 9 + */ + public BiFunction, String> + getHandshakeApplicationProtocolSelector() { + throw new UnsupportedOperationException(); + } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java b/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java index d979f984da3..1284a3f129f 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java +++ b/jdk/src/java.base/share/classes/jdk/internal/jimage/decompressor/StringSharingDecompressor.java @@ -64,8 +64,10 @@ public class StringSharingDecompressor implements ResourceDecompressor { private static final int CONSTANT_MethodHandle = 15; private static final int CONSTANT_MethodType = 16; private static final int CONSTANT_InvokeDynamic = 18; + private static final int CONSTANT_Module = 19; + private static final int CONSTANT_Package = 20; - private static final int[] SIZES = new int[20]; + private static final int[] SIZES = new int[21]; static { @@ -83,6 +85,8 @@ public class StringSharingDecompressor implements ResourceDecompressor { SIZES[CONSTANT_MethodHandle] = 3; SIZES[CONSTANT_MethodType] = 2; SIZES[CONSTANT_InvokeDynamic] = 4; + SIZES[CONSTANT_Module] = 2; + SIZES[CONSTANT_Package] = 2; } public static int[] getSizes() { diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java index d0b1c19232f..eed7a2d2aff 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangModuleAccess.java @@ -38,10 +38,8 @@ import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; import java.net.URI; import java.nio.file.Path; -import java.util.Map; import java.util.Collection; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.function.Supplier; @@ -59,21 +57,28 @@ public interface JavaLangModuleAccess { * @param strict * Indicates whether module names are checked or not */ - ModuleDescriptor.Builder newModuleBuilder(String mn, boolean strict); + ModuleDescriptor.Builder newModuleBuilder(String mn, + boolean strict, + boolean open, + boolean synthetic); /** - * Creates a builder for building an open module with the given module name. - * - * @param strict - * Indicates whether module names are checked or not + * Returns the set of packages that are exported (unconditionally or + * unconditionally). */ - ModuleDescriptor.Builder newOpenModuleBuilder(String mn, boolean strict); + Set exportedPackages(ModuleDescriptor.Builder builder); + + /** + * Returns the set of packages that are opened (unconditionally or + * unconditionally). + */ + Set openPackages(ModuleDescriptor.Builder builder); /** * Returns a {@code ModuleDescriptor.Requires} of the given modifiers * and module name. */ - Requires newRequires(Set ms, String mn); + Requires newRequires(Set ms, String mn, Version v); /** * Returns an unqualified {@code ModuleDescriptor.Exports} @@ -122,6 +127,7 @@ public interface JavaLangModuleAccess { * Returns a new {@code ModuleDescriptor} instance. */ ModuleDescriptor newModuleDescriptor(String name, + Version version, boolean open, boolean automatic, boolean synthetic, @@ -130,20 +136,13 @@ public interface JavaLangModuleAccess { Set opens, Set uses, Set provides, - Version version, + Set packages, String mainClass, String osName, String osArch, String osVersion, - Set packages, - ModuleHashes hashes, int hashCode); - /** - * Returns the object with the hashes of other modules - */ - Optional hashes(ModuleDescriptor descriptor); - /** * Resolves a collection of root modules, with service binding * and the empty configuration as the parent. The post resolution @@ -154,18 +153,4 @@ public interface JavaLangModuleAccess { boolean check, PrintStream traceOutput); - /** - * Creates a ModuleReference to a "patched" module. - */ - ModuleReference newPatchedModule(ModuleDescriptor descriptor, - URI location, - Supplier readerSupplier); - - /** - * Creates a ModuleFinder for a module path. - */ - ModuleFinder newModulePath(Runtime.Version version, - boolean isLinkPhase, - Path... entries); - } diff --git a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java index 55772793111..7bf6a1f3977 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java +++ b/jdk/src/java.base/share/classes/jdk/internal/misc/JavaLangReflectModuleAccess.java @@ -123,4 +123,12 @@ public interface JavaLangReflectModuleAccess { * given class loader. */ Stream layers(ClassLoader loader); + + /** + * Tests if a module exports a package at least {@code other} via its + * module declaration. + * + * @apiNote This is a temporary method for debugging features. + */ + boolean isStaticallyExported(Module module, String pn, Module other); } \ No newline at end of file diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java b/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java index 961dd08f28e..2ef9c11d248 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/Builder.java @@ -30,11 +30,8 @@ import java.lang.module.ModuleDescriptor.Opens; import java.lang.module.ModuleDescriptor.Provides; import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Version; -import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Set; import jdk.internal.misc.JavaLangModuleAccess; @@ -52,7 +49,7 @@ import jdk.internal.misc.SharedSecrets; * SystemModules should contain modules for the boot layer. */ final class Builder { - private static final JavaLangModuleAccess jlma = + private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); // Static cache of the most recently seen Version to cheaply deduplicate @@ -60,13 +57,36 @@ final class Builder { static Version cachedVersion; /** - * Returns a {@link Requires} for a dependence on a module - * with the given (and possibly empty) set of modifiers. + * Returns a {@link Requires} for a dependence on a module with the given + * (and possibly empty) set of modifiers, and optionally the version + * recorded at compile time. + */ + public static Requires newRequires(Set mods, + String mn, + String compiledVersion) + { + Version version = null; + if (compiledVersion != null) { + // use the cached version if the same version string + Version ver = cachedVersion; + if (ver != null && compiledVersion.equals(ver.toString())) { + version = ver; + } else { + version = Version.parse(compiledVersion); + } + } + return JLMA.newRequires(mods, mn, version); + } + + /** + * Returns a {@link Requires} for a dependence on a module with the given + * (and possibly empty) set of modifiers, and optionally the version + * recorded at compile time. */ public static Requires newRequires(Set mods, String mn) { - return jlma.newRequires(mods, mn); + return newRequires(mods, mn, null); } /** @@ -77,7 +97,7 @@ final class Builder { public static Exports newExports(Set ms, String pn, Set targets) { - return jlma.newExports(ms, pn, targets); + return JLMA.newExports(ms, pn, targets); } /** @@ -85,7 +105,7 @@ final class Builder { * modifiers. */ public static Opens newOpens(Set ms, String pn) { - return jlma.newOpens(ms, pn); + return JLMA.newOpens(ms, pn); } /** @@ -96,7 +116,7 @@ final class Builder { public static Opens newOpens(Set ms, String pn, Set targets) { - return jlma.newOpens(ms, pn, targets); + return JLMA.newOpens(ms, pn, targets); } /** @@ -104,7 +124,7 @@ final class Builder { * of modifiers. */ public static Exports newExports(Set ms, String pn) { - return jlma.newExports(ms, pn); + return JLMA.newExports(ms, pn); } /** @@ -112,7 +132,7 @@ final class Builder { * implementation classes. */ public static Provides newProvides(String st, List pcs) { - return jlma.newProvides(st, pcs); + return JLMA.newProvides(st, pcs); } final String name; @@ -130,8 +150,6 @@ final class Builder { String osName; String osArch; String osVersion; - String algorithm; - Map hashes; Builder(String name) { this.name = name; @@ -274,35 +292,14 @@ final class Builder { return this; } - /** - * Sets the algorithm of the module hashes - */ - public Builder algorithm(String algorithm) { - this.algorithm = algorithm; - return this; - } - - /** - * Sets the module hash for the given module name - */ - public Builder moduleHash(String mn, byte[] hash) { - if (hashes == null) - hashes = new HashMap<>(); - - hashes.put(mn, hash); - return this; - } - /** * Builds a {@code ModuleDescriptor} from the components. */ public ModuleDescriptor build(int hashCode) { assert name != null; - ModuleHashes moduleHashes = - hashes != null ? new ModuleHashes(algorithm, hashes) : null; - - return jlma.newModuleDescriptor(name, + return JLMA.newModuleDescriptor(name, + version, open, automatic, synthetic, @@ -311,13 +308,11 @@ final class Builder { opens, uses, provides, - version, + packages, mainClass, osName, osArch, osVersion, - packages, - moduleHashes, hashCode); } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java b/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java index 9f02048b5c8..2fdeaab6211 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/Checks.java @@ -25,79 +25,200 @@ package jdk.internal.module; +/** + * Utility class for checking module name and binary names. + */ + public final class Checks { private Checks() { } - private static void fail(String what, String id, int i) { - throw new IllegalArgumentException(id - + ": Invalid " + what + ": " - + " Illegal character" - + " at index " + i); + /** + * Checks a name to ensure that it's a legal module name. + * + * @throws IllegalArgumentException if name is null or not a legal + * module name + */ + public static String requireModuleName(String name) { + if (name == null) + throw new IllegalArgumentException("Null module name"); + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) { + String id = name.substring(off, next); + throw new IllegalArgumentException(name + ": Invalid module name" + + ": '" + id + "' is not a Java identifier"); + } + off = next+1; + } + int last = isJavaIdentifier(name, off, name.length() - off); + if (last == -1) { + String id = name.substring(off); + throw new IllegalArgumentException(name + ": Invalid module name" + + ": '" + id + "' is not a Java identifier"); + } + //if (!Character.isJavaIdentifierStart(last)) + // throw new IllegalArgumentException(name + ": Module name ends in digit"); + return name; } /** - * Returns {@code true} if the given identifier is a legal Java identifier. + * Returns {@code true} if the given name is a legal module name. */ - public static boolean isJavaIdentifier(String id) { - int n = id.length(); - if (n == 0) - return false; - if (!Character.isJavaIdentifierStart(id.codePointAt(0))) - return false; - int cp = id.codePointAt(0); - int i = Character.charCount(cp); - for (; i < n; i += Character.charCount(cp)) { - cp = id.codePointAt(i); - if (!Character.isJavaIdentifierPart(cp) && id.charAt(i) != '.') + public static boolean isModuleName(String name) { + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) return false; + off = next+1; } - if (cp == '.') + int last = isJavaIdentifier(name, off, name.length() - off); + if (last == -1) return false; - + //if (!Character.isJavaIdentifierStart(last)) + // return false; return true; } /** - * Checks if a given identifier is a legal Java identifier. + * Checks a name to ensure that it's a legal package name. + * + * @throws IllegalArgumentException if name is null or not a legal + * package name */ - public static String requireJavaIdentifier(String what, String id) { - if (id == null) - throw new IllegalArgumentException("Null " + what); - int n = id.length(); - if (n == 0) - throw new IllegalArgumentException("Empty " + what); - if (!Character.isJavaIdentifierStart(id.codePointAt(0))) - fail(what, id, 0); - int cp = id.codePointAt(0); - int i = Character.charCount(cp); - int last = 0; - for (; i < n; i += Character.charCount(cp)) { - cp = id.codePointAt(i); - if (!Character.isJavaIdentifierPart(cp) && id.charAt(i) != '.') - fail(what, id, i); - last = i; + public static String requirePackageName(String name) { + return requireBinaryName("package name", name); + } + + /** + * Checks a name to ensure that it's a legal type name. + * + * @throws IllegalArgumentException if name is null or not a legal + * type name + */ + public static String requireServiceTypeName(String name) { + return requireBinaryName("service type name", name); + } + + /** + * Checks a name to ensure that it's a legal type name. + * + * @throws IllegalArgumentException if name is null or not a legal + * type name + */ + public static String requireServiceProviderName(String name) { + return requireBinaryName("service provider name", name); + } + + /** + * Returns {@code true} if the given name is a legal binary name. + */ + public static boolean isJavaIdentifier(String name) { + return isBinaryName(name); + } + + /** + * Returns {@code true} if the given name is a legal binary name. + */ + public static boolean isBinaryName(String name) { + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) + return false; + off = next+1; } - if (cp == '.') - fail(what, id, last); - - return id; + int count = name.length() - off; + return (isJavaIdentifier(name, off, count) != -1); } - public static String requireModuleName(String id) { - return requireJavaIdentifier("module name", id); + /** + * Checks if the given name is a legal binary name. + * + * @throws IllegalArgumentException if name is null or not a legal + * binary name + */ + public static String requireBinaryName(String what, String name) { + if (name == null) + throw new IllegalArgumentException("Null " + what); + int next; + int off = 0; + while ((next = name.indexOf('.', off)) != -1) { + if (isJavaIdentifier(name, off, (next - off)) == -1) { + String id = name.substring(off, next); + throw new IllegalArgumentException(name + ": Invalid " + what + + ": '" + id + "' is not a Java identifier"); + } + off = next + 1; + } + if (isJavaIdentifier(name, off, name.length() - off) == -1) { + String id = name.substring(off, name.length()); + throw new IllegalArgumentException(name + ": Invalid " + what + + ": '" + id + "' is not a Java identifier"); + } + return name; } - public static String requirePackageName(String id) { - return requireJavaIdentifier("package name", id); + /** + * Returns {@code true} if the last character of the given name is legal + * as the last character of a module name. + * + * @throws IllegalArgumentException if name is empty + */ + public static boolean hasLegalModuleNameLastCharacter(String name) { + if (name.isEmpty()) + throw new IllegalArgumentException("name is empty"); + int len = name.length(); + if (isASCIIString(name)) { + char c = name.charAt(len-1); + return Character.isJavaIdentifierStart(c); + } else { + int i = 0; + int cp = -1; + while (i < len) { + cp = name.codePointAt(i); + i += Character.charCount(cp); + } + return Character.isJavaIdentifierStart(cp); + } } - public static String requireServiceTypeName(String id) { - return requireJavaIdentifier("service type name", id); + /** + * Returns true if the given string only contains ASCII characters. + */ + private static boolean isASCIIString(String s) { + int i = 0; + while (i < s.length()) { + int c = s.charAt(i); + if (c > 0x7F) + return false; + i++; + } + return true; } - public static String requireServiceProviderName(String id) { - return requireJavaIdentifier("service provider name", id); - } + /** + * Checks if a char sequence is a legal Java identifier, returning the code + * point of the last character if legal or {@code -1} if not legal. + */ + private static int isJavaIdentifier(CharSequence cs, int offset, int count) { + if (count == 0) + return -1; + int first = Character.codePointAt(cs, offset); + if (!Character.isJavaIdentifierStart(first)) + return -1; + int cp = first; + int i = Character.charCount(first); + while (i < count) { + cp = Character.codePointAt(cs, offset+i); + if (!Character.isJavaIdentifierPart(cp)) + return -1; + i += Character.charCount(cp); + } + + return cp; + } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java b/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java index 908b137eb5a..69c7ee670dd 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ClassFileAttributes.java @@ -68,12 +68,18 @@ public final class ClassFileAttributes { = SharedSecrets.getJavaLangModuleAccess(); private ModuleDescriptor descriptor; + private Version replacementVersion; public ModuleAttribute(ModuleDescriptor descriptor) { super(MODULE); this.descriptor = descriptor; } + public ModuleAttribute(Version v) { + super(MODULE); + this.replacementVersion = v; + } + public ModuleAttribute() { super(MODULE); } @@ -86,46 +92,70 @@ public final class ClassFileAttributes { int codeOff, Label[] labels) { - ModuleAttribute attr = new ModuleAttribute(); - - // module_name - String mn = cr.readUTF8(off, buf).replace('/', '.'); + // module_name (CONSTANT_Module_info) + String mn = cr.readModule(off, buf); off += 2; // module_flags int module_flags = cr.readUnsignedShort(off); boolean open = ((module_flags & ACC_OPEN) != 0); + boolean synthetic = ((module_flags & ACC_SYNTHETIC) != 0); off += 2; - ModuleDescriptor.Builder builder; - if (open) { - builder = JLMA.newOpenModuleBuilder(mn, false); - } else { - builder = JLMA.newModuleBuilder(mn, false); + ModuleDescriptor.Builder builder = JLMA.newModuleBuilder(mn, + false, + open, + synthetic); + + // module_version + String module_version = cr.readUTF8(off, buf); + off += 2; + if (replacementVersion != null) { + builder.version(replacementVersion); + } else if (module_version != null) { + builder.version(module_version); } // requires_count and requires[requires_count] int requires_count = cr.readUnsignedShort(off); off += 2; for (int i=0; i mods; - if (flags == 0) { + if (requires_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_TRANSITIVE) != 0) + if ((requires_flags & ACC_TRANSITIVE) != 0) mods.add(Requires.Modifier.TRANSITIVE); - if ((flags & ACC_STATIC_PHASE) != 0) + if ((requires_flags & ACC_STATIC_PHASE) != 0) mods.add(Requires.Modifier.STATIC); - if ((flags & ACC_SYNTHETIC) != 0) + if ((requires_flags & ACC_SYNTHETIC) != 0) mods.add(Requires.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((requires_flags & ACC_MANDATED) != 0) mods.add(Requires.Modifier.MANDATED); } - builder.requires(mods, dn); - off += 4; + + + // requires_version + Version compiledVersion = null; + String requires_version = cr.readUTF8(off, buf); + off += 2; + if (requires_version != null) { + compiledVersion = Version.parse(requires_version); + } + + if (compiledVersion == null) { + builder.requires(mods, dn); + } else { + builder.requires(mods, dn, compiledVersion); + } } // exports_count and exports[exports_count] @@ -133,19 +163,20 @@ public final class ClassFileAttributes { off += 2; if (exports_count > 0) { for (int i=0; i mods; - if (flags == 0) { + if (exports_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((exports_flags & ACC_SYNTHETIC) != 0) mods.add(Exports.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((exports_flags & ACC_MANDATED) != 0) mods.add(Exports.Modifier.MANDATED); } @@ -154,7 +185,7 @@ public final class ClassFileAttributes { if (exports_to_count > 0) { Set targets = new HashSet<>(); for (int j=0; j 0) { for (int i=0; i mods; - if (flags == 0) { + if (opens_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((opens_flags & ACC_SYNTHETIC) != 0) mods.add(Opens.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((opens_flags & ACC_MANDATED) != 0) mods.add(Opens.Modifier.MANDATED); } @@ -191,7 +223,7 @@ public final class ClassFileAttributes { if (opens_to_count > 0) { Set targets = new HashSet<>(); for (int j=0; j ts = e.targets(); attr.putShort(ts.size()); - ts.forEach(t -> attr.putShort(cw.newUTF8(t.replace('.', '/')))); + ts.forEach(target -> attr.putShort(cw.newModule(target))); } else { attr.putShort(0); } } - // opens_counts and opens[opens_counts] attr.putShort(descriptor.opens().size()); for (Opens obj : descriptor.opens()) { String pkg = obj.source().replace('.', '/'); - attr.putShort(cw.newUTF8(pkg)); + attr.putShort(cw.newPackage(pkg)); - int flags = 0; + int opens_flags = 0; if (obj.modifiers().contains(Opens.Modifier.SYNTHETIC)) - flags |= ACC_SYNTHETIC; + opens_flags |= ACC_SYNTHETIC; if (obj.modifiers().contains(Opens.Modifier.MANDATED)) - flags |= ACC_MANDATED; - attr.putShort(flags); + opens_flags |= ACC_MANDATED; + attr.putShort(opens_flags); if (obj.isQualified()) { Set ts = obj.targets(); attr.putShort(ts.size()); - ts.forEach(t -> attr.putShort(cw.newUTF8(t.replace('.', '/')))); + ts.forEach(target -> attr.putShort(cw.newModule(target))); } else { attr.putShort(0); } @@ -369,7 +417,7 @@ public final class ClassFileAttributes { * * // the number of entries in the packages table * u2 packages_count; - * { // index to CONSTANT_CONSTANT_utf8_info structure with the package name + * { // index to CONSTANT_Package_info structure with the package name * u2 package_index * } packages[package_count]; * @@ -402,7 +450,7 @@ public final class ClassFileAttributes { // packages Set packages = new HashSet<>(); for (int i=0; i p.replace('.', '/')) - .forEach(p -> attr.putShort(cw.newUTF8(p))); + .forEach(p -> attr.putShort(cw.newPackage(p))); return attr; } } - /** - * ModuleVersion attribute. - * - * 
 {@code
-     *
-     * ModuleVersion_attribute {
-     *   // index to CONSTANT_utf8_info structure in constant pool representing
-     *   // the string "ModuleVersion"
-     *   u2 attribute_name_index;
-     *   u4 attribute_length;
-     *
-     *   // index to CONSTANT_CONSTANT_utf8_info structure with the version
-     *   u2 version_index;
-     * }
-     *
-     * }
- */ - public static class ModuleVersionAttribute extends Attribute { - private final Version version; - - public ModuleVersionAttribute(Version version) { - super(MODULE_VERSION); - this.version = version; - } - - public ModuleVersionAttribute() { - this(null); - } - - @Override - protected Attribute read(ClassReader cr, - int off, - int len, - char[] buf, - int codeOff, - Label[] labels) - { - String value = cr.readUTF8(off, buf); - return new ModuleVersionAttribute(Version.parse(value)); - } - - @Override - protected ByteVector write(ClassWriter cw, - byte[] code, - int len, - int maxStack, - int maxLocals) - { - ByteVector attr = new ByteVector(); - int index = cw.newUTF8(version.toString()); - attr.putShort(index); - return attr; - } - } - /** * ModuleMainClass attribute. * @@ -526,7 +519,7 @@ public final class ClassFileAttributes { int codeOff, Label[] labels) { - String value = cr.readClass(off, buf); + String value = cr.readClass(off, buf).replace('/', '.'); return new ModuleMainClassAttribute(value); } @@ -538,7 +531,7 @@ public final class ClassFileAttributes { int maxLocals) { ByteVector attr = new ByteVector(); - int index = cw.newClass(mainClass); + int index = cw.newClass(mainClass.replace('.', '/')); attr.putShort(index); return attr; } @@ -555,11 +548,11 @@ public final class ClassFileAttributes { * u2 attribute_name_index; * u4 attribute_length; * - * // index to CONSTANT_CONSTANT_utf8_info structure with the OS name + * // index to CONSTANT_utf8_info structure with the OS name * u2 os_name_index; - * // index to CONSTANT_CONSTANT_utf8_info structure with the OS arch + * // index to CONSTANT_utf8_info structure with the OS arch * u2 os_arch_index - * // index to CONSTANT_CONSTANT_utf8_info structure with the OS version + * // index to CONSTANT_utf8_info structure with the OS version * u2 os_version_index; * } * @@ -656,7 +649,7 @@ public final class ClassFileAttributes { * * // the number of entries in the hashes table * u2 hashes_count; - * { u2 module_name_index + * { u2 module_name_index (index to CONSTANT_Module_info structure) * u2 hash_length; * u1 hash[hash_length]; * } hashes[hashes_count]; @@ -691,7 +684,7 @@ public final class ClassFileAttributes { Map map = new HashMap<>(); for (int i=0; i !ModuleResolution.doNotResolveByDefault(mref)) .map(ModuleReference::descriptor) .map(ModuleDescriptor::name) .filter(mn -> f.find(mn).isPresent()) // observable @@ -277,6 +283,8 @@ public final class ModuleBootstrap { // time to create configuration PerfCounters.resolveTime.addElapsedTimeFrom(t3); + // check module names and incubating status + checkModuleNamesAndStatus(cf); // mapping of modules to class loaders Function clf = ModuleLoaderMap.mappingFunction(cf); @@ -508,12 +516,12 @@ public final class ModuleBootstrap { String key = e.getKey(); String[] s = key.split("/"); if (s.length != 2) - fail("Unable to parse: " + key); + fail("Unable to parse as /: " + key); String mn = s[0]; String pn = s[1]; if (mn.isEmpty() || pn.isEmpty()) - fail("Module and package name must be specified:" + key); + fail("Module and package name must be specified: " + key); // The exporting module is in the boot layer Module m; @@ -585,7 +593,7 @@ public final class ModuleBootstrap { int pos = value.indexOf('='); if (pos == -1) - fail("Unable to parse: " + value); + fail("Unable to parse as =: " + value); if (pos == 0) fail("Missing module name in: " + value); @@ -594,7 +602,7 @@ public final class ModuleBootstrap { String rhs = value.substring(pos+1); if (rhs.isEmpty()) - fail("Unable to parse: " + value); + fail("Unable to parse as =: " + value); // value is (,)* or ()* if (!allowDuplicates && map.containsKey(key)) @@ -626,6 +634,33 @@ public final class ModuleBootstrap { return (String)System.getProperties().remove(key); } + /** + * Checks the names and resolution bit of each module in the configuration, + * emitting warnings if needed. + */ + private static void checkModuleNamesAndStatus(Configuration cf) { + String incubating = null; + for (ResolvedModule rm : cf.modules()) { + ModuleReference mref = rm.reference(); + String mn = mref.descriptor().name(); + + // emit warning if module name ends with a non-Java letter + if (!Checks.hasLegalModuleNameLastCharacter(mn)) + warn("Module name \"" + mn + "\" may soon be illegal"); + + // emit warning if the WARN_INCUBATING module resolution bit set + if (ModuleResolution.hasIncubatingWarning(mref)) { + if (incubating == null) { + incubating = mn; + } else { + incubating += ", " + mn; + } + } + } + if (incubating != null) + warn("Using incubator modules: " + incubating); + } + /** * Throws a RuntimeException with the given message */ diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java index 107305e0c79..f4e5fcb9fe1 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleHashes.java @@ -35,6 +35,7 @@ import java.security.NoSuchAlgorithmException; import java.util.Collections; import java.util.HashMap; import java.util.Map; +import java.util.Objects; import java.util.Set; /** @@ -50,7 +51,6 @@ public final class ModuleHashes { byte[] generate(String algorithm); } - private final String algorithm; private final Map nameToHash; @@ -142,4 +142,37 @@ public final class ModuleHashes { } return new ModuleHashes(algorithm, nameToHash); } + + /** + * This is used by jdk.internal.module.SystemModules class + * generated at link time. + */ + public static class Builder { + final String algorithm; + final Map nameToHash; + + Builder(String algorithm, int initialCapacity) { + this.nameToHash = new HashMap<>(initialCapacity); + this.algorithm = Objects.requireNonNull(algorithm); + } + + /** + * Sets the module hash for the given module name + */ + public Builder hashForModule(String mn, byte[] hash) { + nameToHash.put(mn, hash); + return this; + } + + /** + * Builds a {@code ModuleHashes}. + */ + public ModuleHashes build() { + if (!nameToHash.isEmpty()) { + return new ModuleHashes(algorithm, nameToHash); + } else { + return null; + } + } + } } diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java similarity index 69% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java rename to jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java index b1c82819aa9..3aac651577c 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleInfo.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfo.java @@ -23,7 +23,7 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.DataInput; import java.io.DataInputStream; @@ -31,10 +31,13 @@ import java.io.EOFException; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; +import java.lang.module.InvalidModuleDescriptorException; +import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleDescriptor.Builder; import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Exports; import java.lang.module.ModuleDescriptor.Opens; +import java.lang.module.ModuleDescriptor.Version; import java.nio.ByteBuffer; import java.nio.BufferUnderflowException; import java.util.ArrayList; @@ -46,7 +49,9 @@ import java.util.Map; import java.util.Set; import java.util.function.Supplier; -import jdk.internal.module.ModuleHashes; +import jdk.internal.misc.JavaLangModuleAccess; +import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModuleResolution; import static jdk.internal.module.ClassFileConstants.*; @@ -58,7 +63,10 @@ import static jdk.internal.module.ClassFileConstants.*; * and fine control over the throwing of InvalidModuleDescriptorException. */ -final class ModuleInfo { +public final class ModuleInfo { + + private static final JavaLangModuleAccess JLMA + = SharedSecrets.getJavaLangModuleAccess(); // supplies the set of packages when ModulePackages attribute not present private final Supplier> packageFinder; @@ -75,14 +83,42 @@ final class ModuleInfo { this(pf, true); } + /** + * A holder class for the ModuleDescriptor that is created by reading the + * Module and other standard class file attributes. It also holds the objects + * that represent the non-standard class file attributes that are read from + * the class file. + */ + public static final class Attributes { + private final ModuleDescriptor descriptor; + private final ModuleHashes recordedHashes; + private final ModuleResolution moduleResolution; + Attributes(ModuleDescriptor descriptor, + ModuleHashes recordedHashes, + ModuleResolution moduleResolution) { + this.descriptor = descriptor; + this.recordedHashes = recordedHashes; + this.moduleResolution = moduleResolution; + } + public ModuleDescriptor descriptor() { + return descriptor; + } + public ModuleHashes recordedHashes() { + return recordedHashes; + } + public ModuleResolution moduleResolution() { + return moduleResolution; + } + } + + /** * Reads a {@code module-info.class} from the given input stream. * * @throws InvalidModuleDescriptorException * @throws IOException */ - public static ModuleDescriptor read(InputStream in, - Supplier> pf) + public static Attributes read(InputStream in, Supplier> pf) throws IOException { try { @@ -100,9 +136,7 @@ final class ModuleInfo { * @throws InvalidModuleDescriptorException * @throws UncheckedIOException */ - public static ModuleDescriptor read(ByteBuffer bb, - Supplier> pf) - { + public static Attributes read(ByteBuffer bb, Supplier> pf) { try { return new ModuleInfo(pf).doRead(new DataInputWrapper(bb)); } catch (IllegalArgumentException | IllegalStateException e) { @@ -121,9 +155,7 @@ final class ModuleInfo { * @throws InvalidModuleDescriptorException * @throws UncheckedIOException */ - static ModuleDescriptor readIgnoringHashes(ByteBuffer bb, - Supplier> pf) - { + public static Attributes readIgnoringHashes(ByteBuffer bb, Supplier> pf) { try { return new ModuleInfo(pf, false).doRead(new DataInputWrapper(bb)); } catch (IllegalArgumentException | IllegalStateException e) { @@ -144,7 +176,7 @@ final class ModuleInfo { * because an identifier is not a legal Java identifier, duplicate * exports, and many other reasons */ - private ModuleDescriptor doRead(DataInput in) throws IOException { + private Attributes doRead(DataInput in) throws IOException { int magic = in.readInt(); if (magic != 0xCAFEBABE) @@ -163,8 +195,9 @@ final class ModuleInfo { throw invalidModuleDescriptor("access_flags should be ACC_MODULE"); int this_class = in.readUnsignedShort(); - if (this_class != 0) - throw invalidModuleDescriptor("this_class must be 0"); + String mn = cpool.getClassName(this_class); + if (!"module-info".equals(mn)) + throw invalidModuleDescriptor("this_class should be module-info"); int super_class = in.readUnsignedShort(); if (super_class > 0) @@ -189,10 +222,10 @@ final class ModuleInfo { Builder builder = null; Set packages = null; - String version = null; String mainClass = null; String[] osValues = null; ModuleHashes hashes = null; + ModuleResolution moduleResolution = null; for (int i = 0; i < attributes_count ; i++) { int name_index = in.readUnsignedShort(); @@ -215,10 +248,6 @@ final class ModuleInfo { packages = readModulePackagesAttribute(in, cpool); break; - case MODULE_VERSION : - version = readModuleVersionAttribute(in, cpool); - break; - case MODULE_MAIN_CLASS : mainClass = readModuleMainClassAttribute(in, cpool); break; @@ -235,6 +264,10 @@ final class ModuleInfo { } break; + case MODULE_RESOLUTION : + moduleResolution = readModuleResolution(in, cpool); + break; + default: if (isAttributeDisallowed(attribute_name)) { throw invalidModuleDescriptor(attribute_name @@ -263,23 +296,33 @@ final class ModuleInfo { usedPackageFinder = true; } if (packages != null) { - for (String pn : builder.exportedAndOpenPackages()) { - if (!packages.contains(pn)) { - String tail; - if (usedPackageFinder) { - tail = " not found by package finder"; - } else { - tail = " missing from ModulePackages attribute"; + Set exportedPackages = JLMA.exportedPackages(builder); + Set openPackages = JLMA.openPackages(builder); + if (packages.containsAll(exportedPackages) + && packages.containsAll(openPackages)) { + packages.removeAll(exportedPackages); + packages.removeAll(openPackages); + } else { + // the set of packages is not complete + Set exportedAndOpenPackages = new HashSet<>(); + exportedAndOpenPackages.addAll(exportedPackages); + exportedAndOpenPackages.addAll(openPackages); + for (String pn : exportedAndOpenPackages) { + if (!packages.contains(pn)) { + String tail; + if (usedPackageFinder) { + tail = " not found by package finder"; + } else { + tail = " missing from ModulePackages attribute"; + } + throw invalidModuleDescriptor("Package " + pn + tail); } - throw invalidModuleDescriptor("Package " + pn + tail); } - packages.remove(pn); + assert false; // should not get here } builder.contains(packages); } - if (version != null) - builder.version(version); if (mainClass != null) builder.mainClass(mainClass); if (osValues != null) { @@ -287,10 +330,9 @@ final class ModuleInfo { if (osValues[1] != null) builder.osArch(osValues[1]); if (osValues[2] != null) builder.osVersion(osValues[2]); } - if (hashes != null) - builder.hashes(hashes); - return builder.build(); + ModuleDescriptor descriptor = builder.build(); + return new Attributes(descriptor, hashes, moduleResolution); } /** @@ -302,38 +344,55 @@ final class ModuleInfo { { // module_name int module_name_index = in.readUnsignedShort(); - String mn = cpool.getUtf8AsBinaryName(module_name_index); - - Builder builder = new ModuleDescriptor.Builder(mn, /*strict*/ false); + String mn = cpool.getModuleName(module_name_index); int module_flags = in.readUnsignedShort(); boolean open = ((module_flags & ACC_OPEN) != 0); - if (open) - builder.open(true); - if ((module_flags & ACC_SYNTHETIC) != 0) - builder.synthetic(true); + boolean synthetic = ((module_flags & ACC_SYNTHETIC) != 0); + + Builder builder = JLMA.newModuleBuilder(mn, false, open, synthetic); + + int module_version_index = in.readUnsignedShort(); + if (module_version_index != 0) { + String vs = cpool.getUtf8(module_version_index); + builder.version(vs); + } int requires_count = in.readUnsignedShort(); boolean requiresJavaBase = false; for (int i=0; i mods; - if (flags == 0) { + if (requires_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_TRANSITIVE) != 0) + if ((requires_flags & ACC_TRANSITIVE) != 0) mods.add(Requires.Modifier.TRANSITIVE); - if ((flags & ACC_STATIC_PHASE) != 0) + if ((requires_flags & ACC_STATIC_PHASE) != 0) mods.add(Requires.Modifier.STATIC); - if ((flags & ACC_SYNTHETIC) != 0) + if ((requires_flags & ACC_SYNTHETIC) != 0) mods.add(Requires.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((requires_flags & ACC_MANDATED) != 0) mods.add(Requires.Modifier.MANDATED); } - builder.requires(mods, dn); + + int requires_version_index = in.readUnsignedShort(); + Version compiledVersion = null; + if (requires_version_index != 0) { + String vs = cpool.getUtf8(requires_version_index); + compiledVersion = Version.parse(vs); + } + + if (compiledVersion == null) { + builder.requires(mods, dn); + } else { + builder.requires(mods, dn, compiledVersion); + } + if (dn.equals("java.base")) requiresJavaBase = true; } @@ -350,18 +409,18 @@ final class ModuleInfo { int exports_count = in.readUnsignedShort(); if (exports_count > 0) { for (int i=0; i mods; - int flags = in.readUnsignedShort(); - if (flags == 0) { + int exports_flags = in.readUnsignedShort(); + if (exports_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((exports_flags & ACC_SYNTHETIC) != 0) mods.add(Exports.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((exports_flags & ACC_MANDATED) != 0) mods.add(Exports.Modifier.MANDATED); } @@ -370,7 +429,7 @@ final class ModuleInfo { Set targets = new HashSet<>(exports_to_count); for (int j=0; j mods; - int flags = in.readUnsignedShort(); - if (flags == 0) { + int opens_flags = in.readUnsignedShort(); + if (opens_flags == 0) { mods = Collections.emptySet(); } else { mods = new HashSet<>(); - if ((flags & ACC_SYNTHETIC) != 0) + if ((opens_flags & ACC_SYNTHETIC) != 0) mods.add(Opens.Modifier.SYNTHETIC); - if ((flags & ACC_MANDATED) != 0) + if ((opens_flags & ACC_MANDATED) != 0) mods.add(Opens.Modifier.MANDATED); } @@ -406,7 +465,7 @@ final class ModuleInfo { Set targets = new HashSet<>(open_to_count); for (int j=0; j 0) { for (int i=0; i 0) { for (int i=0; i providers = new ArrayList<>(with_count); for (int j=0; j packages = new HashSet<>(package_count); for (int i=0; i map = new HashMap<>(hash_count); for (int i=0; i binary name } - String getClassNameAsBinaryName(int index) { - String value = getClassName(index); + String getPackageName(int index) { + checkIndex(index); + Entry e = pool[index]; + if (e.tag != CONSTANT_Package) { + throw invalidModuleDescriptor("CONSTANT_Package expected at entry: " + + index); + } + String value = getUtf8(((IndexEntry) e).index); + checkUnqualifiedName("CONSTANT_Package", index, value); return value.replace('/', '.'); // internal form -> binary name } + String getModuleName(int index) { + checkIndex(index); + Entry e = pool[index]; + if (e.tag != CONSTANT_Module) { + throw invalidModuleDescriptor("CONSTANT_Module expected at entry: " + + index); + } + String value = getUtf8(((IndexEntry) e).index); + return decodeModuleName(index, value); + } + String getUtf8(int index) { checkIndex(index); Entry e = pool[index]; @@ -733,15 +835,103 @@ final class ModuleInfo { return (String) (((ValueEntry) e).value); } - String getUtf8AsBinaryName(int index) { - String value = getUtf8(index); - return value.replace('/', '.'); // internal -> binary name - } - void checkIndex(int index) { if (index < 1 || index >= pool.length) throw invalidModuleDescriptor("Index into constant pool out of range"); } + + void checkUnqualifiedName(String what, int index, String value) { + int len = value.length(); + if (len == 0) { + throw invalidModuleDescriptor(what + " at entry " + index + + " has zero length"); + } + for (int i=0; i= len) { + throw invalidModuleDescriptor("CONSTANT_Module at entry " + + index + " has illegal " + + "escape sequence"); + } + int next = value.codePointAt(j); + if (next != '\\' && next != ':' && next != '@') { + throw invalidModuleDescriptor("CONSTANT_Module at entry " + + index + " has illegal " + + "escape sequence"); + } + sb.appendCodePoint(next); + i += Character.charCount(next); + } else { + sb.appendCodePoint(cp); + } + + i += Character.charCount(cp); + } + return sb.toString(); + } } /** diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java index 07bb40205cf..952a328b71b 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoExtender.java @@ -70,6 +70,9 @@ public final class ModuleInfoExtender { // the hashes for the Hashes attribute private ModuleHashes hashes; + // the value of the ModuleResolution attribute + private ModuleResolution moduleResolution; + private ModuleInfoExtender(InputStream in) { this.in = in; } @@ -120,6 +123,14 @@ public final class ModuleInfoExtender { return this; } + /** + * Sets the value for the ModuleResolution attribute. + */ + public ModuleInfoExtender moduleResolution(ModuleResolution mres) { + this.moduleResolution = mres; + return this; + } + /** * A ClassVisitor that supports adding class file attributes. If an * attribute already exists then the first occurence of the attribute @@ -183,21 +194,20 @@ public final class ModuleInfoExtender { if (packages != null) cv.addAttribute(new ModulePackagesAttribute(packages)); - if (version != null) - cv.addAttribute(new ModuleVersionAttribute(version)); if (mainClass != null) cv.addAttribute(new ModuleMainClassAttribute(mainClass)); if (osName != null || osArch != null || osVersion != null) cv.addAttribute(new ModuleTargetAttribute(osName, osArch, osVersion)); if (hashes != null) cv.addAttribute(new ModuleHashesAttribute(hashes)); + if (moduleResolution != null) + cv.addAttribute(new ModuleResolutionAttribute(moduleResolution.value())); List attrs = new ArrayList<>(); // prototypes of attributes that should be parsed - attrs.add(new ModuleAttribute()); + attrs.add(new ModuleAttribute(version)); attrs.add(new ModulePackagesAttribute()); - attrs.add(new ModuleVersionAttribute()); attrs.add(new ModuleMainClassAttribute()); attrs.add(new ModuleTargetAttribute()); attrs.add(new ModuleHashesAttribute()); diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java index 5e4efff1486..5a17442106c 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleInfoWriter.java @@ -49,13 +49,12 @@ public final class ModuleInfoWriter { * returning it in a byte array. */ private static byte[] toModuleInfo(ModuleDescriptor md) { - ClassWriter cw = new ClassWriter(0); - cw.visit(Opcodes.V1_9, ACC_MODULE, null, null, null, null); + cw.visit(Opcodes.V1_9, ACC_MODULE, "module-info", null, null, null); cw.visitAttribute(new ModuleAttribute(md)); - // for tests: write the Packages attribute when there are packages that - // aren't exported or open + // for tests: write the ModulePackages attribute when there are packages + // that aren't exported or open Stream exported = md.exports().stream() .map(ModuleDescriptor.Exports::source); Stream open = md.opens().stream() @@ -64,10 +63,10 @@ public final class ModuleInfoWriter { if (md.packages().size() > exportedOrOpen) cw.visitAttribute(new ModulePackagesAttribute(md.packages())); - md.version().ifPresent(v -> cw.visitAttribute(new ModuleVersionAttribute(v))); + // write ModuleMainClass if the module has a main class md.mainClass().ifPresent(mc -> cw.visitAttribute(new ModuleMainClassAttribute(mc))); - // write the TargetPlatform attribute if have any of OS name/arch/version + // write ModuleTarget attribute if have any of OS name/arch/version String osName = md.osName().orElse(null); String osArch = md.osArch().orElse(null); String osVersion = md.osVersion().orElse(null); @@ -76,7 +75,6 @@ public final class ModuleInfoWriter { } cw.visitEnd(); - return cw.toByteArray(); } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java index 97966bd0012..a80b407d809 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePatcher.java @@ -149,9 +149,22 @@ public final class ModulePatcher { // return a module reference to the patched module URI location = mref.location().orElse(null); - return JLMA.newPatchedModule(descriptor, - location, - () -> new PatchedModuleReader(paths, mref)); + + ModuleHashes recordedHashes = null; + ModuleResolution mres = null; + if (mref instanceof ModuleReferenceImpl) { + ModuleReferenceImpl impl = (ModuleReferenceImpl)mref; + recordedHashes = impl.recordedHashes(); + mres = impl.moduleResolution(); + } + + return new ModuleReferenceImpl(descriptor, + location, + () -> new PatchedModuleReader(paths, mref), + this, + recordedHashes, + null, + mres); } diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java similarity index 95% rename from jdk/src/java.base/share/classes/java/lang/module/ModulePath.java rename to jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java index 15df0307180..fb7871d3c31 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModulePath.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModulePath.java @@ -23,7 +23,7 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.BufferedInputStream; import java.io.BufferedReader; @@ -32,7 +32,12 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.UncheckedIOException; +import java.lang.module.FindException; +import java.lang.module.InvalidModuleDescriptorException; +import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleDescriptor.Requires; +import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReference; import java.net.URI; import java.nio.file.DirectoryStream; import java.nio.file.Files; @@ -59,7 +64,6 @@ import java.util.zip.ZipFile; import jdk.internal.jmod.JmodFile; import jdk.internal.jmod.JmodFile.Section; -import jdk.internal.module.Checks; import jdk.internal.perf.PerfCounter; import jdk.internal.util.jar.VersionedStream; @@ -74,7 +78,7 @@ import jdk.internal.util.jar.VersionedStream; * modules in JMOD files. */ -class ModulePath implements ModuleFinder { +public class ModulePath implements ModuleFinder { private static final String MODULE_INFO = "module-info.class"; // the version to use for multi-release modular JARs @@ -90,7 +94,7 @@ class ModulePath implements ModuleFinder { // map of module name to module reference map for modules already located private final Map cachedModules = new HashMap<>(); - ModulePath(Runtime.Version version, boolean isLinkPhase, Path... entries) { + public ModulePath(Runtime.Version version, boolean isLinkPhase, Path... entries) { this.releaseVersion = version; this.isLinkPhase = isLinkPhase; this.entries = entries.clone(); @@ -99,7 +103,7 @@ class ModulePath implements ModuleFinder { } } - ModulePath(Path... entries) { + public ModulePath(Path... entries) { this(JarFile.runtimeVersion(), false, entries); } @@ -343,11 +347,11 @@ class ModulePath implements ModuleFinder { */ private ModuleReference readJMod(Path file) throws IOException { try (JmodFile jf = new JmodFile(file)) { - ModuleDescriptor md; + ModuleInfo.Attributes attrs; try (InputStream in = jf.getInputStream(Section.CLASSES, MODULE_INFO)) { - md = ModuleDescriptor.read(in, () -> jmodPackages(jf)); + attrs = ModuleInfo.read(in, () -> jmodPackages(jf)); } - return ModuleReferences.newJModModule(md, file); + return ModuleReferences.newJModModule(attrs, file); } } @@ -557,13 +561,14 @@ class ModulePath implements ModuleFinder { ZipFile.OPEN_READ, releaseVersion)) { - ModuleDescriptor md; + ModuleInfo.Attributes attrs; JarEntry entry = jf.getJarEntry(MODULE_INFO); if (entry == null) { // no module-info.class so treat it as automatic module try { - md = deriveModuleDescriptor(jf); + ModuleDescriptor md = deriveModuleDescriptor(jf); + attrs = new ModuleInfo.Attributes(md, null, null); } catch (IllegalArgumentException iae) { throw new FindException( "Unable to derive module descriptor for: " @@ -571,11 +576,11 @@ class ModulePath implements ModuleFinder { } } else { - md = ModuleDescriptor.read(jf.getInputStream(entry), - () -> jarPackages(jf)); + attrs = ModuleInfo.read(jf.getInputStream(entry), + () -> jarPackages(jf)); } - return ModuleReferences.newJarModule(md, file); + return ModuleReferences.newJarModule(attrs, file); } } @@ -604,15 +609,15 @@ class ModulePath implements ModuleFinder { */ private ModuleReference readExplodedModule(Path dir) throws IOException { Path mi = dir.resolve(MODULE_INFO); - ModuleDescriptor md; + ModuleInfo.Attributes attrs; try (InputStream in = Files.newInputStream(mi)) { - md = ModuleDescriptor.read(new BufferedInputStream(in), - () -> explodedPackages(dir)); + attrs = ModuleInfo.read(new BufferedInputStream(in), + () -> explodedPackages(dir)); } catch (NoSuchFileException e) { // for now return null; } - return ModuleReferences.newExplodedModule(md, dir); + return ModuleReferences.newExplodedModule(attrs, dir); } /** diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java new file mode 100644 index 00000000000..2ab42bdb4a2 --- /dev/null +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferenceImpl.java @@ -0,0 +1,169 @@ +/* + * 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. 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 jdk.internal.module; + +import java.io.IOException; +import java.io.UncheckedIOException; +import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleReader; +import java.lang.module.ModuleReference; +import java.net.URI; +import java.util.Objects; +import java.util.function.Supplier; + +/** + * A ModuleReference implementation that supports referencing a module that + * is patched and/or can be tied to other modules by means of hashes. + */ + +public class ModuleReferenceImpl extends ModuleReference { + + private final Supplier readerSupplier; + + // non-null if the module is patched + private final ModulePatcher patcher; + + // the hashes of other modules recorded in this module + private final ModuleHashes recordedHashes; + + // the function that computes the hash of this module + private final ModuleHashes.HashSupplier hasher; + + // ModuleResolution flags + private final ModuleResolution moduleResolution; + + // cached hash of this module to avoid needing to compute it many times + private byte[] cachedHash; + + /** + * Constructs a new instance of this class. + */ + ModuleReferenceImpl(ModuleDescriptor descriptor, + URI location, + Supplier readerSupplier, + ModulePatcher patcher, + ModuleHashes recordedHashes, + ModuleHashes.HashSupplier hasher, + ModuleResolution moduleResolution) + { + super(descriptor, Objects.requireNonNull(location)); + this.readerSupplier = readerSupplier; + this.patcher = patcher; + this.recordedHashes = recordedHashes; + this.hasher = hasher; + this.moduleResolution = moduleResolution; + } + + @Override + public ModuleReader open() throws IOException { + try { + return readerSupplier.get(); + } catch (UncheckedIOException e) { + throw e.getCause(); + } + } + + /** + * Returns {@code true} if this module has been patched via --patch-module. + */ + public boolean isPatched() { + return (patcher != null); + } + + /** + * Returns the hashes recorded in this module or {@code null} if there + * are no hashes recorded. + */ + public ModuleHashes recordedHashes() { + return recordedHashes; + } + + /** + * Returns the supplier that computes the hash of this module. + */ + ModuleHashes.HashSupplier hasher() { + return hasher; + } + + /** + * Returns the ModuleResolution flags. + */ + public ModuleResolution moduleResolution() { + return moduleResolution; + } + + /** + * Computes the hash of this module. Returns {@code null} if the hash + * cannot be computed. + * + * @throws java.io.UncheckedIOException if an I/O error occurs + */ + public byte[] computeHash(String algorithm) { + byte[] result = cachedHash; + if (result != null) + return result; + if (hasher == null) + return null; + cachedHash = result = hasher.generate(algorithm); + return result; + } + + @Override + public int hashCode() { + int hc = hash; + if (hc == 0) { + hc = descriptor().hashCode(); + hc = 43 * hc + Objects.hashCode(location()); + hc = 43 * hc + Objects.hashCode(patcher); + if (hc == 0) + hc = -1; + hash = hc; + } + return hc; + } + + private int hash; + + @Override + public boolean equals(Object ob) { + if (!(ob instanceof ModuleReferenceImpl)) + return false; + ModuleReferenceImpl that = (ModuleReferenceImpl)ob; + + // assume module content, recorded hashes, etc. are the same + // when the modules have equal module descriptors, are at the + // same location, and are patched by the same patcher. + return Objects.equals(this.descriptor(), that.descriptor()) + && Objects.equals(this.location(), that.location()) + && Objects.equals(this.patcher, that.patcher); + } + + @Override + public String toString() { + return super.toString(); + } + +} diff --git a/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java similarity index 92% rename from jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java rename to jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java index e53ba0441d3..a2aff8f76be 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/ModuleReferences.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleReferences.java @@ -23,13 +23,15 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.File; import java.io.IOError; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; +import java.lang.module.ModuleReader; +import java.lang.module.ModuleReference; import java.net.URI; import java.nio.ByteBuffer; import java.nio.file.Files; @@ -51,10 +53,7 @@ import java.util.zip.ZipFile; import jdk.internal.jmod.JmodFile; import jdk.internal.misc.JavaLangAccess; import jdk.internal.misc.SharedSecrets; -import jdk.internal.module.ModuleBootstrap; -import jdk.internal.module.ModuleHashes; import jdk.internal.module.ModuleHashes.HashSupplier; -import jdk.internal.module.ModulePatcher; import jdk.internal.util.jar.VersionedStream; import sun.net.www.ParseUtil; @@ -75,12 +74,18 @@ class ModuleReferences { * Creates a ModuleReference to a module or to patched module when * creating modules for the boot Layer and --patch-module is specified. */ - private static ModuleReference newModule(ModuleDescriptor md, + private static ModuleReference newModule(ModuleInfo.Attributes attrs, URI uri, Supplier supplier, HashSupplier hasher) { - ModuleReference mref = new ModuleReference(md, uri, supplier, hasher); + ModuleReference mref = new ModuleReferenceImpl(attrs.descriptor(), + uri, + supplier, + null, + attrs.recordedHashes(), + hasher, + attrs.moduleResolution()); if (JLA.getBootLayer() == null) mref = ModuleBootstrap.patcher().patchIfNeeded(mref); @@ -90,29 +95,29 @@ class ModuleReferences { /** * Creates a ModuleReference to a module packaged as a modular JAR. */ - static ModuleReference newJarModule(ModuleDescriptor md, Path file) { + static ModuleReference newJarModule(ModuleInfo.Attributes attrs, Path file) { URI uri = file.toUri(); Supplier supplier = () -> new JarModuleReader(file, uri); HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a); - return newModule(md, uri, supplier, hasher); + return newModule(attrs, uri, supplier, hasher); } /** * Creates a ModuleReference to a module packaged as a JMOD. */ - static ModuleReference newJModModule(ModuleDescriptor md, Path file) { + static ModuleReference newJModModule(ModuleInfo.Attributes attrs, Path file) { URI uri = file.toUri(); Supplier supplier = () -> new JModModuleReader(file, uri); HashSupplier hasher = (a) -> ModuleHashes.computeHash(file, a); - return newModule(md, file.toUri(), supplier, hasher); + return newModule(attrs, uri, supplier, hasher); } /** * Creates a ModuleReference to an exploded module. */ - static ModuleReference newExplodedModule(ModuleDescriptor md, Path dir) { + static ModuleReference newExplodedModule(ModuleInfo.Attributes attrs, Path dir) { Supplier supplier = () -> new ExplodedModuleReader(dir); - return newModule(md, dir.toUri(), supplier, null); + return newModule(attrs, dir.toUri(), supplier, null); } diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java new file mode 100644 index 00000000000..76c42368c63 --- /dev/null +++ b/jdk/src/java.base/share/classes/jdk/internal/module/ModuleResolution.java @@ -0,0 +1,114 @@ +/* + * 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. 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 jdk.internal.module; + +import java.lang.module.ModuleReference; +import static jdk.internal.module.ClassFileConstants.*; + +/** + * Represents the Module Resolution flags. + */ +public final class ModuleResolution { + + final int value; + + ModuleResolution(int value) { + this.value = value; + } + + public static ModuleResolution empty() { + return new ModuleResolution(0); + } + + public boolean doNotResolveByDefault() { + return (value & DO_NOT_RESOLVE_BY_DEFAULT) != 0; + } + + public boolean hasDeprecatedWarning() { + return (value & WARN_DEPRECATED) != 0; + } + + public boolean hasDeprecatedForRemovalWarning() { + return (value & WARN_DEPRECATED_FOR_REMOVAL) != 0; + } + + public boolean hasIncubatingWarning() { + return (value & WARN_INCUBATING) != 0; + } + + public ModuleResolution withDoNotResolveByDefault() { + return new ModuleResolution(value | DO_NOT_RESOLVE_BY_DEFAULT); + } + + public ModuleResolution withDeprecated() { + if ((value & (WARN_DEPRECATED_FOR_REMOVAL | WARN_INCUBATING)) != 0) + throw new InternalError("cannot add deprecated to " + value); + return new ModuleResolution(value | WARN_DEPRECATED); + } + + public ModuleResolution withDeprecatedForRemoval() { + if ((value & (WARN_DEPRECATED | WARN_INCUBATING)) != 0) + throw new InternalError("cannot add deprecated for removal to " + value); + return new ModuleResolution(value | WARN_DEPRECATED_FOR_REMOVAL); + } + public ModuleResolution withIncubating() { + if ((value & (WARN_DEPRECATED | WARN_DEPRECATED_FOR_REMOVAL)) != 0) + throw new InternalError("cannot add incubating to " + value); + return new ModuleResolution(value | WARN_INCUBATING); + } + + public int value() { + return value; + } + + public static boolean doNotResolveByDefault(ModuleReference mref) { + // get the DO_NOT_RESOLVE_BY_DEFAULT flag, if any + if (!(mref instanceof ModuleReferenceImpl)) + return false; + + ModuleResolution mres = ((ModuleReferenceImpl)mref).moduleResolution(); + if (mres != null) + return mres.doNotResolveByDefault(); + + return false; + } + + public static boolean hasIncubatingWarning(ModuleReference mref) { + if (!(mref instanceof ModuleReferenceImpl)) + return false; + + ModuleResolution mres = ((ModuleReferenceImpl)mref).moduleResolution(); + if (mres != null) + return mres.hasIncubatingWarning(); + + return false; + } + + @Override + public String toString() { + return super.toString() + "[value=" + value + "]"; + } +} diff --git a/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java similarity index 77% rename from jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java rename to jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java index 6de8ce824cf..5ec0a62ca69 100644 --- a/jdk/src/java.base/share/classes/java/lang/module/SystemModuleFinder.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModuleFinder.java @@ -23,12 +23,16 @@ * questions. */ -package java.lang.module; +package jdk.internal.module; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; +import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReader; +import java.lang.module.ModuleReference; import java.net.URI; import java.net.URLConnection; import java.nio.ByteBuffer; @@ -36,7 +40,6 @@ import java.util.ArrayDeque; import java.util.Collections; import java.util.Deque; import java.util.HashMap; -import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -54,11 +57,7 @@ import jdk.internal.jimage.ImageReader; import jdk.internal.jimage.ImageReaderFactory; import jdk.internal.misc.JavaNetUriAccess; import jdk.internal.misc.SharedSecrets; -import jdk.internal.module.ModuleBootstrap; -import jdk.internal.module.ModuleHashes; import jdk.internal.module.ModuleHashes.HashSupplier; -import jdk.internal.module.SystemModules; -import jdk.internal.module.ModulePatcher; import jdk.internal.perf.PerfCounter; /** @@ -69,7 +68,7 @@ import jdk.internal.perf.PerfCounter; * Packages attribute. */ -class SystemModuleFinder implements ModuleFinder { +public class SystemModuleFinder implements ModuleFinder { private static final JavaNetUriAccess JNUA = SharedSecrets.getJavaNetUriAccess(); @@ -84,11 +83,12 @@ class SystemModuleFinder implements ModuleFinder { // ImageReader used to access all modules in the image private static final ImageReader imageReader; - // the set of modules in the run-time image - private static final Set modules; + // singleton finder to find modules in the run-time images + private static final SystemModuleFinder INSTANCE; - // maps module name to module reference - private static final Map nameToModule; + public static SystemModuleFinder getInstance() { + return INSTANCE; + } /** * For now, the module references are created eagerly on the assumption @@ -98,72 +98,11 @@ class SystemModuleFinder implements ModuleFinder { long t0 = System.nanoTime(); imageReader = ImageReaderFactory.getImageReader(); - String[] names = moduleNames(); - ModuleDescriptor[] descriptors = descriptors(names); - - int n = names.length; - moduleCount.add(n); - - ModuleReference[] mods = new ModuleReference[n]; - - @SuppressWarnings(value = {"rawtypes", "unchecked"}) - Entry[] map - = (Entry[])new Entry[n]; - - for (int i = 0; i < n; i++) { - ModuleDescriptor md = descriptors[i]; - - // create the ModuleReference - ModuleReference mref = toModuleReference(md, hashSupplier(i, names[i])); - - mods[i] = mref; - map[i] = Map.entry(names[i], mref); - - // counters - packageCount.add(md.packages().size()); - exportsCount.add(md.exports().size()); - } - - modules = Set.of(mods); - nameToModule = Map.ofEntries(map); + INSTANCE = new SystemModuleFinder(); initTime.addElapsedTimeFrom(t0); } - /* - * Returns an array of ModuleDescriptor of the given module names. - * - * This obtains ModuleDescriptors from SystemModules class that is generated - * from the jlink system-modules plugin. ModuleDescriptors have already - * been validated at link time. - * - * If java.base is patched, or fastpath is disabled for troubleshooting - * purpose, it will fall back to find system modules via jrt file system. - */ - private static ModuleDescriptor[] descriptors(String[] names) { - // fastpath is enabled by default. - // It can be disabled for troubleshooting purpose. - boolean disabled = - System.getProperty("jdk.system.module.finder.disabledFastPath") != null; - - // fast loading of ModuleDescriptor of system modules - if (isFastPathSupported() && !disabled) - return SystemModules.modules(); - - // if fast loading of ModuleDescriptors is disabled - // fallback to read module-info.class - ModuleDescriptor[] descriptors = new ModuleDescriptor[names.length]; - for (int i = 0; i < names.length; i++) { - String mn = names[i]; - ImageLocation loc = imageReader.findLocation(mn, "module-info.class"); - descriptors[i] = ModuleDescriptor.read(imageReader.getResourceBuffer(loc)); - - // add the recorded hashes of tied modules - Hashes.add(descriptors[i]); - } - return descriptors; - } - private static boolean isFastPathSupported() { return SystemModules.MODULE_NAMES.length > 0; } @@ -178,69 +117,95 @@ class SystemModuleFinder implements ModuleFinder { return imageReader.getModuleNames(); } - private static ModuleReference toModuleReference(ModuleDescriptor md, - HashSupplier hash) - { - String mn = md.name(); - URI uri = JNUA.create("jrt", "/".concat(mn)); + // the set of modules in the run-time image + private final Set modules; - Supplier readerSupplier = new Supplier<>() { - @Override - public ModuleReader get() { - return new ImageModuleReader(mn, uri); - } - }; + // maps module name to module reference + private final Map nameToModule; - ModuleReference mref = - new ModuleReference(md, uri, readerSupplier, hash); + // module name to hashes + private final Map hashes; - // may need a reference to a patched module if --patch-module specified - mref = ModuleBootstrap.patcher().patchIfNeeded(mref); + private SystemModuleFinder() { + String[] names = moduleNames(); + int n = names.length; + moduleCount.add(n); - return mref; - } + // fastpath is enabled by default. + // It can be disabled for troubleshooting purpose. + boolean disabled = + System.getProperty("jdk.system.module.finder.disabledFastPath") != null; - private static HashSupplier hashSupplier(int index, String name) { - if (isFastPathSupported()) { - return new HashSupplier() { - @Override - public byte[] generate(String algorithm) { - return SystemModules.MODULES_TO_HASH[index]; - } - }; + ModuleDescriptor[] descriptors; + ModuleHashes[] recordedHashes; + ModuleResolution[] moduleResolutions; + + // fast loading of ModuleDescriptor of system modules + if (isFastPathSupported() && !disabled) { + descriptors = SystemModules.descriptors(); + recordedHashes = SystemModules.hashes(); + moduleResolutions = SystemModules.moduleResolutions(); } else { - return Hashes.hashFor(name); - } - } - - /* - * This helper class is only used when SystemModules is patched. - * It will get the recorded hashes from module-info.class. - */ - private static class Hashes { - static Map hashes = new HashMap<>(); - - static void add(ModuleDescriptor descriptor) { - Optional ohashes = descriptor.hashes(); - if (ohashes.isPresent()) { - hashes.putAll(ohashes.get().hashes()); + // if fast loading of ModuleDescriptors is disabled + // fallback to read module-info.class + descriptors = new ModuleDescriptor[n]; + recordedHashes = new ModuleHashes[n]; + moduleResolutions = new ModuleResolution[n]; + for (int i = 0; i < names.length; i++) { + String mn = names[i]; + ImageLocation loc = imageReader.findLocation(mn, "module-info.class"); + ModuleInfo.Attributes attrs = + ModuleInfo.read(imageReader.getResourceBuffer(loc), null); + descriptors[i] = attrs.descriptor(); + recordedHashes[i] = attrs.recordedHashes(); + moduleResolutions[i] = attrs.moduleResolution(); } } - static HashSupplier hashFor(String name) { - if (!hashes.containsKey(name)) - return null; - - return new HashSupplier() { - @Override - public byte[] generate(String algorithm) { - return hashes.get(name); + Map hashes = null; + boolean secondSeen = false; + // record the hashes to build HashSupplier + for (ModuleHashes mh : recordedHashes) { + if (mh != null) { + // if only one module contain ModuleHashes, use it + if (hashes == null) { + hashes = mh.hashes(); + } else { + if (!secondSeen) { + hashes = new HashMap<>(hashes); + secondSeen = true; + } + hashes.putAll(mh.hashes()); } - }; + } } - } + this.hashes = (hashes == null) ? Map.of() : hashes; - SystemModuleFinder() { } + ModuleReference[] mods = new ModuleReference[n]; + + @SuppressWarnings(value = {"rawtypes", "unchecked"}) + Entry[] map + = (Entry[])new Entry[n]; + + for (int i = 0; i < n; i++) { + ModuleDescriptor md = descriptors[i]; + + // create the ModuleReference + ModuleReference mref = toModuleReference(md, + recordedHashes[i], + hashSupplier(names[i]), + moduleResolutions[i]); + mods[i] = mref; + map[i] = Map.entry(names[i], mref); + + // counters + packageCount.add(md.packages().size()); + exportsCount.add(md.exports().size()); + } + + modules = Set.of(mods); + nameToModule = Map.ofEntries(map); + } @Override public Optional find(String name) { @@ -253,6 +218,41 @@ class SystemModuleFinder implements ModuleFinder { return modules; } + private ModuleReference toModuleReference(ModuleDescriptor md, + ModuleHashes recordedHashes, + HashSupplier hasher, + ModuleResolution mres) { + String mn = md.name(); + URI uri = JNUA.create("jrt", "/".concat(mn)); + + Supplier readerSupplier = new Supplier<>() { + @Override + public ModuleReader get() { + return new ImageModuleReader(mn, uri); + } + }; + + ModuleReference mref = + new ModuleReferenceImpl(md, uri, readerSupplier, null, + recordedHashes, hasher, mres); + + // may need a reference to a patched module if --patch-module specified + mref = ModuleBootstrap.patcher().patchIfNeeded(mref); + + return mref; + } + + private HashSupplier hashSupplier(String name) { + if (!hashes.containsKey(name)) + return null; + + return new HashSupplier() { + @Override + public byte[] generate(String algorithm) { + return hashes.get(name); + } + }; + } /** * A ModuleReader for reading resources from a module linked into the diff --git a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java index 299c6220450..7f2dbd0aad1 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java +++ b/jdk/src/java.base/share/classes/jdk/internal/module/SystemModules.java @@ -29,14 +29,14 @@ import java.lang.module.ModuleDescriptor; /* * SystemModules class will be generated at link time to create - * ModuleDescriptor for the installed modules directly to improve + * ModuleDescriptor for the system modules directly to improve * the module descriptor reconstitution time. * * This will skip parsing of module-info.class file and validating * names such as module name, package name, service and provider type names. * It also avoids taking a defensive copy of any collection. * - * @see jdk.tools.jlink.internal.plugins.SystemModuleDescriptorPlugin + * @see jdk.tools.jlink.internal.plugins.SystemModulesPlugin */ public final class SystemModules { /** @@ -48,11 +48,6 @@ public final class SystemModules { */ public static final String[] MODULE_NAMES = new String[0]; - /** - * Hash of system modules. - */ - public static byte[][] MODULES_TO_HASH = new byte[0][]; - /** * Number of packages in the boot layer from the installed modules. * @@ -66,8 +61,24 @@ public final class SystemModules { * * When running an exploded image it returns an empty array. */ - public static ModuleDescriptor[] modules() { - throw new InternalError("should not reach here"); + public static ModuleDescriptor[] descriptors() { + throw new InternalError("expected to be overridden at link time"); } + /** + * Returns a non-empty array of ModuleHashes recorded in each module + * in the run-time image. + * + * When running an exploded image it returns an empty array. + */ + public static ModuleHashes[] hashes() { + throw new InternalError("expected to be overridden at link time"); + } + + /** + * Returns a non-empty array of ModuleResolutions in the run-time image. + */ + public static ModuleResolution[] moduleResolutions() { + throw new InternalError("expected to be overridden at link time"); + } } diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java index 90593f58fc3..4d91a001690 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java +++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassReader.java @@ -2490,6 +2490,40 @@ public class ClassReader { return readUTF8(items[readUnsignedShort(index)], buf); } + /** + * Reads a CONSTANT_Module_info item in {@code b}. This method is intended + * for {@link Attribute} sub classes, and is normally not needed by class + * generators or adapters. + * + * @param index + * the start index of an unsigned short value in {@link #b b}, + * whose value is the index of a module constant pool item. + * @param buf + * buffer to be used to read the item. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the String corresponding to the specified module item. + */ + public String readModule(int index, char[] buf) { + return readUTF8(items[readUnsignedShort(index)], buf); + } + + /** + * Reads a CONSTANT_Pakcage_info item in {@code b}. This method is + * intended for {@link Attribute} sub slasses, and is normally not needed + * by class generators or adapters. + * + * @param index + * the start index of an unsigned short value in {@link #b b}, + * whose value is the index of a package constant pool item. + * @param buf + * buffer to be used to read the item. This buffer must be + * sufficiently large. It is not automatically resized. + * @return the String corresponding to the specified package item. + */ + public String readPackage(int index, char[] buf) { + return readUTF8(items[readUnsignedShort(index)], buf); + } + /** * Reads a numeric or string constant pool item in {@link #b b}. This * method is intended for {@link Attribute} sub classes, and is normally not @@ -2516,6 +2550,8 @@ public class ClassReader { case ClassWriter.DOUBLE: return Double.longBitsToDouble(readLong(index)); case ClassWriter.CLASS: + case ClassWriter.MODULE: + case ClassWriter.PACKAGE: return Type.getObjectType(readUTF8(index, buf)); case ClassWriter.STR: return readUTF8(index, buf); diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java index a577f933270..bd0978c0c09 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java +++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/ClassWriter.java @@ -271,6 +271,16 @@ public class ClassWriter extends ClassVisitor { */ static final int INDY = 18; + /** + * The type of CONSTANT_Module constant pool items. + */ + static final int MODULE = 19; + + /** + * The type of CONSTANT_Package constant pool items. + */ + static final int PACKAGE = 20; + /** * The base value for all CONSTANT_MethodHandle constant pool items. * Internally, ASM store the 9 variations of CONSTANT_MethodHandle into 9 @@ -1160,6 +1170,50 @@ public class ClassWriter extends ClassVisitor { return newClassItem(value).index; } + /** + * Adds a module name to the constant pool. + * + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param value + * the module name + * @return the index of a new or already existing module reference item. + */ + public int newModule(String value) { + key2.set(MODULE, value, null, null); + Item result = get(key2); + if (result == null) { + pool.put12(MODULE, newUTF8(value)); + result = new Item(index++, key2); + put(result); + } + return result.index; + } + + /** + * Adds a package name to the constant pool. + * + * Does nothing if the constant pool already contains a similar item. + * This method is intended for {@link Attribute} sub classes, and is + * normally not needed by class generators or adapters. + * + * @param value + * the internal name of the package. + * @return the index of a new or already existing package reference item. + */ + public int newPackage(String value) { + key2.set(PACKAGE, value, null, null); + Item result = get(key2); + if (result == null) { + pool.put12(PACKAGE, newUTF8(value)); + result = new Item(index++, key2); + put(result); + } + return result.index; + } + /** * Adds a method type reference to the constant pool of the class being * build. Does nothing if the constant pool already contains a similar item. diff --git a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java index 25ed37718dd..b0b80907d9d 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java +++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/Item.java @@ -239,6 +239,8 @@ final class Item { this.strVal3 = strVal3; switch (type) { case ClassWriter.CLASS: + case ClassWriter.MODULE: + case ClassWriter.PACKAGE: this.intVal = 0; // intVal of a class must be zero, see visitInnerClass case ClassWriter.UTF8: case ClassWriter.STR: @@ -311,6 +313,8 @@ final class Item { case ClassWriter.UTF8: case ClassWriter.STR: case ClassWriter.CLASS: + case ClassWriter.MODULE: + case ClassWriter.PACKAGE: case ClassWriter.MTYPE: case ClassWriter.TYPE_NORMAL: return i.strVal1.equals(strVal1); diff --git a/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java b/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java index 84c0f618a91..5522c0c1ff0 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java +++ b/jdk/src/java.base/share/classes/jdk/internal/ref/Cleaner.java @@ -58,7 +58,6 @@ import java.security.PrivilegedAction; public class Cleaner extends PhantomReference - implements Runnable { // Dummy reference queue, needed because the PhantomReference constructor @@ -153,12 +152,4 @@ public class Cleaner }}); } } - - @Override public void run() { - SecurityManager security = System.getSecurityManager(); - if (security != null) - security.checkPackageAccess("jdk.internal.ref"); - this.clean(); - } - } diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java b/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java index 0c4cb744578..9a410049188 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java +++ b/jdk/src/java.base/share/classes/jdk/internal/reflect/Reflection.java @@ -31,6 +31,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; import jdk.internal.HotSpotIntrinsicCandidate; +import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.VM; import sun.security.action.GetPropertyAction; @@ -218,8 +219,16 @@ public class Reflection { if (c.isPrimitive()) return true; - // check that memberModule exports the package to currentModule - return memberModule.isExported(c.getPackageName(), currentModule); + String pkg = c.getPackageName(); + boolean allowed = memberModule.isExported(pkg, currentModule); + if (allowed && memberModule.isNamed() && printStackTraceWhenAccessSucceeds()) { + if (!SharedSecrets.getJavaLangReflectModuleAccess() + .isStaticallyExported(memberModule, pkg, currentModule)) { + String msg = currentModule + " allowed access to member of " + memberClass; + new Exception(msg).printStackTrace(System.err); + } + } + return allowed; } /** @@ -348,25 +357,43 @@ public class Reflection { } - // true to print a stack trace when IAE is thrown + // true to print a stack trace when access fails private static volatile boolean printStackWhenAccessFails; - // true if printStackWhenAccessFails has been initialized - private static volatile boolean printStackWhenAccessFailsSet; + // true to print a stack trace when access succeeds + private static volatile boolean printStackWhenAccessSucceeds; - private static void printStackTraceIfNeeded(Throwable e) { - if (!printStackWhenAccessFailsSet && VM.initLevel() >= 1) { + // true if printStack* values are initialized + private static volatile boolean printStackPropertiesSet; + + private static void ensurePrintStackPropertiesSet() { + if (!printStackPropertiesSet && VM.initLevel() >= 1) { String s = GetPropertyAction.privilegedGetProperty( "sun.reflect.debugModuleAccessChecks"); - printStackWhenAccessFails = - (s != null && !s.equalsIgnoreCase("false")); - printStackWhenAccessFailsSet = true; - } - if (printStackWhenAccessFails) { - e.printStackTrace(); + if (s != null) { + printStackWhenAccessFails = !s.equalsIgnoreCase("false"); + printStackWhenAccessSucceeds = s.equalsIgnoreCase("access"); + } + printStackPropertiesSet = true; } } + public static void enableStackTraces() { + printStackWhenAccessFails = true; + printStackWhenAccessSucceeds = true; + printStackPropertiesSet = true; + } + + public static boolean printStackTraceWhenAccessFails() { + ensurePrintStackPropertiesSet(); + return printStackWhenAccessFails; + } + + public static boolean printStackTraceWhenAccessSucceeds() { + ensurePrintStackPropertiesSet(); + return printStackWhenAccessSucceeds; + } + /** * Throws IllegalAccessException with the an exception message based on * the access that is denied. @@ -416,17 +443,10 @@ public class Reflection { throws IllegalAccessException { IllegalAccessException e = new IllegalAccessException(msg); - printStackTraceIfNeeded(e); + ensurePrintStackPropertiesSet(); + if (printStackWhenAccessFails) { + e.printStackTrace(System.err); + } throw e; } - - /** - * Throws InaccessibleObjectException with the given exception message. - */ - public static void throwInaccessibleObjectException(String msg) { - InaccessibleObjectException e = new InaccessibleObjectException(msg); - printStackTraceIfNeeded(e); - throw e; - } - } diff --git a/jdk/src/java.base/share/classes/module-info.java b/jdk/src/java.base/share/classes/module-info.java index 74f0bbf6a9d..0c455f827a7 100644 --- a/jdk/src/java.base/share/classes/module-info.java +++ b/jdk/src/java.base/share/classes/module-info.java @@ -180,7 +180,8 @@ module java.base { java.management, jdk.jvmstat; exports jdk.internal.ref to - java.desktop; + java.desktop, + jdk.unsupported; exports jdk.internal.reflect to java.corba, java.logging, @@ -219,7 +220,8 @@ module java.base { exports sun.nio.ch to java.management, jdk.crypto.token, - jdk.sctp; + jdk.sctp, + jdk.unsupported; exports sun.nio.cs to java.desktop, jdk.charsets; diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java index 2e309dc8bb5..f830bc70ce1 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/Handshaker.java @@ -36,6 +36,7 @@ import java.security.AlgorithmConstraints; import java.security.AccessControlContext; import java.security.PrivilegedExceptionAction; import java.security.PrivilegedActionException; +import java.util.function.BiFunction; import javax.crypto.*; import javax.crypto.spec.*; @@ -122,6 +123,14 @@ abstract class Handshaker { // Negotiated ALPN value String applicationProtocol = null; + // Application protocol callback function (for SSLEngine) + BiFunction,String> + appProtocolSelectorSSLEngine = null; + + // Application protocol callback function (for SSLSocket) + BiFunction,String> + appProtocolSelectorSSLSocket = null; + // The maximum expected network packet size for SSL/TLS/DTLS records. int maximumPacketSize = 0; @@ -500,6 +509,22 @@ abstract class Handshaker { return applicationProtocol; } + /** + * Sets the Application Protocol selector function for SSLEngine. + */ + void setApplicationProtocolSelectorSSLEngine( + BiFunction,String> selector) { + this.appProtocolSelectorSSLEngine = selector; + } + + /** + * Sets the Application Protocol selector function for SSLSocket. + */ + void setApplicationProtocolSelectorSSLSocket( + BiFunction,String> selector) { + this.appProtocolSelectorSSLSocket = selector; + } + /** * Sets the cipher suites preference. */ diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java index 6aaaf893d80..f9941165771 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLEngineImpl.java @@ -27,8 +27,9 @@ package sun.security.ssl; import java.io.*; import java.nio.*; -import java.util.*; import java.security.*; +import java.util.*; +import java.util.function.BiFunction; import javax.crypto.BadPaddingException; @@ -206,6 +207,10 @@ public final class SSLEngineImpl extends SSLEngine { // The value under negotiation will be obtained from handshaker. String applicationProtocol = null; + // Callback function that selects the application protocol value during + // the SSL/TLS handshake. + BiFunction, String> applicationProtocolSelector; + // Have we been told whether we're client or server? private boolean serverModeSet = false; private boolean roleIsServer; @@ -442,6 +447,8 @@ public final class SSLEngineImpl extends SSLEngine { handshaker.setEnabledCipherSuites(enabledCipherSuites); handshaker.setEnableSessionCreation(enableSessionCreation); handshaker.setApplicationProtocols(applicationProtocols); + handshaker.setApplicationProtocolSelectorSSLEngine( + applicationProtocolSelector); outputRecord.initHandshaker(); } @@ -2264,6 +2271,21 @@ public final class SSLEngineImpl extends SSLEngine { return null; } + @Override + public synchronized void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + applicationProtocolSelector = selector; + if ((handshaker != null) && !handshaker.activated()) { + handshaker.setApplicationProtocolSelectorSSLEngine(selector); + } + } + + @Override + public synchronized BiFunction, String> + getHandshakeApplicationProtocolSelector() { + return this.applicationProtocolSelector; + } + /** * Returns a printable representation of this end of the connection. */ diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java index 880c98a80a4..2e20d538d6e 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/SSLSocketImpl.java @@ -37,6 +37,7 @@ import java.security.AlgorithmConstraints; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.ReentrantLock; +import java.util.function.BiFunction; import javax.crypto.BadPaddingException; import javax.net.ssl.*; @@ -223,6 +224,10 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { // The value under negotiation will be obtained from handshaker. String applicationProtocol = null; + // Callback function that selects the application protocol value during + // the SSL/TLS handshake. + BiFunction, String> applicationProtocolSelector; + /* * READ ME * READ ME * READ ME * READ ME * READ ME * READ ME * * IMPORTANT STUFF TO UNDERSTANDING THE SYNCHRONIZATION ISSUES. @@ -1370,6 +1375,8 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { handshaker.setEnabledCipherSuites(enabledCipherSuites); handshaker.setEnableSessionCreation(enableSessionCreation); handshaker.setApplicationProtocols(applicationProtocols); + handshaker.setApplicationProtocolSelectorSSLSocket( + applicationProtocolSelector); } /** @@ -2658,6 +2665,21 @@ public final class SSLSocketImpl extends BaseSSLSocketImpl { return null; } + @Override + public synchronized void setHandshakeApplicationProtocolSelector( + BiFunction, String> selector) { + applicationProtocolSelector = selector; + if ((handshaker != null) && !handshaker.activated()) { + handshaker.setApplicationProtocolSelectorSSLSocket(selector); + } + } + + @Override + public synchronized BiFunction, String> + getHandshakeApplicationProtocolSelector() { + return this.applicationProtocolSelector; + } + // // We allocate a separate thread to deliver handshake completion // events. This ensures that the notifications don't block the diff --git a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java index 17777825f3f..4ad18b163e5 100644 --- a/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java +++ b/jdk/src/java.base/share/classes/sun/security/ssl/ServerHandshaker.java @@ -34,6 +34,7 @@ import java.security.cert.*; import java.security.interfaces.*; import java.security.spec.ECParameterSpec; import java.math.BigInteger; +import java.util.function.BiFunction; import javax.crypto.SecretKey; import javax.net.ssl.*; @@ -532,31 +533,39 @@ final class ServerHandshaker extends Handshaker { ALPNExtension clientHelloALPN = (ALPNExtension) mesg.extensions.get(ExtensionType.EXT_ALPN); - if ((clientHelloALPN != null) && (localApl.length > 0)) { + // Use the application protocol callback when provided. + // Otherwise use the local list of application protocols. + boolean hasAPCallback = + ((engine != null && appProtocolSelectorSSLEngine != null) || + (conn != null && appProtocolSelectorSSLSocket != null)); - // Intersect the requested and the locally supported, - // and save for later. - String negotiatedValue = null; - List protocols = clientHelloALPN.getPeerAPs(); + if (!hasAPCallback) { + if ((clientHelloALPN != null) && (localApl.length > 0)) { - // Use server preference order - for (String ap : localApl) { - if (protocols.contains(ap)) { - negotiatedValue = ap; - break; + // Intersect the requested and the locally supported, + // and save for later. + String negotiatedValue = null; + List protocols = clientHelloALPN.getPeerAPs(); + + // Use server preference order + for (String ap : localApl) { + if (protocols.contains(ap)) { + negotiatedValue = ap; + break; + } } - } - if (negotiatedValue == null) { - fatalSE(Alerts.alert_no_application_protocol, - new SSLHandshakeException( - "No matching ALPN values")); - } - applicationProtocol = negotiatedValue; + if (negotiatedValue == null) { + fatalSE(Alerts.alert_no_application_protocol, + new SSLHandshakeException( + "No matching ALPN values")); + } + applicationProtocol = negotiatedValue; - } else { - applicationProtocol = ""; - } + } else { + applicationProtocol = ""; + } + } // Otherwise, applicationProtocol will be set by the callback. session = null; // forget about the current session // @@ -892,8 +901,36 @@ final class ServerHandshaker extends Handshaker { } // Prepare the ALPN response - if (applicationProtocol != null && !applicationProtocol.isEmpty()) { - m1.extensions.add(new ALPNExtension(applicationProtocol)); + if (clientHelloALPN != null) { + List peerAPs = clientHelloALPN.getPeerAPs(); + + // check for a callback function + if (hasAPCallback) { + if (conn != null) { + applicationProtocol = + appProtocolSelectorSSLSocket.apply(conn, peerAPs); + } else { + applicationProtocol = + appProtocolSelectorSSLEngine.apply(engine, peerAPs); + } + } + + // check for no-match and that the selected name was also proposed + // by the TLS peer + if (applicationProtocol == null || + (!applicationProtocol.isEmpty() && + !peerAPs.contains(applicationProtocol))) { + + fatalSE(Alerts.alert_no_application_protocol, + new SSLHandshakeException( + "No matching ALPN values")); + + } else if (!applicationProtocol.isEmpty()) { + m1.extensions.add(new ALPNExtension(applicationProtocol)); + } + } else { + // Nothing was negotiated, returned at end of the handshake + applicationProtocol = ""; } if (debug != null && Debug.isOn("handshake")) { diff --git a/jdk/src/java.base/share/native/libjava/StrictMath.c b/jdk/src/java.base/share/native/libjava/StrictMath.c index 6c5ba3151c4..32d42217c5e 100644 --- a/jdk/src/java.base/share/native/libjava/StrictMath.c +++ b/jdk/src/java.base/share/native/libjava/StrictMath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1994, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1994, 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 @@ -64,12 +64,6 @@ Java_java_lang_StrictMath_atan(JNIEnv *env, jclass unused, jdouble d) return (jdouble) jatan((double)d); } -JNIEXPORT jdouble JNICALL -Java_java_lang_StrictMath_exp(JNIEnv *env, jclass unused, jdouble d) -{ - return (jdouble) jexp((double)d); -} - JNIEXPORT jdouble JNICALL Java_java_lang_StrictMath_log(JNIEnv *env, jclass unused, jdouble d) { diff --git a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java index f26b0108fed..78d9f7fc061 100644 --- a/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java +++ b/jdk/src/java.base/unix/classes/java/lang/ProcessImpl.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -109,13 +109,9 @@ final class ProcessImpl extends Process { private String helperPath(String javahome, String osArch) { switch (this) { case SOLARIS: - if (osArch.equals("x86")) { osArch = "i386"; } - else if (osArch.equals("x86_64")) { osArch = "amd64"; } // fall through... case LINUX: case AIX: - return javahome + "/lib/" + osArch + "/jspawnhelper"; - case BSD: return javahome + "/lib/jspawnhelper"; diff --git a/jdk/src/java.base/unix/classes/module-info.java.extra b/jdk/src/java.base/unix/classes/module-info.java.extra new file mode 100644 index 00000000000..43f85b0309a --- /dev/null +++ b/jdk/src/java.base/unix/classes/module-info.java.extra @@ -0,0 +1,36 @@ +/* + * 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. 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. + */ + +// jdk.vm.compiler uses Unsafe and VM classes from jdk.internal.misc +exports jdk.internal.misc to jdk.vm.compiler; +opens jdk.internal.misc to jdk.vm.compiler; + +// jdk.vm.compiler uses com.sun.crypto.provider to generate crypto intrinsics +opens com.sun.crypto.provider to jdk.vm.compiler; + +exports jdk.internal.module to jdk.vm.compiler; + +// AOT uses jdk.internal.misc.Unsafe +exports jdk.internal.misc to jdk.aot; diff --git a/jdk/src/java.base/unix/native/libjli/java_md.h b/jdk/src/java.base/unix/native/libjli/java_md.h index 8e95aced972..f0eaa302bd3 100644 --- a/jdk/src/java.base/unix/native/libjli/java_md.h +++ b/jdk/src/java.base/unix/native/libjli/java_md.h @@ -54,10 +54,8 @@ char *FindExecName(char *program); const char *SetExecname(char **argv); const char *GetExecName(); static jboolean GetJVMPath(const char *jrepath, const char *jvmtype, - char *jvmpath, jint jvmpathsize, const char * arch, - int bitsWanted); -static jboolean GetJREPath(char *path, jint pathsize, const char * arch, - jboolean speculative); + char *jvmpath, jint jvmpathsize, int bitsWanted); +static jboolean GetJREPath(char *path, jint pathsize, jboolean speculative); #if defined(_AIX) #include "java_md_aix.h" diff --git a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c index 9099d37af00..cb9afc09822 100644 --- a/jdk/src/java.base/unix/native/libjli/java_md_solinux.c +++ b/jdk/src/java.base/unix/native/libjli/java_md_solinux.c @@ -52,9 +52,6 @@ #endif #ifdef __solaris__ -# ifndef LIBARCHNAME -# error "The macro LIBARCHNAME was not defined on the compile line" -# endif # include # include # include @@ -188,12 +185,13 @@ JvmExists(const char *path) { return JNI_FALSE; } /* - * contains a lib/$LIBARCHNAME/{server,client}/libjvm.so ? + * contains a lib/{server,client}/libjvm.so ? */ static jboolean ContainsLibJVM(const char *env) { - char clientPattern[PATH_MAX + 1]; - char serverPattern[PATH_MAX + 1]; + /* the usual suspects */ + char clientPattern[] = "lib/client"; + char serverPattern[] = "lib/server"; char *envpath; char *path; jboolean clientPatternFound; @@ -204,10 +202,6 @@ ContainsLibJVM(const char *env) { return JNI_FALSE; } - /* the usual suspects */ - JLI_Snprintf(clientPattern, PATH_MAX, "lib/%s/client", LIBARCHNAME); - JLI_Snprintf(serverPattern, PATH_MAX, "lib/%s/server", LIBARCHNAME); - /* to optimize for time, test if any of our usual suspects are present. */ clientPatternFound = JLI_StrStr(env, clientPattern) != NULL; serverPatternFound = JLI_StrStr(env, serverPattern) != NULL; @@ -322,7 +316,6 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, /* Check data model flags, and exec process, if needed */ { - char *arch = LIBARCHNAME; /* like sparc or sparcv9 */ char * jvmtype = NULL; int argc = *pargc; char **argv = *pargv; @@ -408,12 +401,12 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, jvmpath does not exist */ if (wanted == running) { /* Find out where the JRE is that we will be using. */ - if (!GetJREPath(jrepath, so_jrepath, arch, JNI_FALSE) ) { + if (!GetJREPath(jrepath, so_jrepath, JNI_FALSE) ) { JLI_ReportErrorMessage(JRE_ERROR1); exit(2); } - JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%s%sjvm.cfg", - jrepath, FILESEP, FILESEP, arch, FILESEP); + JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%sjvm.cfg", + jrepath, FILESEP, FILESEP, FILESEP); /* Find the specified JVM type */ if (ReadKnownVMs(jvmcfg, JNI_FALSE) < 1) { JLI_ReportErrorMessage(CFG_ERROR7); @@ -427,7 +420,7 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, exit(4); } - if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, arch, 0 )) { + if (!GetJVMPath(jrepath, jvmtype, jvmpath, so_jvmpath, 0 )) { JLI_ReportErrorMessage(CFG_ERROR8, jvmtype, jvmpath); exit(4); } @@ -457,8 +450,8 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, * We will set the LD_LIBRARY_PATH as follows: * * o $JVMPATH (directory portion only) - * o $JRE/lib/$LIBARCHNAME - * o $JRE/../lib/$LIBARCHNAME + * o $JRE/lib + * o $JRE/../lib * * followed by the user's previous effective LD_LIBRARY_PATH, if * any. @@ -518,10 +511,10 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, { /* New scope to declare local variable */ char *new_jvmpath = JLI_StringDup(jvmpath); new_runpath_size = ((runpath != NULL) ? JLI_StrLen(runpath) : 0) + - 2 * JLI_StrLen(jrepath) + 2 * JLI_StrLen(arch) + + 2 * JLI_StrLen(jrepath) + #ifdef AIX /* On AIX we additionally need 'jli' in the path because ld doesn't support $ORIGIN. */ - JLI_StrLen(jrepath) + JLI_StrLen(arch) + JLI_StrLen("/lib//jli:") + + JLI_StrLen(jrepath) + JLI_StrLen("/lib//jli:") + #endif JLI_StrLen(new_jvmpath) + 52; new_runpath = JLI_MemAlloc(new_runpath_size); @@ -539,17 +532,17 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, sprintf(new_runpath, LD_LIBRARY_PATH "=" "%s:" - "%s/lib/%s:" + "%s/lib:" #ifdef AIX - "%s/lib/%s/jli:" /* Needed on AIX because ld doesn't support $ORIGIN. */ + "%s/lib/jli:" /* Needed on AIX because ld doesn't support $ORIGIN. */ #endif - "%s/../lib/%s", + "%s/../lib", new_jvmpath, - jrepath, arch, + jrepath, #ifdef AIX - jrepath, arch, + jrepath, #endif - jrepath, arch + jrepath ); JLI_MemFree(new_jvmpath); @@ -640,14 +633,14 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, */ static jboolean GetJVMPath(const char *jrepath, const char *jvmtype, - char *jvmpath, jint jvmpathsize, const char * arch, int bitsWanted) + char *jvmpath, jint jvmpathsize, int bitsWanted) { struct stat s; if (JLI_StrChr(jvmtype, '/')) { JLI_Snprintf(jvmpath, jvmpathsize, "%s/" JVM_DLL, jvmtype); } else { - JLI_Snprintf(jvmpath, jvmpathsize, "%s/lib/%s/%s/" JVM_DLL, jrepath, arch, jvmtype); + JLI_Snprintf(jvmpath, jvmpathsize, "%s/lib/%s/" JVM_DLL, jrepath, jvmtype); } JLI_TraceLauncher("Does `%s' exist ... ", jvmpath); @@ -665,14 +658,14 @@ GetJVMPath(const char *jrepath, const char *jvmtype, * Find path to JRE based on .exe's location or registry settings. */ static jboolean -GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) +GetJREPath(char *path, jint pathsize, jboolean speculative) { char libjava[MAXPATHLEN]; struct stat s; if (GetApplicationHome(path, pathsize)) { /* Is JRE co-located with the application? */ - JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/%s/" JAVA_DLL, path, arch); + JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path); if (access(libjava, F_OK) == 0) { JLI_TraceLauncher("JRE path is %s\n", path); return JNI_TRUE; @@ -683,7 +676,7 @@ GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) return JNI_FALSE; } /* Does the app ship a private JRE in /jre directory? */ - JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/%s/" JAVA_DLL, path, arch); + JLI_Snprintf(libjava, sizeof(libjava), "%s/jre/lib/" JAVA_DLL, path); if (access(libjava, F_OK) == 0) { JLI_StrCat(path, "/jre"); JLI_TraceLauncher("JRE path is %s\n", path); @@ -692,7 +685,7 @@ GetJREPath(char *path, jint pathsize, const char * arch, jboolean speculative) } if (GetApplicationHomeFromDll(path, pathsize)) { - JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/%s/" JAVA_DLL, path, arch); + JLI_Snprintf(libjava, sizeof(libjava), "%s/lib/" JAVA_DLL, path); if (stat(libjava, &s) == 0) { JLI_TraceLauncher("JRE path is %s\n", path); return JNI_TRUE; @@ -858,12 +851,12 @@ void* SplashProcAddress(const char* name) { char jrePath[MAXPATHLEN]; char splashPath[MAXPATHLEN]; - if (!GetJREPath(jrePath, sizeof(jrePath), LIBARCHNAME, JNI_FALSE)) { + if (!GetJREPath(jrePath, sizeof(jrePath), JNI_FALSE)) { JLI_ReportErrorMessage(JRE_ERROR1); return NULL; } - ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s/%s", - jrePath, LIBARCHNAME, SPLASHSCREEN_SO); + ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s", + jrePath, SPLASHSCREEN_SO); if (ret >= (int) sizeof(splashPath)) { JLI_ReportErrorMessage(JRE_ERROR11); diff --git a/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c b/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c index e2e0f10fad9..385b319391b 100644 --- a/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c +++ b/jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c @@ -37,273 +37,10 @@ #include "java_net_Inet4AddressImpl.h" -#if defined(__GLIBC__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 601104)) -#define HAS_GLIBC_GETHOSTBY_R 1 -#endif - - -#if defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) +#if defined(MACOSX) extern jobjectArray lookupIfLocalhost(JNIEnv *env, const char *hostname, jboolean includeV6); - -/* Use getaddrinfo(3), which is thread safe */ -/************************************************************************ - * Inet4AddressImpl - */ - -/* - * Class: java_net_Inet4AddressImpl - * Method: getLocalHostName - * Signature: ()Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL -Java_java_net_Inet4AddressImpl_getLocalHostName(JNIEnv *env, jobject this) { - char hostname[NI_MAXHOST+1]; - - hostname[0] = '\0'; - if (gethostname(hostname, NI_MAXHOST)) { - /* Something went wrong, maybe networking is not setup? */ - strcpy(hostname, "localhost"); - } else { - struct addrinfo hints, *res; - int error; - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_CANONNAME; - hints.ai_family = AF_UNSPEC; - - error = getaddrinfo(hostname, NULL, &hints, &res); - - if (error == 0) { - /* host is known to name service */ - error = getnameinfo(res->ai_addr, - res->ai_addrlen, - hostname, - NI_MAXHOST, - NULL, - 0, - NI_NAMEREQD); - - /* if getnameinfo fails hostname is still the value - from gethostname */ - - freeaddrinfo(res); - } - } - return (*env)->NewStringUTF(env, hostname); -} - -/* - * Find an internet address for a given hostname. Note that this - * code only works for addresses of type INET. The translation - * of %d.%d.%d.%d to an address (int) occurs in java now, so the - * String "host" shouldn't *ever* be a %d.%d.%d.%d string - * - * Class: java_net_Inet4AddressImpl - * Method: lookupAllHostAddr - * Signature: (Ljava/lang/String;)[[B - */ - -JNIEXPORT jobjectArray JNICALL -Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, - jstring host) { - const char *hostname; - jobject name; - jobjectArray ret = 0; - int retLen = 0; - - int getaddrinfo_error=0; - struct addrinfo hints, *res, *resNew = NULL; - - initInetAddressIDs(env); - JNU_CHECK_EXCEPTION_RETURN(env, NULL); - - if (IS_NULL(host)) { - JNU_ThrowNullPointerException(env, "host is null"); - return 0; - } - hostname = JNU_GetStringPlatformChars(env, host, JNI_FALSE); - CHECK_NULL_RETURN(hostname, NULL); - - memset(&hints, 0, sizeof(hints)); - hints.ai_flags = AI_CANONNAME; - hints.ai_family = AF_INET; - - /* - * Workaround for Solaris bug 4160367 - if a hostname contains a - * white space then 0.0.0.0 is returned - */ - if (isspace((unsigned char)hostname[0])) { - JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", - (char *)hostname); - JNU_ReleaseStringPlatformChars(env, host, hostname); - return NULL; - } - - - getaddrinfo_error = getaddrinfo(hostname, NULL, &hints, &res); - -#ifdef MACOSX - if (getaddrinfo_error) { - // If getaddrinfo fails try getifaddrs. - ret = lookupIfLocalhost(env, hostname, JNI_FALSE); - if (ret != NULL || (*env)->ExceptionCheck(env)) { - JNU_ReleaseStringPlatformChars(env, host, hostname); - return ret; - } - } #endif - if (getaddrinfo_error) { - /* report error */ - NET_ThrowUnknownHostExceptionWithGaiError( - env, hostname, getaddrinfo_error); - JNU_ReleaseStringPlatformChars(env, host, hostname); - return NULL; - } else { - int i = 0; - struct addrinfo *itr, *last = NULL, *iterator = res; - while (iterator != NULL) { - int skip = 0; - itr = resNew; - - while (itr != NULL) { - struct sockaddr_in *addr1, *addr2; - - addr1 = (struct sockaddr_in *)iterator->ai_addr; - addr2 = (struct sockaddr_in *)itr->ai_addr; - if (addr1->sin_addr.s_addr == - addr2->sin_addr.s_addr) { - skip = 1; - break; - } - - itr = itr->ai_next; - } - - if (!skip) { - struct addrinfo *next - = (struct addrinfo*) malloc(sizeof(struct addrinfo)); - if (!next) { - JNU_ThrowOutOfMemoryError(env, "Native heap allocation failed"); - ret = NULL; - goto cleanupAndReturn; - } - memcpy(next, iterator, sizeof(struct addrinfo)); - next->ai_next = NULL; - if (resNew == NULL) { - resNew = next; - } else { - last->ai_next = next; - } - last = next; - i++; - } - iterator = iterator->ai_next; - } - - retLen = i; - iterator = resNew; - i = 0; - - name = (*env)->NewStringUTF(env, hostname); - if (IS_NULL(name)) { - goto cleanupAndReturn; - } - - ret = (*env)->NewObjectArray(env, retLen, ia_class, NULL); - if (IS_NULL(ret)) { - /* we may have memory to free at the end of this */ - goto cleanupAndReturn; - } - - while (iterator != NULL) { - /* We need 4 bytes to store ipv4 address; */ - int len = 4; - - jobject iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID); - if (IS_NULL(iaObj)) { - /* we may have memory to free at the end of this */ - ret = NULL; - goto cleanupAndReturn; - } - setInetAddress_addr(env, iaObj, ntohl(((struct sockaddr_in*)(iterator->ai_addr))->sin_addr.s_addr)); - setInetAddress_hostName(env, iaObj, name); - (*env)->SetObjectArrayElement(env, ret, retLen - i -1, iaObj); - i++; - iterator = iterator->ai_next; - } - } - -cleanupAndReturn: - { - struct addrinfo *iterator, *tmp; - iterator = resNew; - while (iterator != NULL) { - tmp = iterator; - iterator = iterator->ai_next; - free(tmp); - } - JNU_ReleaseStringPlatformChars(env, host, hostname); - } - - freeaddrinfo(res); - - return ret; - -} - -/* - * Class: java_net_Inet4AddressImpl - * Method: getHostByAddr - * Signature: (I)Ljava/lang/String; - */ -JNIEXPORT jstring JNICALL -Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this, - jbyteArray addrArray) { - jstring ret = NULL; - - char host[NI_MAXHOST+1]; - jfieldID fid; - int error = 0; - jint family; - struct sockaddr *him ; - int len = 0; - jbyte caddr[4]; - jint addr; - - struct sockaddr_in him4; - struct sockaddr *sa; - - /* - * For IPv4 addresses construct a sockaddr_in structure. - */ - (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr); - addr = ((caddr[0]<<24) & 0xff000000); - addr |= ((caddr[1] <<16) & 0xff0000); - addr |= ((caddr[2] <<8) & 0xff00); - addr |= (caddr[3] & 0xff); - memset((char *) &him4, 0, sizeof(him4)); - him4.sin_addr.s_addr = htonl(addr); - him4.sin_family = AF_INET; - sa = (struct sockaddr *) &him4; - len = sizeof(him4); - - error = getnameinfo(sa, len, host, NI_MAXHOST, NULL, 0, NI_NAMEREQD); - - if (!error) { - ret = (*env)->NewStringUTF(env, host); - } - - if (ret == NULL) { - JNU_ThrowByName(env, JNU_JAVANETPKG "UnknownHostException", NULL); - } - - return ret; - -} - -#else /* defined(_ALLBSD_SOURCE) && !defined(HAS_GLIBC_GETHOSTBY_R) */ - /* the initial size of our hostent buffers */ #ifndef NI_MAXHOST #define NI_MAXHOST 1025 @@ -405,6 +142,17 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, error = getaddrinfo(hostname, NULL, &hints, &res); +#ifdef MACOSX + if (error) { + // If getaddrinfo fails try getifaddrs, see bug 8170910. + ret = lookupIfLocalhost(env, hostname, JNI_FALSE); + if (ret != NULL || (*env)->ExceptionCheck(env)) { + JNU_ReleaseStringPlatformChars(env, host, hostname); + return ret; + } + } +#endif + if (error) { /* report error */ NET_ThrowUnknownHostExceptionWithGaiError(env, hostname, error); @@ -475,7 +223,7 @@ Java_java_net_Inet4AddressImpl_lookupAllHostAddr(JNIEnv *env, jobject this, } } - cleanupAndReturn: +cleanupAndReturn: { struct addrinfo *iterator, *tmp; iterator = resNew; @@ -535,8 +283,6 @@ Java_java_net_Inet4AddressImpl_getHostByAddr(JNIEnv *env, jobject this, return ret; } -#endif /* _ALLBSD_SOURCE */ - #define SET_NONBLOCKING(fd) { \ int flags = fcntl(fd, F_GETFL); \ flags |= O_NONBLOCK; \ diff --git a/jdk/src/java.base/windows/native/libjli/java_md.c b/jdk/src/java.base/windows/native/libjli/java_md.c index adb90a50cc4..385fc8ca36d 100644 --- a/jdk/src/java.base/windows/native/libjli/java_md.c +++ b/jdk/src/java.base/windows/native/libjli/java_md.c @@ -150,22 +150,6 @@ IsJavaw() return _isjavaw; } -/* - * Returns the arch path, to get the current arch use the - * macro GetArch, nbits here is ignored for now. - */ -const char * -GetArchPath(int nbits) -{ -#ifdef _M_AMD64 - return "amd64"; -#elif defined(_M_IA64) - return "ia64"; -#else - return "i386"; -#endif -} - /* * */ @@ -207,8 +191,8 @@ CreateExecutionEnvironment(int *pargc, char ***pargv, exit(2); } - JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%s%s%sjvm.cfg", - jrepath, FILESEP, FILESEP, (char*)GetArch(), FILESEP); + JLI_Snprintf(jvmcfg, so_jvmcfg, "%s%slib%sjvm.cfg", + jrepath, FILESEP, FILESEP); /* Find the specified JVM type */ if (ReadKnownVMs(jvmcfg, JNI_FALSE) < 1) { diff --git a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java index 36e703e9f33..7aaf0893e71 100644 --- a/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java +++ b/jdk/src/java.desktop/macosx/classes/com/apple/laf/AquaMenuBarUI.java @@ -34,10 +34,18 @@ import javax.swing.plaf.basic.BasicMenuBarUI; import sun.lwawt.macosx.LWCToolkit; import sun.security.action.GetBooleanAction; -import sun.security.action.GetPropertyAction; // MenuBar implementation for Mac L&F public class AquaMenuBarUI extends BasicMenuBarUI implements ScreenMenuBarProvider { + + static { + java.security.AccessController.doPrivileged( + (java.security.PrivilegedAction) () -> { + System.loadLibrary("osxui"); + return null; + }); + } + // Utilities public void uninstallUI(final JComponent c) { if (fScreenMenuBar != null) { @@ -134,7 +142,7 @@ public class AquaMenuBarUI extends BasicMenuBarUI implements ScreenMenuBarProvid ScreenMenuBar fScreenMenuBar; boolean useScreenMenuBar = getScreenMenuBarProperty(); - static boolean getScreenMenuBarProperty() { + public static boolean getScreenMenuBarProperty() { // Do not allow AWT to set the screen menu bar if it's embedded in another UI toolkit if (LWCToolkit.isEmbedded()) return false; if (AccessController.doPrivileged( diff --git a/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java b/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java index 0c505b28576..45f48328717 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java +++ b/jdk/src/java.desktop/macosx/classes/sun/font/CFontManager.java @@ -141,12 +141,24 @@ public final class CFontManager extends SunFontManager { } } - protected void registerFontsInDir(String dirName, boolean useJavaRasterizer, int fontRank, boolean defer, boolean resolveSymLinks) { - loadNativeDirFonts(dirName); + protected void registerFontsInDir(final String dirName, boolean useJavaRasterizer, + int fontRank, boolean defer, boolean resolveSymLinks) { + + String[] files = AccessController.doPrivileged((PrivilegedAction) () -> { + return new File(dirName).list(getTrueTypeFilter()); + }); + + if (files == null) { + return; + } else { + for (String f : files) { + loadNativeDirFonts(dirName+File.separator+f); + } + } super.registerFontsInDir(dirName, useJavaRasterizer, fontRank, defer, resolveSymLinks); } - private native void loadNativeDirFonts(String dirName); + private native void loadNativeDirFonts(String fontPath); private native void loadNativeFonts(); void registerFont(String fontName, String fontFamilyName) { diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java index d93b4bbcf21..d0c8275dc7c 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java +++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/CPlatformWindow.java @@ -33,11 +33,14 @@ import java.awt.Dialog.ModalityType; import java.awt.event.*; import java.beans.*; import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Arrays; import javax.swing.*; import sun.awt.*; import sun.awt.AWTAccessor.ComponentAccessor; +import sun.awt.AWTAccessor.WindowAccessor; import sun.java2d.SurfaceData; import sun.java2d.opengl.CGLSurfaceData; import sun.lwawt.*; @@ -1031,6 +1034,11 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo return !peer.isSimpleWindow() && target.getFocusableWindowState(); } + private boolean isBlocked() { + LWWindowPeer blocker = (peer != null) ? peer.getBlocker() : null; + return (blocker != null); + } + /* * An utility method for the support of the auto request focus. * Updates the focusable state of the window under certain @@ -1063,29 +1071,70 @@ public class CPlatformWindow extends CFRetainedResource implements PlatformWindo return true; } + private boolean isOneOfOwnersOrSelf(CPlatformWindow window) { + while (window != null) { + if (this == window) { + return true; + } + window = window.owner; + } + return false; + } + + private CPlatformWindow getRootOwner() { + CPlatformWindow rootOwner = this; + while (rootOwner.owner != null) { + rootOwner = rootOwner.owner; + } + return rootOwner; + } + private void orderAboveSiblings() { - if (owner == null) { - return; + // Recursively pop up the windows from the very bottom, (i.e. root owner) so that + // the windows are ordered above their nearest owner; ancestors of the window, + // which is going to become 'main window', are placed above their siblings. + CPlatformWindow rootOwner = getRootOwner(); + if (rootOwner.isVisible()) { + CWrapper.NSWindow.orderFront(rootOwner.getNSWindowPtr()); } + final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor(); + orderAboveSiblingsImpl(windowAccessor.getOwnedWindows(rootOwner.target)); + } - // NOTE: the logic will fail if we have a hierarchy like: - // visible root owner - // invisible owner - // visible dialog - // However, this is an unlikely scenario for real life apps - if (owner.isVisible()) { - // Recursively pop up the windows from the very bottom so that only - // the very top-most one becomes the main window - owner.orderAboveSiblings(); + private void orderAboveSiblingsImpl(Window[] windows) { + ArrayList childWindows = new ArrayList(); - // Order the window to front of the stack of child windows - final long nsWindowSelfPtr = getNSWindowPtr(); - final long nsWindowOwnerPtr = owner.getNSWindowPtr(); - CWrapper.NSWindow.orderFront(nsWindowOwnerPtr); - CWrapper.NSWindow.orderWindow(nsWindowSelfPtr, CWrapper.NSWindow.NSWindowAbove, nsWindowOwnerPtr); + final ComponentAccessor componentAccessor = AWTAccessor.getComponentAccessor(); + final WindowAccessor windowAccessor = AWTAccessor.getWindowAccessor(); + + // Go through the list of windows and perform ordering. + for (Window w : windows) { + final Object p = componentAccessor.getPeer(w); + if (p instanceof LWWindowPeer) { + CPlatformWindow pw = (CPlatformWindow)((LWWindowPeer)p).getPlatformWindow(); + if (pw != null && pw.isVisible()) { + // If the window is one of ancestors of 'main window' or is going to become main by itself, + // the window should be ordered above its siblings; otherwise the window is just ordered + // above its nearest parent. + if (pw.isOneOfOwnersOrSelf(this)) { + CWrapper.NSWindow.orderFront(pw.getNSWindowPtr()); + } else { + CWrapper.NSWindow.orderWindow(pw.getNSWindowPtr(), CWrapper.NSWindow.NSWindowAbove, + pw.owner.getNSWindowPtr()); + } + pw.applyWindowLevel(w); + } + } + // Retrieve the child windows for each window from the list and store them for future use. + // Note: we collect data about child windows even for invisible owners, since they may have + // visible children. + childWindows.addAll(Arrays.asList(windowAccessor.getOwnedWindows(w))); + } + // If some windows, which have just been ordered, have any child windows, let's start new iteration + // and order these child windows. + if (!childWindows.isEmpty()) { + orderAboveSiblingsImpl(childWindows.toArray(new Window[0])); } - - applyWindowLevel(target); } protected void applyWindowLevel(Window target) { diff --git a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java index 309bc8ca8b1..9c463003a93 100644 --- a/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java +++ b/jdk/src/java.desktop/macosx/classes/sun/lwawt/macosx/LWCToolkit.java @@ -25,6 +25,7 @@ package sun.lwawt.macosx; +import com.apple.laf.AquaMenuBarUI; import java.awt.peer.TaskbarPeer; import java.awt.*; import java.awt.datatransfer.Clipboard; @@ -43,6 +44,7 @@ import java.security.*; import java.util.*; import java.util.concurrent.Callable; import java.net.MalformedURLException; +import javax.swing.UIManager; import sun.awt.*; import sun.awt.datatransfer.DataTransferer; @@ -935,4 +937,13 @@ public final class LWCToolkit extends LWToolkit { protected PlatformWindow getPlatformWindowUnderMouse() { return CPlatformWindow.nativeGetTopmostPlatformWindowUnderMouse(); } + + @Override + public void updateScreenMenuBarUI() { + if (AquaMenuBarUI.getScreenMenuBarProperty()) { + UIManager.put("MenuBarUI", "com.apple.laf.AquaMenuBarUI"); + } else { + UIManager.put("MenuBarUI", null); + } + } } diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m index 8b76294c32d..ca983d031c1 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m @@ -430,7 +430,22 @@ AWT_ASSERT_APPKIT_THREAD; [super dealloc]; } -// Tests wheather the corresponding Java paltform window is visible or not +// Tests whether window is blocked by modal dialog/window +- (BOOL) isBlocked { + BOOL isBlocked = NO; + + JNIEnv *env = [ThreadUtilities getJNIEnv]; + jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env]; + if (platformWindow != NULL) { + static JNF_MEMBER_CACHE(jm_isBlocked, jc_CPlatformWindow, "isBlocked", "()Z"); + isBlocked = JNFCallBooleanMethod(env, platformWindow, jm_isBlocked) == JNI_TRUE ? YES : NO; + (*env)->DeleteLocalRef(env, platformWindow); + } + + return isBlocked; +} + +// Tests whether the corresponding Java platform window is visible or not + (BOOL) isJavaPlatformWindowVisible:(NSWindow *)window { BOOL isVisible = NO; @@ -454,8 +469,9 @@ AWT_ASSERT_APPKIT_THREAD; - (void) orderChildWindows:(BOOL)focus { AWT_ASSERT_APPKIT_THREAD; - if (self.isMinimizing) { + if (self.isMinimizing || [self isBlocked]) { // Do not perform any ordering, if iconify is in progress + // or the window is blocked by a modal window return; } @@ -809,18 +825,20 @@ AWT_ASSERT_APPKIT_THREAD; - (void)sendEvent:(NSEvent *)event { if ([event type] == NSLeftMouseDown || [event type] == NSRightMouseDown || [event type] == NSOtherMouseDown) { - // Move parent windows to front and make sure that a child window is displayed - // in front of its nearest parent. - if (self.ownerWindow != nil) { - JNIEnv *env = [ThreadUtilities getJNIEnvUncached]; - jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env]; - if (platformWindow != NULL) { - static JNF_MEMBER_CACHE(jm_orderAboveSiblings, jc_CPlatformWindow, "orderAboveSiblings", "()V"); - JNFCallVoidMethod(env,platformWindow, jm_orderAboveSiblings); - (*env)->DeleteLocalRef(env, platformWindow); + if ([self isBlocked]) { + // Move parent windows to front and make sure that a child window is displayed + // in front of its nearest parent. + if (self.ownerWindow != nil) { + JNIEnv *env = [ThreadUtilities getJNIEnvUncached]; + jobject platformWindow = [self.javaPlatformWindow jObjectWithEnv:env]; + if (platformWindow != NULL) { + static JNF_MEMBER_CACHE(jm_orderAboveSiblings, jc_CPlatformWindow, "orderAboveSiblings", "()V"); + JNFCallVoidMethod(env,platformWindow, jm_orderAboveSiblings); + (*env)->DeleteLocalRef(env, platformWindow); + } } + [self orderChildWindows:YES]; } - [self orderChildWindows:YES]; NSPoint p = [NSEvent mouseLocation]; NSRect frame = [self.nsWindow frame]; diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m index ac82ca85d5a..bcf7893005c 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m @@ -115,19 +115,18 @@ if (keyWindow != nil) { return; } - } - else { - static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem"); - static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event) - - NSUInteger modifiers = [currEvent modifierFlags]; - jint javaModifiers = NsKeyModifiersToJavaModifiers(modifiers, NO); - - JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event) - } + } + + static JNF_CLASS_CACHE(jc_CMenuItem, "sun/lwawt/macosx/CMenuItem"); + static JNF_MEMBER_CACHE(jm_handleAction, jc_CMenuItem, "handleAction", "(JI)V"); // AWT_THREADING Safe (event) + + NSUInteger modifiers = [currEvent modifierFlags]; + jint javaModifiers = NsKeyModifiersToJavaModifiers(modifiers, NO); + + JNFCallVoidMethod(env, fPeer, jm_handleAction, UTC(currEvent), javaModifiers); // AWT_THREADING Safe (event) } JNF_COCOA_EXIT(env); - + } - (void) setJavaLabel:(NSString *)theLabel shortcut:(NSString *)theKeyEquivalent modifierMask:(jint)modifiers { diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m index d374e5a1241..bca21021347 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/AWTFont.m @@ -404,19 +404,14 @@ Java_sun_font_CFontManager_loadNativeDirFonts { JNF_COCOA_ENTER(env); - NSString *nsFilePath = JNFJavaToNSString(env, filename); - - FSRef iFile; - OSStatus status = CreateFSRef(&iFile, nsFilePath); - - if (status == noErr) { - ATSFontContainerRef oContainer; - status = ATSFontActivateFromFileReference(&iFile, kATSFontContextLocal, - kATSFontFormatUnspecified, - NULL, kNilOptions, - &oContainer); - } - + NSString *path = JNFJavaToNSString(env, filename); + NSURL *url = [NSURL fileURLWithPath:(NSString *)path]; + bool res = CTFontManagerRegisterFontsForURL((CFURLRef)url, kCTFontManagerScopeProcess, nil); +#ifdef DEBUG + NSLog(@"path is : %@", (NSString*)path); + NSLog(@"url is : %@", (NSString*)url); + printf("res is %d\n", res); +#endif JNF_COCOA_EXIT(env); } diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m index 79cdf5bf7a3..1d9269fc57f 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CGGlyphImages.m @@ -591,7 +591,7 @@ CGGI_CreateImageForGlyph static inline GlyphInfo * CGGI_CreateImageForUnicode (CGGI_GlyphCanvas *canvas, const AWTStrike *strike, - const CGGI_RenderingMode *mode, const UniChar uniChar) + const CGGI_RenderingMode *mode, const UnicodeScalarValue uniChar) { // save the state of the world CGContextSaveGState(canvas->context); @@ -668,7 +668,7 @@ CGGI_FillImagesForGlyphsWithSizedCanvas(CGGI_GlyphCanvas *canvas, const AWTStrike *strike, const CGGI_RenderingMode *mode, jlong glyphInfos[], - const UniChar uniChars[], + const UnicodeScalarValue uniChars[], const CGGlyph glyphs[], const CFIndex len) { @@ -720,7 +720,7 @@ static NSString *threadLocalLCDCanvasKey = static inline void CGGI_FillImagesForGlyphs(jlong *glyphInfos, const AWTStrike *strike, const CGGI_RenderingMode *mode, - const UniChar uniChars[], const CGGlyph glyphs[], + const UnicodeScalarValue uniChars[], const CGGlyph glyphs[], const size_t maxWidth, const size_t maxHeight, const CFIndex len) { @@ -767,7 +767,7 @@ CGGI_FillImagesForGlyphs(jlong *glyphInfos, const AWTStrike *strike, static inline void CGGI_CreateGlyphInfos(jlong *glyphInfos, const AWTStrike *strike, const CGGI_RenderingMode *mode, - const UniChar uniChars[], const CGGlyph glyphs[], + const UnicodeScalarValue uniChars[], const CGGlyph glyphs[], CGSize advances[], CGRect bboxes[], const CFIndex len) { AWTFont *font = strike->fAWTFont; @@ -817,7 +817,7 @@ CGGI_CreateGlyphsAndScanForComplexities(jlong *glyphInfos, const AWTStrike *strike, const CGGI_RenderingMode *mode, jint rawGlyphCodes[], - UniChar uniChars[], CGGlyph glyphs[], + UnicodeScalarValue uniChars[], CGGlyph glyphs[], CGSize advances[], CGRect bboxes[], const CFIndex len) { @@ -860,7 +860,7 @@ CGGlyphImages_GetGlyphImagePtrs(jlong glyphInfos[], CGRect bboxes[len]; CGSize advances[len]; CGGlyph glyphs[len]; - UniChar uniChars[len]; + UnicodeScalarValue uniChars[len]; CGGI_CreateGlyphsAndScanForComplexities(glyphInfos, strike, &mode, rawGlyphCodes, uniChars, glyphs, @@ -871,7 +871,7 @@ CGGlyphImages_GetGlyphImagePtrs(jlong glyphInfos[], // just do one malloc, and carve it up for all the buffers void *buffer = malloc(sizeof(CGRect) * sizeof(CGSize) * - sizeof(CGGlyph) * sizeof(UniChar) * len); + sizeof(CGGlyph) * sizeof(UnicodeScalarValue) * len); if (buffer == NULL) { [[NSException exceptionWithName:NSMallocException reason:@"Failed to allocate memory for the temporary glyph strike and measurement buffers." userInfo:nil] raise]; @@ -880,7 +880,7 @@ CGGlyphImages_GetGlyphImagePtrs(jlong glyphInfos[], CGRect *bboxes = (CGRect *)(buffer); CGSize *advances = (CGSize *)(bboxes + sizeof(CGRect) * len); CGGlyph *glyphs = (CGGlyph *)(advances + sizeof(CGGlyph) * len); - UniChar *uniChars = (UniChar *)(glyphs + sizeof(UniChar) * len); + UnicodeScalarValue *uniChars = (UnicodeScalarValue *)(glyphs + sizeof(UnicodeScalarValue) * len); CGGI_CreateGlyphsAndScanForComplexities(glyphInfos, strike, &mode, rawGlyphCodes, uniChars, glyphs, diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h index a0ede94846c..cbd3dc5923b 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.h @@ -32,7 +32,9 @@ #pragma mark --- CoreText Support --- #define HI_SURROGATE_START 0xD800 +#define HI_SURROGATE_END 0xDBFF #define LO_SURROGATE_START 0xDC00 +#define LO_SURROGATE_END 0xDFFF /* * Transform Unicode characters into glyphs. diff --git a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m index 1bcd9f55102..5663b3084ac 100644 --- a/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m +++ b/jdk/src/java.desktop/macosx/native/libawt_lwawt/font/CoreTextSupport.m @@ -103,24 +103,34 @@ void CTS_GetGlyphsAsIntsForCharacters size_t i; for (i = 0; i < count; i++) { + UniChar unicode = unicodes[i]; + UniChar nextUnicode = (i+1) < count ? unicodes[i+1] : 0; + bool surrogatePair = unicode >= HI_SURROGATE_START && unicode <= HI_SURROGATE_END + && nextUnicode >= LO_SURROGATE_START && nextUnicode <= LO_SURROGATE_END; + CGGlyph glyph = glyphs[i]; if (glyph > 0) { glyphsAsInts[i] = glyph; + if (surrogatePair) i++; continue; } - UniChar unicode = unicodes[i]; - const CTFontRef fallback = JRSFontCreateFallbackFontForCharacters((CTFontRef)font->fFont, &unicode, 1); + const CTFontRef fallback = JRSFontCreateFallbackFontForCharacters((CTFontRef)font->fFont, &unicodes[i], + surrogatePair ? 2 : 1); if (fallback) { - CTFontGetGlyphsForCharacters(fallback, &unicode, &glyph, 1); + CTFontGetGlyphsForCharacters(fallback, &unicodes[i], &glyphs[i], surrogatePair ? 2 : 1); + glyph = glyphs[i]; CFRelease(fallback); } if (glyph > 0) { - glyphsAsInts[i] = -unicode; // set the glyph code to the negative unicode value + int codePoint = surrogatePair ? (((int)(unicode - HI_SURROGATE_START)) << 10) + + nextUnicode - LO_SURROGATE_START + 0x10000 : unicode; + glyphsAsInts[i] = -codePoint; // set the glyph code to the negative unicode value } else { glyphsAsInts[i] = 0; // CoreText couldn't find a glyph for this character either } + if (surrogatePair) i++; } } @@ -158,8 +168,18 @@ CTFontRef CTS_CopyCTFallbackFontAndGlyphForJavaGlyphCode return (CTFontRef)font->fFont; } - UTF16Char character = -glyphCode; - return CTS_CopyCTFallbackFontAndGlyphForUnicode(font, &character, glyphRef, 1); + int codePoint = -glyphCode; + if (codePoint >= 0x10000) { + UTF16Char chars[2]; + CGGlyph glyphs[2]; + CTS_BreakupUnicodeIntoSurrogatePairs(codePoint, chars); + CTFontRef result = CTS_CopyCTFallbackFontAndGlyphForUnicode(font, chars, glyphs, 2); + *glyphRef = glyphs[0]; + return result; + } else { + UTF16Char character = codePoint; + return CTS_CopyCTFallbackFontAndGlyphForUnicode(font, &character, glyphRef, 1); + } } // Breakup a 32 bit unicode value into the component surrogate pairs diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java index 1c194fb3b95..2b94d15317f 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java @@ -541,10 +541,10 @@ public class TIFFIFD extends TIFFDirectory { } // Stream position initially at beginning, left at end - // if ignoreUnknownFields is true, do not load fields for which + // if readUnknownTags is false, do not load fields for which // a tag cannot be found in an allowed TagSet. public void initialize(ImageInputStream stream, boolean isPrimaryIFD, - boolean ignoreUnknownFields) throws IOException { + boolean ignoreMetadata, boolean readUnknownTags) throws IOException { removeTIFFFields(); @@ -553,10 +553,16 @@ public class TIFFIFD extends TIFFDirectory { List tagSetList = getTagSetList(); + // Configure essential tag variables if this is the primary IFD and + // either all metadata are being ignored, or metadata are not being + // ignored but both unknown tags are being ignored and the tag set + // list does not contain the baseline tags. boolean ensureEssentialTags = false; TIFFTagSet baselineTagSet = null; - if (isPrimaryIFD && ignoreUnknownFields - && !tagSetList.contains(BaselineTIFFTagSet.getInstance())) { + if (isPrimaryIFD && + (ignoreMetadata || + (!readUnknownTags && + !tagSetList.contains(BaselineTIFFTagSet.getInstance())))) { ensureEssentialTags = true; initializeEssentialTags(); baselineTagSet = BaselineTIFFTagSet.getInstance(); @@ -590,9 +596,12 @@ public class TIFFIFD extends TIFFDirectory { tag = baselineTagSet.getTag(tagNumber); } - // Ignore unknown fields, fields with unknown type, and fields + // Ignore non-essential fields, unknown fields unless forcibly + // being read, fields with unknown type, and fields // with count out of int range. - if((tag == null && ignoreUnknownFields) + if((ignoreMetadata && + (!ensureEssentialTags || !essentialTags.contains(tagNumber))) + || (tag == null && !readUnknownTags) || (tag != null && !tag.isDataTypeOK(type)) || longCount > Integer.MAX_VALUE) { // Skip the value/offset so as to leave the stream @@ -701,7 +710,8 @@ public class TIFFIFD extends TIFFDirectory { tagSets.add(tag.getTagSet()); TIFFIFD subIFD = new TIFFIFD(tagSets); - subIFD.initialize(stream, false, ignoreUnknownFields); + subIFD.initialize(stream, false, ignoreMetadata, + readUnknownTags); TIFFField f = new TIFFField(tag, type, e.offset, subIFD); addTIFFField(f); } else { diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java index a1455315331..ef68d134892 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java @@ -82,12 +82,13 @@ public class TIFFImageMetadata extends IIOMetadata { } public void initializeFromStream(ImageInputStream stream, - boolean ignoreUnknownFields) + boolean ignoreMetadata, + boolean readUnknownTags) throws IOException { - rootIFD.initialize(stream, true, ignoreUnknownFields); + rootIFD.initialize(stream, true, ignoreMetadata, readUnknownTags); } - public void addShortOrLongField(int tagNumber, int value) { + public void addShortOrLongField(int tagNumber, long value) { TIFFField field = new TIFFField(rootIFD.getTag(tagNumber), value); rootIFD.addTIFFField(field); } diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java index 91778e7e097..3ccc3cd9233 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageReader.java @@ -305,16 +305,19 @@ public class TIFFImageReader extends ImageReader { try { // Create an object to store the image metadata List tagSets; + boolean readUnknownTags = false; if (imageReadParam instanceof TIFFImageReadParam) { - tagSets - = ((TIFFImageReadParam) imageReadParam).getAllowedTagSets(); + TIFFImageReadParam tp = (TIFFImageReadParam)imageReadParam; + tagSets = tp.getAllowedTagSets(); + readUnknownTags = tp.getReadUnknownTags(); } else { tagSets = new ArrayList(1); tagSets.add(BaselineTIFFTagSet.getInstance()); } this.imageMetadata = new TIFFImageMetadata(tagSets); - imageMetadata.initializeFromStream(stream, ignoreMetadata); + imageMetadata.initializeFromStream(stream, ignoreMetadata, + readUnknownTags); } catch (IIOException iioe) { throw iioe; } catch (IOException ioe) { diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java index 8e0942d75b7..6d27c01bb93 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java @@ -3015,7 +3015,7 @@ public class TIFFImageWriter extends ImageWriter { List tagSets = new ArrayList(1); tagSets.add(BaselineTIFFTagSet.getInstance()); TIFFIFD rootIFD = new TIFFIFD(tagSets); - rootIFD.initialize(stream, true, true); + rootIFD.initialize(stream, true, false, false); stream.reset(); return rootIFD; diff --git a/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java b/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java index 470ad9a17d0..f966a767459 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java +++ b/jdk/src/java.desktop/share/classes/java/awt/CheckboxMenuItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -22,17 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; import java.awt.peer.CheckboxMenuItemPeer; -import java.awt.event.*; -import java.util.EventListener; -import java.io.ObjectOutputStream; -import java.io.ObjectInputStream; import java.io.IOException; -import javax.accessibility.*; -import sun.awt.AWTAccessor; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.EventListener; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleAction; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleValue; + +import sun.awt.AWTAccessor; /** * This class represents a check box that can be included in a menu. @@ -43,7 +50,8 @@ import sun.awt.AWTAccessor; * of {@code CheckBoxMenuItem}: *

* Menu labeled Examples, containing items Basic, Simple, Check, and More Examples. The Check item is a CheckBoxMenuItem instance, in the off state. *

* The item labeled {@code Check} shows a check box menu item @@ -84,9 +92,9 @@ public class CheckboxMenuItem extends MenuItem implements ItemSelectable, Access * @see #getState() * @see #setState(boolean) */ - boolean state = false; + private volatile boolean state; - transient ItemListener itemListener; + private transient volatile ItemListener itemListener; private static final String base = "chkmenuitem"; private static int nameCounter = 0; diff --git a/jdk/src/java.desktop/share/classes/java/awt/Menu.java b/jdk/src/java.desktop/share/classes/java/awt/Menu.java index 70b5ee1f25f..4bd1bba8a0e 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/Menu.java +++ b/jdk/src/java.desktop/share/classes/java/awt/Menu.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -22,15 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.KeyEvent; +import java.awt.peer.MenuPeer; import java.io.IOException; import java.io.ObjectInputStream; -import java.util.Vector; import java.util.Enumeration; -import java.awt.peer.MenuPeer; -import java.awt.event.KeyEvent; -import javax.accessibility.*; +import java.util.Vector; + +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; + import sun.awt.AWTAccessor; /** @@ -78,7 +83,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * @serial * @see #countItems() */ - Vector items = new Vector<>(); + private final Vector items = new Vector<>(); /** * This field indicates whether the menu has the @@ -92,7 +97,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * @serial * @see #isTearOff() */ - boolean tearOff; + private final boolean tearOff; /** * This field will be set to {@code true} @@ -102,7 +107,7 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { * * @serial */ - boolean isHelpMenu; + volatile boolean isHelpMenu; private static final String base = "menu"; private static int nameCounter = 0; @@ -415,8 +420,8 @@ public class Menu extends MenuItem implements MenuContainer, Accessible { if (peer != null) { peer.delItem(index); mi.removeNotify(); - mi.parent = null; } + mi.parent = null; } } diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java index 4a57b0dbf2c..8d0d51d6360 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java +++ b/jdk/src/java.desktop/share/classes/java/awt/MenuBar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -22,16 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.KeyEvent; +import java.awt.peer.MenuBarPeer; import java.io.IOException; import java.io.ObjectInputStream; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; + +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; + import sun.awt.AWTAccessor; -import java.awt.peer.MenuBarPeer; -import java.awt.event.KeyEvent; -import javax.accessibility.*; /** * The {@code MenuBar} class encapsulates the platform's @@ -94,7 +99,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible * @serial * @see #countMenus() */ - Vector

menus = new Vector<>(); + private final Vector menus = new Vector<>(); /** * This menu is a special menu dedicated to @@ -106,7 +111,7 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible * @see #getHelpMenu() * @see #setHelpMenu(Menu) */ - Menu helpMenu; + private volatile Menu helpMenu; private static final String base = "menubar"; private static int nameCounter = 0; @@ -252,8 +257,8 @@ public class MenuBar extends MenuComponent implements MenuContainer, Accessible if (peer != null) { peer.delMenu(index); m.removeNotify(); - m.parent = null; } + m.parent = null; if (helpMenu == m) { helpMenu = null; m.isHelpMenu = false; diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java b/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java index c6097397c98..fb3c72c617e 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java +++ b/jdk/src/java.desktop/share/classes/java/awt/MenuComponent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -22,21 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; -import java.awt.peer.MenuComponentPeer; import java.awt.event.ActionEvent; +import java.awt.peer.MenuComponentPeer; import java.io.IOException; import java.io.ObjectInputStream; -import sun.awt.AppContext; -import sun.awt.AWTAccessor; -import sun.awt.ComponentFactory; - -import javax.accessibility.*; - import java.security.AccessControlContext; import java.security.AccessController; +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleComponent; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleSelection; +import javax.accessibility.AccessibleState; +import javax.accessibility.AccessibleStateSet; + +import sun.awt.AWTAccessor; +import sun.awt.AppContext; +import sun.awt.ComponentFactory; + /** * The abstract class {@code MenuComponent} is the superclass * of all menu-related components. In this respect, the class @@ -60,13 +67,13 @@ public abstract class MenuComponent implements java.io.Serializable { } transient volatile MenuComponentPeer peer; - transient MenuContainer parent; + transient volatile MenuContainer parent; /** * The {@code AppContext} of the {@code MenuComponent}. * This is set in the constructor and never changes. */ - transient AppContext appContext; + private transient volatile AppContext appContext; /** * The menu component's font. This value can be @@ -77,7 +84,7 @@ public abstract class MenuComponent implements java.io.Serializable { * @see #setFont(Font) * @see #getFont() */ - volatile Font font; + private volatile Font font; /** * The menu component's name, which defaults to {@code null}. @@ -85,7 +92,7 @@ public abstract class MenuComponent implements java.io.Serializable { * @see #getName() * @see #setName(String) */ - private String name; + private volatile String name; /** * A variable to indicate whether a name is explicitly set. @@ -94,14 +101,14 @@ public abstract class MenuComponent implements java.io.Serializable { * @serial * @see #setName(String) */ - private boolean nameExplicitlySet = false; + private volatile boolean nameExplicitlySet; /** * Defaults to {@code false}. * @serial * @see #dispatchEvent(AWTEvent) */ - boolean newEventsOnly = false; + volatile boolean newEventsOnly; /* * The menu's AccessControlContext. diff --git a/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java b/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java index 3a70fe2bee0..e0611ccba31 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java +++ b/jdk/src/java.desktop/share/classes/java/awt/MenuItem.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 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 @@ -22,15 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + package java.awt; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; import java.awt.peer.MenuItemPeer; -import java.awt.event.*; -import java.util.EventListener; -import java.io.ObjectOutputStream; -import java.io.ObjectInputStream; import java.io.IOException; -import javax.accessibility.*; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.util.EventListener; + +import javax.accessibility.Accessible; +import javax.accessibility.AccessibleAction; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; +import javax.accessibility.AccessibleValue; + import sun.awt.AWTAccessor; /** @@ -111,7 +121,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #isEnabled() * @see #setEnabled(boolean) */ - boolean enabled = true; + private volatile boolean enabled = true; /** * {@code label} is the label of a menu item. @@ -121,7 +131,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #getLabel() * @see #setLabel(String) */ - String label; + volatile String label; /** * This field indicates the command that has been issued @@ -134,7 +144,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #setActionCommand(String) * @see #getActionCommand() */ - String actionCommand; + private volatile String actionCommand; /** * The eventMask is ONLY set by subclasses via enableEvents. @@ -144,9 +154,9 @@ public class MenuItem extends MenuComponent implements Accessible { * * @serial */ - long eventMask; + volatile long eventMask; - transient ActionListener actionListener; + private transient volatile ActionListener actionListener; /** * A sequence of key stokes that ia associated with @@ -160,7 +170,7 @@ public class MenuItem extends MenuComponent implements Accessible { * @see #setShortcut(MenuShortcut) * @see #deleteShortcut() */ - private MenuShortcut shortcut = null; + private volatile MenuShortcut shortcut; private static final String base = "menuitem"; private static int nameCounter = 0; diff --git a/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java b/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java index 253351f164a..48460749d6e 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java +++ b/jdk/src/java.desktop/share/classes/java/awt/PopupMenu.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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,8 +26,9 @@ package java.awt; import java.awt.peer.PopupMenuPeer; -import javax.accessibility.*; +import javax.accessibility.AccessibleContext; +import javax.accessibility.AccessibleRole; import sun.awt.AWTAccessor; @@ -48,7 +49,7 @@ public class PopupMenu extends Menu { private static final String base = "popup"; static int nameCounter = 0; - transient boolean isTrayIconPopup = false; + transient volatile boolean isTrayIconPopup; static { AWTAccessor.setPopupMenuAccessor( diff --git a/jdk/src/java.desktop/share/classes/java/awt/Window.java b/jdk/src/java.desktop/share/classes/java/awt/Window.java index ed7d63ae154..8d122be3522 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/Window.java +++ b/jdk/src/java.desktop/share/classes/java/awt/Window.java @@ -4122,6 +4122,10 @@ public class Window extends Container implements Accessible { public void setTrayIconWindow(Window w, boolean isTrayIconWindow) { w.isTrayIconWindow = isTrayIconWindow; } + + public Window[] getOwnedWindows(Window w) { + return w.getOwnedWindows_NoClientCode(); + } }); // WindowAccessor } // static diff --git a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java index 7d858548ddb..63ceb3f1706 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java +++ b/jdk/src/java.desktop/share/classes/java/awt/dnd/DragSourceContext.java @@ -279,7 +279,7 @@ public class DragSourceContext } /** - * Sets the cursor for this drag operation to the specified + * Sets the custom cursor for this drag operation to the specified * {@code Cursor}. If the specified {@code Cursor} * is {@code null}, the default drag cursor behavior is * activated for this drag operation, otherwise it is deactivated. @@ -298,9 +298,11 @@ public class DragSourceContext } /** - * Returns the current drag {@code Cursor}. + * Returns the current custom drag {@code Cursor}. * - * @return the current drag {@code Cursor} + * @return the current custom drag {@code Cursor}, if it was set + * otherwise returns {@code null}. + * @see #setCursor */ public Cursor getCursor() { return cursor; } diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java b/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java index 9d190a92e2c..89c43879ac3 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java +++ b/jdk/src/java.desktop/share/classes/java/awt/image/AbstractMultiResolutionImage.java @@ -64,27 +64,71 @@ import java.awt.Image; public abstract class AbstractMultiResolutionImage extends java.awt.Image implements MultiResolutionImage { + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getWidth(observer)}. + * + * @return the width of the base image, or -1 if the width is not yet known + * @see #getBaseImage() + * + * @since 9 + */ @Override public int getWidth(ImageObserver observer) { return getBaseImage().getWidth(observer); } + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getHeight(observer)}. + * + * @return the height of the base image, or -1 if the height is not yet known + * @see #getBaseImage() + * + * @since 9 + */ @Override public int getHeight(ImageObserver observer) { return getBaseImage().getHeight(observer); } + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getSource()}. + * + * @return the image producer that produces the pixels for the base image + * @see #getBaseImage() + * + * @since 9 + */ @Override public ImageProducer getSource() { return getBaseImage().getSource(); } + /** + * As per the contract of the base {@code Image#getGraphics()} method, + * this implementation will always throw {@code UnsupportedOperationException} + * since only off-screen images can return a {@code Graphics} object. + * + * @return throws {@code UnsupportedOperationException} + * @throws UnsupportedOperationException this method is not supported + */ @Override public Graphics getGraphics() { throw new UnsupportedOperationException("getGraphics() not supported" + " on Multi-Resolution Images"); } + /** + * This method simply delegates to the same method on the base image and + * it is equivalent to: {@code getBaseImage().getProperty(name, observer)}. + * + * @return the value of the named property in the base image + * @see #getBaseImage() + * + * @since 9 + */ @Override public Object getProperty(String name, ImageObserver observer) { return getBaseImage().getProperty(name, observer); diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html index 2fc49cfec0f..5cff3659bf3 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html +++ b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/doc-files/tiff_metadata.html @@ -216,22 +216,27 @@ second on the inferred color space.

Metadata Issues

-By default all fields in the TIFF image file directory (IFD) are loaded into -the native image metadata object. In cases where the IFD includes fields which -contain large amounts of data this could be very inefficient. Which fields -are loaded may be controlled by setting which TIFF tags the reader is allowed -to recognize and whether it is ignoring metadata. The reader is informed to -disregard metadata as usual via the ignoreMetadata parameter of +By default all recognized fields in the TIFF image file directory (IFD) are +loaded into the native image metadata object. Which fields are loaded may be +controlled by setting which TIFF tags the reader is allowed to recognize, +whether to read fields with unrecognized tags, and whether to ignore all +metadata. The reader is informed to disregard all metadata as usual via the +ignoreMetadata parameter of ImageReader.setInput(Object,boolean,boolean). It is informed of which TIFFTags to recognize or not to recognize via -TIFFImageReadParam.addAllowedTagSet(TIFFTagSet) -and +TIFFImageReadParam.addAllowedTagSet(TIFFTagSet) and TIFFImageReadParam.removeAllowedTagSet(TIFFTagSet). -If ignoreMetadata is true, then the reader will -load into the native image metadata object only those fields which have a -TIFFTag contained in the one of the allowed -TIFFTagSets. +If ignoreMetadata is true, then only metadata +essential to reading the image will be loaded into the native image metadata +object. If ignoreMetadata is false, then the reader +will by default load into the native image metadata object only those fields +which are either essential to reading the image or have a TIFFTag +contained in the one of the allowed TIFFTagSets. Reading of +fields with tags not in the allowed TIFFTagSets may be forced +by passing in a TIFFImageReadParam on which +TIFFImageReadParam.setReadUnknownTags(boolean) has been +invoked with parameter true.

Use of a TIFFDirectory object may simplify gaining access to metadata values. An instance of @@ -534,7 +539,7 @@ Technical Note #2 ZLib "Deflate/Inflate" compression (see note following this table) - + Adobe Photoshop® TIFF Technical Notes (PDF) @@ -545,9 +550,9 @@ Adobe Photoshop® TIFF Technical Notes (PDF) Deflate "Zip-in-TIFF" compression (see note following this table) - + ZLIB Compressed Data Format Specification, - + DEFLATE Compressed Data Format Specification diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java index 8c9ce8eaffa..d6181990e3f 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/BaselineTIFFTagSet.java @@ -224,7 +224,7 @@ public final class BaselineTIFFTagSet extends TIFFTagSet { * A value to be used with the "Compression" tag. * * @see #TAG_COMPRESSION - * @see DEFLATE specification + * @see DEFLATE specification * @see TIFF Specification Supplement 2 */ public static final int COMPRESSION_DEFLATE = 32946; diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java index 3ecfe500673..07888435588 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/FaxTIFFTagSet.java @@ -29,7 +29,7 @@ import java.util.List; /** * A class representing the extra tags found in a - * TIFF-F (RFC 2036) file. + * TIFF-F (RFC 2036) file. * * @since 9 */ diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java index 4f77c2926bf..18962ed3816 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/GeoTIFFTagSet.java @@ -30,10 +30,7 @@ import java.util.List; /** * A class representing the tags found in a GeoTIFF IFD. GeoTIFF is a * standard for annotating georeferenced or geocoded raster imagery. - * The GeoTIFF specification may be found at - * {@code http://www.remotesensing.org/geotiff/spec/geotiffhome.html} - * . This class does not handle the GeoKeys referenced + * This class does not handle the GeoKeys referenced * from a GeoKeyDirectoryTag as those are not TIFF tags per se. * *

The definitions of the data types referenced by the field diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java index 8ac2316d277..b36406b41e8 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java @@ -263,14 +263,16 @@ import com.sun.imageio.plugins.tiff.TIFFIFD; */ public final class TIFFField implements Cloneable { - private static final String[] typeNames = { + private static final long MAX_UINT32 = 0xffffffffL; + + private static final String[] TYPE_NAMES = { null, "Byte", "Ascii", "Short", "Long", "Rational", "SByte", "Undefined", "SShort", "SLong", "SRational", "Float", "Double", "IFDPointer" }; - private static final boolean[] isIntegral = { + private static final boolean[] IS_INTEGRAL = { false, true, false, true, true, false, true, true, true, true, false, @@ -544,6 +546,9 @@ public final class TIFFField implements Cloneable { * @throws IllegalArgumentException if {@code data} is an instance of * a class incompatible with the specified type. * @throws IllegalArgumentException if the size of the data array is wrong. + * @throws IllegalArgumentException if the type of the data array is + * {@code TIFF_LONG}, {@code TIFF_RATIONAL}, or {@code TIFF_IFD_POINTER} + * and any of the elements is negative or greater than {@code 0xffffffff}. */ public TIFFField(TIFFTag tag, int type, int count, Object data) { if(tag == null) { @@ -587,15 +592,50 @@ public final class TIFFField implements Cloneable { case TIFFTag.TIFF_LONG: isDataArrayCorrect = data instanceof long[] && ((long[])data).length == count; + if (isDataArrayCorrect) { + for (long datum : (long[])data) { + if (datum < 0) { + throw new IllegalArgumentException + ("Negative value supplied for TIFF_LONG"); + } + if (datum > MAX_UINT32) { + throw new IllegalArgumentException + ("Too large value supplied for TIFF_LONG"); + } + } + } break; case TIFFTag.TIFF_IFD_POINTER: isDataArrayCorrect = data instanceof long[] && ((long[])data).length == 1; + if (((long[])data)[0] < 0) { + throw new IllegalArgumentException + ("Negative value supplied for TIFF_IFD_POINTER"); + } + if (((long[])data)[0] > MAX_UINT32) { + throw new IllegalArgumentException + ("Too large value supplied for TIFF_IFD_POINTER"); + } break; case TIFFTag.TIFF_RATIONAL: isDataArrayCorrect = data instanceof long[][] - && ((long[][])data).length == count - && ((long[][])data)[0].length == 2; + && ((long[][])data).length == count; + if (isDataArrayCorrect) { + for (long[] datum : (long[][])data) { + if (datum.length != 2) { + isDataArrayCorrect = false; + break; + } + if (datum[0] < 0 || datum[1] < 0) { + throw new IllegalArgumentException + ("Negative value supplied for TIFF_RATIONAL"); + } + if (datum[0] > MAX_UINT32 || datum[1] > MAX_UINT32) { + throw new IllegalArgumentException + ("Too large value supplied for TIFF_RATIONAL"); + } + } + } break; case TIFFTag.TIFF_SSHORT: isDataArrayCorrect = data instanceof short[] @@ -607,8 +647,15 @@ public final class TIFFField implements Cloneable { break; case TIFFTag.TIFF_SRATIONAL: isDataArrayCorrect = data instanceof int[][] - && ((int[][])data).length == count - && ((int[][])data)[0].length == 2; + && ((int[][])data).length == count; + if (isDataArrayCorrect) { + for (int[] datum : (int[][])data) { + if (datum.length != 2) { + isDataArrayCorrect = false; + break; + } + } + } break; case TIFFTag.TIFF_FLOAT: isDataArrayCorrect = data instanceof float[] @@ -658,27 +705,32 @@ public final class TIFFField implements Cloneable { /** * Constructs a {@code TIFFField} with a single non-negative integral - * value. - * The field will have type - * {@link TIFFTag#TIFF_SHORT TIFF_SHORT} if - * {@code val < 65536} and type - * {@link TIFFTag#TIFF_LONG TIFF_LONG} otherwise. The count - * of the field will be unity. + * value. The field will have type {@link TIFFTag#TIFF_SHORT TIFF_SHORT} + * if {@code value} is in {@code [0,0xffff]}, and type + * {@link TIFFTag#TIFF_LONG TIFF_LONG} if {@code value} is in + * {@code [0x10000,0xffffffff]}. The count of the field will be unity. * * @param tag The tag to associate with this field. * @param value The value to associate with this field. * @throws NullPointerException if {@code tag == null}. - * @throws IllegalArgumentException if the derived type is unacceptable - * for the supplied {@code TIFFTag}. - * @throws IllegalArgumentException if {@code value < 0}. + * @throws IllegalArgumentException if {@code value} is not in + * {@code [0,0xffffffff]}. + * @throws IllegalArgumentException if {@code value} is in + * {@code [0,0xffff]} and {@code TIFF_SHORT} is an unacceptable type + * for the {@code TIFFTag}, or if {@code value} is in + * {@code [0x10000,0xffffffff]} and {@code TIFF_LONG} is an unacceptable + * type for the {@code TIFFTag}. */ - public TIFFField(TIFFTag tag, int value) { + public TIFFField(TIFFTag tag, long value) { if(tag == null) { throw new NullPointerException("tag == null!"); } if (value < 0) { throw new IllegalArgumentException("value < 0!"); } + if (value > MAX_UINT32) { + throw new IllegalArgumentException("value > 0xffffffff!"); + } this.tag = tag; this.tagNumber = tag.getNumber(); @@ -687,7 +739,8 @@ public final class TIFFField implements Cloneable { if (value < 65536) { if (!tag.isDataTypeOK(TIFFTag.TIFF_SHORT)) { throw new IllegalArgumentException("Illegal data type " - + TIFFTag.TIFF_SHORT + " for " + tag.getName() + " tag"); + + getTypeName(TIFFTag.TIFF_SHORT) + " for tag " + + "\"" + tag.getName() + "\""); } this.type = TIFFTag.TIFF_SHORT; char[] cdata = new char[1]; @@ -696,7 +749,8 @@ public final class TIFFField implements Cloneable { } else { if (!tag.isDataTypeOK(TIFFTag.TIFF_LONG)) { throw new IllegalArgumentException("Illegal data type " - + TIFFTag.TIFF_LONG + " for " + tag.getName() + " tag"); + + getTypeName(TIFFTag.TIFF_LONG) + " for tag " + + "\"" + tag.getName() + "\""); } this.type = TIFFTag.TIFF_LONG; long[] ldata = new long[1]; @@ -799,7 +853,7 @@ public final class TIFFField implements Cloneable { throw new IllegalArgumentException("Unknown data type "+dataType); } - return typeNames[dataType]; + return TYPE_NAMES[dataType]; } /** @@ -812,7 +866,7 @@ public final class TIFFField implements Cloneable { */ public static int getTypeByName(String typeName) { for (int i = TIFFTag.MIN_DATATYPE; i <= TIFFTag.MAX_DATATYPE; i++) { - if (typeName.equals(typeNames[i])) { + if (typeName.equals(TYPE_NAMES[i])) { return i; } } @@ -887,7 +941,7 @@ public final class TIFFField implements Cloneable { * @return Whether the field type is integral. */ public boolean isIntegral() { - return isIntegral[type]; + return IS_INTEGRAL[type]; } /** diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java index 1b8821aef1c..0abf60219e7 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFImageReadParam.java @@ -46,11 +46,18 @@ import javax.imageio.ImageReadParam; * {@code ExifParentTIFFTagSet}, and {@code GeoTIFFTagSet} * are included. * + *

Forcing reading of fields corresponding to {@code TIFFTag}s + * not in any of the allowed {@code TIFFTagSet}s may be effected via + * {@link #setReadUnknownTags setReadUnknownTags}. + * * @since 9 */ public final class TIFFImageReadParam extends ImageReadParam { - private List allowedTagSets = new ArrayList(4); + private final List allowedTagSets = + new ArrayList(4); + + private boolean readUnknownTags = false; /** * Constructs a {@code TIFFImageReadParam}. Tags defined by @@ -72,7 +79,8 @@ public final class TIFFImageReadParam extends ImageReadParam { /** * Adds a {@code TIFFTagSet} object to the list of allowed - * tag sets. + * tag sets. Attempting to add a duplicate object to the list + * has no effect. * * @param tagSet a {@code TIFFTagSet}. * @@ -83,7 +91,9 @@ public final class TIFFImageReadParam extends ImageReadParam { if (tagSet == null) { throw new IllegalArgumentException("tagSet == null!"); } - allowedTagSets.add(tagSet); + if (!allowedTagSets.contains(tagSet)) { + allowedTagSets.add(tagSet); + } } /** @@ -113,4 +123,27 @@ public final class TIFFImageReadParam extends ImageReadParam { public List getAllowedTagSets() { return allowedTagSets; } + + /** + * Set whether to read fields corresponding to {@code TIFFTag}s not in + * the allowed {@code TIFFTagSet}s. The default setting is {@code false}. + * If the TIFF {@code ImageReader} is ignoring metadata, then a setting + * of {@code true} is overridden as all metadata are ignored except those + * essential to reading the image itself. + * + * @param readUnknownTags Whether to read fields of unrecognized tags + */ + public void setReadUnknownTags(boolean readUnknownTags) { + this.readUnknownTags = readUnknownTags; + } + + /** + * Retrieve the setting of whether to read fields corresponding to unknown + * {@code TIFFTag}s. + * + * @return Whether to read fields of unrecognized tags + */ + public boolean getReadUnknownTags() { + return readUnknownTags; + } } diff --git a/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java b/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java index 5bc2f0687a9..542e1cb3c16 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/DefaultRowSorter.java @@ -182,6 +182,8 @@ public abstract class DefaultRowSorter extends RowSorter { */ private int modelRowCount; + // Whether to print warning about JDK-8160087 + private static boolean warning8160087 = true; /** * Creates an empty DefaultRowSorter. @@ -489,10 +491,7 @@ public abstract class DefaultRowSorter extends RowSorter { */ public int convertRowIndexToView(int index) { if (modelToView == null) { - if (index < 0 || index >= modelRowCount) { - throw new IndexOutOfBoundsException("Invalid index"); - } - return index; + return convertUnsortedUnfiltered(index); } return modelToView[index]; } @@ -504,14 +503,30 @@ public abstract class DefaultRowSorter extends RowSorter { */ public int convertRowIndexToModel(int index) { if (viewToModel == null) { - if (index < 0 || index >= modelRowCount) { - throw new IndexOutOfBoundsException("Invalid index"); - } - return index; + return convertUnsortedUnfiltered(index); } return viewToModel[index].modelIndex; } + private int convertUnsortedUnfiltered(int index) { + if (index < 0 || index >= modelRowCount) { + if(index >= modelRowCount && + index < getModelWrapper().getRowCount()) { + // 8160087 + if(warning8160087) { + warning8160087 = false; + System.err.println("WARNING: row index is bigger than " + + "sorter's row count. Most likely this is a wrong " + + "sorter usage."); + } + } else { + throw new IndexOutOfBoundsException("Invalid index"); + } + } + return index; + } + + private boolean isUnsorted() { List keys = getSortKeys(); int keySize = keys.size(); diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java b/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java index 979d2b8a3d7..7582a025eae 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/JMenuBar.java @@ -27,6 +27,7 @@ package javax.swing; import java.awt.Component; import java.awt.Graphics; import java.awt.Insets; +import java.awt.Toolkit; import java.awt.event.*; import java.beans.JavaBean; import java.beans.BeanProperty; @@ -41,6 +42,8 @@ import java.io.IOException; import javax.swing.plaf.*; import javax.accessibility.*; +import sun.awt.SunToolkit; + /** * An implementation of a menu bar. You add JMenu objects to the * menu bar to construct a menu. When the user selects a JMenu @@ -144,6 +147,10 @@ public class JMenuBar extends JComponent implements Accessible,MenuElement * @see JComponent#updateUI */ public void updateUI() { + Toolkit tk = Toolkit.getDefaultToolkit(); + if (tk instanceof SunToolkit) { + ((SunToolkit)tk).updateScreenMenuBarUI(); + } setUI((MenuBarUI)UIManager.getUI(this)); } diff --git a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java index 491d16306ea..44576585435 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/JViewport.java @@ -47,6 +47,7 @@ import java.util.Arrays; import java.util.Collections; import sun.awt.AWTAccessor; +import sun.swing.SwingUtilities2; /** * The "viewport" or "porthole" through which you see the underlying @@ -1034,9 +1035,16 @@ public class JViewport extends JComponent implements Accessible private boolean isBlitting() { Component view = getView(); return (scrollMode == BLIT_SCROLL_MODE) && - (view instanceof JComponent) && view.isOpaque(); + (view instanceof JComponent) && view.isOpaque() && !isFPScale(); } + private boolean isFPScale() { + GraphicsConfiguration gc = getGraphicsConfiguration(); + if (gc != null) { + return SwingUtilities2.isFloatingPointScale(gc.getDefaultTransform()); + } + return false; + } /** * Returns the JViewport's one child or null. diff --git a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java index 1db490608b7..8737b6bb760 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/RepaintManager.java @@ -45,7 +45,11 @@ import sun.java2d.SunGraphicsEnvironment; import sun.security.action.GetPropertyAction; import com.sun.java.swing.SwingUtilities3; +import java.awt.geom.AffineTransform; +import sun.java2d.SunGraphics2D; +import sun.java2d.pipe.Region; import sun.swing.SwingAccessor; +import sun.swing.SwingUtilities2; import sun.swing.SwingUtilities2.RepaintListener; /** @@ -1517,9 +1521,12 @@ public class RepaintManager // standard Image buffer. boolean paintCompleted = false; Image offscreen; + int sw = w + 1; + int sh = h + 1; + if (repaintManager.useVolatileDoubleBuffer() && (offscreen = getValidImage(repaintManager. - getVolatileOffscreenBuffer(bufferComponent, w, h))) != null) { + getVolatileOffscreenBuffer(bufferComponent, sw, sh))) != null) { VolatileImage vImage = (java.awt.image.VolatileImage)offscreen; GraphicsConfiguration gc = bufferComponent. getGraphicsConfiguration(); @@ -1529,7 +1536,7 @@ public class RepaintManager VolatileImage.IMAGE_INCOMPATIBLE) { repaintManager.resetVolatileDoubleBuffer(gc); offscreen = repaintManager.getVolatileOffscreenBuffer( - bufferComponent,w, h); + bufferComponent, sw, sh); vImage = (java.awt.image.VolatileImage)offscreen; } paintDoubleBuffered(paintingComponent, vImage, g, x, y, @@ -1589,8 +1596,18 @@ public class RepaintManager * Paints a portion of a component to an offscreen buffer. */ protected void paintDoubleBuffered(JComponent c, Image image, - Graphics g, int clipX, int clipY, - int clipW, int clipH) { + Graphics g, int clipX, int clipY, + int clipW, int clipH) { + if (image instanceof VolatileImage && isPixelsCopying(c, g)) { + paintDoubleBufferedFPScales(c, image, g, clipX, clipY, clipW, clipH); + } else { + paintDoubleBufferedImpl(c, image, g, clipX, clipY, clipW, clipH); + } + } + + private void paintDoubleBufferedImpl(JComponent c, Image image, + Graphics g, int clipX, int clipY, + int clipW, int clipH) { Graphics osg = image.getGraphics(); int bw = Math.min(clipW, image.getWidth(null)); int bh = Math.min(clipH, image.getHeight(null)); @@ -1629,6 +1646,76 @@ public class RepaintManager } } + private void paintDoubleBufferedFPScales(JComponent c, Image image, + Graphics g, int clipX, int clipY, + int clipW, int clipH) { + Graphics osg = image.getGraphics(); + Graphics2D g2d = (Graphics2D) g; + Graphics2D osg2d = (Graphics2D) osg; + + AffineTransform identity = new AffineTransform(); + int bw = Math.min(clipW, image.getWidth(null)); + int bh = Math.min(clipH, image.getHeight(null)); + int x, y, maxx, maxy; + + AffineTransform tx = g2d.getTransform(); + double scaleX = tx.getScaleX(); + double scaleY = tx.getScaleY(); + double trX = tx.getTranslateX(); + double trY = tx.getTranslateY(); + + boolean translucent = volatileBufferType != Transparency.OPAQUE; + Composite oldComposite = g2d.getComposite(); + + try { + for (x = clipX, maxx = clipX + clipW; x < maxx; x += bw) { + for (y = clipY, maxy = clipY + clipH; y < maxy; y += bh) { + + // draw x, y, bw, bh + int pixelx1 = Region.clipRound(x * scaleX + trX); + int pixely1 = Region.clipRound(y * scaleY + trY); + int pixelx2 = Region.clipRound((x + bw) * scaleX + trX); + int pixely2 = Region.clipRound((y + bh) * scaleY + trY); + int pixelw = pixelx2 - pixelx1; + int pixelh = pixely2 - pixely1; + + osg2d.setTransform(identity); + if (translucent) { + final Color oldBg = g2d.getBackground(); + g2d.setBackground(c.getBackground()); + g2d.clearRect(pixelx1, pixely1, pixelw, pixelh); + g2d.setBackground(oldBg); + } + + osg2d.setClip(0, 0, pixelw, pixelh); + osg2d.translate(trX - pixelx1, trY - pixely1); + osg2d.scale(scaleX, scaleY); + c.paintToOffscreen(osg, x, y, bw, bh, maxx, maxy); + + g2d.setTransform(identity); + g2d.setClip(pixelx1, pixely1, pixelw, pixelh); + AffineTransform stx = new AffineTransform(); + stx.translate(pixelx1, pixely1); + stx.scale(scaleX, scaleY); + g2d.setTransform(stx); + + if (translucent) { + g2d.setComposite(AlphaComposite.Src); + } + + g2d.drawImage(image, 0, 0, c); + + if (translucent) { + g2d.setComposite(oldComposite); + } + g2d.setTransform(tx); + } + } + } finally { + osg.dispose(); + } + } + /** * If image is non-null with a positive size it * is returned, otherwise null is returned. @@ -1671,8 +1758,32 @@ public class RepaintManager */ protected void dispose() { } - } + private boolean isPixelsCopying(JComponent c, Graphics g) { + + AffineTransform tx = getTransform(g); + GraphicsConfiguration gc = c.getGraphicsConfiguration(); + + if (tx == null || gc == null + || !SwingUtilities2.isFloatingPointScale(tx)) { + return false; + } + + AffineTransform gcTx = gc.getDefaultTransform(); + + return gcTx.getScaleX() == tx.getScaleX() + && gcTx.getScaleY() == tx.getScaleY(); + } + + private static AffineTransform getTransform(Graphics g) { + if (g instanceof SunGraphics2D) { + return ((SunGraphics2D) g).transform; + } else if (g instanceof Graphics2D) { + return ((Graphics2D) g).getTransform(); + } + return null; + } + } private class DoubleBufferInfo { public Image image; diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java index 91132582193..32db72db408 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/metal/MetalFileChooserUI.java @@ -571,7 +571,9 @@ public class MetalFileChooserUI extends BasicFileChooserUI { /** * Obsolete class, not used in this version. + * @deprecated As of JDK version 9. Obsolete class. */ + @Deprecated(since = "9") protected class SingleClickListener extends MouseAdapter { /** * Constructs an instance of {@code SingleClickListener}. @@ -584,7 +586,9 @@ public class MetalFileChooserUI extends BasicFileChooserUI { /** * Obsolete class, not used in this version. + * @deprecated As of JDK version 9. Obsolete class. */ + @Deprecated(since = "9") @SuppressWarnings("serial") // Superclass is not serializable across versions protected class FileRenderer extends DefaultListCellRenderer { } diff --git a/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java b/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java index 6bb02264dd3..dde3437adf4 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/text/WrappedPlainView.java @@ -26,6 +26,7 @@ package javax.swing.text; import java.awt.*; import java.awt.font.FontRenderContext; +import java.awt.geom.Rectangle2D; import java.lang.ref.SoftReference; import java.security.AccessController; import java.security.PrivilegedAction; @@ -750,7 +751,6 @@ public class WrappedPlainView extends BoxView implements TabExpander { * valid location in the associated document * @see View#modelToView */ - @SuppressWarnings("deprecation") public Shape modelToView(int pos, Shape a, Position.Bias b) throws BadLocationException { Rectangle alloc = a.getBounds(); @@ -777,9 +777,11 @@ public class WrappedPlainView extends BoxView implements TabExpander { if (pos > p0) { Segment segment = SegmentCache.getSharedSegment(); loadText(segment, p0, pos); - alloc.x += Utilities.getTabbedTextWidth(segment, metrics, - alloc.x, WrappedPlainView.this, p0); + float x = alloc.x; + x += Utilities.getTabbedTextWidth(segment, metrics, x, + WrappedPlainView.this, p0); SegmentCache.releaseSharedSegment(segment); + return new Rectangle2D.Float(x, alloc.y, alloc.width, alloc.height); } return alloc; } diff --git a/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java b/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java index b20d8d62367..29a435c96b9 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/AWTAccessor.java @@ -360,6 +360,12 @@ public final class AWTAccessor { * Marks the specified window as an utility window for TrayIcon. */ void setTrayIconWindow(Window w, boolean isTrayIconWindow); + + /** + * Return an array containing all the windows this + * window currently owns. + */ + Window[] getOwnedWindows(Window w); } /** diff --git a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java index f2a99711ff7..de1d303a1a9 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/SunToolkit.java @@ -1857,6 +1857,9 @@ public abstract class SunToolkit extends Toolkit return time == null ? -1 : time; } + public void updateScreenMenuBarUI() { + } + // Cosntant alpha public boolean isWindowOpacitySupported() { return false; diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java index 2fe223647f1..4c0abc9eec8 100644 --- a/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java +++ b/jdk/src/java.desktop/share/classes/sun/java2d/SunGraphics2D.java @@ -3101,10 +3101,10 @@ public final class SunGraphics2D if (scaleX == 1 && scaleY == 1) { return null; } - sx1 = Region.clipScale(sx1, scaleX); - sx2 = Region.clipScale(sx2, scaleX); - sy1 = Region.clipScale(sy1, scaleY); - sy2 = Region.clipScale(sy2, scaleY); + sx1 = Region.clipRound(sx1 * scaleX); + sx2 = Region.clipRound(sx2 * scaleX); + sy1 = Region.clipRound(sy1 * scaleY); + sy2 = Region.clipRound(sy2 * scaleY); AffineTransform tx = null; if (xform != null) { diff --git a/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java b/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java index 9671ec9101a..14b3eaa61a0 100644 --- a/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java +++ b/jdk/src/java.desktop/share/classes/sun/swing/JLightweightFrame.java @@ -305,6 +305,12 @@ public final class JLightweightFrame extends LightweightFrame implements RootPan int startY = (int)Math.floor(y * scaleY); int width = (int)Math.ceil((x + w) * scaleX) - startX; int height = (int)Math.ceil((y + h) * scaleY) - startY; + if (startX + width > linestride) { + width = linestride - startX; + } + if (startY + height > bbImage.getHeight()) { + height = bbImage.getHeight() - startY; + } for (int i = 0; i < height; i++) { int from = (startY + i) * linestride + startX; diff --git a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java index 5bf01c5f99d..f55290b1ca1 100644 --- a/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java +++ b/jdk/src/java.desktop/share/classes/sun/swing/SwingUtilities2.java @@ -33,6 +33,7 @@ import java.awt.font.*; import java.awt.geom.Rectangle2D; import java.awt.geom.AffineTransform; import static java.awt.geom.AffineTransform.TYPE_FLIP; +import static java.awt.geom.AffineTransform.TYPE_MASK_SCALE; import static java.awt.geom.AffineTransform.TYPE_TRANSLATION; import java.awt.print.PrinterGraphics; import java.text.BreakIterator; @@ -2162,6 +2163,19 @@ public class SwingUtilities2 { return false; } + public static boolean isFloatingPointScale(AffineTransform tx) { + int type = tx.getType() & ~(TYPE_FLIP | TYPE_TRANSLATION); + if (type == 0) { + return false; + } else if ((type & ~TYPE_MASK_SCALE) == 0) { + double scaleX = tx.getScaleX(); + double scaleY = tx.getScaleY(); + return (scaleX != (int) scaleX) || (scaleY != (int) scaleY); + } else { + return false; + } + } + /** * Returns the client property for the given key if it is set; otherwise * returns the {@L&F} property. diff --git a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c b/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c index 95a92f221ad..41cf1864178 100644 --- a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c +++ b/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c @@ -140,7 +140,7 @@ jboolean storeGVData(JNIEnv* env, indices[storei] = baseIndex + cluster; glyphs[storei] = (unsigned int)(glyphInfo[i].codepoint | slot); positions[storei*2] = startX + x + glyphPos[i].x_offset * scale; - positions[(storei*2)+1] = startY + y + glyphPos[i].y_offset * scale; + positions[(storei*2)+1] = startY + y - glyphPos[i].y_offset * scale; x += glyphPos[i].x_advance * scale; y += glyphPos[i].y_advance * scale; storei++; diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java index 85e578b4052..74444b8d2d6 100644 --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java +++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XContentWindow.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -123,15 +123,26 @@ public final class XContentWindow extends XWindow { // Change in the size of the content window means, well, change of the size // Change in the location of the content window means change in insets boolean needHandleResize = !(newBounds.equals(getBounds())); + boolean needPaint = width <= 0 || height <= 0; reshape(newBounds); if (needHandleResize) { insLog.fine("Sending RESIZED"); handleResize(newBounds); } + if (needPaint) { + postPaintEvent(target, 0, 0, newBounds.width, newBounds.height); + } } finally { XToolkit.awtUnlock(); } - validateSurface(); + } + + @Override + public void handleExposeEvent(XEvent xev) { + if (width <= 0 || height <= 0) { + return; + } + super.handleExposeEvent(xev); } // NOTE: This method may be called by privileged threads. diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp index 080fdc8062e..f2d32860e32 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp @@ -251,7 +251,8 @@ AwtComponent::AwtComponent() m_bPauseDestroy = FALSE; m_MessagesProcessing = 0; - m_wheelRotationAmount = 0; + m_wheelRotationAmountX = 0; + m_wheelRotationAmountY = 0; if (!sm_PrimaryDynamicTableBuilt) { // do it once. AwtComponent::BuildPrimaryDynamicTable(); @@ -1208,6 +1209,7 @@ void SpyWinMessage(HWND hwnd, UINT message, LPCTSTR szComment) { WIN_MSG(WM_XBUTTONDOWN) WIN_MSG(WM_XBUTTONUP) WIN_MSG(WM_MOUSEWHEEL) + WIN_MSG(WM_MOUSEHWHEEL) WIN_MSG(WM_PARENTNOTIFY) WIN_MSG(WM_ENTERMENULOOP) WIN_MSG(WM_EXITMENULOOP) @@ -1639,6 +1641,7 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) case WM_XBUTTONUP: case WM_MOUSEMOVE: case WM_MOUSEWHEEL: + case WM_MOUSEHWHEEL: case WM_AWT_MOUSEENTER: case WM_AWT_MOUSEEXIT: curPos = ::GetMessagePos(); @@ -1708,10 +1711,12 @@ LRESULT AwtComponent::WindowProc(UINT message, WPARAM wParam, LPARAM lParam) case WM_AWT_MOUSEEXIT: mr = WmMouseExit(static_cast(wParam), myPos.x, myPos.y); break; - case WM_MOUSEWHEEL: + case WM_MOUSEWHEEL: + case WM_MOUSEHWHEEL: mr = WmMouseWheel(GET_KEYSTATE_WPARAM(wParam), GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam), - GET_WHEEL_DELTA_WPARAM(wParam)); + GET_WHEEL_DELTA_WPARAM(wParam), + switchMessage == WM_MOUSEHWHEEL); break; } break; @@ -2078,13 +2083,15 @@ MsgRouting AwtComponent::WmShowWindow(BOOL show, UINT status) MsgRouting AwtComponent::WmSetFocus(HWND hWndLostFocus) { - m_wheelRotationAmount = 0; + m_wheelRotationAmountX = 0; + m_wheelRotationAmountY = 0; return mrDoDefault; } MsgRouting AwtComponent::WmKillFocus(HWND hWndGotFocus) { - m_wheelRotationAmount = 0; + m_wheelRotationAmountX = 0; + m_wheelRotationAmountY = 0; return mrDoDefault; } @@ -2461,7 +2468,7 @@ MsgRouting AwtComponent::WmMouseExit(UINT flags, int x, int y) } MsgRouting AwtComponent::WmMouseWheel(UINT flags, int x, int y, - int wheelRotation) + int wheelRotation, BOOL isHorizontal) { // convert coordinates to be Component-relative, not screen relative // for wheeling when outside the window, this works similar to @@ -2475,42 +2482,54 @@ MsgRouting AwtComponent::WmMouseWheel(UINT flags, int x, int y, // set some defaults jint scrollType = java_awt_event_MouseWheelEvent_WHEEL_UNIT_SCROLL; - jint scrollLines = 3; + jint scrollUnits = 3; BOOL result; - UINT platformLines; - - m_wheelRotationAmount += wheelRotation; + UINT platformUnits; + jint roundedWheelRotation; + jdouble preciseWheelRotation; // AWT interprets wheel rotation differently than win32, so we need to // decode wheel amount. - jint roundedWheelRotation = m_wheelRotationAmount / (-1 * WHEEL_DELTA); - jdouble preciseWheelRotation = (jdouble) wheelRotation / (-1 * WHEEL_DELTA); + jint modifiers = GetJavaModifiers(); + if (isHorizontal) { + modifiers |= java_awt_event_InputEvent_SHIFT_DOWN_MASK; + m_wheelRotationAmountX += wheelRotation; + roundedWheelRotation = m_wheelRotationAmountX / (WHEEL_DELTA); + preciseWheelRotation = (jdouble) wheelRotation / (WHEEL_DELTA); + result = ::SystemParametersInfo(SPI_GETWHEELSCROLLCHARS, 0, + &platformUnits, 0); + } else { + m_wheelRotationAmountY += wheelRotation; + roundedWheelRotation = m_wheelRotationAmountY / (-1 * WHEEL_DELTA); + preciseWheelRotation = (jdouble) wheelRotation / (-1 * WHEEL_DELTA); + result = ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, + &platformUnits, 0); + } MSG msg; - result = ::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, - &platformLines, 0); InitMessage(&msg, lastMessage, MAKEWPARAM(flags, wheelRotation), MAKELPARAM(x, y)); if (result) { - if (platformLines == WHEEL_PAGESCROLL) { + if (platformUnits == WHEEL_PAGESCROLL) { scrollType = java_awt_event_MouseWheelEvent_WHEEL_BLOCK_SCROLL; - scrollLines = 1; + scrollUnits = 1; } else { scrollType = java_awt_event_MouseWheelEvent_WHEEL_UNIT_SCROLL; - scrollLines = platformLines; + scrollUnits = platformUnits; } } DTRACE_PRINTLN("calling SendMouseWheelEvent"); SendMouseWheelEvent(java_awt_event_MouseEvent_MOUSE_WHEEL, ::JVM_CurrentTimeMillis(NULL, 0), - eventPt.x, eventPt.y, GetJavaModifiers(), 0, 0, scrollType, - scrollLines, roundedWheelRotation, preciseWheelRotation, &msg); + eventPt.x, eventPt.y, modifiers, 0, 0, scrollType, + scrollUnits, roundedWheelRotation, preciseWheelRotation, &msg); - m_wheelRotationAmount %= WHEEL_DELTA; + m_wheelRotationAmountX %= WHEEL_DELTA; + m_wheelRotationAmountY %= WHEEL_DELTA; // this message could be propagated up to the parent chain // by the mouse message post processors return mrConsume; diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h index bcf96a78669..0d6bf7a0079 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h @@ -522,7 +522,7 @@ public: virtual MsgRouting WmMouseMove(UINT flags, int x, int y); virtual MsgRouting WmMouseExit(UINT flags, int x, int y); virtual MsgRouting WmMouseWheel(UINT flags, int x, int y, - int wheelRotation); + int wheelRotation, BOOL isHorizontal); virtual MsgRouting WmNcMouseDown(WPARAM hitTest, int x, int y, int button); virtual MsgRouting WmNcMouseUp(WPARAM hitTest, int x, int y, int button); virtual MsgRouting WmWindowPosChanging(LPARAM windowPos); @@ -824,7 +824,8 @@ private: int windowMoveLockPosCY; // 6524352: support finer-resolution - int m_wheelRotationAmount; + int m_wheelRotationAmountX; + int m_wheelRotationAmountY; BOOL deadKeyActive; diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp index fb65b85a519..e3413714b62 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp @@ -240,6 +240,7 @@ LRESULT CALLBACK AwtDialog::MouseHookProc(int nCode, (wParam == WM_RBUTTONDOWN) || (wParam == WM_MOUSEACTIVATE) || (wParam == WM_MOUSEWHEEL) || + (wParam == WM_MOUSEHWHEEL) || (wParam == WM_NCLBUTTONDOWN) || (wParam == WM_NCMBUTTONDOWN) || (wParam == WM_NCRBUTTONDOWN)) diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp index 6c8d65a47c7..9bc6366d17b 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp @@ -484,7 +484,10 @@ MsgRouting AwtFrame::WmShowWindow(BOOL show, UINT status) if (fgProcessID != ::GetCurrentProcessId()) { AwtWindow* window = (AwtWindow*)GetComponent(GetHWnd()); - if (window != NULL && window->IsFocusableWindow() && window->IsAutoRequestFocus() && + if (window != NULL && + window->IsFocusableWindow() && + window->IsAutoRequestFocus() && + !::IsWindowVisible(GetHWnd()) && // the window is really showing !::IsWindow(GetModalBlocker(GetHWnd()))) { // When the Java process is not allowed to set the foreground window diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp index 0fffffbf725..4a0ac907f62 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp @@ -1590,7 +1590,7 @@ BOOL AwtToolkit::PreProcessMouseMsg(AwtComponent* p, MSG& msg) * the mouse, not the Component with the input focus. */ - if (msg.message == WM_MOUSEWHEEL) { + if (msg.message == WM_MOUSEWHEEL || msg.message == WM_MOUSEHWHEEL) { //i.e. mouse is over client area for this window DWORD hWndForWheelProcess; DWORD hWndForWheelThread = ::GetWindowThreadProcessId(hWndForWheel, &hWndForWheelProcess); diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h b/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h index d0131af99fe..ba8a4492591 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1996, 2011, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1996, 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 @@ -45,6 +45,10 @@ extern const UINT SYSCOMMAND_IMM; #define WM_MOUSEWHEEL 0x020A #endif //WM_MOUSEWHEEL +#ifndef WM_MOUSEHWHEEL +#define WM_MOUSEHWHEEL 0x020E +#endif //WM_MOUSEHWHEEL + #ifndef WHEEL_DELTA #define WHEEL_DELTA 120 #endif //WHEEL_DELTA @@ -54,12 +58,16 @@ extern const UINT SYSCOMMAND_IMM; #endif //WHEEL_PAGESCROLL #ifndef SPI_GETWHEELSCROLLLINES -#define SPI_GETWHEELSCROLLLINES 104 +#define SPI_GETWHEELSCROLLLINES 0x0068 #endif //SPI_GETWHEELSCROLLLINES +#ifndef SPI_GETWHEELSCROLLCHARS +#define SPI_GETWHEELSCROLLCHARS 0x006C +#endif //SPI_GETWHEELSCROLLCHARS + #ifndef SM_MOUSEWHEELPRESENT #define SM_MOUSEWHEELPRESENT 75 -#endif //SPI_GETWHEELSCROLLLINES +#endif //SM_MOUSEWHEELPRESENT #ifndef COLOR_HOTLIGHT #define COLOR_HOTLIGHT 26 diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java index 0e3e1094d67..510b6885a91 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Connections.java @@ -27,7 +27,6 @@ package com.sun.jndi.ldap.pool; import java.util.ArrayList; // JDK 1.2 import java.util.List; -import java.util.Iterator; import java.lang.ref.Reference; import java.lang.ref.SoftReference; @@ -290,23 +289,28 @@ final class Connections implements PoolCallback { * @param threshold an entry idle since this time has expired. * @return true if no more connections in list */ - synchronized boolean expire(long threshold) { - Iterator iter = conns.iterator(); - ConnectionDesc entry; - while (iter.hasNext()) { - entry = iter.next(); + boolean expire(long threshold) { + List clonedConns; + synchronized(this) { + clonedConns = new ArrayList<>(conns); + } + List expired = new ArrayList<>(); + + for (ConnectionDesc entry : clonedConns) { + d("expire(): ", entry); if (entry.expire(threshold)) { - d("expire(): removing ", entry); - td("Expired ", entry); - - iter.remove(); // remove from pool - - // Don't need to call notify() because we're - // removing only idle connections. If there were - // idle connections, then there should be no waiters. + expired.add(entry); + td("expire(): Expired ", entry); } } - return conns.isEmpty(); // whether whole list has 'expired' + + synchronized (this) { + conns.removeAll(expired); + // Don't need to call notify() because we're + // removing only idle connections. If there were + // idle connections, then there should be no waiters. + return conns.isEmpty(); // whether whole list has 'expired' + } } /** diff --git a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java index a2813bf9233..504c87ddd43 100644 --- a/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java +++ b/jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool/Pool.java @@ -25,11 +25,11 @@ package com.sun.jndi.ldap.pool; +import java.util.ArrayList; import java.util.Map; import java.util.WeakHashMap; import java.util.Collection; import java.util.Collections; -import java.util.Iterator; import java.util.LinkedList; import java.io.PrintStream; @@ -166,17 +166,25 @@ final public class Pool { * and removed. */ public void expire(long threshold) { + Collection copy; synchronized (map) { - Iterator iter = map.values().iterator(); - Connections conns; - while (iter.hasNext()) { - conns = iter.next().getConnections(); - if (conns.expire(threshold)) { - d("expire(): removing ", conns); - iter.remove(); - } + copy = new ArrayList<>(map.values()); + } + + ArrayList removed = new ArrayList<>(); + Connections conns; + for (ConnectionsRef ref : copy) { + conns = ref.getConnections(); + if (conns.expire(threshold)) { + d("expire(): removing ", conns); + removed.add(ref); } } + + synchronized (map) { + map.values().removeAll(removed); + } + expungeStaleConnections(); } diff --git a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java index a32cf8f564d..7fe59001940 100644 --- a/jdk/src/java.sql/share/classes/java/sql/DriverManager.java +++ b/jdk/src/java.sql/share/classes/java/sql/DriverManager.java @@ -41,46 +41,41 @@ import jdk.internal.reflect.Reflection; /** - *

The basic service for managing a set of JDBC drivers.
- * NOTE: The {@link javax.sql.DataSource} interface, new in the - * JDBC 2.0 API, provides another way to connect to a data source. - * The use of a DataSource object is the preferred means of + * The basic service for managing a set of JDBC drivers. + *

+ * NOTE: The {@link javax.sql.DataSource} interface, provides + * another way to connect to a data source. + * The use of a {@code DataSource} object is the preferred means of * connecting to a data source. - * - *

As part of its initialization, the DriverManager class will - * attempt to load the driver classes referenced in the "jdbc.drivers" - * system property. This allows a user to customize the JDBC Drivers - * used by their applications. For example in your - * ~/.hotjava/properties file you might specify: - * 

- * jdbc.drivers=foo.bah.Driver:wombat.sql.Driver:bad.taste.ourDriver
- *
- *

The DriverManager methods getConnection and - * getDrivers have been enhanced to support the Java Standard Edition - * Service Provider mechanism. JDBC 4.0 Drivers must - * include the file META-INF/services/java.sql.Driver. This file contains the name of the JDBC drivers - * implementation of java.sql.Driver. For example, to load the my.sql.Driver class, - * the META-INF/services/java.sql.Driver file would contain the entry: - * 

- * my.sql.Driver
- *
- * - *

Applications no longer need to explicitly load JDBC drivers using Class.forName(). Existing programs - * which currently load JDBC drivers using Class.forName() will continue to work without - * modification. - * - *

When the method getConnection is called, - * the DriverManager will attempt to - * locate a suitable driver from amongst those loaded at - * initialization and those loaded explicitly using the same classloader - * as the current applet or application. - * *

- * Starting with the Java 2 SDK, Standard Edition, version 1.3, a - * logging stream can be set only if the proper - * permission has been granted. Normally this will be done with - * the tool PolicyTool, which can be used to grant permission - * java.sql.SQLPermission "setLog". + * As part of its initialization, the {@code DriverManager} class will + * attempt to load available JDBC drivers by using: + *

    + *
  • The {@code jdbc.drivers} system property which contains a + * colon separated list of fully qualified class names of JDBC drivers. Each + * driver is loaded using the {@linkplain ClassLoader#getSystemClassLoader + * system class loader}: + *
      + *
    • {@code jdbc.drivers=foo.bah.Driver:wombat.sql.Driver:bad.taste.ourDriver} + *
    + * + *
  • Service providers of the {@code java.sql.Driver} class, that are loaded + * via the {@linkplain ServiceLoader#load service-provider loading} mechanism. + *
+ * + *

+ * @ImplNote + * {@code DriverManager} initialization is done lazily and looks up service + * providers using the thread context class loader. The drivers loaded and + * available to an application will depend on the thread context class loader of + * the thread that triggers driver initialization by {@code DriverManager}. + * + *

When the method {@code getConnection} is called, + * the {@code DriverManager} will attempt to + * locate a suitable driver from amongst those loaded at + * initialization and those loaded explicitly using the same class loader + * as the current application. + * * @see Driver * @see Connection */ @@ -137,29 +132,15 @@ public class DriverManager { /** * Sets the logging/tracing PrintWriter object * that is used by the DriverManager and all drivers. - *

- * There is a minor versioning problem created by the introduction - * of the method setLogWriter. The - * method setLogWriter cannot create a PrintStream object - * that will be returned by getLogStream---the Java platform does - * not provide a backward conversion. As a result, a new application - * that uses setLogWriter and also uses a JDBC 1.0 driver that uses - * getLogStream will likely not see debugging information written - * by that driver. *

- * Starting with the Java 2 SDK, Standard Edition, version 1.3 release, this method checks - * to see that there is an SQLPermission object before setting - * the logging stream. If a SecurityManager exists and its - * checkPermission method denies setting the log writer, this - * method throws a java.lang.SecurityException. + * If a security manager exists, its {@code checkPermission} + * method is first called with a {@code SQLPermission("setLog")} + * permission to check that the caller is allowed to call {@code setLogWriter}. * * @param out the new logging/tracing PrintStream object; * null to disable logging and tracing - * @throws SecurityException - * if a security manager exists and its - * checkPermission method denies - * setting the log writer - * + * @throws SecurityException if a security manager exists and its + * {@code checkPermission} method denies permission to set the log writer. * @see SecurityManager#checkPermission * @see #getLogWriter * @since 1.2 @@ -374,8 +355,9 @@ public class DriverManager { * If a {@code null} value is specified for the driver to be removed, then no * action is taken. *

- * If a security manager exists and its {@code checkPermission} denies - * permission, then a {@code SecurityException} will be thrown. + * If a security manager exists, its {@code checkPermission} + * method is first called with a {@code SQLPermission("deregisterDriver")} + * permission to check that the caller is allowed to deregister a JDBC Driver. *

* If the specified driver is not found in the list of registered drivers, * then no action is taken. If the driver was found, it will be removed @@ -501,17 +483,14 @@ public class DriverManager { * by the DriverManager * and all drivers. *

- * In the Java 2 SDK, Standard Edition, version 1.3 release, this method checks - * to see that there is an SQLPermission object before setting - * the logging stream. If a SecurityManager exists and its - * checkPermission method denies setting the log writer, this - * method throws a java.lang.SecurityException. + * If a security manager exists, its {@code checkPermission} + * method is first called with a {@code SQLPermission("setLog")} + * permission to check that the caller is allowed to call {@code setLogStream}. * * @param out the new logging/tracing PrintStream; to disable, set to null * @deprecated Use {@code setLogWriter} * @throws SecurityException if a security manager exists and its - * checkPermission method denies setting the log stream - * + * {@code checkPermission} method denies permission to set the log stream. * @see SecurityManager#checkPermission * @see #getLogStream */ diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java index cd3cf14164e..297779d39c8 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AWTEventMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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,10 +25,8 @@ package com.sun.java.accessibility.util; -import java.util.*; import java.awt.*; import java.awt.event.*; -import javax.accessibility.*; import javax.swing.*; import javax.swing.event.*; import sun.awt.AWTPermissions; @@ -55,7 +53,7 @@ public class AWTEventMonitor { * @deprecated This field is unused; to get the component with focus use the * getComponentWithFocus method. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected Component componentWithFocus = null; static private Component componentWithFocus_private = null; @@ -69,7 +67,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ComponentListener componentListener = null; static private ComponentListener componentListener_private = null; @@ -82,7 +80,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ContainerListener containerListener = null; static private ContainerListener containerListener_private = null; @@ -95,7 +93,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected FocusListener focusListener = null; static private FocusListener focusListener_private = null; @@ -108,7 +106,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected KeyListener keyListener = null; static private KeyListener keyListener_private = null; @@ -121,7 +119,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected MouseListener mouseListener = null; static private MouseListener mouseListener_private = null; @@ -134,7 +132,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected MouseMotionListener mouseMotionListener = null; static private MouseMotionListener mouseMotionListener_private = null; @@ -147,7 +145,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected WindowListener windowListener = null; static private WindowListener windowListener_private = null; @@ -162,7 +160,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ActionListener actionListener = null; static private ActionListener actionListener_private = null; @@ -175,7 +173,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected AdjustmentListener adjustmentListener = null; static private AdjustmentListener adjustmentListener_private = null; @@ -188,7 +186,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected ItemListener itemListener = null; static private ItemListener itemListener_private = null; @@ -201,7 +199,7 @@ public class AWTEventMonitor { * * @deprecated This field is unused. */ - @Deprecated + @Deprecated(since="8", forRemoval=true) static protected TextListener textListener = null; static private TextListener textListener_private = null; @@ -212,13 +210,8 @@ public class AWTEventMonitor { * This listener calls the other registered listeners when an event * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. - * - * @deprecated This field is unused. */ - @Deprecated - static protected AWTEventsListener awtListener = new AWTEventsListener(); - - static private final AWTEventsListener awtListener_private = new AWTEventsListener(); + static private final AWTEventsListener awtListener = new AWTEventsListener(); /** * Returns the component that currently has keyboard focus. The return @@ -253,7 +246,7 @@ public class AWTEventMonitor { static public void addComponentListener(ComponentListener l) { if (componentListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.COMPONENT); + awtListener.installListeners(EventID.COMPONENT); } componentListener_private = AWTEventMulticaster.add(componentListener_private, l); } @@ -268,7 +261,7 @@ public class AWTEventMonitor { static public void removeComponentListener(ComponentListener l) { componentListener_private = AWTEventMulticaster.remove(componentListener_private, l); if (componentListener_private == null) { - awtListener_private.removeListeners(EventID.COMPONENT); + awtListener.removeListeners(EventID.COMPONENT); } } @@ -335,7 +328,7 @@ public class AWTEventMonitor { static public void addKeyListener(KeyListener l) { if (keyListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.KEY); + awtListener.installListeners(EventID.KEY); } keyListener_private = AWTEventMulticaster.add(keyListener_private, l); } @@ -350,7 +343,7 @@ public class AWTEventMonitor { static public void removeKeyListener(KeyListener l) { keyListener_private = AWTEventMulticaster.remove(keyListener_private, l); if (keyListener_private == null) { - awtListener_private.removeListeners(EventID.KEY); + awtListener.removeListeners(EventID.KEY); } } @@ -367,7 +360,7 @@ public class AWTEventMonitor { static public void addMouseListener(MouseListener l) { if (mouseListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.MOUSE); + awtListener.installListeners(EventID.MOUSE); } mouseListener_private = AWTEventMulticaster.add(mouseListener_private, l); } @@ -382,7 +375,7 @@ public class AWTEventMonitor { static public void removeMouseListener(MouseListener l) { mouseListener_private = AWTEventMulticaster.remove(mouseListener_private, l); if (mouseListener_private == null) { - awtListener_private.removeListeners(EventID.MOUSE); + awtListener.removeListeners(EventID.MOUSE); } } @@ -399,7 +392,7 @@ public class AWTEventMonitor { static public void addMouseMotionListener(MouseMotionListener l) { if (mouseMotionListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.MOTION); + awtListener.installListeners(EventID.MOTION); } mouseMotionListener_private = AWTEventMulticaster.add(mouseMotionListener_private, l); } @@ -414,7 +407,7 @@ public class AWTEventMonitor { static public void removeMouseMotionListener(MouseMotionListener l) { mouseMotionListener_private = AWTEventMulticaster.remove(mouseMotionListener_private, l); if (mouseMotionListener_private == null) { - awtListener_private.removeListeners(EventID.MOTION); + awtListener.removeListeners(EventID.MOTION); } } @@ -431,7 +424,7 @@ public class AWTEventMonitor { static public void addWindowListener(WindowListener l) { if (windowListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.WINDOW); + awtListener.installListeners(EventID.WINDOW); } windowListener_private = AWTEventMulticaster.add(windowListener_private, l); } @@ -446,7 +439,7 @@ public class AWTEventMonitor { static public void removeWindowListener(WindowListener l) { windowListener_private = AWTEventMulticaster.remove(windowListener_private, l); if (windowListener_private == null) { - awtListener_private.removeListeners(EventID.WINDOW); + awtListener.removeListeners(EventID.WINDOW); } } @@ -463,7 +456,7 @@ public class AWTEventMonitor { static public void addActionListener(ActionListener l) { if (actionListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.ACTION); + awtListener.installListeners(EventID.ACTION); } actionListener_private = AWTEventMulticaster.add(actionListener_private, l); } @@ -478,7 +471,7 @@ public class AWTEventMonitor { static public void removeActionListener(ActionListener l) { actionListener_private = AWTEventMulticaster.remove(actionListener_private, l); if (actionListener_private == null) { - awtListener_private.removeListeners(EventID.ACTION); + awtListener.removeListeners(EventID.ACTION); } } @@ -496,7 +489,7 @@ public class AWTEventMonitor { static public void addAdjustmentListener(AdjustmentListener l) { if (adjustmentListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.ADJUSTMENT); + awtListener.installListeners(EventID.ADJUSTMENT); } adjustmentListener_private = AWTEventMulticaster.add(adjustmentListener_private, l); } @@ -511,7 +504,7 @@ public class AWTEventMonitor { static public void removeAdjustmentListener(AdjustmentListener l) { adjustmentListener_private = AWTEventMulticaster.remove(adjustmentListener_private, l); if (adjustmentListener_private == null) { - awtListener_private.removeListeners(EventID.ADJUSTMENT); + awtListener.removeListeners(EventID.ADJUSTMENT); } } @@ -528,7 +521,7 @@ public class AWTEventMonitor { static public void addItemListener(ItemListener l) { if (itemListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.ITEM); + awtListener.installListeners(EventID.ITEM); } itemListener_private = AWTEventMulticaster.add(itemListener_private, l); } @@ -543,7 +536,7 @@ public class AWTEventMonitor { static public void removeItemListener(ItemListener l) { itemListener_private = AWTEventMulticaster.remove(itemListener_private, l); if (itemListener_private == null) { - awtListener_private.removeListeners(EventID.ITEM); + awtListener.removeListeners(EventID.ITEM); } } @@ -560,7 +553,7 @@ public class AWTEventMonitor { static public void addTextListener(TextListener l) { if (textListener_private == null) { checkInstallPermission(); - awtListener_private.installListeners(EventID.TEXT); + awtListener.installListeners(EventID.TEXT); } textListener_private = AWTEventMulticaster.add(textListener_private, l); } @@ -575,7 +568,7 @@ public class AWTEventMonitor { static public void removeTextListener(TextListener l) { textListener_private = AWTEventMulticaster.remove(textListener_private, l); if (textListener_private == null) { - awtListener_private.removeListeners(EventID.TEXT); + awtListener.removeListeners(EventID.TEXT); } } diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java index 603ba035ae7..e26718d15b5 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/AccessibilityEventMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -63,7 +63,7 @@ public class AccessibilityEventMonitor { * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. */ - static protected final AccessibilityEventListener accessibilityListener = + static private final AccessibilityEventListener accessibilityListener = new AccessibilityEventListener(); /** diff --git a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java index bbb0fcb18b3..c5dcda4df3e 100644 --- a/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java +++ b/jdk/src/jdk.accessibility/share/classes/com/sun/java/accessibility/util/SwingEventMonitor.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 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 @@ -71,7 +71,7 @@ public class SwingEventMonitor extends AWTEventMonitor { * occurs. By doing things this way, the actual number of listeners * installed on a component instance is drastically reduced. */ - static protected final SwingEventListener swingListener = new SwingEventListener(); + static private final SwingEventListener swingListener = new SwingEventListener(); /** * Adds the specified listener to receive all {@link EventID#ANCESTOR ANCESTOR} diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java index 62992138361..1b5d48a6b4a 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java +++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/GNUStyleOptions.java @@ -34,6 +34,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; +import jdk.internal.module.ModuleResolution; /** * Parser for GNU Style Options. @@ -158,6 +159,31 @@ class GNUStyleOptions { ModuleFinder.of(paths)); } }, + new Option(false, OptionType.CREATE_UPDATE, "--do-not-resolve-by-default") { + void process(Main jartool, String opt, String arg) { + ModuleResolution mres = jartool.moduleResolution; + jartool.moduleResolution = mres.withDoNotResolveByDefault(); + } + boolean isExtra() { return true; } + }, + new Option(true, OptionType.CREATE_UPDATE, "--warn-if-resolved") { + void process(Main jartool, String opt, String arg) throws BadArgs { + ModuleResolution mres = ModuleResolution.empty(); + if (jartool.moduleResolution.doNotResolveByDefault()) + mres.withDoNotResolveByDefault(); + + if (arg.equals("deprecated")) { + jartool.moduleResolution = mres.withDeprecated(); + } else if (arg.equals("deprecated-for-removal")) { + jartool.moduleResolution = mres.withDeprecatedForRemoval(); + } else if (arg.equals("incubating")) { + jartool.moduleResolution = mres.withIncubating(); + } else { + throw new BadArgs("error.bad.reason", arg); + } + } + boolean isExtra() { return true; } + }, new Option(false, OptionType.CREATE_UPDATE_INDEX, "--no-compress", "-0") { void process(Main jartool, String opt, String arg) { jartool.flag0 = true; @@ -175,17 +201,20 @@ class GNUStyleOptions { // Other options new Option(true, true, OptionType.OTHER, "--help", "-h") { void process(Main jartool, String opt, String arg) throws BadArgs { - if (jartool.info == null) { - if (arg == null) { - jartool.info = Main.Info.HELP; - return; - } - - if (!arg.equals("compat")) - throw new BadArgs("error.illegal.option", arg).showUsage(true); - - jartool.info = Main.Info.COMPAT_HELP; + if (arg == null) { + jartool.info = Main.Info.HELP; + return; } + + if (!arg.equals("compat")) + throw new BadArgs("error.illegal.option", arg).showUsage(true); + + jartool.info = Main.Info.COMPAT_HELP; + } + }, + new Option(false, OptionType.OTHER, "--help-extra") { + void process(Main jartool, String opt, String arg) throws BadArgs { + jartool.info = Main.Info.HELP_EXTRA; } }, new Option(false, OptionType.OTHER, "--version") { @@ -229,6 +258,8 @@ class GNUStyleOptions { boolean isHidden() { return false; } + boolean isExtra() { return false; } + boolean matches(String opt) { for (String a : aliases) { if (a.equals(opt)) { @@ -292,6 +323,14 @@ class GNUStyleOptions { } static void printHelp(PrintWriter out) { + printHelp(out, false); + } + + static void printHelpExtra(PrintWriter out) { + printHelp(out, true); + } + + private static void printHelp(PrintWriter out, boolean printExtra) { out.format("%s%n", Main.getMsg("main.help.preopt")); for (OptionType type : OptionType.values()) { boolean typeHeadingWritten = false; @@ -304,6 +343,9 @@ class GNUStyleOptions { if (o.isHidden() || name.equals("h")) { continue; } + if (o.isExtra() && !printExtra) { + continue; + } if (!typeHeadingWritten) { out.format("%n%s%n", Main.getMsg("main.help.opt." + type.name)); typeHeadingWritten = true; diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java index 6d00af822ff..8e0fc0160de 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java +++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/Main.java @@ -47,7 +47,6 @@ import java.nio.file.StandardCopyOption; import java.util.*; import java.util.function.Consumer; import java.util.function.Function; -import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -57,11 +56,11 @@ import java.util.jar.Pack200.*; import java.util.jar.Manifest; import java.text.MessageFormat; -import jdk.internal.misc.JavaLangModuleAccess; -import jdk.internal.misc.SharedSecrets; import jdk.internal.module.Checks; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo; import jdk.internal.module.ModuleInfoExtender; +import jdk.internal.module.ModuleResolution; import jdk.internal.util.jar.JarIndex; import static jdk.internal.util.jar.JarIndex.INDEX_NAME; @@ -211,6 +210,7 @@ class Main { /* To support additional GNU Style informational options */ enum Info { HELP(GNUStyleOptions::printHelp), + HELP_EXTRA(GNUStyleOptions::printHelpExtra), COMPAT_HELP(GNUStyleOptions::printCompatHelp), USAGE_TRYHELP(GNUStyleOptions::printUsageTryHelp), VERSION(GNUStyleOptions::printVersion); @@ -225,6 +225,7 @@ class Main { /* Modular jar related options */ Version moduleVersion; Pattern modulesToHash; + ModuleResolution moduleResolution = ModuleResolution.empty(); ModuleFinder moduleFinder = ModuleFinder.of(); private static final String MODULE_INFO = "module-info.class"; @@ -1991,12 +1992,13 @@ class Main { .collect(joining(" ")); } - private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); - private void printModuleDescriptor(InputStream entryInputStream) throws IOException { - ModuleDescriptor md = ModuleDescriptor.read(entryInputStream); + ModuleInfo.Attributes attrs = ModuleInfo.read(entryInputStream, null); + ModuleDescriptor md = attrs.descriptor(); + ModuleHashes hashes = attrs.recordedHashes(); + StringBuilder sb = new StringBuilder(); sb.append("\n"); if (md.isOpen()) @@ -2043,15 +2045,24 @@ class Main { md.osVersion().ifPresent(v -> sb.append("\n operating-system-version " + v)); - JLMA.hashes(md).ifPresent(hashes -> - hashes.names().stream().sorted().forEach( + if (hashes != null) { + hashes.names().stream().sorted().forEach( mod -> sb.append("\n hashes ").append(mod).append(" ") .append(hashes.algorithm()).append(" ") - .append(hashes.hashFor(mod)))); + .append(toHex(hashes.hashFor(mod)))); + } output(sb.toString()); } + private 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 static String toBinaryName(String classname) { return (classname.replace('.', '/')) + ".class"; } @@ -2212,6 +2223,10 @@ class Main { } } + if (moduleResolution.value() != 0) { + extender.moduleResolution(moduleResolution); + } + extender.write(baos); return baos.toByteArray(); } @@ -2228,13 +2243,12 @@ class Main { // Create a module finder that finds the modular JAR // being created/updated URI uri = Paths.get(fname).toUri(); - ModuleReference mref = new ModuleReference(descriptor, uri, - new Supplier<>() { - @Override - public ModuleReader get() { - throw new UnsupportedOperationException("should not reach here"); - } - }); + ModuleReference mref = new ModuleReference(descriptor, uri) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException("should not reach here"); + } + }; // Compose a module finder with the module path and // the modular JAR being created or updated diff --git a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties index dd1d0ff4ee0..c575f3b3c00 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties +++ b/jdk/src/jdk.jartool/share/classes/sun/tools/jar/resources/jar.properties @@ -46,6 +46,8 @@ error.bad.eflag=\ together! error.bad.dflag=\ '-d, --print-module-descriptor' option requires no input file(s) to be specified: {0} +error.bad.reason=\ + bad reason: {0}, must be one of deprecated, deprecated-for-removal, or incubating error.nosuch.fileordir=\ {0} : no such file or directory error.write.file=\ @@ -246,6 +248,12 @@ main.help.opt.create.update.hash-modules=\ main.help.opt.create.update.module-path=\ \ -p, --module-path Location of module dependence for generating\n\ \ the hash +main.help.opt.create.update.do-not-resolve-by-default=\ +\ --do-not-resolve-by-default Exclude from the default root set of modules +main.help.opt.create.update.warn-if-resolved=\ +\ --warn-if-resolved Hint for a tool to issue a warning if the module\n\ +\ is resolved. One of deprecated, deprecated-for-removal,\n\ +\ or incubating main.help.opt.create.update.index=\ \ Operation modifiers valid only in create, update, and generate-index mode:\n main.help.opt.create.update.index.no-compress=\ @@ -254,6 +262,8 @@ main.help.opt.other=\ \ Other options:\n main.help.opt.other.help=\ \ -?, --help[:compat] Give this, or optionally the compatibility, help +main.help.opt.other.help-extra=\ +\ --help-extra Give help on extra options main.help.opt.other.version=\ \ --version Print program version main.help.postopt=\ diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java index 5e01cc5f9af..27f79dd74d1 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java @@ -130,6 +130,7 @@ public final class DefaultImageBuilder implements ImageBuilder { } private final Path root; + private final Map launchers; private final Path mdir; private final Set modules = new HashSet<>(); private String targetOsName; @@ -140,10 +141,9 @@ public final class DefaultImageBuilder implements ImageBuilder { * @param root The image root directory. * @throws IOException */ - public DefaultImageBuilder(Path root) throws IOException { - Objects.requireNonNull(root); - - this.root = root; + public DefaultImageBuilder(Path root, Map launchers) throws IOException { + this.root = Objects.requireNonNull(root); + this.launchers = Objects.requireNonNull(launchers); this.mdir = root.resolve("lib"); Files.createDirectories(mdir); } @@ -235,7 +235,7 @@ public final class DefaultImageBuilder implements ImageBuilder { // If native files are stripped completely, /bin dir won't exist! // So, don't bother generating launcher scripts. if (Files.isDirectory(bin)) { - prepareApplicationFiles(files, modules); + prepareApplicationFiles(files); } } catch (IOException ex) { throw new PluginException(ex); @@ -246,22 +246,44 @@ public final class DefaultImageBuilder implements ImageBuilder { * Generates launcher scripts. * * @param imageContent The image content. - * @param modules The set of modules that the runtime image contains. * @throws IOException */ - protected void prepareApplicationFiles(ResourcePool imageContent, Set modules) throws IOException { + protected void prepareApplicationFiles(ResourcePool imageContent) throws IOException { // generate launch scripts for the modules with a main class - for (String module : modules) { + for (Map.Entry entry : launchers.entrySet()) { + String launcherEntry = entry.getValue(); + int slashIdx = launcherEntry.indexOf("/"); + String module, mainClassName; + if (slashIdx == -1) { + module = launcherEntry; + mainClassName = null; + } else { + module = launcherEntry.substring(0, slashIdx); + assert !module.isEmpty(); + mainClassName = launcherEntry.substring(slashIdx + 1); + assert !mainClassName.isEmpty(); + } + String path = "/" + module + "/module-info.class"; Optional res = imageContent.findEntry(path); if (!res.isPresent()) { throw new IOException("module-info.class not found for " + module + " module"); } - Optional mainClass; ByteArrayInputStream stream = new ByteArrayInputStream(res.get().contentBytes()); - mainClass = ModuleDescriptor.read(stream).mainClass(); - if (mainClass.isPresent()) { - Path cmd = root.resolve("bin").resolve(module); + Optional mainClass = ModuleDescriptor.read(stream).mainClass(); + if (mainClassName == null && mainClass.isPresent()) { + mainClassName = mainClass.get(); + } + + if (mainClassName != null) { + // make sure main class exists! + if (!imageContent.findEntry("/" + module + "/" + + mainClassName.replace('.', '/') + ".class").isPresent()) { + throw new IllegalArgumentException(module + " does not have main class: " + mainClassName); + } + + String launcherFile = entry.getKey(); + Path cmd = root.resolve("bin").resolve(launcherFile); // generate shell script for Unix platforms StringBuilder sb = new StringBuilder(); sb.append("#!/bin/sh") @@ -272,7 +294,7 @@ public final class DefaultImageBuilder implements ImageBuilder { .append("\n"); sb.append("$DIR/java $JLINK_VM_OPTIONS -m ") .append(module).append('/') - .append(mainClass.get()) + .append(mainClassName) .append(" $@\n"); try (BufferedWriter writer = Files.newBufferedWriter(cmd, @@ -286,7 +308,7 @@ public final class DefaultImageBuilder implements ImageBuilder { } // generate .bat file for Windows if (isWindows()) { - Path bat = root.resolve(BIN_DIRNAME).resolve(module + ".bat"); + Path bat = root.resolve(BIN_DIRNAME).resolve(launcherFile + ".bat"); sb = new StringBuilder(); sb.append("@echo off") .append("\r\n"); @@ -296,7 +318,7 @@ public final class DefaultImageBuilder implements ImageBuilder { .append("\r\n"); sb.append("\"%DIR%\\java\" %JLINK_VM_OPTIONS% -m ") .append(module).append('/') - .append(mainClass.get()) + .append(mainClassName) .append(" %*\r\n"); try (BufferedWriter writer = Files.newBufferedWriter(bat, @@ -305,6 +327,8 @@ public final class DefaultImageBuilder implements ImageBuilder { writer.write(sb.toString()); } } + } else { + throw new IllegalArgumentException(module + " doesn't contain main class & main not specified in command line"); } } } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java index 4a5cbffe579..0eb7ade59fa 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java @@ -53,7 +53,9 @@ import jdk.tools.jlink.internal.ImagePluginStack.ImageProvider; import jdk.tools.jlink.plugin.PluginException; import jdk.tools.jlink.builder.DefaultImageBuilder; import jdk.tools.jlink.plugin.Plugin; -import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.Checks; +import jdk.internal.module.ModulePath; +import jdk.internal.module.ModuleResolution; /** * Implementation for the jlink tool. @@ -108,6 +110,27 @@ public class JlinkTask { Path path = Paths.get(arg); task.options.output = path; }, "--output"), + new Option(true, (task, opt, arg) -> { + String[] values = arg.split("="); + // check values + if (values.length != 2 || values[0].isEmpty() || values[1].isEmpty()) { + throw taskHelper.newBadArgs("err.launcher.value.format", arg); + } else { + String commandName = values[0]; + String moduleAndMain = values[1]; + int idx = moduleAndMain.indexOf("/"); + if (idx != -1) { + if (moduleAndMain.substring(0, idx).isEmpty()) { + throw taskHelper.newBadArgs("err.launcher.module.name.empty", arg); + } + + if (moduleAndMain.substring(idx + 1).isEmpty()) { + throw taskHelper.newBadArgs("err.launcher.main.class.empty", arg); + } + } + task.options.launchers.put(commandName, moduleAndMain); + } + }, "--launcher"), new Option(true, (task, opt, arg) -> { if ("little".equals(arg)) { task.options.endian = ByteOrder.LITTLE_ENDIAN; @@ -168,6 +191,7 @@ public class JlinkTask { final Set limitMods = new HashSet<>(); final Set addMods = new HashSet<>(); Path output; + final Map launchers = new HashMap<>(); Path packagedModulesPath; ByteOrder endian = ByteOrder.nativeOrder(); boolean ignoreSigning = false; @@ -260,7 +284,8 @@ public class JlinkTask { config.getModules(), config.getByteOrder(), null, - IGNORE_SIGNING_DEFAULT); + IGNORE_SIGNING_DEFAULT, + null); // Then create the Plugin Stack ImagePluginStack stack = ImagePluginConfiguration.parseConfiguration(plugins); @@ -284,7 +309,7 @@ public class JlinkTask { } private void postProcessOnly(Path existingImage) throws Exception { - PluginsConfiguration config = taskHelper.getPluginsConfig(null); + PluginsConfiguration config = taskHelper.getPluginsConfig(null, null); ExecutableImage img = DefaultImageBuilder.getExecutableImage(existingImage); if (img == null) { throw taskHelper.newBadArgs("err.existing.image.invalid"); @@ -328,11 +353,12 @@ public class JlinkTask { roots, options.endian, options.packagedModulesPath, - options.ignoreSigning); + options.ignoreSigning, + log); // Then create the Plugin Stack ImagePluginStack stack = ImagePluginConfiguration. - parseConfiguration(taskHelper.getPluginsConfig(options.output)); + parseConfiguration(taskHelper.getPluginsConfig(options.output, options.launchers)); //Ask the stack to proceed stack.operate(imageProvider); @@ -344,9 +370,7 @@ public class JlinkTask { */ private ModuleFinder modulePathFinder() { Path[] entries = options.modulePath.toArray(new Path[0]); - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, entries); - + ModuleFinder finder = new ModulePath(Runtime.version(), true, entries); if (!options.limitMods.isEmpty()) { finder = limitFinder(finder, options.limitMods, Collections.emptySet()); } @@ -364,8 +388,7 @@ public class JlinkTask { Set roots) { Path[] entries = paths.toArray(new Path[0]); - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, entries); + ModuleFinder finder = new ModulePath(Runtime.version(), true, entries); // if limitmods is specified then limit the universe if (!limitMods.isEmpty()) { @@ -386,7 +409,8 @@ public class JlinkTask { Set roots, ByteOrder order, Path retainModulesPath, - boolean ignoreSigning) + boolean ignoreSigning, + PrintWriter log) throws IOException { if (roots.isEmpty()) { @@ -398,6 +422,27 @@ public class JlinkTask { ModuleFinder.of(), roots); + // emit warning for modules that end with a digit + cf.modules().stream() + .map(ResolvedModule::name) + .filter(mn -> !Checks.hasLegalModuleNameLastCharacter(mn)) + .forEach(mn -> System.err.println("WARNING: Module name \"" + + mn + "\" may soon be illegal")); + + // emit a warning for any incubating modules in the configuration + if (log != null) { + String im = cf.modules() + .stream() + .map(ResolvedModule::reference) + .filter(ModuleResolution::hasIncubatingWarning) + .map(ModuleReference::descriptor) + .map(ModuleDescriptor::name) + .collect(Collectors.joining(", ")); + + if (!"".equals(im)) + log.println("WARNING: Using incubator modules: " + im); + } + Map mods = cf.modules().stream() .collect(Collectors.toMap(ResolvedModule::name, JlinkTask::toPathLocation)); return new ImageHelper(cf, mods, order, retainModulesPath, ignoreSigning); diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java index 63ce3cd7593..9c81c7740c6 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolConfiguration.java @@ -28,6 +28,7 @@ package jdk.tools.jlink.internal; import java.lang.module.Configuration; import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleFinder; +import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; import java.io.IOException; import java.io.UncheckedIOException; @@ -78,10 +79,12 @@ final class ResourcePoolConfiguration { } private static ModuleReference moduleReference(ModuleDescriptor desc) { - return new ModuleReference(desc, null, () -> { - IOException ioe = new IOException(""); - throw new UncheckedIOException(ioe); - }); + return new ModuleReference(desc, null) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException(); + } + }; } private static Map allModRefs(ResourcePool pool) { diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java index fc7d85fbff7..19044f57e65 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/TaskHelper.java @@ -58,7 +58,7 @@ import jdk.tools.jlink.internal.Jlink.PluginsConfiguration; import jdk.tools.jlink.internal.plugins.PluginsResourceBundle; import jdk.tools.jlink.internal.plugins.DefaultCompressPlugin; import jdk.tools.jlink.internal.plugins.StripDebugPlugin; -import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModulePath; /** * @@ -403,7 +403,7 @@ public final class TaskHelper { return null; } - private PluginsConfiguration getPluginsConfig(Path output + private PluginsConfiguration getPluginsConfig(Path output, Map launchers ) throws IOException, BadArgs { if (output != null) { if (Files.exists(output)) { @@ -440,9 +440,9 @@ public final class TaskHelper { // recreate or postprocessing don't require an output directory. ImageBuilder builder = null; if (output != null) { - builder = new DefaultImageBuilder(output); - + builder = new DefaultImageBuilder(output, launchers); } + return new Jlink.PluginsConfiguration(pluginsList, builder, lastSorter); } @@ -745,9 +745,9 @@ public final class TaskHelper { + bundleHelper.getMessage(key, args)); } - public PluginsConfiguration getPluginsConfig(Path output) + public PluginsConfiguration getPluginsConfig(Path output, Map launchers) throws IOException, BadArgs { - return pluginOptions.getPluginsConfig(output); + return pluginOptions.getPluginsConfig(output, launchers); } public Path getExistingImage() { @@ -765,9 +765,7 @@ public final class TaskHelper { static Layer createPluginsLayer(List paths) { Path[] dirs = paths.toArray(new Path[0]); - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, dirs); - + ModuleFinder finder = new ModulePath(Runtime.version(), true, dirs); Configuration bootConfiguration = Layer.boot().configuration(); try { Configuration cf = bootConfiguration diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java index 5b06d8135f2..dd0889d3786 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/packager/AppRuntimeImageBuilder.java @@ -49,6 +49,7 @@ import java.util.Set; */ public final class AppRuntimeImageBuilder { private Path outputDir = null; + private Map launchers = Collections.emptyMap(); private List modulePath = null; private Set addModules = null; private Set limitModules = null; @@ -62,6 +63,10 @@ public final class AppRuntimeImageBuilder { outputDir = value; } + public void setLaunchers(Map value) { + launchers = value; + } + public void setModulePath(List value) { modulePath = value; } @@ -120,7 +125,7 @@ public final class AppRuntimeImageBuilder { // build the image Jlink.PluginsConfiguration pluginConfig = new Jlink.PluginsConfiguration( - plugins, new DefaultImageBuilder(outputDir), null); + plugins, new DefaultImageBuilder(outputDir, launchers), null); Jlink jlink = new Jlink(); jlink.build(jlinkConfig, pluginConfig); } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java similarity index 67% rename from jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java rename to jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.java index 6be8c5f2acf..d7cd59a398e 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModuleDescriptorPlugin.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/SystemModulesPlugin.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 @@ -34,17 +34,19 @@ import java.util.ArrayList; import java.util.Collection; import java.util.EnumSet; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Objects; import java.util.Set; +import java.util.TreeSet; import java.util.function.IntSupplier; import jdk.internal.misc.JavaLangModuleAccess; import jdk.internal.misc.SharedSecrets; import jdk.internal.module.Checks; +import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo.Attributes; import jdk.internal.module.ModuleInfoExtender; +import jdk.internal.module.ModuleResolution; import jdk.internal.module.SystemModules; import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.MethodVisitor; @@ -55,7 +57,6 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*; import jdk.tools.jlink.plugin.PluginException; import jdk.tools.jlink.plugin.ResourcePool; import jdk.tools.jlink.plugin.Plugin; -import jdk.tools.jlink.internal.plugins.SystemModuleDescriptorPlugin.SystemModulesClassGenerator.*; import jdk.tools.jlink.plugin.ResourcePoolBuilder; import jdk.tools.jlink.plugin.ResourcePoolEntry; @@ -67,10 +68,10 @@ import jdk.tools.jlink.plugin.ResourcePoolEntry; * * This plugin will override jdk.internal.module.SystemModules class * - * @see java.lang.module.SystemModuleFinder + * @see jdk.internal.module.SystemModuleFinder * @see SystemModules */ -public final class SystemModuleDescriptorPlugin implements Plugin { +public final class SystemModulesPlugin implements Plugin { private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); @@ -79,7 +80,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { PluginsResourceBundle.getDescription(NAME); private boolean enabled; - public SystemModuleDescriptorPlugin() { + public SystemModulesPlugin() { this.enabled = true; } @@ -126,20 +127,18 @@ public final class SystemModuleDescriptorPlugin implements Plugin { assert module.name().equals(data.moduleName()); try { - ByteArrayInputStream bain = new ByteArrayInputStream(data.contentBytes()); - ModuleDescriptor md = ModuleDescriptor.read(bain); - validateNames(md); + ModuleInfo moduleInfo = new ModuleInfo(data.contentBytes(), module.packages()); + generator.addModule(moduleInfo); - Set packages = module.packages(); - generator.addModule(md, module.packages()); + // link-time validation + moduleInfo.validateNames(); + // check if any exported or open package is not present + moduleInfo.validatePackages(); - // add Packages attribute if not exist - if (md.packages().isEmpty() && packages.size() > 0) { - bain.reset(); - ModuleInfoRewriter minfoWriter = - new ModuleInfoRewriter(bain, module.packages()); + // Packages attribute needs update + if (moduleInfo.shouldAddPackagesAttribute()) { // replace with the overridden version - data = data.copyWithContent(minfoWriter.getBytes()); + data = data.copyWithContent(moduleInfo.getBytes()); } out.add(data); } catch (IOException e) { @@ -164,61 +163,119 @@ public final class SystemModuleDescriptorPlugin implements Plugin { return out.build(); } - /* - * Add Packages attribute - */ - class ModuleInfoRewriter extends ByteArrayOutputStream { - final ModuleInfoExtender extender; - ModuleInfoRewriter(InputStream in, Set packages) throws IOException { - this.extender = ModuleInfoExtender.newExtender(in); - // Add Packages attribute - this.extender.packages(packages); - this.extender.write(this); + class ModuleInfo { + final ModuleDescriptor descriptor; + final ModuleHashes recordedHashes; + final ModuleResolution moduleResolution; + final Set packages; + final ByteArrayInputStream bain; + + ModuleInfo(byte[] bytes, Set packages) throws IOException { + this.bain = new ByteArrayInputStream(bytes); + this.packages = packages; + + Attributes attrs = jdk.internal.module.ModuleInfo.read(bain, null); + this.descriptor = attrs.descriptor(); + this.recordedHashes = attrs.recordedHashes(); + this.moduleResolution = attrs.moduleResolution(); + + if (descriptor.isAutomatic()) { + throw new InternalError("linking automatic module is not supported"); + } } - byte[] getBytes() { - return buf; + String moduleName() { + return descriptor.name(); } - } - void validateNames(ModuleDescriptor md) { - Checks.requireModuleName(md.name()); - for (Requires req : md.requires()) { - Checks.requireModuleName(req.name()); + /** + * Validates names in ModuleDescriptor + */ + void validateNames() { + Checks.requireModuleName(descriptor.name()); + for (Requires req : descriptor.requires()) { + Checks.requireModuleName(req.name()); + } + for (Exports e : descriptor.exports()) { + Checks.requirePackageName(e.source()); + if (e.isQualified()) + e.targets().forEach(Checks::requireModuleName); + } + for (Opens opens : descriptor.opens()) { + Checks.requirePackageName(opens.source()); + if (opens.isQualified()) + opens.targets().forEach(Checks::requireModuleName); + } + for (Provides provides : descriptor.provides()) { + Checks.requireServiceTypeName(provides.service()); + provides.providers().forEach(Checks::requireServiceProviderName); + } + for (String service : descriptor.uses()) { + Checks.requireServiceTypeName(service); + } + for (String pn : descriptor.packages()) { + Checks.requirePackageName(pn); + } } - for (Exports e : md.exports()) { - Checks.requirePackageName(e.source()); - if (e.isQualified()) - e.targets().forEach(Checks::requireModuleName); - } - for (Opens opens : md.opens()) { - Checks.requirePackageName(opens.source()); - if (opens.isQualified()) - opens.targets().forEach(Checks::requireModuleName); - } - for (Provides provides : md.provides()) { - Checks.requireServiceTypeName(provides.service()); - provides.providers().forEach(Checks::requireServiceProviderName); - } - for (String service : md.uses()) { - Checks.requireServiceTypeName(service); - } - for (String pn : md.packages()) { - Checks.requirePackageName(pn); - } - } - /* - * Returns the initial capacity for a new Set or Map of the given size - * to avoid resizing. - */ - static final int initialCapacity(int size) { - if (size == 0) { - return 0; - } else { - // Adjust to try and get size/capacity as close to the - // HashSet/HashMap default load factor without going over. - return (int)(Math.ceil((double)size / 0.75)); + + /** + * Validates if exported and open packages are present + */ + void validatePackages() { + Set nonExistPackages = new TreeSet<>(); + descriptor.exports().stream() + .map(Exports::source) + .filter(pn -> !packages.contains(pn)) + .forEach(nonExistPackages::add); + + descriptor.opens().stream() + .map(Opens::source) + .filter(pn -> !packages.contains(pn)) + .forEach(nonExistPackages::add); + + if (!nonExistPackages.isEmpty()) { + throw new PluginException("Packages that are exported or open in " + + descriptor.name() + " are not present: " + nonExistPackages); + } + } + + /** + * Returns true if the PackagesAttribute should be written + */ + boolean shouldAddPackagesAttribute() { + return descriptor.packages().isEmpty() && packages.size() > 0; + } + + /** + * Returns the bytes for the module-info.class with PackagesAttribute + * if it contains at least one package + */ + byte[] getBytes() throws IOException { + bain.reset(); + + // add Packages attribute if not exist + if (shouldAddPackagesAttribute()) { + return new ModuleInfoRewriter(bain, packages).getBytes(); + } else { + return bain.readAllBytes(); + } + } + + class ModuleInfoRewriter extends ByteArrayOutputStream { + final ModuleInfoExtender extender; + ModuleInfoRewriter(InputStream in, Set packages) throws IOException { + this.extender = ModuleInfoExtender.newExtender(in); + // Add Packages attribute + if (packages.size() > 0) { + this.extender.packages(packages); + } + this.extender.write(this); + } + + byte[] getBytes() { + return buf; + } } } @@ -239,30 +296,31 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "java/lang/module/ModuleDescriptor$Exports$Modifier"; private static final String OPENS_MODIFIER_CLASSNAME = "java/lang/module/ModuleDescriptor$Opens$Modifier"; + private static final String MODULE_HASHES_ARRAY_SIGNATURE = + "[Ljdk/internal/module/ModuleHashes;"; + private static final String MODULE_RESOLUTION_CLASSNAME = + "jdk/internal/module/ModuleResolution"; + private static final String MODULE_RESOLUTIONS_ARRAY_SIGNATURE = + "[Ljdk/internal/module/ModuleResolution;"; // static variables in SystemModules class private static final String MODULE_NAMES = "MODULE_NAMES"; - private static final String MODULES_TO_HASH = "MODULES_TO_HASH"; private static final String PACKAGE_COUNT = "PACKAGES_IN_BOOT_LAYER"; private static final int MAX_LOCAL_VARS = 256; private final int BUILDER_VAR = 0; private final int MD_VAR = 1; // variable for ModuleDescriptor + private final int MH_VAR = 1; // variable for ModuleHashes private int nextLocalVar = 2; // index to next local variable private final ClassWriter cw; + + // Method visitor for generating the SystemModules::modules() method private MethodVisitor mv; - private int nextModulesIndex = 0; // list of all ModuleDescriptorBuilders, invoked in turn when building. - private final List builders = new ArrayList<>(); - - // module name to hash - private final Map modulesToHash = new HashMap<>(); - - // module name to index in MODULES_TO_HASH - private final Map modulesToHashIndex = new HashMap<>(); + private final List moduleInfos = new ArrayList<>(); // A builder to create one single Set instance for a given set of // names or modifiers to reduce the footprint @@ -293,66 +351,34 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "[Ljava/lang/String;", null, null) .visitEnd(); - // public static byte[][] MODULES_TO_HASH - cw.visitField(ACC_PUBLIC+ACC_FINAL+ACC_STATIC, MODULES_TO_HASH, - "[[B", null, null) - .visitEnd(); - // public static int PACKAGES_IN_BOOT_LAYER; cw.visitField(ACC_PUBLIC+ACC_FINAL+ACC_STATIC, PACKAGE_COUNT, "I", null, numPackages) .visitEnd(); - this.mv = cw.visitMethod(ACC_STATIC, "", "()V", - null, null); - mv.visitCode(); + MethodVisitor clinit = + cw.visitMethod(ACC_STATIC, "", "()V", + null, null); + clinit.visitCode(); // create the MODULE_NAMES array - pushInt(numModules); - mv.visitTypeInsn(ANEWARRAY, "java/lang/String"); + pushInt(clinit, numModules); + clinit.visitTypeInsn(ANEWARRAY, "java/lang/String"); int index = 0; - for (ModuleDescriptorBuilder builder : builders) { - mv.visitInsn(DUP); // arrayref - pushInt(index++); - mv.visitLdcInsn(builder.md.name()); // value - mv.visitInsn(AASTORE); + for (ModuleInfo minfo : moduleInfos) { + clinit.visitInsn(DUP); // arrayref + pushInt(clinit, index++); + clinit.visitLdcInsn(minfo.moduleName()); // value + clinit.visitInsn(AASTORE); } - mv.visitFieldInsn(PUTSTATIC, CLASSNAME, MODULE_NAMES, + clinit.visitFieldInsn(PUTSTATIC, CLASSNAME, MODULE_NAMES, "[Ljava/lang/String;"); - // create the MODULES_TO_HASH array - pushInt(numModules); - mv.visitTypeInsn(ANEWARRAY, "[B"); - - index = 0; - for (ModuleDescriptorBuilder builder : builders) { - String mn = builder.md.name(); - byte[] recordedHash = modulesToHash.get(mn); - if (recordedHash != null) { - mv.visitInsn(DUP); // arrayref - pushInt(index); - pushInt(recordedHash.length); - mv.visitIntInsn(NEWARRAY, T_BYTE); - for (int i = 0; i < recordedHash.length; i++) { - mv.visitInsn(DUP); // arrayref - pushInt(i); - mv.visitIntInsn(BIPUSH, recordedHash[i]); - mv.visitInsn(BASTORE); - } - mv.visitInsn(AASTORE); - modulesToHashIndex.put(mn, index); - } - index++; - } - - mv.visitFieldInsn(PUTSTATIC, CLASSNAME, MODULES_TO_HASH, "[[B"); - - mv.visitInsn(RETURN); - mv.visitMaxs(0, 0); - mv.visitEnd(); - + clinit.visitInsn(RETURN); + clinit.visitMaxs(0, 0); + clinit.visitEnd(); } /* @@ -360,9 +386,9 @@ public final class SystemModuleDescriptorPlugin implements Plugin { * prepares mapping from various Sets to SetBuilders to emit an * optimized number of sets during build. */ - public void addModule(ModuleDescriptor md, Set packages) { - ModuleDescriptorBuilder builder = new ModuleDescriptorBuilder(md, packages); - builders.add(builder); + public void addModule(ModuleInfo moduleInfo) { + ModuleDescriptor md = moduleInfo.descriptor; + moduleInfos.add(moduleInfo); // exports for (Exports e : md.exports()) { @@ -383,45 +409,129 @@ public final class SystemModuleDescriptorPlugin implements Plugin { // uses dedupSetBuilder.stringSet(md.uses()); - - // hashes - JLMA.hashes(md).ifPresent(mh -> modulesToHash.putAll(mh.hashes())); } /* * Generate bytecode for SystemModules */ public ClassWriter getClassWriter() { - int numModules = builders.size(); + int numModules = moduleInfos.size(); int numPackages = 0; - for (ModuleDescriptorBuilder builder : builders) { - numPackages += builder.md.packages().size(); + for (ModuleInfo minfo : moduleInfos) { + numPackages += minfo.packages.size(); } - this.clinit(numModules, numPackages); - this.mv = cw.visitMethod(ACC_PUBLIC+ACC_STATIC, - "modules", "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, - "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, null); + clinit(numModules, numPackages); + + // generate SystemModules::descriptors + genDescriptorsMethod(); + // generate SystemModules::hashes + genHashesMethod(); + // generate SystemModules::moduleResolutions + genModuleResolutionsMethod(); + + return cw; + } + + /* + * Generate bytecode for SystemModules::descriptors method + */ + private void genDescriptorsMethod() { + this.mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, + "descriptors", + "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, + "()" + MODULE_DESCRIPTOR_ARRAY_SIGNATURE, + null); mv.visitCode(); - pushInt(numModules); + pushInt(mv, moduleInfos.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor"); mv.visitVarInsn(ASTORE, MD_VAR); - for (ModuleDescriptorBuilder builder : builders) { - builder.build(); + for (int index = 0; index < moduleInfos.size(); index++) { + ModuleInfo minfo = moduleInfos.get(index); + new ModuleDescriptorBuilder(minfo.descriptor, + minfo.packages, + index).build(); } mv.visitVarInsn(ALOAD, MD_VAR); mv.visitInsn(ARETURN); mv.visitMaxs(0, 0); mv.visitEnd(); - return cw; + + } + + /* + * Generate bytecode for SystemModules::hashes method + */ + private void genHashesMethod() { + MethodVisitor hmv = + cw.visitMethod(ACC_PUBLIC + ACC_STATIC, + "hashes", + "()" + MODULE_HASHES_ARRAY_SIGNATURE, + "()" + MODULE_HASHES_ARRAY_SIGNATURE, + null); + hmv.visitCode(); + pushInt(hmv, moduleInfos.size()); + hmv.visitTypeInsn(ANEWARRAY, "jdk/internal/module/ModuleHashes"); + hmv.visitVarInsn(ASTORE, MH_VAR); + + for (int index = 0; index < moduleInfos.size(); index++) { + ModuleInfo minfo = moduleInfos.get(index); + if (minfo.recordedHashes != null) { + new ModuleHashesBuilder(minfo.recordedHashes, + index, + hmv).build(); + } + } + + hmv.visitVarInsn(ALOAD, MH_VAR); + hmv.visitInsn(ARETURN); + hmv.visitMaxs(0, 0); + hmv.visitEnd(); + + } + + /* + * Generate bytecode for SystemModules::methodResoultions method + */ + private void genModuleResolutionsMethod() { + MethodVisitor mresmv = + cw.visitMethod(ACC_PUBLIC+ACC_STATIC, + "moduleResolutions", + "()" + MODULE_RESOLUTIONS_ARRAY_SIGNATURE, + "()" + MODULE_RESOLUTIONS_ARRAY_SIGNATURE, + null); + mresmv.visitCode(); + pushInt(mresmv, moduleInfos.size()); + mresmv.visitTypeInsn(ANEWARRAY, MODULE_RESOLUTION_CLASSNAME); + mresmv.visitVarInsn(ASTORE, 0); + + for (int index=0; index < moduleInfos.size(); index++) { + ModuleInfo minfo = moduleInfos.get(index); + if (minfo.moduleResolution != null) { + mresmv.visitVarInsn(ALOAD, 0); + pushInt(mresmv, index); + mresmv.visitTypeInsn(NEW, MODULE_RESOLUTION_CLASSNAME); + mresmv.visitInsn(DUP); + mresmv.visitLdcInsn(minfo.moduleResolution.value()); + mresmv.visitMethodInsn(INVOKESPECIAL, + MODULE_RESOLUTION_CLASSNAME, + "", + "(I)V", false); + mresmv.visitInsn(AASTORE); + } + } + mresmv.visitVarInsn(ALOAD, 0); + mresmv.visitInsn(ARETURN); + mresmv.visitMaxs(0, 0); + mresmv.visitEnd(); } public boolean isOverriddenClass(String path) { return path.equals("/java.base/" + CLASSNAME + ".class"); } - void pushInt(int num) { + void pushInt(MethodVisitor mv, int num) { if (num <= 5) { mv.visitInsn(ICONST_0 + num); } else if (num < Byte.MAX_VALUE) { @@ -460,6 +570,8 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "(Ljava/lang/String;Ljava/util/List;)" + PROVIDES_TYPE; static final String REQUIRES_SET_STRING_SIG = "(Ljava/util/Set;Ljava/lang/String;)" + REQUIRES_TYPE; + static final String REQUIRES_SET_STRING_STRING_SIG = + "(Ljava/util/Set;Ljava/lang/String;Ljava/lang/String;)" + REQUIRES_TYPE; // method signature for Builder instance methods that // return this Builder instance @@ -473,20 +585,18 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "([" + REQUIRES_TYPE + ")" + BUILDER_TYPE; static final String SET_SIG = "(Ljava/util/Set;)" + BUILDER_TYPE; static final String STRING_SIG = "(Ljava/lang/String;)" + BUILDER_TYPE; - static final String STRING_BYTE_ARRAY_SIG = - "(Ljava/lang/String;[B)" + BUILDER_TYPE; static final String BOOLEAN_SIG = "(Z)" + BUILDER_TYPE; - final ModuleDescriptor md; final Set packages; - - ModuleDescriptorBuilder(ModuleDescriptor md, Set packages) { + final int index; + ModuleDescriptorBuilder(ModuleDescriptor md, Set packages, int index) { if (md.isAutomatic()) { throw new InternalError("linking automatic module is not supported"); } this.md = md; this.packages = packages; + this.index = index; } void build() { @@ -517,12 +627,6 @@ public final class SystemModuleDescriptorPlugin implements Plugin { // main class md.mainClass().ifPresent(this::mainClass); - // hashes - JLMA.hashes(md).ifPresent(mh -> { - algorithm(mh.algorithm()); - mh.names().forEach(mn -> moduleHash(mn, mh.hashFor(mn))); - }); - putModuleDescriptor(); } @@ -554,7 +658,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitInsn(ICONST_0); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - methodName, BOOLEAN_SIG, false); + methodName, BOOLEAN_SIG, false); mv.visitInsn(POP); } @@ -563,12 +667,12 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void putModuleDescriptor() { mv.visitVarInsn(ALOAD, MD_VAR); - pushInt(nextModulesIndex++); + pushInt(mv, index); mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitLdcInsn(md.hashCode()); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "build", "(I)Ljava/lang/module/ModuleDescriptor;", - false); + "build", "(I)Ljava/lang/module/ModuleDescriptor;", + false); mv.visitInsn(AASTORE); } @@ -580,31 +684,42 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void requires(Set requires) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(requires.size()); + pushInt(mv, requires.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Requires"); int arrayIndex = 0; for (Requires require : requires) { - mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); - newRequires(require.modifiers(), require.name()); + String compiledVersion = null; + if (require.compiledVersion().isPresent()) { + compiledVersion = require.compiledVersion().get().toString(); + } + + mv.visitInsn(DUP); // arrayref + pushInt(mv, arrayIndex++); + newRequires(require.modifiers(), require.name(), compiledVersion); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "requires", REQUIRES_ARRAY_SIG, false); + "requires", REQUIRES_ARRAY_SIG, false); } /* - * Invoke Builder.newRequires(Set mods, String mn) + * Invoke Builder.newRequires(Set mods, String mn, String compiledVersion) * * Set mods = ... - * Builder.newRequires(mods, mn); + * Builder.newRequires(mods, mn, compiledVersion); */ - void newRequires(Set mods, String name) { + void newRequires(Set mods, String name, String compiledVersion) { int varIndex = dedupSetBuilder.indexOfRequiresModifiers(mods); mv.visitVarInsn(ALOAD, varIndex); mv.visitLdcInsn(name); - mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newRequires", REQUIRES_SET_STRING_SIG, false); + if (compiledVersion != null) { + mv.visitLdcInsn(compiledVersion); + mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, + "newRequires", REQUIRES_SET_STRING_STRING_SIG, false); + } else { + mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, + "newRequires", REQUIRES_SET_STRING_SIG, false); + } } /* @@ -615,17 +730,17 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void exports(Set exports) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(exports.size()); + pushInt(mv, exports.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Exports"); int arrayIndex = 0; for (Exports export : exports) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); newExports(export.modifiers(), export.source(), export.targets()); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "exports", EXPORTS_ARRAY_SIG, false); + "exports", EXPORTS_ARRAY_SIG, false); } /* @@ -664,22 +779,21 @@ public final class SystemModuleDescriptorPlugin implements Plugin { /** * Call Builder::newOpens to create Opens instances and * then pass it to the builder by calling: - * Builder.opens(Opens[]) - * + * Builder.opens(Opens[]) */ void opens(Set opens) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(opens.size()); + pushInt(mv, opens.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Opens"); int arrayIndex = 0; for (Opens open : opens) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); newOpens(open.modifiers(), open.source(), open.targets()); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "opens", OPENS_ARRAY_SIG, false); + "opens", OPENS_ARRAY_SIG, false); } /* @@ -705,12 +819,12 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitLdcInsn(pn); mv.visitVarInsn(ALOAD, stringSetIndex); mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newOpens", OPENS_MODIFIER_SET_STRING_SET_SIG, false); + "newOpens", OPENS_MODIFIER_SET_STRING_SET_SIG, false); } else { mv.visitVarInsn(ALOAD, modifiersSetIndex); mv.visitLdcInsn(pn); mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newOpens", OPENS_MODIFIER_SET_STRING_SIG, false); + "newOpens", OPENS_MODIFIER_SET_STRING_SIG, false); } } @@ -722,7 +836,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitVarInsn(ALOAD, varIndex); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "uses", SET_SIG, false); + "uses", SET_SIG, false); mv.visitInsn(POP); } @@ -734,17 +848,17 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void provides(Collection provides) { mv.visitVarInsn(ALOAD, BUILDER_VAR); - pushInt(provides.size()); + pushInt(mv, provides.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/module/ModuleDescriptor$Provides"); int arrayIndex = 0; for (Provides provide : provides) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); newProvides(provide.service(), provide.providers()); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "provides", PROVIDES_ARRAY_SIG, false); + "provides", PROVIDES_ARRAY_SIG, false); } /* @@ -758,19 +872,19 @@ public final class SystemModuleDescriptorPlugin implements Plugin { */ void newProvides(String service, List providers) { mv.visitLdcInsn(service); - pushInt(providers.size()); + pushInt(mv, providers.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/String"); int arrayIndex = 0; for (String provider : providers) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex++); + pushInt(mv, arrayIndex++); mv.visitLdcInsn(provider); mv.visitInsn(AASTORE); } mv.visitMethodInsn(INVOKESTATIC, "java/util/List", - "of", "([Ljava/lang/Object;)Ljava/util/List;", true); + "of", "([Ljava/lang/Object;)Ljava/util/List;", true); mv.visitMethodInsn(INVOKESTATIC, MODULE_DESCRIPTOR_BUILDER, - "newProvides", PROVIDES_STRING_LIST_SIG, false); + "newProvides", PROVIDES_STRING_LIST_SIG, false); } /* @@ -781,7 +895,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitVarInsn(ALOAD, varIndex); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "packages", SET_SIG, false); + "packages", SET_SIG, false); mv.visitInsn(POP); } @@ -792,7 +906,7 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitLdcInsn(cn); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "mainClass", STRING_SIG, false); + "mainClass", STRING_SIG, false); mv.visitInsn(POP); } @@ -803,48 +917,97 @@ public final class SystemModuleDescriptorPlugin implements Plugin { mv.visitVarInsn(ALOAD, BUILDER_VAR); mv.visitLdcInsn(v.toString()); mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "version", STRING_SIG, false); + "version", STRING_SIG, false); mv.visitInsn(POP); } + } + + class ModuleHashesBuilder { + private static final String MODULE_HASHES_BUILDER = + "jdk/internal/module/ModuleHashes$Builder"; + private static final String MODULE_HASHES_BUILDER_TYPE = + "L" + MODULE_HASHES_BUILDER + ";"; + static final String STRING_BYTE_ARRAY_SIG = + "(Ljava/lang/String;[B)" + MODULE_HASHES_BUILDER_TYPE; + + final ModuleHashes recordedHashes; + final MethodVisitor hmv; + final int index; + + ModuleHashesBuilder(ModuleHashes hashes, int index, MethodVisitor hmv) { + this.recordedHashes = hashes; + this.hmv = hmv; + this.index = index; + } + + /** + * Build ModuleHashes + */ + void build() { + if (recordedHashes == null) + return; + + // new jdk.internal.module.ModuleHashes.Builder + newModuleHashesBuilder(); + + // Invoke ModuleHashes.Builder::hashForModule + recordedHashes + .names() + .forEach(mn -> hashForModule(mn, recordedHashes.hashFor(mn))); + + // Put ModuleHashes into the hashes array + pushModuleHashes(); + } + + + /* + * Create ModuleHashes.Builder instance + */ + void newModuleHashesBuilder() { + hmv.visitTypeInsn(NEW, MODULE_HASHES_BUILDER); + hmv.visitInsn(DUP); + hmv.visitLdcInsn(recordedHashes.algorithm()); + pushInt(hmv, ((4 * recordedHashes.names().size()) / 3) + 1); + hmv.visitMethodInsn(INVOKESPECIAL, MODULE_HASHES_BUILDER, + "", "(Ljava/lang/String;I)V", false); + hmv.visitVarInsn(ASTORE, BUILDER_VAR); + hmv.visitVarInsn(ALOAD, BUILDER_VAR); + } + + + /* + * Invoke ModuleHashes.Builder::build and put the returned + * ModuleHashes to the hashes array + */ + void pushModuleHashes() { + hmv.visitVarInsn(ALOAD, MH_VAR); + pushInt(hmv, index); + hmv.visitVarInsn(ALOAD, BUILDER_VAR); + hmv.visitMethodInsn(INVOKEVIRTUAL, MODULE_HASHES_BUILDER, + "build", "()Ljdk/internal/module/ModuleHashes;", + false); + hmv.visitInsn(AASTORE); + } /* - * Invoke Builder.algorithm(String a); + * Invoke ModuleHashes.Builder.hashForModule(String name, byte[] hash); */ - void algorithm(String alg) { - mv.visitVarInsn(ALOAD, BUILDER_VAR); - mv.visitLdcInsn(alg); - mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "algorithm", STRING_SIG, false); - mv.visitInsn(POP); - } + void hashForModule(String name, byte[] hash) { + hmv.visitVarInsn(ALOAD, BUILDER_VAR); + hmv.visitLdcInsn(name); - /* - * Invoke Builder.moduleHash(String name, byte[] hash); - */ - void moduleHash(String name, byte[] hash) { - mv.visitVarInsn(ALOAD, BUILDER_VAR); - mv.visitLdcInsn(name); - - // must exist - Integer index = modulesToHashIndex.get(name); - if (index != null) { - mv.visitFieldInsn(GETSTATIC, CLASSNAME, MODULES_TO_HASH, "[[B"); - pushInt(index); - mv.visitInsn(AALOAD); - assert(Objects.equals(hash, modulesToHash.get(name))); - } else { - pushInt(hash.length); - mv.visitIntInsn(NEWARRAY, T_BYTE); - for (int i = 0; i < hash.length; i++) { - mv.visitInsn(DUP); // arrayref - pushInt(i); - mv.visitIntInsn(BIPUSH, hash[i]); - mv.visitInsn(BASTORE); - } + pushInt(hmv, hash.length); + hmv.visitIntInsn(NEWARRAY, T_BYTE); + for (int i = 0; i < hash.length; i++) { + hmv.visitInsn(DUP); // arrayref + pushInt(hmv, i); + hmv.visitIntInsn(BIPUSH, hash[i]); + hmv.visitInsn(BASTORE); } - mv.visitMethodInsn(INVOKEVIRTUAL, MODULE_DESCRIPTOR_BUILDER, - "moduleHash", STRING_BYTE_ARRAY_SIG, false); - mv.visitInsn(POP); + + hmv.visitMethodInsn(INVOKEVIRTUAL, MODULE_HASHES_BUILDER, + "hashForModule", STRING_BYTE_ARRAY_SIG, false); + hmv.visitInsn(POP); } } @@ -1039,12 +1202,12 @@ public final class SystemModuleDescriptorPlugin implements Plugin { "of", sb.toString(), true); } else { // call Set.of(E... elements) - pushInt(elements.size()); + pushInt(mv, elements.size()); mv.visitTypeInsn(ANEWARRAY, "java/lang/String"); int arrayIndex = 0; for (T t : elements) { mv.visitInsn(DUP); // arrayref - pushInt(arrayIndex); + pushInt(mv, arrayIndex); visitElement(t, mv); // value mv.visitInsn(AASTORE); arrayIndex++; diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties index a56c77be18d..5f88c60a6ee 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties @@ -53,6 +53,11 @@ main.opt.limit-modules=\ main.opt.output=\ \ --output Location of output path +main.opt.launcher=\ +\ --launcher = Launcher command name for the module\n\ +\ --launcher =/

\n\ +\ Launcher command name for the module and the main class + main.command.files=\ \ @ Read options from file @@ -91,6 +96,9 @@ main.extended.help.footer=\ err.unknown.byte.order:unknown byte order {0} +err.launcher.main.class.empty:launcher main class name cannot be empty: {0} +err.launcher.module.name.empty:launcher module name cannot be empty: {0} +err.launcher.value.format:launcher value should be of form =[/]: {0} err.output.must.be.specified:--output must be specified err.modulepath.must.be.specified:--module-path must be specified err.mods.must.be.specified:no modules specified to {0} diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java index e1f7b431794..ecc53f9ea0a 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/JmodTask.java @@ -66,6 +66,7 @@ import java.util.Comparator; import java.util.Deque; import java.util.HashMap; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; @@ -98,10 +99,11 @@ import jdk.internal.joptsimple.OptionSet; import jdk.internal.joptsimple.OptionSpec; import jdk.internal.joptsimple.ValueConverter; import jdk.internal.loader.ResourceHelper; -import jdk.internal.misc.JavaLangModuleAccess; -import jdk.internal.misc.SharedSecrets; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleInfo; import jdk.internal.module.ModuleInfoExtender; +import jdk.internal.module.ModulePath; +import jdk.internal.module.ModuleResolution; import jdk.tools.jlink.internal.Utils; import static java.util.stream.Collectors.joining; @@ -163,6 +165,7 @@ public class JmodTask { Mode mode; Path jmodFile; boolean help; + boolean helpExtra; boolean version; List classpath; List cmds; @@ -178,6 +181,7 @@ public class JmodTask { String osArch; String osVersion; Pattern modulesToHash; + ModuleResolution moduleResolution; boolean dryrun; List excludes; Path extractDir; @@ -191,7 +195,7 @@ public class JmodTask { showUsageSummary(); return EXIT_CMDERR; } - if (options.help) { + if (options.help || options.helpExtra) { showHelp(); return EXIT_OK; } @@ -287,8 +291,8 @@ public class JmodTask { private boolean describe() throws IOException { try (JmodFile jf = new JmodFile(options.jmodFile)) { try (InputStream in = jf.getInputStream(Section.CLASSES, MODULE_INFO)) { - ModuleDescriptor md = ModuleDescriptor.read(in); - printModuleDescriptor(md); + ModuleInfo.Attributes attrs = ModuleInfo.read(in, null); + printModuleDescriptor(attrs.descriptor(), attrs.recordedHashes()); return true; } catch (IOException e) { throw new CommandException("err.module.descriptor.not.found"); @@ -302,9 +306,7 @@ public class JmodTask { .collect(joining(" ")); } - private static final JavaLangModuleAccess JLMA = SharedSecrets.getJavaLangModuleAccess(); - - private void printModuleDescriptor(ModuleDescriptor md) + private void printModuleDescriptor(ModuleDescriptor md, ModuleHashes hashes) throws IOException { StringBuilder sb = new StringBuilder(); @@ -350,15 +352,24 @@ public class JmodTask { md.osVersion().ifPresent(v -> sb.append("\n operating-system-version " + v)); - JLMA.hashes(md).ifPresent( - hashes -> hashes.names().stream().sorted().forEach( - mod -> sb.append("\n hashes ").append(mod).append(" ") - .append(hashes.algorithm()).append(" ") - .append(hashes.hashFor(mod)))); + if (hashes != null) { + hashes.names().stream().sorted().forEach( + mod -> sb.append("\n hashes ").append(mod).append(" ") + .append(hashes.algorithm()).append(" ") + .append(toHex(hashes.hashFor(mod)))); + } out.println(sb.toString()); } + private 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 boolean create() throws IOException { JmodFileWriter jmod = new JmodFileWriter(); @@ -400,6 +411,7 @@ public class JmodTask { final String osVersion = options.osVersion; final List excludes = options.excludes; final Hasher hasher = hasher(); + final ModuleResolution moduleResolution = options.moduleResolution; JmodFileWriter() { } @@ -509,6 +521,10 @@ public class JmodTask { } } + if (moduleResolution != null && moduleResolution.value() != 0) { + extender.moduleResolution(moduleResolution); + } + // write the (possibly extended or modified) module-info.class out.writeEntry(extender.toByteArray(), Section.CLASSES, MODULE_INFO); } @@ -537,12 +553,12 @@ public class JmodTask { } URI uri = options.jmodFile.toUri(); - ModuleReference mref = new ModuleReference(descriptor, uri, new Supplier<>() { + ModuleReference mref = new ModuleReference(descriptor, uri) { @Override - public ModuleReader get() { + public ModuleReader open() { throw new UnsupportedOperationException(); } - }); + }; // compose a module finder with the module path and also // a module finder that can find the jmod file being created @@ -1139,6 +1155,28 @@ public class JmodTask { @Override public String valuePattern() { return "module-version"; } } + static class WarnIfResolvedReasonConverter + implements ValueConverter + { + @Override + public ModuleResolution convert(String value) { + if (value.equals("deprecated")) + return ModuleResolution.empty().withDeprecated(); + else if (value.equals("deprecated-for-removal")) + return ModuleResolution.empty().withDeprecatedForRemoval(); + else if (value.equals("incubating")) + return ModuleResolution.empty().withIncubating(); + else + throw new CommandException("err.bad.WarnIfResolvedReason", value); + } + + @Override public Class valueType() { + return ModuleResolution.class; + } + + @Override public String valuePattern() { return "reason"; } + } + static class PatternConverter implements ValueConverter { @Override public Pattern convert(String value) { @@ -1182,12 +1220,24 @@ public class JmodTask { */ private static final class JmodHelpFormatter extends BuiltinHelpFormatter { - private JmodHelpFormatter() { super(80, 2); } + private final Options opts; + + private JmodHelpFormatter(Options opts) { + super(80, 2); + this.opts = opts; + } @Override public String format(Map options) { - Map all = new HashMap<>(); + Map all = new LinkedHashMap<>(); all.putAll(options); + + // extra options + if (!opts.helpExtra) { + all.remove("do-not-resolve-by-default"); + all.remove("warn-if-resolved"); + } + all.put(CMD_FILENAME, new OptionDescriptor() { @Override public Collection options() { @@ -1243,7 +1293,8 @@ public class JmodTask { private final OptionParser parser = new OptionParser("hp"); private void handleOptions(String[] args) { - parser.formatHelpWith(new JmodHelpFormatter()); + options = new Options(); + parser.formatHelpWith(new JmodHelpFormatter(options)); OptionSpec classPath = parser.accepts("class-path", getMessage("main.opt.class-path")) @@ -1285,6 +1336,9 @@ public class JmodTask { = parser.acceptsAll(Set.of("h", "help"), getMessage("main.opt.help")) .forHelp(); + OptionSpec helpExtra + = parser.accepts("help-extra", getMessage("main.opt.help-extra")); + OptionSpec headerFiles = parser.accepts("header-files", getMessage("main.opt.header-files")) .withRequiredArg() @@ -1342,6 +1396,15 @@ public class JmodTask { .withRequiredArg() .describedAs(getMessage("main.opt.os-version.arg")); + OptionSpec doNotResolveByDefault + = parser.accepts("do-not-resolve-by-default", + getMessage("main.opt.do-not-resolve-by-default")); + + OptionSpec warnIfResolved + = parser.accepts("warn-if-resolved", getMessage("main.opt.warn-if-resolved")) + .withRequiredArg() + .withValuesConvertedBy(new WarnIfResolvedReasonConverter()); + OptionSpec version = parser.accepts("version", getMessage("main.opt.version")); @@ -1351,9 +1414,9 @@ public class JmodTask { try { OptionSet opts = parser.parse(args); - if (opts.has(help) || opts.has(version)) { - options = new Options(); + if (opts.has(help) || opts.has(helpExtra) || opts.has(version)) { options.help = opts.has(help); + options.helpExtra = opts.has(helpExtra); options.version = opts.has(version); return; // informational message will be shown } @@ -1362,7 +1425,6 @@ public class JmodTask { if (words.isEmpty()) throw new CommandException("err.missing.mode").showUsage(true); String verb = words.get(0); - options = new Options(); try { options.mode = Enum.valueOf(Mode.class, verb.toUpperCase()); } catch (IllegalArgumentException e) { @@ -1391,7 +1453,7 @@ public class JmodTask { options.legalNotices = opts.valuesOf(legalNotices); if (opts.has(modulePath)) { Path[] dirs = opts.valuesOf(modulePath).toArray(new Path[0]); - options.moduleFinder = JLMA.newModulePath(Runtime.version(), true, dirs); + options.moduleFinder = new ModulePath(Runtime.version(), true, dirs); } if (opts.has(moduleVersion)) options.moduleVersion = opts.valueOf(moduleVersion); @@ -1403,6 +1465,13 @@ public class JmodTask { options.osArch = opts.valueOf(osArch); if (opts.has(osVersion)) options.osVersion = opts.valueOf(osVersion); + if (opts.has(warnIfResolved)) + options.moduleResolution = opts.valueOf(warnIfResolved); + if (opts.has(doNotResolveByDefault)) { + if (options.moduleResolution == null) + options.moduleResolution = ModuleResolution.empty(); + options.moduleResolution = options.moduleResolution.withDoNotResolveByDefault(); + } if (opts.has(hashModules)) { options.modulesToHash = opts.valueOf(hashModules); // if storing hashes then the module path is required diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties index af61db52b76..f87810236d0 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jmod/resources/jmod.properties @@ -47,6 +47,7 @@ main.opt.mode.hash=\ \hash - Records hashes of tied modules. main.opt.help=Print this usage message +main.opt.help-extra=Print help on extra options main.opt.version=Version information main.opt.class-path=Application jar files|dir containing classes main.opt.libs=Location of native libraries @@ -74,6 +75,9 @@ main.opt.hash-modules=Compute and record hashes to tie a packaged module\ \ with modules matching the given and depending upon it directly\ \ or indirectly. The hashes are recorded in the JMOD file being created, or\ \ a JMOD file or modular JAR on the module path specified the jmod hash command. +main.opt.do-not-resolve-by-default=Exclude from the default root set of modules +main.opt.warn-if-resolved=Hint for a tool to issue a warning if the module \ +is resolved. One of deprecated, deprecated-for-removal, or incubating main.opt.cmdfile=Read options from the specified file @@ -96,6 +100,8 @@ err.invalid.class.path.entry=invalid class path entry: {0} err.file.already.exists=file already exists: {0} err.jmod.not.found=no jmod file found: {0} err.bad.pattern=bad pattern {0} +err.bad.WarnIfResolvedReason=bad reason: {0}, must be one of deprecated,\ +\ deprecated-for-removal, or incubating err.unknown.option=unknown option(s): {0} err.missing.arg=no value given for {0} err.internal.error=internal error: {0} {1} {2} diff --git a/jdk/src/jdk.jlink/share/classes/module-info.java b/jdk/src/jdk.jlink/share/classes/module-info.java index 659e98b5aad..69c4ae9952e 100644 --- a/jdk/src/jdk.jlink/share/classes/module-info.java +++ b/jdk/src/jdk.jlink/share/classes/module-info.java @@ -41,7 +41,7 @@ module jdk.jlink { jdk.tools.jlink.internal.plugins.ExcludeFilesPlugin, jdk.tools.jlink.internal.plugins.ExcludeJmodSectionPlugin, jdk.tools.jlink.internal.plugins.LegalNoticeFilePlugin, - jdk.tools.jlink.internal.plugins.SystemModuleDescriptorPlugin, + jdk.tools.jlink.internal.plugins.SystemModulesPlugin, jdk.tools.jlink.internal.plugins.StripNativeCommandsPlugin, jdk.tools.jlink.internal.plugins.OrderResourcesPlugin, jdk.tools.jlink.internal.plugins.DefaultCompressPlugin, diff --git a/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java b/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java index 54971142527..641fa2f06cb 100644 --- a/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java +++ b/jdk/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java @@ -27,8 +27,10 @@ package sun.misc; import jdk.internal.vm.annotation.ForceInline; import jdk.internal.misc.VM; +import jdk.internal.ref.Cleaner; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; +import sun.nio.ch.DirectBuffer; import java.lang.reflect.Field; import java.security.ProtectionDomain; @@ -1228,4 +1230,28 @@ public final class Unsafe { public void fullFence() { theInternalUnsafe.fullFence(); } + + /** + * Invokes the given direct byte buffer's cleaner, if any. + * + * @param directBuffer a direct byte buffer + * @throws NullPointerException if {@code directBuffer} is null + * @throws IllegalArgumentException if {@code directBuffer} is non-direct, + * or is a {@link java.nio.Buffer#slice slice}, or is a + * {@link java.nio.Buffer#duplicate duplicate} + * @since 9 + */ + public void invokeCleaner(java.nio.ByteBuffer directBuffer) { + if (!directBuffer.isDirect()) + throw new IllegalArgumentException("buffer is non-direct"); + + DirectBuffer db = (DirectBuffer)directBuffer; + if (db.attachment() != null) + throw new IllegalArgumentException("duplicate or slice"); + + Cleaner cleaner = db.cleaner(); + if (cleaner != null) { + cleaner.clean(); + } + } } diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 4329ffb0f27..5df1d73818d 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -205,6 +205,8 @@ sun/rmi/rmic/newrmic/equivalence/run.sh 8145980 generic- java/rmi/transport/dgcDeadLock/DGCDeadLock.java 8029360 macosx-all +java/rmi/registry/readTest/readTest.sh 7146543 generic-all + ############################################################################ # jdk_security @@ -217,6 +219,10 @@ sun/security/tools/jarsigner/warnings/BadKeyUsageTest.java 8026393 generic- sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java 8161232 macosx-all +sun/net/www/protocol/https/HttpsClient/ServerIdentityTest.java 8171043 windows-all + +javax/net/ssl/DTLS/PacketLossRetransmission.java 8169086 macosx-x64 + ############################################################################ # jdk_sound diff --git a/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java b/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java new file mode 100644 index 00000000000..6db02253f42 --- /dev/null +++ b/jdk/test/java/awt/Dialog/DialogAboveFrame/DialogAboveFrameTest.java @@ -0,0 +1,81 @@ +/* + * 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 + * @bug 8169589 + * @summary Activating a dialog puts to back another dialog owned by the same frame + * @author Dmitry Markov + * @library ../../regtesthelpers + * @build Util + * @run main DialogAboveFrameTest + */ + +import java.awt.Color; +import java.awt.Dialog; +import java.awt.Frame; +import java.awt.Point; +import java.awt.Robot; + +import test.java.awt.regtesthelpers.Util; + +public class DialogAboveFrameTest { + public static void main(String[] args) { + Robot robot = Util.createRobot(); + + Frame frame = new Frame("Frame"); + frame.setBackground(Color.BLUE); + frame.setBounds(200, 50, 300, 300); + frame.setVisible(true); + + Dialog dialog1 = new Dialog(frame, "Dialog 1", false); + dialog1.setBackground(Color.RED); + dialog1.setBounds(100, 100, 200, 200); + dialog1.setVisible(true); + + Dialog dialog2 = new Dialog(frame, "Dialog 2", false); + dialog2.setBackground(Color.GREEN); + dialog2.setBounds(400, 100, 200, 200); + dialog2.setVisible(true); + + Util.waitForIdle(robot); + + Util.clickOnComp(dialog2, robot); + Util.waitForIdle(robot); + + Point point = dialog1.getLocationOnScreen(); + int x = point.x + (int)(dialog1.getWidth() * 0.9); + int y = point.y + (int)(dialog1.getHeight() * 0.9); + + try { + if (!robot.getPixelColor(x, y).equals(dialog1.getBackground())) { + throw new RuntimeException("Test FAILED: Dialog is behind the frame"); + } + } finally { + frame.dispose(); + dialog1.dispose(); + dialog2.dispose(); + } + } +} + diff --git a/jdk/test/java/awt/JAWT/Makefile.unix b/jdk/test/java/awt/JAWT/Makefile.unix index b3be2f9a624..978d6cee043 100644 --- a/jdk/test/java/awt/JAWT/Makefile.unix +++ b/jdk/test/java/awt/JAWT/Makefile.unix @@ -1,4 +1,4 @@ -# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2012, 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 @@ -32,7 +32,7 @@ LINK = ld J_INC = $(TESTJAVA)/include INCLUDES = -I$(J_INC) -I$(J_INC)/$(SYST) -I. -LIBS = -L$(TESTJAVA)/lib/$(ARCH) -ljawt -lX11 +LIBS = -L$(TESTJAVA)/lib -ljawt -lX11 all: $(CLASSES) libmylib.so diff --git a/jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java b/jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java new file mode 100644 index 00000000000..18dc47912aa --- /dev/null +++ b/jdk/test/java/awt/Menu/WrongParentAfterRemoveMenu/WrongParentAfterRemoveMenu.java @@ -0,0 +1,126 @@ +/* + * 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. + */ + +import java.awt.Frame; +import java.awt.Menu; +import java.awt.MenuBar; +import java.awt.PopupMenu; +import java.awt.Window; + +/** + * @test + * @bug 8165769 + * @key headful + */ +public final class WrongParentAfterRemoveMenu { + + public static void main(final String[] args) { + testMenuBar(); + testComponent(); + testFrame(); + } + + private static void testFrame() { + // peer exists + Frame frame = new Frame(); + try { + frame.pack(); + PopupMenu popupMenu = new PopupMenu(); + frame.add(popupMenu); + checkParent(popupMenu, frame); + frame.remove(popupMenu); + checkParent(popupMenu, null); + } finally { + frame.dispose(); + } + // peer is null + frame = new Frame(); + PopupMenu popupMenu = new PopupMenu(); + frame.add(popupMenu); + checkParent(popupMenu, frame); + frame.remove(popupMenu); + checkParent(popupMenu, null); + } + + private static void testComponent() { + // peer exists + Window w = new Window(null); + try { + w.pack(); + PopupMenu popupMenu = new PopupMenu(); + w.add(popupMenu); + checkParent(popupMenu, w); + w.remove(popupMenu); + checkParent(popupMenu, null); + } finally { + w.dispose(); + } + // peer is null + w = new Window(null); + PopupMenu popupMenu = new PopupMenu(); + w.add(popupMenu); + checkParent(popupMenu, w); + w.remove(popupMenu); + checkParent(popupMenu, null); + } + + private static void testMenuBar() { + // peer exists + MenuBar mb = new MenuBar(); + try { + mb.addNotify(); + Menu m1 = new Menu(); + Menu m2 = new Menu(); + m1.add(m2); + mb.add(m1); + checkParent(m1, mb); + checkParent(m2, m1); + m1.remove(m2); + checkParent(m2, null); + mb.remove(m1); + checkParent(m1, null); + } finally { + mb.removeNotify(); + } + // peer is null + mb = new MenuBar(); + Menu m1 = new Menu(); + Menu m2 = new Menu(); + m1.add(m2); + mb.add(m1); + checkParent(m1, mb); + checkParent(m2, m1); + m1.remove(m2); + checkParent(m2, null); + mb.remove(m1); + checkParent(m1, null); + } + + private static void checkParent(final Menu menu, final Object parent) { + if (menu.getParent() != parent) { + System.err.println("Expected: " + parent); + System.err.println("Actual: " + menu.getParent()); + throw new RuntimeException("Wrong parent"); + } + } +} diff --git a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java index 26c4f728599..a4c026b7931 100644 --- a/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java +++ b/jdk/test/java/awt/SplashScreen/MultiResolutionSplash/unix/UnixMultiResolutionSplashTest.java @@ -44,9 +44,11 @@ import java.util.Map; import javax.imageio.ImageIO; /** - * @test @bug 8145174 8151787 + * @test + * @bug 8145174 8151787 8168657 * @summary HiDPI splash screen support on Linux * @modules java.desktop/sun.java2d + * @requires (os.family == "linux") * @run main UnixMultiResolutionSplashTest */ public class UnixMultiResolutionSplashTest { diff --git a/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java b/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java index 5ef5f1d67e3..06d4dc43b55 100644 --- a/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java +++ b/jdk/test/java/awt/dnd/DnDFileGroupDescriptor/DnDFileGroupDescriptor.java @@ -25,6 +25,7 @@ test @bug 6242241 @summary Tests basic DnD functionality in an applet + @requires (os.family == "windows") @author Your Name: Alexey Utkin area=dnd @run applet/manual=yesno DnDFileGroupDescriptor.html */ diff --git a/jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java b/jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java new file mode 100644 index 00000000000..9a87243d898 --- /dev/null +++ b/jdk/test/java/awt/font/Fallback/SurrogatesFallbackTest.java @@ -0,0 +1,88 @@ +/* + * Copyright 2016 JetBrains s.r.o. + * 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 8169202 + * @summary verify font fallback for surrogate pairs on macOS + * @requires os.family == "mac" + */ + +import java.awt.Color; +import java.awt.Font; +import java.awt.Graphics2D; +import java.awt.font.GlyphVector; +import java.awt.image.BufferedImage; +import java.util.function.Consumer; + +public class SurrogatesFallbackTest { + private static final int CHARACTER = 0x1d400; // MATHEMATICAL BOLD CAPITAL A + private static final Font FONT = new Font("Menlo", // expected to fallback to STIXGeneral for the character above + Font.PLAIN, + 12); + private static final int IMAGE_WIDTH = 20; + private static final int IMAGE_HEIGHT = 20; + private static final int GLYPH_X = 5; + private static final int GLYPH_Y = 15; + + public static void main(String[] args) { + BufferedImage noGlyph = createImage(g -> {}); + BufferedImage missingGlyph = createImage(g -> { + GlyphVector gv = FONT.createGlyphVector(g.getFontRenderContext(), new int[]{FONT.getMissingGlyphCode()}); + g.drawGlyphVector(gv, GLYPH_X, GLYPH_Y); + }); + BufferedImage surrogateCharGlyph = createImage(g -> { + g.setFont(FONT); + g.drawString(new String(Character.toChars(CHARACTER)), GLYPH_X, GLYPH_Y); + }); + + if (imagesAreEqual(surrogateCharGlyph, noGlyph)) { + throw new RuntimeException("Character was not rendered"); + } + if (imagesAreEqual(surrogateCharGlyph, missingGlyph)) { + throw new RuntimeException("Character is rendered as missing"); + } + } + + private static BufferedImage createImage(Consumer drawing) { + BufferedImage image = new BufferedImage(IMAGE_WIDTH, IMAGE_HEIGHT, BufferedImage.TYPE_INT_RGB); + Graphics2D g = image.createGraphics(); + g.setColor(Color.white); + g.fillRect(0, 0, IMAGE_WIDTH, IMAGE_HEIGHT); + g.setColor(Color.black); + drawing.accept(g); + g.dispose(); + return image; + } + + private static boolean imagesAreEqual(BufferedImage i1, BufferedImage i2) { + if (i1.getWidth() != i2.getWidth() || i1.getHeight() != i2.getHeight()) return false; + for (int i = 0; i < i1.getWidth(); i++) { + for (int j = 0; j < i1.getHeight(); j++) { + if (i1.getRGB(i, j) != i2.getRGB(i, j)) { + return false; + } + } + } + return true; + } +} + diff --git a/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java b/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java new file mode 100644 index 00000000000..e74edf8b8ed --- /dev/null +++ b/jdk/test/java/awt/font/TextLayout/ArabicDiacriticTest.java @@ -0,0 +1,95 @@ +/* + * 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 + */ + +/* @test + * @summary verify Arab Diacritic Positioning + * @bug 8168759 + */ + +import java.awt.Font; +import java.awt.GridLayout; +import java.awt.Rectangle; +import java.awt.font.FontRenderContext; +import java.awt.font.TextLayout; +import java.util.Locale; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; + +public class ArabicDiacriticTest { + + static final String SAMPLE = + "\u0627\u0644\u0639\u064e\u0631\u064e\u0628\u0650\u064a\u064e\u0651\u0629"; + + static final String STR1 = "\u0644\u0639\u064e\u0629"; + static final String STR2 = "\u0644\u0639\u0629"; + + static JFrame frame; + static final String FONT = "DejaVu Sans"; + + public static void main(String args[]) throws Exception { + showText(); // for a human + measureText(); // for the test harness + Thread.sleep(5000); + frame.dispose(); + } + + static void showText() { + SwingUtilities.invokeLater(() -> { + frame = new JFrame(); + JLabel label = new JLabel(SAMPLE); + Font font = new Font(FONT, Font.PLAIN, 36); + label.setFont(font); + frame.setLayout(new GridLayout(3,1)); + frame.add(label); + label = new JLabel(STR1); + label.setFont(font); + frame.add(label); + label = new JLabel(STR2); + label.setFont(font); + frame.add(label); + frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE); + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + }); + } + + static void measureText() { + Font font = new Font(FONT, Font.PLAIN, 36); + if (!font.getFamily(Locale.ENGLISH).equals(FONT)) { + return; + } + FontRenderContext frc = new FontRenderContext(null, false, false); + TextLayout tl1 = new TextLayout(STR1, font, frc); + TextLayout tl2 = new TextLayout(STR2, font, frc); + Rectangle r1 = tl1.getPixelBounds(frc, 0f, 0f); + Rectangle r2 = tl2.getPixelBounds(frc, 0f, 0f); + if (r1.height > r2.height) { + System.out.println(font); + System.out.println(r1); + System.out.println(r2); + throw new RuntimeException("BAD BOUNDS"); + } + } +} diff --git a/jdk/test/java/lang/StrictMath/ExpTests.java b/jdk/test/java/lang/StrictMath/ExpTests.java new file mode 100644 index 00000000000..0a2e1f0304d --- /dev/null +++ b/jdk/test/java/lang/StrictMath/ExpTests.java @@ -0,0 +1,147 @@ +/* + * 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 8139688 + * @key randomness + * @library /lib/testlibrary/ + * @build jdk.testlibrary.RandomFactory + * @build Tests + * @build FdlibmTranslit + * @build ExpTests + * @run main ExpTests + * @summary Tests specifically for StrictMath.exp + */ + +import jdk.testlibrary.RandomFactory; + +/** + * The role of this test is to verify that the FDLIBM exp algorithm is + * being used by running golden file style tests on values that may + * vary from one conforming exponential implementation to another. + */ + +public class ExpTests { + private ExpTests(){} + + public static void main(String [] argv) { + int failures = 0; + + failures += testExp(); + failures += testAgainstTranslit(); + + if (failures > 0) { + System.err.println("Testing the exponential incurred " + + failures + " failures."); + throw new RuntimeException(); + } + } + + // From the fdlibm source, the overflow threshold in hex is: + // 0x4086_2E42_FEFA_39EF. + static final double EXP_OVERFLOW_THRESH = Double.longBitsToDouble(0x4086_2E42_FEFA_39EFL); + + // From the fdlibm source, the underflow threshold in hex is: + // 0xc087_4910_D52D_3051L. + static final double EXP_UNDERFLOW_THRESH = Double.longBitsToDouble(0xc087_4910_D52D_3051L); + + static int testExp() { + int failures = 0; + + double [][] testCases = { + // Some of these could be moved to common Math/StrictMath exp testing. + {Double.NaN, Double.NaN}, + {Double.MAX_VALUE, Double.POSITIVE_INFINITY}, + {Double.POSITIVE_INFINITY, Double.POSITIVE_INFINITY}, + {Double.NEGATIVE_INFINITY, +0.0}, + {EXP_OVERFLOW_THRESH, 0x1.ffff_ffff_fff2ap1023}, + {Math.nextUp(EXP_OVERFLOW_THRESH), Double.POSITIVE_INFINITY}, + {Math.nextDown(EXP_UNDERFLOW_THRESH), +0.0}, + {EXP_UNDERFLOW_THRESH, +Double.MIN_VALUE}, + }; + + for(double[] testCase: testCases) + failures+=testExpCase(testCase[0], testCase[1]); + + return failures; + } + + static int testExpCase(double input, double expected) { + int failures = 0; + + failures+=Tests.test("StrictMath.exp(double)", input, + StrictMath.exp(input), expected); + return failures; + } + + // Initialize shared random number generator + private static java.util.Random random = RandomFactory.getRandom(); + + /** + * Test StrictMath.exp against transliteration port of exp. + */ + private static int testAgainstTranslit() { + int failures = 0; + + double[] decisionPoints = { + // Near overflow threshold + EXP_OVERFLOW_THRESH - 512*Math.ulp(EXP_OVERFLOW_THRESH), + + // Near underflow threshold + EXP_UNDERFLOW_THRESH - 512*Math.ulp(EXP_UNDERFLOW_THRESH), + + // Straddle algorithm conditional checks + Double.longBitsToDouble(0x4086_2E42_0000_0000L - 512L), + Double.longBitsToDouble(0x3fd6_2e42_0000_0000L - 512L), + Double.longBitsToDouble(0x3FF0_A2B2_0000_0000L - 512L), + Double.longBitsToDouble(0x3e30_0000_0000_0000L - 512L), + + // Other notable points + Double.MIN_NORMAL - Math.ulp(Double.MIN_NORMAL)*512, + -Double.MIN_VALUE*512, + }; + + for (double decisionPoint : decisionPoints) { + double ulp = Math.ulp(decisionPoint); + failures += testRange(decisionPoint - 1024*ulp, ulp, 1_024); + } + + // Try out some random values + for (int i = 0; i < 100; i++) { + double x = Tests.createRandomDouble(random); + failures += testRange(x, Math.ulp(x), 100); + } + + return failures; + } + + private static int testRange(double start, double increment, int count) { + int failures = 0; + double x = start; + for (int i = 0; i < count; i++, x += increment) { + failures += testExpCase(x, FdlibmTranslit.Exp.compute(x)); + } + return failures; + } +} diff --git a/jdk/test/java/lang/StrictMath/FdlibmTranslit.java b/jdk/test/java/lang/StrictMath/FdlibmTranslit.java index 64d4ca6112a..5ad48cb4b44 100644 --- a/jdk/test/java/lang/StrictMath/FdlibmTranslit.java +++ b/jdk/test/java/lang/StrictMath/FdlibmTranslit.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -48,7 +48,8 @@ public class FdlibmTranslit { */ private static double __LO(double x, int low) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L)|low ); + return Double.longBitsToDouble((transX & 0xFFFF_FFFF_0000_0000L) | + (low & 0x0000_0000_FFFF_FFFFL)); } /** @@ -65,7 +66,8 @@ public class FdlibmTranslit { */ private static double __HI(double x, int high) { long transX = Double.doubleToRawLongBits(x); - return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL)|( ((long)high)) << 32 ); + return Double.longBitsToDouble((transX & 0x0000_0000_FFFF_FFFFL) | + ( ((long)high)) << 32 ); } public static double hypot(double x, double y) { @@ -250,4 +252,136 @@ public class FdlibmTranslit { return w; } } + + /** + * Returns the exponential of x. + * + * Method + * 1. Argument reduction: + * Reduce x to an r so that |r| <= 0.5*ln2 ~ 0.34658. + * Given x, find r and integer k such that + * + * x = k*ln2 + r, |r| <= 0.5*ln2. + * + * Here r will be represented as r = hi-lo for better + * accuracy. + * + * 2. Approximation of exp(r) by a special rational function on + * the interval [0,0.34658]: + * Write + * R(r**2) = r*(exp(r)+1)/(exp(r)-1) = 2 + r*r/6 - r**4/360 + ... + * We use a special Reme algorithm on [0,0.34658] to generate + * a polynomial of degree 5 to approximate R. The maximum error + * of this polynomial approximation is bounded by 2**-59. In + * other words, + * R(z) ~ 2.0 + P1*z + P2*z**2 + P3*z**3 + P4*z**4 + P5*z**5 + * (where z=r*r, and the values of P1 to P5 are listed below) + * and + * | 5 | -59 + * | 2.0+P1*z+...+P5*z - R(z) | <= 2 + * | | + * The computation of exp(r) thus becomes + * 2*r + * exp(r) = 1 + ------- + * R - r + * r*R1(r) + * = 1 + r + ----------- (for better accuracy) + * 2 - R1(r) + * where + * 2 4 10 + * R1(r) = r - (P1*r + P2*r + ... + P5*r ). + * + * 3. Scale back to obtain exp(x): + * From step 1, we have + * exp(x) = 2^k * exp(r) + * + * Special cases: + * exp(INF) is INF, exp(NaN) is NaN; + * exp(-INF) is 0, and + * for finite argument, only exp(0)=1 is exact. + * + * Accuracy: + * according to an error analysis, the error is always less than + * 1 ulp (unit in the last place). + * + * Misc. info. + * For IEEE double + * if x > 7.09782712893383973096e+02 then exp(x) overflow + * if x < -7.45133219101941108420e+02 then exp(x) underflow + * + * Constants: + * The hexadecimal values are the intended ones for the following + * constants. The decimal values may be used, provided that the + * compiler will convert from decimal to binary accurately enough + * to produce the hexadecimal values shown. + */ + static class Exp { + private static final double one = 1.0; + private static final double[] halF = {0.5,-0.5,}; + private static final double huge = 1.0e+300; + private static final double twom1000= 9.33263618503218878990e-302; /* 2**-1000=0x01700000,0*/ + private static final double o_threshold= 7.09782712893383973096e+02; /* 0x40862E42, 0xFEFA39EF */ + private static final double u_threshold= -7.45133219101941108420e+02; /* 0xc0874910, 0xD52D3051 */ + private static final double[] ln2HI ={ 6.93147180369123816490e-01, /* 0x3fe62e42, 0xfee00000 */ + -6.93147180369123816490e-01}; /* 0xbfe62e42, 0xfee00000 */ + private static final double[] ln2LO ={ 1.90821492927058770002e-10, /* 0x3dea39ef, 0x35793c76 */ + -1.90821492927058770002e-10,}; /* 0xbdea39ef, 0x35793c76 */ + private static final double invln2 = 1.44269504088896338700e+00; /* 0x3ff71547, 0x652b82fe */ + private static final double P1 = 1.66666666666666019037e-01; /* 0x3FC55555, 0x5555553E */ + private static final double P2 = -2.77777777770155933842e-03; /* 0xBF66C16C, 0x16BEBD93 */ + private static final double P3 = 6.61375632143793436117e-05; /* 0x3F11566A, 0xAF25DE2C */ + private static final double P4 = -1.65339022054652515390e-06; /* 0xBEBBBD41, 0xC5D26BF1 */ + private static final double P5 = 4.13813679705723846039e-08; /* 0x3E663769, 0x72BEA4D0 */ + + public static strictfp double compute(double x) { + double y,hi=0,lo=0,c,t; + int k=0,xsb; + /*unsigned*/ int hx; + + hx = __HI(x); /* high word of x */ + xsb = (hx>>31)&1; /* sign bit of x */ + hx &= 0x7fffffff; /* high word of |x| */ + + /* filter out non-finite argument */ + if(hx >= 0x40862E42) { /* if |x|>=709.78... */ + if(hx>=0x7ff00000) { + if(((hx&0xfffff)|__LO(x))!=0) + return x+x; /* NaN */ + else return (xsb==0)? x:0.0; /* exp(+-inf)={inf,0} */ + } + if(x > o_threshold) return huge*huge; /* overflow */ + if(x < u_threshold) return twom1000*twom1000; /* underflow */ + } + + /* argument reduction */ + if(hx > 0x3fd62e42) { /* if |x| > 0.5 ln2 */ + if(hx < 0x3FF0A2B2) { /* and |x| < 1.5 ln2 */ + hi = x-ln2HI[xsb]; lo=ln2LO[xsb]; k = 1-xsb-xsb; + } else { + k = (int)(invln2*x+halF[xsb]); + t = k; + hi = x - t*ln2HI[0]; /* t*ln2HI is exact here */ + lo = t*ln2LO[0]; + } + x = hi - lo; + } + else if(hx < 0x3e300000) { /* when |x|<2**-28 */ + if(huge+x>one) return one+x;/* trigger inexact */ + } + else k = 0; + + /* x is now in primary range */ + t = x*x; + c = x - t*(P1+t*(P2+t*(P3+t*(P4+t*P5)))); + if(k==0) return one-((x*c)/(c-2.0)-x); + else y = one-((lo-(x*c)/(2.0-c))-hi); + if(k >= -1021) { + y = __HI(y, __HI(y) + (k<<20)); /* add k to y's exponent */ + return y; + } else { + y = __HI(y, __HI(y) + ((k+1000)<<20));/* add k to y's exponent */ + return y*twom1000; + } + } + } } diff --git a/jdk/test/java/lang/invoke/DropLookupModeTest.java b/jdk/test/java/lang/invoke/DropLookupModeTest.java new file mode 100644 index 00000000000..be7d0a60e54 --- /dev/null +++ b/jdk/test/java/lang/invoke/DropLookupModeTest.java @@ -0,0 +1,152 @@ +/* + * 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 + * @run testng DropLookupModeTest + * @summary Basic unit tests Lookup::dropLookupMode + */ + +import java.lang.invoke.MethodHandles; +import java.lang.invoke.MethodHandles.Lookup; +import static java.lang.invoke.MethodHandles.Lookup.*; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +@Test +public class DropLookupModeTest { + + /** + * Basic test of dropLookupMode + */ + public void testBasic() { + final Lookup fullPowerLookup = MethodHandles.lookup(); + final Class lc = fullPowerLookup.lookupClass(); + assertTrue(fullPowerLookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PROTECTED|PRIVATE)); + + Lookup lookup = fullPowerLookup.dropLookupMode(PRIVATE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE)); + + lookup = fullPowerLookup.dropLookupMode(PROTECTED); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PRIVATE)); + + lookup = fullPowerLookup.dropLookupMode(PACKAGE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE)); + + lookup = fullPowerLookup.dropLookupMode(MODULE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC)); + + lookup = fullPowerLookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + } + + /** + * Starting with a full power Lookup, use dropLookupMode to create new Lookups + * with reduced access. + */ + public void testReducingAccess() { + Lookup lookup = MethodHandles.lookup(); + final Class lc = lookup.lookupClass(); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PROTECTED|PRIVATE)); + + lookup = lookup.dropLookupMode(PROTECTED); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE|PRIVATE)); + + lookup = lookup.dropLookupMode(PRIVATE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE|PACKAGE)); + + lookup = lookup.dropLookupMode(PACKAGE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == (PUBLIC|MODULE)); + + lookup = lookup.dropLookupMode(MODULE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = lookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + + // repeat with lookup has no access + lookup = lookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + } + + /** + * Test dropLookupMode on the public Lookup. + */ + public void testPublicLookup() { + final Lookup publicLookup = MethodHandles.publicLookup(); + final Class lc = publicLookup.lookupClass(); + assertTrue(publicLookup.lookupModes() == PUBLIC); + + Lookup lookup = publicLookup.dropLookupMode(PRIVATE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(PROTECTED); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(PACKAGE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(MODULE); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == PUBLIC); + + lookup = publicLookup.dropLookupMode(PUBLIC); + assertTrue(lookup.lookupClass() == lc); + assertTrue(lookup.lookupModes() == 0); + } + + @DataProvider(name = "badInput") + public Object[][] badInput() { + return new Object[][] { + { 0, null }, + { (PACKAGE|PRIVATE), null }, // two modes + { Integer.MAX_VALUE, null }, + { Integer.MIN_VALUE, null }, + }; + } + + /** + * Check that IllegalArgumentException is thrown for bad input + */ + @Test(dataProvider = "badInput", expectedExceptions = {IllegalArgumentException.class}) + public void testBadInput(Integer modeToDrop, Object ignore) { + MethodHandles.lookup().dropLookupMode(modeToDrop); + } + +} \ No newline at end of file diff --git a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java b/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java index 87dfbd7f06e..823ae8797b5 100644 --- a/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java +++ b/jdk/test/java/lang/invoke/MethodHandles/privateLookupIn/test/p/PrivateLookupInTests.java @@ -84,8 +84,7 @@ public class PrivateLookupInTests { // Invoke MethodHandles.privateLookupIn with a reduced-power caller public void testReducedAccessCallerSameModule() throws Throwable { - // drop access - Lookup caller = MethodHandles.lookup().in(publicType); + Lookup caller = MethodHandles.lookup().dropLookupMode(PACKAGE); assertTrue((caller.lookupModes() & PRIVATE) == 0); assertTrue((caller.lookupModes() & PACKAGE) == 0); assertTrue((caller.lookupModes() & MODULE) != 0); diff --git a/jdk/test/java/lang/module/ModuleDescriptorTest.java b/jdk/test/java/lang/module/ModuleDescriptorTest.java index efaa498d558..276ecf71048 100644 --- a/jdk/test/java/lang/module/ModuleDescriptorTest.java +++ b/jdk/test/java/lang/module/ModuleDescriptorTest.java @@ -23,8 +23,7 @@ /** * @test - * @modules java.base/java.lang.module:open - * java.base/jdk.internal.module + * @modules java.base/jdk.internal.module * @run testng ModuleDescriptorTest * @summary Basic test for java.lang.module.ModuleDescriptor and its builder */ @@ -41,16 +40,13 @@ import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Provides; import java.lang.module.ModuleDescriptor.Requires.Modifier; import java.lang.module.ModuleDescriptor.Version; -import java.lang.reflect.Constructor; import java.lang.reflect.Module; import java.nio.ByteBuffer; import java.util.Collections; import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import static java.lang.module.ModuleDescriptor.Requires.Modifier.*; @@ -66,10 +62,20 @@ public class ModuleDescriptorTest { public Object[][] invalidJavaIdentifiers() { return new Object[][]{ - { null, null }, - { ".foo", null }, - { "foo.", null }, - { "[foo]", null }, + { null, null }, + { "1", null }, + { "1foo", null }, + { ".foo", null }, + { "foo.", null }, + { "[foo]", null }, + { "foo.1", null }, + { "1foo.bar", null }, + { "foo.1bar", null }, + { "foo.[bar]", null }, + { "foo..bar", null }, + { "foo.bar.1", null }, + { "foo.bar.1gus", null }, + { "foo.bar.[gus]", null }, }; } @@ -86,6 +92,15 @@ public class ModuleDescriptorTest { .next(); } + private Requires requires(Set mods, String mn, Version v) { + return ModuleDescriptor.module("m") + .requires(mods, mn, v) + .build() + .requires() + .iterator() + .next(); + } + private Requires requires(String mn) { return requires(Collections.emptySet(), mn); } @@ -103,6 +118,7 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertTrue(r.modifiers().isEmpty()); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); } public void testRequiresWithOneModifier() { @@ -111,6 +127,7 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertEquals(r.modifiers(), EnumSet.of(TRANSITIVE)); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); } public void testRequiresWithTwoModifiers() { @@ -119,6 +136,7 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertEquals(r.modifiers(), EnumSet.of(TRANSITIVE, SYNTHETIC)); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); } public void testRequiresWithAllModifiers() { @@ -127,6 +145,18 @@ public class ModuleDescriptorTest { assertTrue(r.compareTo(r) == 0); assertEquals(r.modifiers(), EnumSet.of(TRANSITIVE, STATIC, SYNTHETIC, MANDATED)); assertEquals(r.name(), "foo"); + assertFalse(r.compiledVersion().isPresent()); + } + + public void testRequiresWithCompiledVersion() { + Version v = Version.parse("1.0"); + Requires r = requires(Set.of(), "foo", v); + assertEquals(r, r); + assertTrue(r.compareTo(r) == 0); + assertEquals(r.modifiers(), Set.of()); + assertEquals(r.name(), "foo"); + assertTrue(r.compiledVersion().isPresent()); + assertEquals(r.compiledVersion().get().toString(), "1.0"); } @Test(expectedExceptions = IllegalStateException.class) @@ -167,6 +197,16 @@ public class ModuleDescriptorTest { ModuleDescriptor.module("m").requires((Requires) null); } + @Test(expectedExceptions = NullPointerException.class) + public void testRequiresWithNullModifiers() { + ModuleDescriptor.module("m").requires(null, "foo"); + } + + @Test(expectedExceptions = NullPointerException.class) + public void testRequiresWithNullVersion() { + ModuleDescriptor.module("m").requires(Set.of(), "foo", null); + } + public void testRequiresCompare() { Requires r1 = requires(EnumSet.noneOf(Modifier.class), "foo"); Requires r2 = requires(EnumSet.noneOf(Modifier.class), "bar"); @@ -190,6 +230,20 @@ public class ModuleDescriptorTest { assertTrue(r2.compareTo(r1) == 0); } + public void testRequiresCompareWithSameCompiledVersion() { + Requires r1 = requires(Set.of(), "foo", Version.parse("2.0")); + Requires r2 = requires(Set.of(), "foo", Version.parse("2.0")); + assertTrue(r1.compareTo(r2) == 0); + assertTrue(r2.compareTo(r1) == 0); + } + + public void testRequiresCompareWithDifferentCompiledVersion() { + Requires r1 = requires(Set.of(), "foo", Version.parse("1.0")); + Requires r2 = requires(Set.of(), "foo", Version.parse("2.0")); + assertTrue(r1.compareTo(r2) < 0); + assertTrue(r2.compareTo(r1) > 0); + } + public void testRequiresEqualsAndHashCode() { Requires r1 = requires("foo"); Requires r2 = requires("foo"); @@ -208,6 +262,17 @@ public class ModuleDescriptorTest { r1 = requires(EnumSet.allOf(Requires.Modifier.class), "foo"); r2 = requires(Set.of(), "foo"); assertNotEquals(r1, r2); + + Version v1 = Version.parse("1.0"); + r1 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v1); + r2 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v1); + assertEquals(r1, r2); + assertTrue(r1.hashCode() == r2.hashCode()); + + Version v2 = Version.parse("2.0"); + r1 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v1); + r2 = requires(EnumSet.allOf(Requires.Modifier.class), "foo", v2); + assertNotEquals(r1, r2); } public void testRequiresToString() { @@ -938,7 +1003,7 @@ public class ModuleDescriptorTest { }; // basic test reading module-info.class - public void testRead1() throws Exception { + public void testRead() throws Exception { Module base = Object.class.getModule(); try (InputStream in = base.getResourceAsStream("module-info.class")) { @@ -954,45 +1019,6 @@ public class ModuleDescriptorTest { assertEquals(descriptor.name(), "java.base"); } } - - /** - * Test reading a module-info.class that has a module name, requires, - * and qualified exports with module names that are not supported in the - * Java Language. - */ - public void testRead2() throws Exception { - // use non-public constructor to create a Builder that is not strict - Constructor ctor = Builder.class.getDeclaredConstructor(String.class, boolean.class); - ctor.setAccessible(true); - - Builder builder = (ModuleDescriptor.Builder) ctor.newInstance("m?1", false); - ModuleDescriptor descriptor = builder - .requires("java.base") - .requires("-m1") - .exports("p", Set.of("m2-")) - .build(); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - ModuleInfoWriter.write(descriptor, baos); - ByteBuffer bb = ByteBuffer.wrap(baos.toByteArray()); - - descriptor = ModuleDescriptor.read(bb); - assertEquals(descriptor.name(), "m?1"); - - Set requires = descriptor.requires() - .stream() - .map(Requires::name) - .collect(Collectors.toSet()); - assertTrue(requires.size() == 2); - assertTrue(requires.contains("java.base")); - assertTrue(requires.contains("-m1")); - - assertTrue(descriptor.exports().size() == 1); - Exports e = descriptor.exports().iterator().next(); - assertTrue(e.targets().size() == 1); - assertTrue(e.targets().contains("m2-")); - } - /** * Test ModuleDescriptor with a packager finder */ diff --git a/jdk/test/java/lang/module/ModuleNamesTest.java b/jdk/test/java/lang/module/ModuleNamesTest.java new file mode 100644 index 00000000000..c0790eab202 --- /dev/null +++ b/jdk/test/java/lang/module/ModuleNamesTest.java @@ -0,0 +1,261 @@ +/* + * 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 + * @modules java.base/jdk.internal.misc + * java.base/jdk.internal.module + * @run testng ModuleNamesTest + * @summary Basic test of reading a module-info.class with module names that + * are legal in class files but not legal in the Java Language + */ + +import java.io.ByteArrayOutputStream; +import java.lang.module.InvalidModuleDescriptorException; +import java.lang.module.ModuleDescriptor; +import java.lang.module.ModuleDescriptor.Builder; +import java.lang.module.ModuleDescriptor.Exports; +import java.lang.module.ModuleDescriptor.Opens; +import java.lang.module.ModuleDescriptor.Requires; +import java.nio.ByteBuffer; +import java.util.Optional; +import java.util.Set; + +import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModuleInfoWriter; + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +@Test +public class ModuleNamesTest { + + @DataProvider(name = "legalModuleNames") + public Object[][] legalModuleNames() { + return new Object[][] { + + { ".", "." }, + { ".foo", ".foo" }, + { "foo.", "foo." }, + { "foo.bar", "foo.bar" }, + + { "..", ".." }, + { "..foo", "..foo" }, + { "foo..", "foo.." }, + { "foo..bar", "foo..bar" }, + + { "[", "[" }, + { "[foo", "[foo" }, + { "foo[", "foo[" }, + { "foo[bar", "foo[bar" }, + + { ";", ";" }, + { ";foo", ";foo" }, + { "foo;", "foo;" }, + { "foo;bar", "foo;bar" }, + + { "\\\\", "\\" }, + { "\\\\foo", "\\foo" }, + { "foo\\\\", "foo\\" }, + { "foo\\\\bar", "foo\\bar" }, + + { "\\\\\\\\", "\\\\" }, + { "\\\\\\\\foo", "\\\\foo" }, + { "foo\\\\\\\\", "foo\\\\" }, + { "foo\\\\\\\\bar", "foo\\\\bar" }, + + { "\\:", ":" }, + { "\\:foo", ":foo" }, + { "foo\\:", "foo:" }, + { "foo\\:bar", "foo:bar" }, + + { "\\:\\:", "::" }, + { "\\:\\:foo", "::foo" }, + { "foo\\:\\:", "foo::" }, + { "foo\\:\\:bar", "foo::bar" }, + + { "\\@", "@" }, + { "\\@foo", "@foo" }, + { "foo\\@", "foo@" }, + { "foo\\@bar", "foo@bar" }, + + { "\\@\\@", "@@" }, + { "\\@\\@foo", "@@foo" }, + { "foo\\@\\@", "foo@@" }, + { "foo\\@\\@bar", "foo@@bar" }, + + { makeString("", 0x20, ""), " " }, + { makeString("foo", 0x20, ""), "foo " }, + { makeString("", 0x20, "foo"), " foo" }, + { makeString("foo", 0x20, "bar"), "foo bar" }, + }; + } + + @DataProvider(name = "illegalModuleNames") + public Object[][] illegalModuleNames() { + return new Object[][] { + + { "", null }, + + { ":", null }, + { ":foo", null }, + { "foo:", null }, + { "foo:bar", null }, + + { "@", null }, + { "@foo", null }, + { "foo@", null }, + { "foo@bar", null }, + + { "\\", null }, + { "\\foo", null }, + { "foo\\", null }, + { "foo\\bar", null }, + + { makeString("", 0x00, ""), null }, + { makeString("", 0x00, "foo"), null }, + { makeString("foo", 0x00, ""), null }, + { makeString("foo", 0x00, "bar"), null }, + + { makeString("", 0x1f, ""), null }, + { makeString("", 0x1f, "foo"), null }, + { makeString("foo", 0x1f, ""), null }, + { makeString("foo", 0x1f, "bar"), null }, + + }; + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalModuleName(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder(mn).requires("java.base").build(); + ByteBuffer bb = toBuffer(md); + String name = ModuleDescriptor.read(bb).name(); + assertEquals(name, expected); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalModuleName(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder(mn).requires("java.base").build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalRequires(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder("m").requires("java.base").requires(mn).build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor descriptor = ModuleDescriptor.read(bb); + Optional requires = descriptor.requires().stream() + .filter(r -> !r.name().equals("java.base")) + .findAny(); + assertTrue(requires.isPresent()); + assertEquals(requires.get().name(), expected); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalRequires(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder("m").requires("java.base").requires(mn).build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalExports(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .exports("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor descriptor = ModuleDescriptor.read(bb); + Optional export = descriptor.exports().stream().findAny(); + assertTrue(export.isPresent()); + assertTrue(export.get().targets().contains(expected)); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalExports(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .exports("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + @Test(dataProvider = "legalModuleNames") + public void testLegalOpens(String mn, String expected) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .opens("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor descriptor = ModuleDescriptor.read(bb); + Optional opens = descriptor.opens().stream().findAny(); + assertTrue(opens.isPresent()); + assertTrue(opens.get().targets().contains(expected)); + } + + @Test(dataProvider = "illegalModuleNames", + expectedExceptions = InvalidModuleDescriptorException.class) + public void testIllegalOpens(String mn, String ignore) throws Exception { + ModuleDescriptor md = newBuilder("m") + .requires("java.base") + .opens("p", Set.of(mn)) + .build(); + ByteBuffer bb = toBuffer(md); + ModuleDescriptor.read(bb); // throws InvalidModuleDescriptorException + } + + /** + * Returns a Builder that does not validate module names. + */ + private Builder newBuilder(String mn) { + return SharedSecrets.getJavaLangModuleAccess() + .newModuleBuilder(mn, false, false, false); + } + + /** + * Returns a {@code ByteBuffer} containing the given module descriptor + * in module-info.class format. + */ + private ByteBuffer toBuffer(ModuleDescriptor descriptor) throws Exception { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ModuleInfoWriter.write(descriptor, baos); + return ByteBuffer.wrap(baos.toByteArray()); + } + + /** + * Returns a string containing a given code point. + */ + private String makeString(String prefix, int codePoint, String suffix) { + StringBuilder sb = new StringBuilder(); + sb.append(prefix); + sb.appendCodePoint(codePoint); + sb.append(suffix); + return sb.toString(); + } +} diff --git a/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java b/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java index 63c4c7404e0..d956c249651 100644 --- a/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java +++ b/jdk/test/java/lang/module/ModuleReader/ModuleReaderTest.java @@ -24,7 +24,7 @@ /** * @test * @library /lib/testlibrary - * @modules java.base/jdk.internal.misc + * @modules java.base/jdk.internal.module * jdk.compiler * @build ModuleReaderTest CompilerUtils JarUtils * @run testng ModuleReaderTest @@ -53,7 +53,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.spi.ToolProvider; -import jdk.internal.misc.SharedSecrets; +import jdk.internal.module.ModulePath; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -216,9 +216,7 @@ public class ModuleReaderTest { */ void test(Path mp) throws IOException { - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, mp); - + ModuleFinder finder = new ModulePath(Runtime.version(), true, mp); ModuleReference mref = finder.find(TEST_MODULE).get(); ModuleReader reader = mref.open(); diff --git a/jdk/test/java/lang/module/ModuleReferenceTest.java b/jdk/test/java/lang/module/ModuleReferenceTest.java index 6b480bb8b2c..bf2db124de5 100644 --- a/jdk/test/java/lang/module/ModuleReferenceTest.java +++ b/jdk/test/java/lang/module/ModuleReferenceTest.java @@ -31,7 +31,6 @@ import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleReader; import java.lang.module.ModuleReference; import java.net.URI; -import java.util.function.Supplier; import org.testng.annotations.Test; import static org.testng.Assert.*; @@ -39,8 +38,13 @@ import static org.testng.Assert.*; @Test public class ModuleReferenceTest { - private Supplier makeSupplier() { - return () -> { throw new UnsupportedOperationException(); }; + private ModuleReference newModuleReference(ModuleDescriptor descriptor, URI uri) { + return new ModuleReference(descriptor, uri) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException(); + } + }; } public void testBasic() throws Exception { @@ -53,25 +57,16 @@ public class ModuleReferenceTest { URI uri = URI.create("module:/m"); - Supplier supplier = makeSupplier(); - - ModuleReference mref = new ModuleReference(descriptor, uri, supplier); + ModuleReference mref = newModuleReference(descriptor, uri); assertTrue(mref.descriptor().equals(descriptor)); assertTrue(mref.location().get().equals(uri)); - - // check that the supplier is called - try { - mref.open(); - assertTrue(false); - } catch (UnsupportedOperationException expected) { } } - @Test(expectedExceptions = { NullPointerException.class }) public void testNullDescriptor() throws Exception { URI location = URI.create("module:/m"); - new ModuleReference(null, location, makeSupplier()); + newModuleReference(null, location); } public void testNullLocation() { @@ -79,55 +74,8 @@ public class ModuleReferenceTest { = ModuleDescriptor.module("m") .exports("p") .build(); - Supplier supplier = makeSupplier(); - ModuleReference mref = new ModuleReference(descriptor, null, supplier); + ModuleReference mref = newModuleReference(descriptor, null); assertTrue(!mref.location().isPresent()); } - @Test(expectedExceptions = { NullPointerException.class }) - public void testNullSupplier() throws Exception { - ModuleDescriptor descriptor = ModuleDescriptor.module("m").build(); - URI location = URI.create("module:/m"); - new ModuleReference(descriptor, location, null); - } - - - public void testEqualsAndHashCode() { - ModuleDescriptor descriptor1 - = ModuleDescriptor.module("m1") - .exports("p") - .build(); - ModuleDescriptor descriptor2 - = ModuleDescriptor.module("m1") - .exports("p") - .build(); - - URI uri = URI.create("module:/m1"); - Supplier supplier = makeSupplier(); - - ModuleReference mref1 = new ModuleReference(descriptor1, uri, supplier); - ModuleReference mref2 = new ModuleReference(descriptor2, uri, supplier); - ModuleReference mref3 = new ModuleReference(descriptor1, null, supplier); - - assertTrue(mref1.equals(mref1)); - assertTrue(mref1.equals(mref2)); - assertTrue(mref2.equals(mref1)); - assertTrue(mref1.hashCode() == mref2.hashCode()); - - assertTrue(mref3.equals(mref3)); - assertFalse(mref3.equals(mref1)); - assertFalse(mref1.equals(mref3)); - } - - - public void testToString() { - ModuleDescriptor descriptor = ModuleDescriptor.module("m1").build(); - URI uri = URI.create("module:/m1"); - Supplier supplier = makeSupplier(); - ModuleReference mref = new ModuleReference(descriptor, uri, supplier); - String s = mref.toString(); - assertTrue(s.contains("m1")); - assertTrue(s.contains(uri.toString())); - } - } diff --git a/jdk/test/java/lang/reflect/Module/AnnotationsTest.java b/jdk/test/java/lang/reflect/Module/AnnotationsTest.java index 1746d6d40e9..0390698b282 100644 --- a/jdk/test/java/lang/reflect/Module/AnnotationsTest.java +++ b/jdk/test/java/lang/reflect/Module/AnnotationsTest.java @@ -119,7 +119,6 @@ public class AnnotationsTest { List attrs = new ArrayList<>(); attrs.add(new ClassFileAttributes.ModuleAttribute()); attrs.add(new ClassFileAttributes.ModulePackagesAttribute()); - attrs.add(new ClassFileAttributes.ModuleVersionAttribute()); attrs.add(new ClassFileAttributes.ModuleTargetAttribute()); cr.accept(cv, attrs.toArray(new Attribute[0]), 0); diff --git a/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java b/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java index 7a4ce531b0b..47feb498c51 100644 --- a/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java +++ b/jdk/test/java/net/URLClassLoader/closetest/CloseTest.java @@ -21,10 +21,11 @@ * questions. */ -/** +/* * @test * @bug 4167874 - * @modules jdk.httpserver + * @modules java.logging + * jdk.httpserver * @library ../../../../com/sun/net/httpserver * @library /lib/testlibrary * @build FileServerHandler jdk.testlibrary.FileUtils @@ -33,10 +34,13 @@ * @summary URL-downloaded jar files can consume all available file descriptors */ -import java.io.*; -import java.net.*; -import java.lang.reflect.*; -import com.sun.net.httpserver.*; +import java.io.File; +import java.lang.reflect.Method; +import java.net.URLClassLoader; +import java.net.InetSocketAddress; +import java.net.URL; +import com.sun.net.httpserver.HttpContext; +import com.sun.net.httpserver.HttpServer; public class CloseTest extends Common { @@ -130,7 +134,7 @@ public class CloseTest extends Common { // load tests loadClass ("com.foo.TestClass1", loader, false); loadClass ("com.foo.TestClass", loader, true); - loadClass ("java.sql.Array", loader, true); + loadClass ("java.util.ArrayList", loader, true); // now check we can delete the path rm_minus_rf (new File(name)); diff --git a/jdk/test/java/rmi/registry/reexport/Reexport.java b/jdk/test/java/rmi/registry/reexport/Reexport.java index a0c9707a74a..1034cad1903 100644 --- a/jdk/test/java/rmi/registry/reexport/Reexport.java +++ b/jdk/test/java/rmi/registry/reexport/Reexport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, 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 @@ -67,10 +67,6 @@ public class Reexport { System.err.println("Creating duplicate registry, this should fail..."); reg = createReg(true, regPort); - if (reg != null) { - TestLibrary.bomb("failed was able to duplicate the registry?!?"); - } - // Kill the first registry. System.err.println("Bringing down the first registry"); try { @@ -105,6 +101,9 @@ public class Reexport { try { reg = LocateRegistry.createRegistry(port); + if (remoteOk) { + TestLibrary.bomb("Remote registry is up, an Exception is expected!"); + } } catch (Throwable e) { if (remoteOk) { System.err.println("EXPECTING PORT IN USE EXCEPTION:"); diff --git a/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java b/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java index 14a5741cbf8..c24ebe21320 100644 --- a/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java @@ -223,7 +223,7 @@ public class MultiPageImageTIFFFieldTest { ImageReader reader = getTIFFReader(); ImageInputStream s = ImageIO.createImageInputStream(new File(FILENAME)); - reader.setInput(s, false, true); + reader.setInput(s, false, false); int ni = reader.getNumImages(true); check(ni == 2, "invalid number of images"); diff --git a/jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java b/jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java new file mode 100644 index 00000000000..3734b865adb --- /dev/null +++ b/jdk/test/javax/imageio/plugins/tiff/ReadUnknownTagsTest.java @@ -0,0 +1,269 @@ +/* + * 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 + * @bug 8154058 + * @author a.stepanov + * @summary Some checks for ignoring metadata + * @run main ReadUnknownTagsTest + */ + +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; +import javax.imageio.*; +import javax.imageio.metadata.*; + +import javax.imageio.stream.*; +import javax.imageio.plugins.tiff.*; + + +public class ReadUnknownTagsTest { + + private final static int SZ = 50; + private final static Color C = Color.RED; + + private final static int DESCRIPTION_TAG = + BaselineTIFFTagSet.TAG_IMAGE_DESCRIPTION; + private final static String DESCRIPTION = "A Test Image"; + + private final static int FAX_TAG = FaxTIFFTagSet.TAG_CLEAN_FAX_DATA; + private final static short FAX_DATA = + FaxTIFFTagSet.CLEAN_FAX_DATA_ERRORS_UNCORRECTED; + + private final boolean ignoreMetadata; + private final boolean readUnknownTags; + + public ReadUnknownTagsTest(boolean ignoreMetadata, + boolean readUnknownTags) { + this.ignoreMetadata = ignoreMetadata; + this.readUnknownTags = readUnknownTags; + } + + private ImageWriter getTIFFWriter() { + + java.util.Iterator writers = + ImageIO.getImageWritersByFormatName("TIFF"); + if (!writers.hasNext()) { + throw new RuntimeException("No writers available for TIFF format"); + } + return writers.next(); + } + + private ImageReader getTIFFReader() { + + java.util.Iterator readers = + ImageIO.getImageReadersByFormatName("TIFF"); + if (!readers.hasNext()) { + throw new RuntimeException("No readers available for TIFF format"); + } + return readers.next(); + } + + + private void writeImage() throws Exception { + + String fn = "test-" + ignoreMetadata + ".tiff"; + OutputStream s = new BufferedOutputStream(new FileOutputStream(fn)); + try (ImageOutputStream ios = ImageIO.createImageOutputStream(s)) { + + ImageWriter writer = getTIFFWriter(); + writer.setOutput(ios); + + BufferedImage img = new BufferedImage(SZ, SZ, + BufferedImage.TYPE_INT_RGB); + Graphics g = img.getGraphics(); + g.setColor(C); + g.fillRect(0, 0, SZ, SZ); + g.dispose(); + + ImageWriteParam param = writer.getDefaultWriteParam(); + + IIOMetadata md = writer.getDefaultImageMetadata( + new ImageTypeSpecifier(img), param); + + TIFFDirectory dir = TIFFDirectory.createFromMetadata(md); + + TIFFTag descTag = + BaselineTIFFTagSet.getInstance().getTag(DESCRIPTION_TAG); + dir.addTIFFField(new TIFFField(descTag, TIFFTag.TIFF_ASCII, 1, + new String[] {DESCRIPTION})); + + TIFFTag faxTag = FaxTIFFTagSet.getInstance().getTag(FAX_TAG); + dir.addTIFFField(new TIFFField(faxTag, FAX_DATA)); + + writer.write(new IIOImage(img, null, dir.getAsMetadata())); + + ios.flush(); + writer.dispose(); + } + s.close(); + } + + private void readAndCheckImage() throws Exception { + + ImageReader reader = getTIFFReader(); + + String fn = "test-" + ignoreMetadata + ".tiff"; + ImageInputStream s = ImageIO.createImageInputStream(new File(fn)); + + reader.setInput(s, false, ignoreMetadata); + + int ni = reader.getNumImages(true); + check(ni == 1, "invalid number of images"); + + + TIFFImageReadParam param = new TIFFImageReadParam(); + // fax data are allowed by default + param.removeAllowedTagSet(FaxTIFFTagSet.getInstance()); + + // readUnknownTags setting + if (param.getReadUnknownTags()) { + throw new RuntimeException("Default readUnknownTags is not false"); + } + param.setReadUnknownTags(readUnknownTags); + if (param.getReadUnknownTags() != readUnknownTags) { + throw new RuntimeException("Incorrect readUnknownTags setting " + + "\"" + readUnknownTags + "\""); + } + + // read images and metadata + IIOImage i = reader.readAll(0, param); + BufferedImage bi = (BufferedImage) i.getRenderedImage(); + + check(bi.getWidth() == SZ, "invalid width"); + check(bi.getHeight() == SZ, "invalid height"); + Color c = new Color(bi.getRGB(SZ / 2, SZ / 2)); + check(c.equals(C), "invalid color"); + + IIOMetadata metadata = i.getMetadata(); + + // + // Verify presence of image metadata + // + if (metadata == null) { + throw new RuntimeException("No image metadata retrieved"); + } + + TIFFDirectory dir = TIFFDirectory.createFromMetadata(metadata); + + // + // Verify presence of essential ImageWidth field regardless of + // settings of ignoreMetadata and readUnknownTags + // + int failures = 0; + if (!dir.containsTIFFField(BaselineTIFFTagSet.TAG_IMAGE_WIDTH)) { + System.err.println("Metadata is missing essential ImageWidth tag"); + failures++; + } else { + TIFFField widthField = + dir.getTIFFField(BaselineTIFFTagSet.TAG_IMAGE_WIDTH); + System.out.printf("ImageWidth: %d%n", widthField.getAsLong(0)); + } + + // + // Verify presence of non-essential baseline ImageDescription field + // if and only if ignoreMetadata == false + // + boolean hasDescription = dir.containsTIFFField(DESCRIPTION_TAG); + System.out.println("ImageDescription (" + !ignoreMetadata + "): " + + hasDescription); + if (ignoreMetadata && hasDescription) { + System.err.println + ("Description metadata present despite ignoreMetadata"); + failures++; + } else if (!ignoreMetadata && !hasDescription) { + System.err.println + ("Description metadata absent despite !ignoreMetadata"); + failures++; + } + + // + // Verify presence of CleanFaxData field if and only if + // ignoreMetadata == false and readUnknownTags == true + // + boolean shouldHaveFaxField = !ignoreMetadata && readUnknownTags; + boolean hasFaxField = dir.containsTIFFField(FAX_TAG); + System.out.println("CleanFaxData (" + shouldHaveFaxField + "): " + + hasFaxField); + + if (ignoreMetadata) { + if (hasFaxField) { + System.err.println + ("Fax metadata present despite ignoreMetadata"); + failures++; + } + } else { // !ignoreMetadata + if (!readUnknownTags && hasFaxField) { + System.err.println + ("Fax metadata present despite !readUnknownTags"); + failures++; + } else if (readUnknownTags && !hasFaxField) { + System.err.println + ("Fax metadata absent despite readUnknownTags"); + failures++; + } + } + + if (failures > 0) { + throw new RuntimeException("Test failed for ignoreMetadata " + + ignoreMetadata + " and readUnknownTags " + readUnknownTags); + } + } + + public void run() { + try { + writeImage(); + readAndCheckImage(); + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + private void check(boolean ok, String msg) { + if (!ok) { throw new RuntimeException(msg); } + } + + public static void main(String[] args) { + int failures = 0; + + System.out.println(); + for (boolean ignoreMetadata : new boolean[] {false, true}) { + for (boolean readUnknownTags : new boolean[] {false, true}) { + try { + System.out.printf + ("ignoreMetadata: %s, readUnknownTags: %s%n", + ignoreMetadata, readUnknownTags); + (new ReadUnknownTagsTest(ignoreMetadata, + readUnknownTags)).run(); + } catch (Exception e) { + e.printStackTrace(); + failures++; + } finally { + System.out.println(); + } + } + } + } +} diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java b/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java index 39c2474512c..570f5f224c7 100644 --- a/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/TIFFDirectoryTest.java @@ -154,7 +154,7 @@ public class TIFFDirectoryTest { "must return null TIFFField"); long offset = 4L; - long a[] = {Long.MIN_VALUE, 0, Long.MAX_VALUE}; + long a[] = {0, Integer.MAX_VALUE, (1 << 32) - 1}; int v = 100500; TIFFField f1 = new TIFFField(tag1, type, offset, d), diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java b/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java index 936a5e3af68..9b05bbb8fd2 100644 --- a/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/TIFFFieldTest.java @@ -23,7 +23,7 @@ /** * @test - * @bug 8152183 8149562 + * @bug 8152183 8149562 8169725 8169728 * @author a.stepanov * @summary Some checks for TIFFField methods * @run main TIFFFieldTest @@ -65,7 +65,26 @@ public class TIFFFieldTest { ok = false; try { new TIFFField(tag, -1); } catch (IllegalArgumentException e) { ok = true; } - check(ok, CONSTRUCT + "invalid count"); + check(ok, CONSTRUCT + "negative value"); + + ok = false; + try { new TIFFField(tag, 1L << 32); } + catch (IllegalArgumentException e) { ok = true; } + check(ok, CONSTRUCT + "value > 0xffffffff"); + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_SHORT); + new TIFFField(t, 0x10000); + } catch (IllegalArgumentException e) { ok = true; } + check(ok, CONSTRUCT + "value 0x10000 incompatible with TIFF_SHORT"); + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_LONG); + new TIFFField(t, 0xffff); + } catch (IllegalArgumentException e) { ok = true; } + check(ok, CONSTRUCT + "value 0xffff incompatible with TIFF_LONG"); // check value type recognition int v = 1 << 16; @@ -152,6 +171,94 @@ public class TIFFFieldTest { check((f.getDirectory() == null) && !f.hasDirectory(), "must not have directory"); + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_RATIONAL); + long[][] tiffRationals = new long[6][3]; + new TIFFField(t, TIFFTag.TIFF_RATIONAL, tiffRationals.length, + tiffRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_SRATIONAL); + int[][] tiffSRationals = new int[6][3]; + new TIFFField(t, TIFFTag.TIFF_SRATIONAL, tiffSRationals.length, + tiffSRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_LONG); + long[] tiffLongs = new long[] {0, -7, 10}; + new TIFFField(t, TIFFTag.TIFF_LONG, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_LONG); + long[] tiffLongs = new long[] {0, 7, 0x100000000L}; + new TIFFField(t, TIFFTag.TIFF_LONG, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_IFD_POINTER); + long[] tiffLongs = new long[] {-7}; + new TIFFField(t, TIFFTag.TIFF_IFD_POINTER, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_IFD_POINTER); + long[] tiffLongs = new long[] {0x100000000L}; + new TIFFField(t, TIFFTag.TIFF_IFD_POINTER, tiffLongs.length, + tiffLongs); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_RATIONAL); + long[][] tiffRationals = new long[][] { + {10, 2}, + {1, -3}, + {4, 7} + }; + new TIFFField(t, TIFFTag.TIFF_RATIONAL, tiffRationals.length, + tiffRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + + ok = false; + try { + TIFFTag t = new TIFFTag(NAME, NUM, 1 << TIFFTag.TIFF_RATIONAL); + long[][] tiffRationals = new long[][] { + {10, 2}, + {0x100000000L, 3}, + {4, 7} + }; + new TIFFField(t, TIFFTag.TIFF_RATIONAL, tiffRationals.length, + tiffRationals); + } catch (IllegalArgumentException e) { + ok = true; + } + // constructor: TIFFField(tag, type, offset, dir) List tags = new ArrayList<>(); tags.add(tag); diff --git a/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java b/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java index 34fd5ed8983..6cd71e27872 100644 --- a/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/TIFFImageReadParamTest.java @@ -159,7 +159,7 @@ public class TIFFImageReadParamTest { ImageReader reader = getTIFFReader(); ImageInputStream s = ImageIO.createImageInputStream(new File(FILENAME)); - reader.setInput(s, false, true); + reader.setInput(s, false, false); int ni = reader.getNumImages(true); check(ni == 1, "invalid number of images: " + ni); diff --git a/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java b/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java index d457766d5d4..ecd7dcfc4eb 100644 --- a/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java +++ b/jdk/test/javax/net/ssl/ALPN/MyX509ExtendedKeyManager.java @@ -34,15 +34,17 @@ public class MyX509ExtendedKeyManager extends X509ExtendedKeyManager { static final String ERROR = "ERROR"; X509ExtendedKeyManager akm; String expectedAP; + boolean doCheck = true; MyX509ExtendedKeyManager(X509ExtendedKeyManager akm) { this.akm = akm; } public MyX509ExtendedKeyManager( - X509ExtendedKeyManager akm, String expectedAP) { + X509ExtendedKeyManager akm, String expectedAP, boolean doCheck) { this.akm = akm; this.expectedAP = expectedAP; + this.doCheck = doCheck; } @@ -104,6 +106,12 @@ public class MyX509ExtendedKeyManager extends X509ExtendedKeyManager { private void checkALPN(String ap) { + if (!doCheck) { + System.out.println("Skipping KeyManager checks " + + "because a callback has been registered"); + return; + } + if (ERROR.equals(expectedAP)) { throw new RuntimeException("Should not reach here"); } diff --git a/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java b/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java index de4ea6cc0b6..b17da745841 100644 --- a/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java +++ b/jdk/test/javax/net/ssl/ALPN/SSLEngineAlpnTest.java @@ -26,23 +26,53 @@ /* * @test - * @bug 8051498 8145849 + * @bug 8051498 8145849 8170282 * @summary JEP 244: TLS Application-Layer Protocol Negotiation Extension * @compile MyX509ExtendedKeyManager.java - * @run main/othervm SSLEngineAlpnTest h2 h2 h2 - * @run main/othervm SSLEngineAlpnTest h2 h2,http/1.1 h2 - * @run main/othervm SSLEngineAlpnTest h2,http/1.1 h2,http/1.1 h2 - * @run main/othervm SSLEngineAlpnTest http/1.1,h2 h2,http/1.1 http/1.1 - * @run main/othervm SSLEngineAlpnTest h4,h3,h2 h1,h2 h2 - * @run main/othervm SSLEngineAlpnTest EMPTY h2,http/1.1 NONE - * @run main/othervm SSLEngineAlpnTest h2 EMPTY NONE - * @run main/othervm SSLEngineAlpnTest H2 h2 ERROR - * @run main/othervm SSLEngineAlpnTest h2 http/1.1 ERROR + * + * @run main/othervm SSLEngineAlpnTest h2 UNUSED h2 h2 + * @run main/othervm SSLEngineAlpnTest h2 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest http/1.1,h2 UNUSED h2,http/1.1 http/1.1 + * @run main/othervm SSLEngineAlpnTest h4,h3,h2 UNUSED h1,h2 h2 + * @run main/othervm SSLEngineAlpnTest EMPTY UNUSED h2,http/1.1 NONE + * @run main/othervm SSLEngineAlpnTest h2 UNUSED EMPTY NONE + * @run main/othervm SSLEngineAlpnTest H2 UNUSED h2 ERROR + * @run main/othervm SSLEngineAlpnTest h2 UNUSED http/1.1 ERROR + * + * @run main/othervm SSLEngineAlpnTest UNUSED h2 h2 h2 + * @run main/othervm SSLEngineAlpnTest UNUSED h2 h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest UNUSED h2 http/1.1,h2 h2 + * @run main/othervm SSLEngineAlpnTest UNUSED http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLEngineAlpnTest UNUSED EMPTY h2,http/1.1 NONE + * @run main/othervm SSLEngineAlpnTest UNUSED h2 EMPTY NONE + * @run main/othervm SSLEngineAlpnTest UNUSED H2 h2 ERROR + * @run main/othervm SSLEngineAlpnTest UNUSED h2 http/1.1 ERROR + * + * @run main/othervm SSLEngineAlpnTest h2 h2 h2 h2 + * @run main/othervm SSLEngineAlpnTest H2 h2 h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLEngineAlpnTest http/1.1,h2 h2 h2,http/1.1 h2 + * @run main/othervm SSLEngineAlpnTest EMPTY h2 h2 h2 + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 EMPTY http/1.1 NONE + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 h2 EMPTY NONE + * @run main/othervm SSLEngineAlpnTest UNUSED UNUSED http/1.1,h2 NONE + * @run main/othervm SSLEngineAlpnTest h2 h2 http/1.1 ERROR + * @run main/othervm SSLEngineAlpnTest h2,http/1.1 H2 http/1.1 ERROR */ /** * A simple SSLEngine-based client/server that demonstrates the proposed API * changes for JEP 244 in support of the TLS ALPN extension (RFC 7301). * + * Usage: + * java SSLEngineAlpnTest + * + * where: + * EMPTY indicates that ALPN is disabled + * UNUSED indicates that no ALPN values are supplied (server-side only) + * ERROR indicates that an exception is expected + * NONE indicates that no ALPN is expected + * * This example is based on our standard SSLEngineTemplate. * * The immediate consumer of ALPN will be HTTP/2 (RFC 7540), aka H2. The H2 IETF @@ -98,6 +128,7 @@ import javax.net.ssl.SSLEngineResult.*; import java.io.*; import java.security.*; import java.nio.*; +import java.util.Arrays; public class SSLEngineAlpnTest { @@ -117,6 +148,9 @@ public class SSLEngineAlpnTest { */ private static final boolean debug = false; + private static boolean hasServerAPs; // whether server APs are present + private static boolean hasCallback; // whether a callback is present + private final SSLContext sslc; private SSLEngine clientEngine; // client Engine @@ -157,17 +191,21 @@ public class SSLEngineAlpnTest { if (debug) { System.setProperty("javax.net.debug", "all"); } + System.out.println("Test args: " + Arrays.toString(args)); // Validate parameters - if (args.length != 3) { + if (args.length != 4) { throw new Exception("Invalid number of test parameters"); } - SSLEngineAlpnTest test = new SSLEngineAlpnTest(args[2]); + hasServerAPs = !args[0].equals("UNUSED"); // are server APs being used? + hasCallback = !args[1].equals("UNUSED"); // is callback being used? + + SSLEngineAlpnTest test = new SSLEngineAlpnTest(args[3]); try { - test.runTest(convert(args[0]), convert(args[1]), args[2]); + test.runTest(convert(args[0]), args[1], convert(args[2]), args[3]); } catch (SSLHandshakeException she) { - if (args[2].equals("ERROR")) { + if (args[3].equals("ERROR")) { System.out.println("Caught the expected exception: " + she); } else { throw she; @@ -199,7 +237,8 @@ public class SSLEngineAlpnTest { } kms = new KeyManager[] { new MyX509ExtendedKeyManager( - (X509ExtendedKeyManager) kms[0], expectedAP) }; + (X509ExtendedKeyManager) kms[0], expectedAP, + !hasCallback && hasServerAPs) }; TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(ts); @@ -215,12 +254,15 @@ public class SSLEngineAlpnTest { * Convert a comma-separated list into an array of strings. */ private static String[] convert(String list) { - String[] strings = null; + if (list.equals("UNUSED")) { + return null; + } if (list.equals("EMPTY")) { return new String[0]; } + String[] strings; if (list.indexOf(',') > 0) { strings = list.split(","); } else { @@ -247,12 +289,12 @@ public class SSLEngineAlpnTest { * One could easily separate these phases into separate * sections of code. */ - private void runTest(String[] serverAPs, String[] clientAPs, - String expectedAP) throws Exception { + private void runTest(String[] serverAPs, String callbackAP, + String[] clientAPs, String expectedAP) throws Exception { boolean dataDone = false; - createSSLEngines(serverAPs, clientAPs); + createSSLEngines(serverAPs, callbackAP, clientAPs); createBuffers(); SSLEngineResult clientResult; // results from client's last operation @@ -364,8 +406,8 @@ public class SSLEngineAlpnTest { * Using the SSLContext created during object creation, * create/configure the SSLEngines we'll use for this test. */ - private void createSSLEngines(String[] serverAPs, String[] clientAPs) - throws Exception { + private void createSSLEngines(String[] serverAPs, String callbackAP, + String[] clientAPs) throws Exception { /* * Configure the serverEngine to act as a server in the SSL/TLS * handshake. Also, require SSL client authentication. @@ -385,18 +427,42 @@ public class SSLEngineAlpnTest { */ String[] suites = sslp.getCipherSuites(); sslp.setCipherSuites(suites); - sslp.setApplicationProtocols(serverAPs); + if (serverAPs != null) { + sslp.setApplicationProtocols(serverAPs); + } sslp.setUseCipherSuitesOrder(true); // Set server side order serverEngine.setSSLParameters(sslp); + // check that no callback has been registered + if (serverEngine.getHandshakeApplicationProtocolSelector() != null) { + throw new Exception("getHandshakeApplicationProtocolSelector() " + + "should return null"); + } + + if (hasCallback) { + serverEngine.setHandshakeApplicationProtocolSelector( + (sslEngine, clientProtocols) -> { + return callbackAP.equals("EMPTY") ? "" : callbackAP; + }); + + // check that the callback can be retrieved + if (serverEngine.getHandshakeApplicationProtocolSelector() + == null) { + throw new Exception("getHandshakeApplicationProtocolSelector()" + + " should return non-null"); + } + } + /* * Similar to above, but using client mode instead. */ clientEngine = sslc.createSSLEngine("client", 80); clientEngine.setUseClientMode(true); sslp = clientEngine.getSSLParameters(); - sslp.setApplicationProtocols(clientAPs); + if (clientAPs != null) { + sslp.setApplicationProtocols(clientAPs); + } clientEngine.setSSLParameters(sslp); if ((clientEngine.getHandshakeApplicationProtocol() != null) || diff --git a/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java b/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java index a310cbb0336..a9373ed09f9 100644 --- a/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java +++ b/jdk/test/javax/net/ssl/ALPN/SSLServerSocketAlpnTest.java @@ -26,22 +26,61 @@ /* * @test - * @bug 8051498 8145849 8158978 + * @bug 8051498 8145849 8158978 8170282 * @summary JEP 244: TLS Application-Layer Protocol Negotiation Extension * @compile MyX509ExtendedKeyManager.java - * @run main/othervm SSLServerSocketAlpnTest h2 h2 h2 - * @run main/othervm SSLServerSocketAlpnTest h2 h2,http/1.1 h2 - * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 h2,http/1.1 h2 - * @run main/othervm SSLServerSocketAlpnTest http/1.1,h2 h2,http/1.1 http/1.1 - * @run main/othervm SSLServerSocketAlpnTest h4,h3,h2 h1,h2 h2 - * @run main/othervm SSLServerSocketAlpnTest EMPTY h2,http/1.1 NONE - * @run main/othervm SSLServerSocketAlpnTest h2 EMPTY NONE - * @run main/othervm SSLServerSocketAlpnTest H2 h2 ERROR - * @run main/othervm SSLServerSocketAlpnTest h2 http/1.1 ERROR + * + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED h2 h2 + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest http/1.1,h2 UNUSED h2,http/1.1 http/1.1 + * @run main/othervm SSLServerSocketAlpnTest h4,h3,h2 UNUSED h1,h2 h2 + * @run main/othervm SSLServerSocketAlpnTest EMPTY UNUSED h2,http/1.1 NONE + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED EMPTY NONE + * @run main/othervm SSLServerSocketAlpnTest H2 UNUSED h2 ERROR + * @run main/othervm SSLServerSocketAlpnTest h2 UNUSED http/1.1 ERROR + * + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 h2 h2 + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 http/1.1,h2 h2 + * @run main/othervm SSLServerSocketAlpnTest UNUSED http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLServerSocketAlpnTest UNUSED EMPTY h2,http/1.1 NONE + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 EMPTY NONE + * @run main/othervm SSLServerSocketAlpnTest UNUSED H2 h2 ERROR + * @run main/othervm SSLServerSocketAlpnTest UNUSED h2 http/1.1 ERROR + * + * @run main/othervm SSLServerSocketAlpnTest h2 h2 h2 h2 + * @run main/othervm SSLServerSocketAlpnTest H2 h2 h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLServerSocketAlpnTest http/1.1,h2 h2 h2,http/1.1 h2 + * @run main/othervm SSLServerSocketAlpnTest EMPTY h2 h2 h2 + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 EMPTY http/1.1 NONE + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 h2 EMPTY NONE + * @run main/othervm SSLServerSocketAlpnTest UNUSED UNUSED http/1.1,h2 NONE + * @run main/othervm SSLServerSocketAlpnTest h2 h2 http/1.1 ERROR + * @run main/othervm SSLServerSocketAlpnTest h2,http/1.1 H2 http/1.1 ERROR + * * @author Brad Wetmore */ +/** + * A simple SSLSocket-based client/server that demonstrates the proposed API + * changes for JEP 244 in support of the TLS ALPN extension (RFC 7301). + * + * Usage: + * java SSLServerSocketAlpnTest + * + * + * where: + * EMPTY indicates that ALPN is disabled + * UNUSED indicates that no ALPN values are supplied (server-side only) + * ERROR indicates that an exception is expected + * NONE indicates that no ALPN is expected + * + * This example is based on our standard SSLSocketTemplate. + */ import java.io.*; import java.security.KeyStore; +import java.util.Arrays; import javax.net.ssl.*; @@ -73,6 +112,9 @@ public class SSLServerSocketAlpnTest { static String trustFilename = System.getProperty("test.src", ".") + "/" + pathToStores + "/" + trustStoreFile; + private static boolean hasServerAPs; // whether server APs are present + private static boolean hasCallback; // whether a callback is present + /* * SSLContext */ @@ -89,6 +131,7 @@ public class SSLServerSocketAlpnTest { static boolean debug = false; static String[] serverAPs; + static String callbackAP; static String[] clientAPs; static String expectedAP; @@ -129,7 +172,9 @@ public class SSLServerSocketAlpnTest { sslp.setUseCipherSuitesOrder(true); // Set server side order // Set the ALPN selection. - sslp.setApplicationProtocols(serverAPs); + if (serverAPs != null) { + sslp.setApplicationProtocols(serverAPs); + } sslServerSocket.setSSLParameters(sslp); serverPort = sslServerSocket.getLocalPort(); @@ -146,6 +191,25 @@ public class SSLServerSocketAlpnTest { + "return null before the handshake starts"); } + // check that no callback has been registered + if (sslSocket.getHandshakeApplicationProtocolSelector() != null) { + throw new Exception("getHandshakeApplicationProtocolSelector() " + + "should return null"); + } + + if (hasCallback) { + sslSocket.setHandshakeApplicationProtocolSelector( + (serverSocket, clientProtocols) -> { + return callbackAP.equals("EMPTY") ? "" : callbackAP; + }); + + // check that the callback can be retrieved + if (sslSocket.getHandshakeApplicationProtocolSelector() == null) { + throw new Exception("getHandshakeApplicationProtocolSelector()" + + " should return non-null"); + } + } + sslSocket.startHandshake(); if (sslSocket.getHandshakeApplicationProtocol() != null) { @@ -276,14 +340,19 @@ public class SSLServerSocketAlpnTest { if (debug) { System.setProperty("javax.net.debug", "all"); } + System.out.println("Test args: " + Arrays.toString(args)); // Validate parameters - if (args.length != 3) { + if (args.length != 4) { throw new Exception("Invalid number of test parameters"); } serverAPs = convert(args[0]); - clientAPs = convert(args[1]); - expectedAP = args[2]; + callbackAP = args[1]; + clientAPs = convert(args[2]); + expectedAP = args[3]; + + hasServerAPs = !args[0].equals("UNUSED"); // are server APs being used? + hasCallback = !callbackAP.equals("UNUSED"); // is callback being used? /* * Start the tests. @@ -291,7 +360,7 @@ public class SSLServerSocketAlpnTest { try { new SSLServerSocketAlpnTest(); } catch (SSLHandshakeException she) { - if (args[2].equals("ERROR")) { + if (args[3].equals("ERROR")) { System.out.println("Caught the expected exception: " + she); } else { throw she; @@ -322,7 +391,8 @@ public class SSLServerSocketAlpnTest { } kms = new KeyManager[] { new MyX509ExtendedKeyManager( - (X509ExtendedKeyManager) kms[0], expectedAP) }; + (X509ExtendedKeyManager) kms[0], expectedAP, + !hasCallback && hasServerAPs) }; TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(trustKS); @@ -338,12 +408,15 @@ public class SSLServerSocketAlpnTest { * Convert a comma-separated list into an array of strings. */ private static String[] convert(String list) { - String[] strings; + if (list.equals("UNUSED")) { + return null; + } if (list.equals("EMPTY")) { return new String[0]; } + String[] strings; if (list.indexOf(',') > 0) { strings = list.split(","); } else { diff --git a/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java b/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java index fd52f251f9d..ef72474f417 100644 --- a/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java +++ b/jdk/test/javax/net/ssl/ALPN/SSLSocketAlpnTest.java @@ -26,22 +26,60 @@ /* * @test - * @bug 8051498 8145849 + * @bug 8051498 8145849 8170282 * @summary JEP 244: TLS Application-Layer Protocol Negotiation Extension * @compile MyX509ExtendedKeyManager.java - * @run main/othervm SSLSocketAlpnTest h2 h2 h2 - * @run main/othervm SSLSocketAlpnTest h2 h2,http/1.1 h2 - * @run main/othervm SSLSocketAlpnTest h2,http/1.1 h2,http/1.1 h2 - * @run main/othervm SSLSocketAlpnTest http/1.1,h2 h2,http/1.1 http/1.1 - * @run main/othervm SSLSocketAlpnTest h4,h3,h2 h1,h2 h2 - * @run main/othervm SSLSocketAlpnTest EMPTY h2,http/1.1 NONE - * @run main/othervm SSLSocketAlpnTest h2 EMPTY NONE - * @run main/othervm SSLSocketAlpnTest H2 h2 ERROR - * @run main/othervm SSLSocketAlpnTest h2 http/1.1 ERROR + * + * @run main/othervm SSLSocketAlpnTest h2 UNUSED h2 h2 + * @run main/othervm SSLSocketAlpnTest h2 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 UNUSED h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest http/1.1,h2 UNUSED h2,http/1.1 http/1.1 + * @run main/othervm SSLSocketAlpnTest h4,h3,h2 UNUSED h1,h2 h2 + * @run main/othervm SSLSocketAlpnTest EMPTY UNUSED h2,http/1.1 NONE + * @run main/othervm SSLSocketAlpnTest h2 UNUSED EMPTY NONE + * @run main/othervm SSLSocketAlpnTest H2 UNUSED h2 ERROR + * @run main/othervm SSLSocketAlpnTest h2 UNUSED http/1.1 ERROR + * + * @run main/othervm SSLSocketAlpnTest UNUSED h2 h2 h2 + * @run main/othervm SSLSocketAlpnTest UNUSED h2 h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest UNUSED h2 http/1.1,h2 h2 + * @run main/othervm SSLSocketAlpnTest UNUSED http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLSocketAlpnTest UNUSED EMPTY h2,http/1.1 NONE + * @run main/othervm SSLSocketAlpnTest UNUSED h2 EMPTY NONE + * @run main/othervm SSLSocketAlpnTest UNUSED H2 h2 ERROR + * @run main/othervm SSLSocketAlpnTest UNUSED h2 http/1.1 ERROR + * + * @run main/othervm SSLSocketAlpnTest h2 h2 h2 h2 + * @run main/othervm SSLSocketAlpnTest H2 h2 h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 http/1.1 h2,http/1.1 http/1.1 + * @run main/othervm SSLSocketAlpnTest http/1.1,h2 h2 h2,http/1.1 h2 + * @run main/othervm SSLSocketAlpnTest EMPTY h2 h2 h2 + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 EMPTY http/1.1 NONE + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 h2 EMPTY NONE + * @run main/othervm SSLSocketAlpnTest UNUSED UNUSED http/1.1,h2 NONE + * @run main/othervm SSLSocketAlpnTest h2 h2 http/1.1 ERROR + * @run main/othervm SSLSocketAlpnTest h2,http/1.1 H2 http/1.1 ERROR + * * @author Brad Wetmore */ +/** + * A simple SSLSocket-based client/server that demonstrates the proposed API + * changes for JEP 244 in support of the TLS ALPN extension (RFC 7301). + * + * Usage: + * java SSLSocketAlpnTest + * + * where: + * EMPTY indicates that ALPN is disabled + * UNUSED indicates that no ALPN values are supplied (server-side only) + * ERROR indicates that an exception is expected + * NONE indicates that no ALPN is expected + * + * This example is based on our standard SSLSocketTemplate. + */ import java.io.*; import java.security.KeyStore; +import java.util.Arrays; import javax.net.ssl.*; @@ -73,6 +111,9 @@ public class SSLSocketAlpnTest { static String trustFilename = System.getProperty("test.src", ".") + "/" + pathToStores + "/" + trustStoreFile; + private static boolean hasServerAPs; // whether server APs are present + private static boolean hasCallback; // whether a callback is present + /* * SSLContext */ @@ -89,6 +130,7 @@ public class SSLSocketAlpnTest { static boolean debug = false; static String[] serverAPs; + static String callbackAP; static String[] clientAPs; static String expectedAP; @@ -136,7 +178,9 @@ public class SSLSocketAlpnTest { sslp.setUseCipherSuitesOrder(true); // Set server side order // Set the ALPN selection. - sslp.setApplicationProtocols(serverAPs); + if (serverAPs != null) { + sslp.setApplicationProtocols(serverAPs); + } sslSocket.setSSLParameters(sslp); if (sslSocket.getHandshakeApplicationProtocol() != null) { @@ -144,6 +188,24 @@ public class SSLSocketAlpnTest { + "return null before the handshake starts"); } + // check that no callback has been registered + if (sslSocket.getHandshakeApplicationProtocolSelector() != null) { + throw new Exception("getHandshakeApplicationProtocolSelector() " + + "should return null"); + } + + if (hasCallback) { + sslSocket.setHandshakeApplicationProtocolSelector( + (serverSocket, clientProtocols) -> { + return callbackAP.equals("EMPTY") ? "" : callbackAP; + }); + + // check that the callback can be retrieved + if (sslSocket.getHandshakeApplicationProtocolSelector() == null) { + throw new Exception("getHandshakeApplicationProtocolSelector()" + " should return non-null"); + } + } + sslSocket.startHandshake(); if (sslSocket.getHandshakeApplicationProtocol() != null) { @@ -274,14 +336,19 @@ public class SSLSocketAlpnTest { if (debug) { System.setProperty("javax.net.debug", "all"); } + System.out.println("Test args: " + Arrays.toString(args)); // Validate parameters - if (args.length != 3) { + if (args.length != 4) { throw new Exception("Invalid number of test parameters"); } serverAPs = convert(args[0]); - clientAPs = convert(args[1]); - expectedAP = args[2]; + callbackAP = args[1]; + clientAPs = convert(args[2]); + expectedAP = args[3]; + + hasServerAPs = !args[0].equals("UNUSED"); // are server APs being used? + hasCallback = !callbackAP.equals("UNUSED"); // is callback being used? /* * Start the tests. @@ -289,7 +356,7 @@ public class SSLSocketAlpnTest { try { new SSLSocketAlpnTest(); } catch (SSLHandshakeException she) { - if (args[2].equals("ERROR")) { + if (args[3].equals("ERROR")) { System.out.println("Caught the expected exception: " + she); } else { throw she; @@ -320,7 +387,8 @@ public class SSLSocketAlpnTest { } kms = new KeyManager[] { new MyX509ExtendedKeyManager( - (X509ExtendedKeyManager) kms[0], expectedAP) }; + (X509ExtendedKeyManager) kms[0], expectedAP, + !hasCallback && hasServerAPs) }; TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509"); tmf.init(trustKS); @@ -336,12 +404,15 @@ public class SSLSocketAlpnTest { * Convert a comma-separated list into an array of strings. */ private static String[] convert(String list) { - String[] strings; + if (list.equals("UNUSED")) { + return null; + } if (list.equals("EMPTY")) { return new String[0]; } + String[] strings; if (list.indexOf(',') > 0) { strings = list.split(","); } else { diff --git a/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java b/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java index f8373a6383a..544428566cb 100644 --- a/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java +++ b/jdk/test/javax/print/PrintServiceLookup/GetPrintServices.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 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 @@ -29,30 +29,37 @@ import javax.print.attribute.standard.PrinterName; /* * @test - * @bug 8013810 - * @summary Test that print service returned without filter are of the same class as with name filter + * @bug 8013810 8025439 + * @summary Test that print service returned without filter are of the same class + * as with name filter */ public class GetPrintServices { - public static void main(String[] args) throws Exception { - for (PrintService service : PrintServiceLookup.lookupPrintServices(null, null)) { - String serviceName = service.getName(); - PrintService serviceByName = lookupByName(serviceName); - if (!service.equals(serviceByName)) { - throw new RuntimeException("NOK " + serviceName + public static void main(String[] args) throws Exception { + for (PrintService service : PrintServiceLookup.lookupPrintServices(null, null)) { + String serviceName = service.getName(); + PrinterName name = service.getAttribute(PrinterName.class); + String printerName = name.getValue(); + + PrintService serviceByName = lookupByName(printerName); + System.out.println("service " + service); + System.out.println("serviceByName " + serviceByName); + if (!service.equals(serviceByName)) { + throw new RuntimeException("NOK " + serviceName + " expected: " + service.getClass().getName() + " got: " + serviceByName.getClass().getName()); - } + } + } + System.out.println("Test PASSED"); } - System.out.println("Test PASSED"); - } - private static PrintService lookupByName(String name) { - AttributeSet attributes = new HashAttributeSet(); - attributes.add(new PrinterName(name, null)); - for (PrintService service : PrintServiceLookup.lookupPrintServices(null, attributes)) { - return service; + private static PrintService lookupByName(String name) { + AttributeSet attributes = new HashAttributeSet(); + attributes.add(new PrinterName(name, null)); + for (PrintService service : + PrintServiceLookup.lookupPrintServices(null, attributes)) { + return service; + } + return null; } - return null; - } } diff --git a/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java b/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java index c7ea83f3b02..7bf4a440585 100644 --- a/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java +++ b/jdk/test/javax/swing/JComboBox/8041909/ActionListenerExceptionTest.java @@ -26,7 +26,7 @@ * @summary Test to check JComboBox does not lose its ability to invoke * registerd ActionListener in case of exception in ActionListener * @run main ActionListenerExceptionTest - */ + */ import java.awt.AWTEvent; import java.awt.AWTException; @@ -44,6 +44,7 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JFrame; import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; import javax.swing.SwingUtilities; public class ActionListenerExceptionTest { @@ -133,7 +134,11 @@ public class ActionListenerExceptionTest { SwingUtilities.invokeAndWait(new Runnable() { public void run() { Object comp = combo.getUI().getAccessibleChild(combo, 0); - JComponent scrollPane = (JComponent) ((JPopupMenu) comp).getComponent(0); + int i = 0; + JComponent scrollPane; + do { + scrollPane = (JComponent) ((JPopupMenu) comp).getComponent(i++); + } while (!(scrollPane instanceof JScrollPane)); menuItemHeight = scrollPane.getSize().height / TOTAL_MENU_ITEMS; yPos = scrollPane.getLocationOnScreen().y + menuItemHeight / 2; diff --git a/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java b/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java index 5c6080c336f..81dfea088a4 100644 --- a/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java +++ b/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java @@ -24,10 +24,12 @@ /* @test @key headful - @bug 8062946 + @bug 8062946 8159906 @summary Verify Transparency upon iconify/deiconify sequence @run main TransparencyTest */ +import java.awt.GraphicsEnvironment; +import java.awt.GraphicsDevice; import java.awt.Color; import java.awt.Point; import java.awt.Robot; @@ -43,7 +45,7 @@ public class TransparencyTest { private static final int WIDTH = 250; private static final int HEIGHT = 250; private static final float OPACITY = 0.60f; - private static Point dlgPos; + private static volatile Point dlgPos; public static void createAndShowGUI() { frame = new JFrame("JFrame"); @@ -67,6 +69,14 @@ public class TransparencyTest { public static void main(String[] args) throws Exception { + GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment(); + GraphicsDevice gd = ge.getDefaultScreenDevice(); + GraphicsDevice.WindowTranslucency mode = GraphicsDevice.WindowTranslucency.TRANSLUCENT; + boolean translucencyCheck = gd.isWindowTranslucencySupported(mode); + if(!translucencyCheck) { + return; + } + Robot robot = new Robot(); // create a GUI SwingUtilities.invokeAndWait(new Runnable() { diff --git a/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java b/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java new file mode 100644 index 00000000000..f02bcc0e0dd --- /dev/null +++ b/jdk/test/javax/swing/JLightweightFrame/JLightweightFrameRoundTest.java @@ -0,0 +1,87 @@ +/* + * 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 + * @bug 8170387 + * @summary JLightweightFrame#syncCopyBuffer() may throw IOOBE + * @modules java.desktop/sun.swing + * @run main JLightweightFrameRoundTest + */ + +import sun.swing.JLightweightFrame; +import sun.swing.LightweightContent; + +import javax.swing.*; + +public class JLightweightFrameRoundTest { + public static void main(String[] args) throws Exception { + SwingUtilities.invokeAndWait(() -> { + JLightweightFrame jLightweightFrame = new JLightweightFrame(); + jLightweightFrame.setContent(new XLightweightContent()); + jLightweightFrame.setSize(600, 600); + jLightweightFrame.notifyDisplayChanged(1.0001, 1.0001); + }); + } + + static class XLightweightContent implements LightweightContent { + @Override + public JComponent getComponent() { + return new JPanel(); + } + + @Override + public void paintLock() {} + + @Override + public void paintUnlock() {} + + @Override + public void imageBufferReset(int[] data, int x, int y, int width, + int height, int linestride, + double scaleX, + double scaleY) {} + + @Override + public void imageReshaped(int x, int y, int width, int height) {} + + @Override + public void imageUpdated(int dirtyX, int dirtyY, int dirtyWidth, + int dirtyHeight) {} + + @Override + public void focusGrabbed() {} + + @Override + public void focusUngrabbed() {} + + @Override + public void preferredSizeChanged(int width, int height) {} + + @Override + public void maximumSizeChanged(int width, int height) {} + + @Override + public void minimumSizeChanged(int width, int height) {} + } +} diff --git a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java index 4b95dc92bb3..a9ad28e7504 100644 --- a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java +++ b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java @@ -26,22 +26,31 @@ * @key headful * @library ../../regtesthelpers * @build Util - * @bug 8033699 8154043 + * @bug 8033699 8154043 8167160 * @summary Incorrect radio button behavior when pressing tab key - * @author Vivi An * @run main bug8033699 */ - -import javax.swing.*; -import javax.swing.event.*; -import java.awt.event.*; -import java.awt.*; +import java.awt.KeyboardFocusManager; +import java.awt.Robot; +import java.awt.event.KeyEvent; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; +import javax.swing.ButtonGroup; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JRadioButton; +import javax.swing.SwingUtilities; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; public class bug8033699 { - private static Robot robot; + private static JFrame mainFrame; + private static Robot robot; private static JButton btnStart; - private static ButtonGroup btnGrp; private static JButton btnEnd; private static JButton btnMiddle; private static JRadioButton radioBtn1; @@ -51,7 +60,9 @@ public class bug8033699 { public static void main(String args[]) throws Throwable { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { + changeLAF(); createAndShowGUI(); } }); @@ -84,11 +95,30 @@ public class bug8033699 { // down key circle back to first button in grouped radio button runTest8(); + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + mainFrame.dispose(); + } + }); + } + + private static void changeLAF() { + String currentLAF = UIManager.getLookAndFeel().toString(); + System.out.println(currentLAF); + currentLAF = currentLAF.toLowerCase(); + if (currentLAF.contains("aqua") || currentLAF.contains("nimbus")) { + try { + UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel"); + } catch (Exception ex) { + ex.printStackTrace(); + } + } } private static void createAndShowGUI() { - JFrame mainFrame = new JFrame("Bug 8033699 - 8 Tests for Grouped/Non Group Radio Buttons"); - + mainFrame = new JFrame("Bug 8033699 - 8 Tests for Grouped/Non Group Radio Buttons"); btnStart = new JButton("Start"); btnEnd = new JButton("End"); btnMiddle = new JButton("Middle"); @@ -132,12 +162,13 @@ public class bug8033699 { } // Radio button Group as a single component when traversing through tab key - private static void runTest1() throws Exception{ + private static void runTest1() throws Exception { hitKey(robot, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) { System.out.println("Radio Button Group Go To Next Component through Tab Key failed"); @@ -148,9 +179,10 @@ public class bug8033699 { } // Non-Grouped Radio button as a single component when traversing through tab key - private static void runTest2() throws Exception{ + private static void runTest2() throws Exception { hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnEnd) { System.out.println("Non Grouped Radio Button Go To Next Component through Tab Key failed"); @@ -161,11 +193,12 @@ public class bug8033699 { } // Non-Grouped Radio button and Group Radio button as a single component when traversing through shift-tab key - private static void runTest3() throws Exception{ + private static void runTest3() throws Exception { hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB); hitKey(robot, KeyEvent.VK_SHIFT, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) { System.out.println("Radio button Group/Non Grouped Radio Button SHIFT-Tab Key Test failed"); @@ -176,10 +209,11 @@ public class bug8033699 { } // Using arrow key to move focus in radio button group - private static void runTest4() throws Exception{ + private static void runTest4() throws Exception { hitKey(robot, KeyEvent.VK_DOWN); hitKey(robot, KeyEvent.VK_RIGHT); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn3) { System.out.println("Radio button Group UP/LEFT Arrow Key Move Focus Failed"); @@ -189,10 +223,11 @@ public class bug8033699 { }); } - private static void runTest5() throws Exception{ + private static void runTest5() throws Exception { hitKey(robot, KeyEvent.VK_UP); hitKey(robot, KeyEvent.VK_LEFT); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn1) { System.out.println("Radio button Group Left/Up Arrow Key Move Focus Failed"); @@ -202,10 +237,11 @@ public class bug8033699 { }); } - private static void runTest6() throws Exception{ + private static void runTest6() throws Exception { hitKey(robot, KeyEvent.VK_UP); hitKey(robot, KeyEvent.VK_UP); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtn2) { System.out.println("Radio button Group Circle Back To First Button Test"); @@ -215,9 +251,10 @@ public class bug8033699 { }); } - private static void runTest7() throws Exception{ + private static void runTest7() throws Exception { hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != btnMiddle) { System.out.println("Separate Component added in button group layout"); @@ -227,9 +264,10 @@ public class bug8033699 { }); } - private static void runTest8() throws Exception{ + private static void runTest8() throws Exception { hitKey(robot, KeyEvent.VK_TAB); SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { if (KeyboardFocusManager.getCurrentKeyboardFocusManager().getFocusOwner() != radioBtnSingle) { System.out.println("Separate Component added in button group layout"); diff --git a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java index 4c773c0f7b1..9ab19f7b245 100644 --- a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java +++ b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java @@ -42,7 +42,6 @@ import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JTextField; import javax.swing.KeyStroke; -import javax.swing.LookAndFeel; import javax.swing.SwingUtilities; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -133,41 +132,19 @@ public class FocusTraversal { } private static void runTestCase() throws Exception { - LookAndFeel lookAndFeel = UIManager.getLookAndFeel(); focusOn(a); - if (isExcludedLookAndFeel(lookAndFeel)) { - robot.keyPress(KeyEvent.VK_ENTER); - robot.keyRelease(KeyEvent.VK_ENTER); - robot.waitForIdle(); - isFocusOwner(b, "forward"); - robot.keyPress(KeyEvent.VK_SHIFT); - robot.keyPress(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_SHIFT); - robot.waitForIdle(); - isFocusOwner(a, "backward"); - } else { + robot.keyPress(KeyEvent.VK_ENTER); + robot.keyRelease(KeyEvent.VK_ENTER); + robot.waitForIdle(); + isFocusOwner(next, "forward"); + robot.keyPress(KeyEvent.VK_SHIFT); + robot.keyPress(KeyEvent.VK_TAB); + robot.keyRelease(KeyEvent.VK_TAB); + robot.keyRelease(KeyEvent.VK_SHIFT); + robot.waitForIdle(); + isFocusOwner(a, "backward"); - robot.keyPress(KeyEvent.VK_ENTER); - robot.keyRelease(KeyEvent.VK_ENTER); - robot.waitForIdle(); - isFocusOwner(next, "forward"); - robot.keyPress(KeyEvent.VK_SHIFT); - robot.keyPress(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_TAB); - robot.keyRelease(KeyEvent.VK_SHIFT); - robot.waitForIdle(); - isFocusOwner(d, "backward"); - } - - } - - private static boolean isExcludedLookAndFeel(LookAndFeel lookAndFeel) { - - return lookAndFeel.toString().toLowerCase().contains("aqua") - || lookAndFeel.toString().toLowerCase().contains("nimbus") - || lookAndFeel.toString().toLowerCase().contains("gtk"); } private static void focusOn(Component component) diff --git a/jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java b/jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java new file mode 100644 index 00000000000..fec08479521 --- /dev/null +++ b/jdk/test/javax/swing/JTable/SorterIOOBEtest/DefaultRowSorterIOOBEtest.java @@ -0,0 +1,119 @@ +/* + * 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 + * @bug 8160087 + * @summary Change IOOBE to warning in the scenarios when it had not being + * thrown before the JDK-8078514 + * @run main/othervm DefaultRowSorterIOOBEtest + */ + +import javax.swing.*; +import javax.swing.table.AbstractTableModel; +import javax.swing.table.TableModel; +import javax.swing.table.TableRowSorter; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.util.ArrayList; +import java.util.List; + +public class DefaultRowSorterIOOBEtest extends TableRowSorter { + static List rows = new ArrayList<>(); + + static TableModel tableModel = new AbstractTableModel() { + + @Override + public int getRowCount() { + return rows.size(); + } + + @Override + public int getColumnCount() { + return 1; + } + + @Override + public Object getValueAt(int rowIndex, int columnIndex) { + return rows.get(rowIndex); + } + }; + + public static void main(String[] args) { + DefaultRowSorter sorter = + new DefaultRowSorter<>() { + { + setModelWrapper(new SorterModelWrapper()); + } + }; + + PrintStream err = System.err; + ByteArrayOutputStream bos = new ByteArrayOutputStream(10000) { + @Override + public synchronized void write(byte[] b, int off, int len) { + super.write(b, off, len); + err.print(new String(b, off, len)); + } + }; + System.setErr(new PrintStream(bos)); + + rows.add("New"); + + sorter.convertRowIndexToView(0); + sorter.convertRowIndexToModel(0); + + String out = new String(bos.toByteArray()); + if(out.indexOf("WARNING:") < 0) { + throw new RuntimeException("No warnings found"); + } + } + + static class SorterModelWrapper extends + DefaultRowSorter.ModelWrapper { + + @Override + public TableModel getModel() { + return tableModel; + } + + @Override + public int getColumnCount() { + return tableModel.getColumnCount(); + } + + @Override + public int getRowCount() { + return tableModel.getRowCount(); + } + + @Override + public Object getValueAt(int row, int column) { + return tableModel.getValueAt(row, column); + } + + @Override + public Integer getIdentifier(int row) { + return row; + } + } +} diff --git a/jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java b/jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java new file mode 100644 index 00000000000..e20f3a81704 --- /dev/null +++ b/jdk/test/javax/swing/RepaintManager/8162350/RepaintManagerFPUIScaleTest.java @@ -0,0 +1,223 @@ +/* + * 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. + */ + +import java.awt.Color; +import java.awt.Component; +import java.awt.Graphics2D; +import java.awt.GraphicsEnvironment; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Image; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.geom.AffineTransform; +import java.awt.image.BaseMultiResolutionImage; +import java.awt.image.BufferedImage; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import javax.swing.DefaultListCellRenderer; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; + +/* + * @test + * @bug 8162350 + * @summary RepaintManager shifts repainted region when the floating point UI scale is used + * @run main/manual/othervm -Dsun.java2d.uiScale=1.5 RepaintManagerFPUIScaleTest + */ +public class RepaintManagerFPUIScaleTest { + + private static volatile boolean testResult = false; + private static volatile CountDownLatch countDownLatch; + private static final String INSTRUCTIONS = "INSTRUCTIONS:\n" + + "Check JScrollPane correctly repaints the view" + + " when UI scale has floating point value:\n" + + "\n" + + "1. Scroll down the JScrollPane\n" + + "2. Select some values\n" + + "If the scrolled selected value is painted without artifacts," + + "press PASS, else press FAIL."; + + public static void main(String args[]) throws Exception { + + countDownLatch = new CountDownLatch(1); + + SwingUtilities.invokeLater(RepaintManagerFPUIScaleTest::createUI); + countDownLatch.await(15, TimeUnit.MINUTES); + + if (!testResult) { + throw new RuntimeException("Test fails!"); + } + } + + private static void createUI() { + + final JFrame mainFrame = new JFrame("Motif L&F icons test"); + GridBagLayout layout = new GridBagLayout(); + JPanel mainControlPanel = new JPanel(layout); + JPanel resultButtonPanel = new JPanel(layout); + + GridBagConstraints gbc = new GridBagConstraints(); + + JComponent testPanel = createComponent(); + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(testPanel, gbc); + + JTextArea instructionTextArea = new JTextArea(); + instructionTextArea.setText(INSTRUCTIONS); + instructionTextArea.setEditable(false); + instructionTextArea.setBackground(Color.white); + + gbc.gridx = 0; + gbc.gridy = 1; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(instructionTextArea, gbc); + + JButton passButton = new JButton("Pass"); + passButton.setActionCommand("Pass"); + passButton.addActionListener((ActionEvent e) -> { + testResult = true; + mainFrame.dispose(); + countDownLatch.countDown(); + + }); + + JButton failButton = new JButton("Fail"); + failButton.setActionCommand("Fail"); + failButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + mainFrame.dispose(); + countDownLatch.countDown(); + } + }); + + gbc.gridx = 0; + gbc.gridy = 0; + resultButtonPanel.add(passButton, gbc); + + gbc.gridx = 1; + gbc.gridy = 0; + resultButtonPanel.add(failButton, gbc); + + gbc.gridx = 0; + gbc.gridy = 2; + mainControlPanel.add(resultButtonPanel, gbc); + + mainFrame.add(mainControlPanel); + mainFrame.pack(); + + mainFrame.addWindowListener(new WindowAdapter() { + + @Override + public void windowClosing(WindowEvent e) { + mainFrame.dispose(); + countDownLatch.countDown(); + } + }); + mainFrame.setVisible(true); + } + + private static JComponent createComponent() { + + int N = 100; + String[] data = new String[N]; + for (int i = 0; i < N; i++) { + data[i] = "Floating point test List Item: " + i; + } + JList list = new JList(data); + list.setCellRenderer(new TestListCellRenderer()); + + JScrollPane scrollPane = new JScrollPane(list); + return scrollPane; + } + + private static Color[] COLORS = { + Color.RED, Color.ORANGE, Color.GREEN, Color.BLUE, Color.GRAY + }; + + private static Image createTestImage(int width, int height, int colorindex) { + + Color color = COLORS[colorindex % COLORS.length]; + + AffineTransform tx = GraphicsEnvironment + .getLocalGraphicsEnvironment() + .getDefaultScreenDevice() + .getDefaultConfiguration() + .getDefaultTransform(); + + Image baseImage = createTestImage(width, height, 1, 1, color); + Image rvImage = createTestImage(width, height, tx.getScaleX(), tx.getScaleY(), color); + + return new BaseMultiResolutionImage(baseImage, rvImage); + } + + private static Image createTestImage(int w, int h, + double scaleX, double scaleY, Color color) { + + int width = (int) Math.ceil(scaleX * w); + int height = (int) Math.ceil(scaleY * h); + BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB); + + Graphics2D g = img.createGraphics(); + g.setColor(Color.WHITE); + g.fillRect(0, 0, width, height); + g.scale(scaleX, scaleY); + g.setColor(color); + int d = 1; + int d2 = 2 * d; + g.drawLine(d, h / 2, w - d2, h / 2); + g.drawLine(w / 2, d, w / 2, h - d2); + g.drawRect(d, d, w - d2, h - d2); + g.dispose(); + + return img; + } + + static class TestListCellRenderer extends DefaultListCellRenderer { + + public Component getListCellRendererComponent( + JList list, + Object value, + int index, + boolean isSelected, + boolean cellHasFocus) { + Component retValue = super.getListCellRendererComponent( + list, value, index, isSelected, cellHasFocus + ); + setIcon(new ImageIcon(createTestImage(20, 10, index))); + return retValue; + } + } +} diff --git a/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java b/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java index fc53de9dee2..4504475d554 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java +++ b/jdk/test/javax/swing/plaf/basic/BasicScrollPaneUI/8166591/TooMuchWheelRotationEventsTest.java @@ -44,20 +44,20 @@ import javax.swing.SwingUtilities; * @key headful * @summary [macos 10.12] Trackpad scrolling of text on OS X 10.12 Sierra * is very fast (Trackpad, Retina only) + * @requires (os.family == "windows" | os.family == "mac") * @run main/manual/othervm TooMuchWheelRotationEventsTest */ public class TooMuchWheelRotationEventsTest { private static volatile boolean testResult = false; private static volatile CountDownLatch countDownLatch; - private static final String INSTRUCTIONS = "INSTRUCTIONS:\n" - + "Try to check the issue on Mac OS X 10.12 Sierra with trackpad" - + " on Retina display.\n" + private static final String INSTRUCTIONS = " INSTRUCTIONS:\n" + + " Try to check the issue with trackpad\n" + "\n" - + "If the trackpad is not supported, press PASS\n" + + " If the trackpad is not supported, press PASS\n" + "\n" - + "Use the trackpad to slightly scroll the JTextArea horizontally and vertically.\n" - + "If the text area is scrolled too fast press FAIL, else press PASS."; + + " Use the trackpad to slightly scroll the JTextArea horizontally and vertically.\n" + + " If the text area is scrolled too fast press FAIL, else press PASS."; public static void main(String args[]) throws Exception { countDownLatch = new CountDownLatch(1); @@ -138,6 +138,7 @@ public class TooMuchWheelRotationEventsTest { countDownLatch.countDown(); } }); + mainFrame.setLocationRelativeTo(null); mainFrame.setVisible(true); } diff --git a/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java b/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java index f6f571aa05e..25066dafe42 100644 --- a/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java +++ b/jdk/test/javax/swing/text/GlyphPainter2/6427244/bug6427244.java @@ -23,7 +23,7 @@ */ /* @test - @bug 6427244 8144240 8166003 + @bug 6427244 8144240 8166003 8169879 @summary Test that pressing HOME correctly moves caret in I18N document. @author Sergey Groznyh @library ../../../regtesthelpers @@ -69,10 +69,12 @@ public class bug6427244 { bug6427244 t = new bug6427244(); for (String space: SPACES) { t.init(space); - t.runAllTests(); + t.testCaretPosition(); } System.out.println("OK"); + // Dispose the test interface upon completion + t.destroyTestInterface(); } void init(final String space) { @@ -113,29 +115,65 @@ public class bug6427244 { } } - void blockTillDisplayed(JComponent comp) { - if(comp != null) { - while (!comp.isVisible()) { - try { + void destroyTestInterface() { + try { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + // Dispose the frame + jf.dispose(); + } + }); + } catch (Exception ex) { + // No-op + } + } + + void blockTillDisplayed(JComponent comp) throws Exception { + while (comp != null && isCompVisible == false) { + try { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + isCompVisible = comp.isVisible(); + } + }); + + if (isCompVisible == false) { + // A short wait for component to be visible Thread.sleep(1000); - } catch (InterruptedException ie) { - /* No-op */ } + } catch (InterruptedException ex) { + // No-op. Thread resumed from sleep + } catch (Exception ex) { + throw new RuntimeException(ex); } } } public void testCaretPosition() { - Point p = tp.getLocationOnScreen(); - // the right-top corner position - p.x += (dim.width - 5); - p.y += 5; - ROBOT.mouseMove(p.x, p.y); + final Point p[] = new Point[1]; + try { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + p[0] = tp.getLocationOnScreen(); + + // the right-top corner position + p[0].x += (dim.width - 5); + p[0].y += 5; + } + }); + } catch (Exception ex) { + throw new RuntimeException(ex); + } + ROBOT.mouseMove(p[0].x, p[0].y); ROBOT.clickMouse(); ROBOT.hitKey(KeyEvent.VK_HOME); ROBOT.waitForIdle(); // this will fail if caret moves out of the 1st line. if (getCaretOrdinate() != 0) { + // Dispose the test interface upon completion + destroyTestInterface(); throw new RuntimeException("Test Failed."); } } @@ -162,7 +200,8 @@ public class bug6427244 { return y[0]; } - JFrame jf; - JTextPane tp; - Dimension dim; + private JFrame jf; + private JTextPane tp; + private Dimension dim; + private volatile boolean isCompVisible = false; } diff --git a/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java b/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java new file mode 100644 index 00000000000..10fe6e867bc --- /dev/null +++ b/jdk/test/javax/swing/text/html/StyleSheet/bug4936917.java @@ -0,0 +1,121 @@ +/* + * 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 + @bug 4936917 7190578 + @summary Tests if background is correctly painted when has css margins + @author Denis Sharypov + @library ../../../regtesthelpers + @run main bug4936917 +*/ + + + +import java.awt.Color; +import java.awt.Point; +import java.awt.Robot; +import java.util.Timer; +import javax.swing.JComponent; +import javax.swing.JEditorPane; +import javax.swing.JFrame; +import javax.swing.SwingUtilities; + + +public class bug4936917 { + + private boolean passed = false; + private Timer timer; + private JEditorPane editorPane; + private static JFrame f; + private volatile Point p = null; + + private String text = + "" + + " some text "; + + public void init() throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + editorPane = new JEditorPane("text/html", ""); + editorPane.setEditable(false); + editorPane.setMargin(new java.awt.Insets(0, 0, 0, 0)); + editorPane.setText(text); + + f = new JFrame(); + f.getContentPane().add(editorPane); + f.setSize(600, 400); + f.setVisible(true); + } + }); + blockTillDisplayed(editorPane); + Robot robot = new Robot(); + robot.waitForIdle(); + + int x0 = p.x + 15 ; + int y = p.y + 15; + int match = 0; + int nonmatch = 0; + + passed = true; + for (int x = x0; x < x0 + 10; x++) { + System.out.println("color ("+x+"," + y +")=" + robot.getPixelColor(x,y)); + if (!robot.getPixelColor(x, y).equals(new Color(0xcc, 0xcc, 0xcc))) { + nonmatch++; + } else match++; + } + if (nonmatch > match) { + passed = false; + } + } + + void blockTillDisplayed(JComponent comp) throws Exception { + while (p == null) { + try { + SwingUtilities.invokeAndWait(() -> { + p = comp.getLocationOnScreen(); + }); + } catch (IllegalStateException e) { + try { + Thread.sleep(1000); + } catch (InterruptedException ie) { + } + } + } + } + + public void destroy() throws Exception { + SwingUtilities.invokeAndWait(()->f.dispose()); + if(!passed) { + throw new RuntimeException("Test failed."); + } + } + + + public static void main(String args[]) throws Exception { + bug4936917 test = new bug4936917(); + test.init(); + test.destroy(); + } +} diff --git a/jdk/test/jdk/modules/incubator/DefaultImage.java b/jdk/test/jdk/modules/incubator/DefaultImage.java new file mode 100644 index 00000000000..ff6f5261f14 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/DefaultImage.java @@ -0,0 +1,158 @@ +/* + * 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 + * @bug 8170859 + * @summary Ensure no incubator modules are resolved by default in the image + * @library /lib/testlibrary + * @modules jdk.compiler + * @build CompilerUtils + * @run testng DefaultImage + */ + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.function.Consumer; +import java.util.stream.Stream; + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static jdk.testlibrary.ProcessTools.executeCommand; +import static org.testng.Assert.*; + +public class DefaultImage { + private static final String JAVA_HOME = System.getProperty("java.home"); + private static final Path TEST_SRC = Paths.get(System.getProperty("test.src")); + private static final Path CP_DIR = Paths.get("cp"); + + @BeforeTest + private void setup() throws Throwable { + Path src = TEST_SRC.resolve("src").resolve("cp").resolve("listmods"); + assertTrue(CompilerUtils.compile(src, CP_DIR)); + } + + public void test() throws Throwable { + if (isExplodedBuild()) { + System.out.println("Test cannot run on exploded build"); + return; + } + + java("-cp", CP_DIR.toString(), + "listmods.ListModules") + .assertSuccess() + .resultChecker(r -> r.assertOutputContains("java.base")) + .resultChecker(r -> r.assertOutputDoesNotContain("jdk.incubator")); + } + + @DataProvider(name = "tokens") + public Object[][] singleModuleValues() throws IOException { + return new Object[][]{ { "ALL-DEFAULT" }, { "ALL-SYSTEM"} }; + } + + @Test(dataProvider = "tokens") + public void testAddMods(String addModsToken) throws Throwable { + if (isExplodedBuild()) { + System.out.println("Test cannot run on exploded build"); + return; + } + + java("--add-modules", addModsToken, + "-cp", CP_DIR.toString(), + "listmods.ListModules") + .assertSuccess() + .resultChecker(r -> r.assertOutputContains("java.base")) + .resultChecker(r -> r.assertOutputDoesNotContain("jdk.incubator")); + } + + static ToolResult java(String... opts) throws Throwable { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + String[] options = Stream.concat(Stream.of(getJava()), Stream.of(opts)) + .toArray(String[]::new); + + ProcessBuilder pb = new ProcessBuilder(options); + int exitValue = executeCommand(pb).outputTo(ps) + .errorTo(ps) + .getExitValue(); + + return new ToolResult(exitValue, new String(baos.toByteArray(), UTF_8)); + } + + static class ToolResult { + final int exitCode; + final String output; + + ToolResult(int exitValue, String output) { + this.exitCode = exitValue; + this.output = output; + } + + ToolResult assertSuccess() { + assertEquals(exitCode, 0, + "Expected exit code 0, got " + exitCode + + ", with output[" + output + "]"); + return this; + } + + ToolResult resultChecker(Consumer r) { + r.accept(this); + return this; + } + + ToolResult assertOutputContains(String subString) { + assertTrue(output.contains(subString), + "Expected to find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + + ToolResult assertOutputDoesNotContain(String subString) { + assertFalse(output.contains(subString), + "Expected to NOT find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + } + + static String getJava() { + Path image = Paths.get(JAVA_HOME); + boolean isWindows = System.getProperty("os.name").startsWith("Windows"); + Path java = image.resolve("bin").resolve(isWindows ? "java.exe" : "java"); + if (Files.notExists(java)) + throw new RuntimeException(java + " not found"); + return java.toAbsolutePath().toString(); + } + + static boolean isExplodedBuild() { + Path modulesPath = Paths.get(JAVA_HOME).resolve("lib").resolve("modules"); + return Files.notExists(modulesPath); + } +} diff --git a/jdk/test/jdk/modules/incubator/ImageModules.java b/jdk/test/jdk/modules/incubator/ImageModules.java new file mode 100644 index 00000000000..347b1d4e221 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/ImageModules.java @@ -0,0 +1,382 @@ +/* + * 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 + * @bug 8170859 + * @summary Basic test for incubator modules in jmods and images + * @library /lib/testlibrary + * @modules jdk.compiler jdk.jartool jdk.jlink + * @build CompilerUtils + * @run testng/othervm ImageModules + */ + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.PrintStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import java.util.spi.ToolProvider; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jdk.testlibrary.FileUtils; +import org.testng.annotations.BeforeTest; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static jdk.testlibrary.ProcessTools.executeCommand; +import static org.testng.Assert.*; + +public class ImageModules { + private static final String JAVA_HOME = System.getProperty("java.home"); + private static final Path JDK_JMODS = Paths.get(JAVA_HOME, "jmods"); + + private static final Path TEST_SRC = Paths.get(System.getProperty("test.src")); + private static final Path MODS_DIR = Paths.get("mods"); + private static final Path CP_DIR = Paths.get("cp"); + private static final Path JARS_DIR = Paths.get("jars"); + private static final Path JMODS_DIR = Paths.get("jmods"); + private static final Path IMAGE = Paths.get("image"); + + private static final String JAVA_BASE = "java.base"; + private final String[] modules = new String[] { "message.writer", + "message.converter" }; + + @BeforeTest + private void setup() throws Throwable { + Path src = TEST_SRC.resolve("src"); + for (String name : modules) { + assertTrue(CompilerUtils.compile(src.resolve(name), + MODS_DIR, + "--module-source-path", src.toString())); + } + + assertTrue(CompilerUtils.compile(src.resolve("cp"), + CP_DIR, + "--module-path", MODS_DIR.toString(), + "--add-modules", "message.writer")); + } + + @DataProvider(name = "singleModule") + public Object[][] singleModuleValues() throws IOException { + Object[][] values = new Object[][]{ + // { Extra args to the build the message.converter jmod + // Tokens to pass to the run time --add-modules option + // SUCCESS or FAILURE expected + // Messages expected in the run time output + // Messages that must not appear in the run time output }, + { "", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("hello world", "message.converter", "java.base"), + List.of("WARNING") }, + { "--do-not-resolve-by-default", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.base", "java.lang.ClassNotFoundException: converter.MessageConverter"), + List.of("WARNING", "message.converter") }, + { "--warn-if-resolved=incubating", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("hello world", "message.converter", "java.base", + "WARNING: Using incubator modules: message.converter"), + List.of() }, + { "--do-not-resolve-by-default --warn-if-resolved=incubating", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.base", "java.lang.ClassNotFoundException: converter.MessageConverter"), + List.of("WARNING", "message.converter") }, + { "--do-not-resolve-by-default --warn-if-resolved=incubating", + List.of("message.converter"), + ToolResult.ASSERT_SUCCESS, + List.of("hello world", "message.converter", "java.base", "WARNING"), + List.of() } + }; + return values; + } + + @Test(dataProvider = "singleModule") + public void singleModule(String extraJmodArg, + List addModsTokens, + Consumer assertExitCode, + List expectedOutput, + List unexpectedOutput) + throws Throwable + { + if (Files.notExists(JDK_JMODS)) { + System.out.println("JDK jmods not found test cannot run."); + return; + } + + FileUtils.deleteFileTreeUnchecked(JMODS_DIR); + FileUtils.deleteFileTreeUnchecked(IMAGE); + Files.createDirectories(JMODS_DIR); + Path converterJmod = JMODS_DIR.resolve("converter.jmod"); + + jmod("create", + "--class-path", MODS_DIR.resolve("message.converter").toString(), + extraJmodArg, + converterJmod.toString()) + .assertSuccess(); + + String mpath = JDK_JMODS.toString() + File.pathSeparator + JMODS_DIR.toString(); + jlink("--module-path", mpath, + "--add-modules", JAVA_BASE + ",message.converter", + "--output", IMAGE.toString()) + .assertSuccess(); + + for (String addModsToken : addModsTokens) { + String[] props = new String[] {"", "-Djdk.system.module.finder.disabledFastPath"}; + for (String systemProp : props) + java(IMAGE, + systemProp, + "--add-modules", addModsToken, + "-cp", CP_DIR.toString(), + "test.ConvertToLowerCase", "HEllo WoRlD") + .resultChecker(assertExitCode) + .resultChecker(r -> { + expectedOutput.forEach(e -> r.assertContains(e)); + unexpectedOutput.forEach(e -> r.assertDoesNotContains(e)); + }); + } + } + + @Test + public void singleModularJar() throws Throwable { + FileUtils.deleteFileTreeUnchecked(JARS_DIR); + Files.createDirectories(JARS_DIR); + Path converterJar = JARS_DIR.resolve("converter.jar"); + + jar("--create", + "--file", converterJar.toString(), + "--warn-if-resolved=incubating", + "-C", MODS_DIR.resolve("message.converter").toString() , ".") + .assertSuccess(); + + + java(Paths.get(JAVA_HOME), + "--module-path", JARS_DIR.toString(), + "--add-modules", "message.converter", + "-cp", CP_DIR.toString(), + "test.ConvertToLowerCase", "HEllo WoRlD") + .assertSuccess() + .resultChecker(r -> { + r.assertContains("WARNING: Using incubator modules: message.converter"); + }); + } + + @DataProvider(name = "twoModules") + public Object[][] twoModulesValues() throws IOException { + Object[][] values = new Object[][]{ + // { Extra args to the build the message.writer jmod + // Extra args to the build the message.converter jmod + // Tokens to pass to the run time --add-modules option + // SUCCESS or FAILURE expected + // Messages expected in the run time output + // Messages that must not appear in the run time output }, + { "", + "", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base"), + List.of() }, + { "", + "--do-not-resolve-by-default", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base"), + List.of() }, + { "--do-not-resolve-by-default", + "", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.lang.ClassNotFoundException: writer.MessageWriter", "java.base"), + List.of("message.writer") }, + { "--do-not-resolve-by-default", + "--do-not-resolve-by-default", + List.of("ALL-DEFAULT", "ALL-SYSTEM"), + ToolResult.ASSERT_FAILURE, + List.of("java.lang.ClassNotFoundException: writer.MessageWriter", "java.base"), + List.of("message.converter", "message.writer") }, + // now add in warnings + { "--do-not-resolve-by-default --warn-if-resolved=incubating", + "", + List.of("message.writer"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base", + "WARNING: Using incubator modules: message.writer"), + List.of() }, + { "", + "--do-not-resolve-by-default --warn-if-resolved=incubating", + List.of("message.writer"), + ToolResult.ASSERT_SUCCESS, + List.of("HELLO CHEGAR !!!", "message.writer", "message.converter", "java.base", + "WARNING: Using incubator modules: message.converter"), + List.of() } }; + return values; + } + + @Test(dataProvider = "twoModules") + public void doNotResolveByDefaultTwoModules(String extraFirstJmodArg, + String extraSecondJmodArg, + List addModsTokens, + Consumer assertExitCode, + List expectedOutput, + List unexpectedOutput) + throws Throwable + { + if (Files.notExists(JDK_JMODS)) { + System.out.println("JDK jmods not found test cannot run."); + return; + } + + FileUtils.deleteFileTreeUnchecked(JMODS_DIR); + FileUtils.deleteFileTreeUnchecked(IMAGE); + Files.createDirectories(JMODS_DIR); + Path writerJmod = JMODS_DIR.resolve("writer.jmod"); + Path converterJmod = JMODS_DIR.resolve("converter.jmod"); + + jmod("create", + extraFirstJmodArg, + "--class-path", MODS_DIR.resolve("message.writer").toString(), + writerJmod.toString()); + + jmod("create", + "--class-path", MODS_DIR.resolve("message.converter").toString(), + extraSecondJmodArg, + converterJmod.toString()) + .assertSuccess(); + + String mpath = JDK_JMODS.toString() + File.pathSeparator + JMODS_DIR.toString(); + jlink("--module-path", mpath, + "--add-modules", JAVA_BASE + ",message.writer,message.converter", + "--output", IMAGE.toString()) + .assertSuccess(); + + for (String addModsToken : addModsTokens) { + String[] props = new String[] {"", "-Djdk.system.module.finder.disabledFastPath"}; + for (String systemProp : props) + java(IMAGE, + systemProp, + "--add-modules", addModsToken, + "-cp", CP_DIR.toString(), + "test.WriteUpperCase", "hello chegar !!!") + .resultChecker(assertExitCode) + .resultChecker(r -> { + expectedOutput.forEach(e -> r.assertContains(e)); + unexpectedOutput.forEach(e -> r.assertDoesNotContains(e)); + }); + } + } + + static final ToolProvider JMOD_TOOL = ToolProvider.findFirst("jmod") + .orElseThrow(() -> new RuntimeException("jmod tool not found")); + static final ToolProvider JAR_TOOL = ToolProvider.findFirst("jar") + .orElseThrow(() -> new RuntimeException("jar tool not found")); + static final ToolProvider JLINK_TOOL = ToolProvider.findFirst("jlink") + .orElseThrow(() -> new RuntimeException("jlink tool not found")); + + static ToolResult jmod(String... args) { return execTool(JMOD_TOOL, args); } + + static ToolResult jar(String... args) { return execTool(JAR_TOOL, args); } + + static ToolResult jlink(String... args) { return execTool(JLINK_TOOL, args); } + + static ToolResult java(Path image, String... opts) throws Throwable { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + String[] options = Stream.concat(Stream.of(getJava(image)), + Stream.of(opts).filter(s -> !s.equals(""))) + .toArray(String[]::new); + + ProcessBuilder pb = new ProcessBuilder(options); + int exitValue = executeCommand(pb).outputTo(ps) + .errorTo(ps) + .getExitValue(); + + return new ToolResult(exitValue, new String(baos.toByteArray(), UTF_8)); + } + + static ToolResult execTool(ToolProvider tool, String... args) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + PrintStream ps = new PrintStream(baos); + List filteredArgs = Stream.of(args) + .map(s -> s.split(" ")).flatMap(Stream::of) + .filter(s -> !s.equals("")) + .collect(Collectors.toList()); + System.out.println(tool + " " + filteredArgs); + int ec = tool.run(ps, ps, filteredArgs.toArray(new String[] {})); + return new ToolResult(ec, new String(baos.toByteArray(), UTF_8)); + } + + static class ToolResult { + final int exitCode; + final String output; + + ToolResult(int exitValue, String output) { + this.exitCode = exitValue; + this.output = output; + } + + static Consumer ASSERT_SUCCESS = r -> + assertEquals(r.exitCode, 0, + "Expected exit code 0, got " + r.exitCode + + ", with output[" + r.output + "]"); + static Consumer ASSERT_FAILURE = r -> + assertNotEquals(r.exitCode, 0, + "Expected exit code != 0, got " + r.exitCode + + ", with output[" + r.output + "]"); + + ToolResult assertSuccess() { ASSERT_SUCCESS.accept(this); return this; } + ToolResult assertFailure() { ASSERT_FAILURE.accept(this); return this; } + ToolResult resultChecker(Consumer r) { r.accept(this); return this; } + + ToolResult assertContains(String subString) { + assertTrue(output.contains(subString), + "Expected to find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + ToolResult assertDoesNotContains(String subString) { + assertFalse(output.contains(subString), + "Expected to NOT find [" + subString + "], in output [" + + output + "]" + "\n"); + return this; + } + } + + static String getJava(Path image) { + boolean isWindows = System.getProperty("os.name").startsWith("Windows"); + Path java = image.resolve("bin").resolve(isWindows ? "java.exe" : "java"); + if (Files.notExists(java)) + throw new RuntimeException(java + " not found"); + return java.toAbsolutePath().toString(); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java b/jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java new file mode 100644 index 00000000000..2d80d198ee0 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/cp/listmods/ListModules.java @@ -0,0 +1,39 @@ +/* + * 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 listmods; + +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import static java.util.stream.Collectors.joining; + +public class ListModules { + public static void main(String[] args) throws Exception { + System.out.println(Layer.boot() + .modules() + .stream() + .map(Module::getName) + .sorted() + .collect(joining("\n"))); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java b/jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java new file mode 100644 index 00000000000..cf0d1c7cba9 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/cp/test/ConvertToLowerCase.java @@ -0,0 +1,40 @@ +/* + * 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 test; + +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import static java.util.stream.Collectors.joining; + +public class ConvertToLowerCase { + public static void main(String[] args) { + System.out.println(Layer.boot() + .modules() + .stream() + .map(Module::getName) + .sorted() + .collect(joining("\n"))); + System.out.println(converter.MessageConverter.toLowerCase(args[0])); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java b/jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java new file mode 100644 index 00000000000..844fccb2fcf --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/cp/test/WriteUpperCase.java @@ -0,0 +1,40 @@ +/* + * 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 test; + +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import static java.util.stream.Collectors.joining; + +public class WriteUpperCase { + public static void main(String[] args) { + System.out.println(Layer.boot() + .modules() + .stream() + .map(Module::getName) + .sorted() + .collect(joining("\n"))); + writer.MessageWriter.writeOn(args[0], System.out); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java b/jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.java new file mode 100644 index 00000000000..d9604df2ec0 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.converter/converter/MessageConverter.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. + */ + +package converter; + +public class MessageConverter { + public static String toUpperCase(String message) { + return message.toUpperCase(java.util.Locale.ROOT); + } + + public static String toLowerCase(String message) { + return message.toLowerCase(java.util.Locale.ROOT); + } +} diff --git a/jdk/test/jdk/modules/incubator/src/message.converter/module-info.java b/jdk/test/jdk/modules/incubator/src/message.converter/module-info.java new file mode 100644 index 00000000000..6fbfa700a7b --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.converter/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 message.converter { + exports converter; +} diff --git a/jdk/test/jdk/modules/incubator/src/message.writer/module-info.java b/jdk/test/jdk/modules/incubator/src/message.writer/module-info.java new file mode 100644 index 00000000000..09370cc283a --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.writer/module-info.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. + */ + +module message.writer { + requires message.converter; + exports writer; +} diff --git a/jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java b/jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java new file mode 100644 index 00000000000..0c6ba17cf26 --- /dev/null +++ b/jdk/test/jdk/modules/incubator/src/message.writer/writer/MessageWriter.java @@ -0,0 +1,38 @@ +/* + * 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 writer; + +import java.io.PrintStream; +import java.util.Locale; + +public class MessageWriter { + public static void writeOn(String message, PrintStream out) { + String newMesssage = converter.MessageConverter.toUpperCase(message); + if (!newMesssage.equals(message.toUpperCase(Locale.ROOT))) + throw new RuntimeException("Expected " + message.toUpperCase(Locale.ROOT) + + ", got " + newMesssage ); + + out.println(newMesssage); + } +} diff --git a/jdk/test/lib/testlibrary/ModuleUtils.java b/jdk/test/lib/testlibrary/ModuleUtils.java index c227464da1a..b3c9d5e49c8 100644 --- a/jdk/test/lib/testlibrary/ModuleUtils.java +++ b/jdk/test/lib/testlibrary/ModuleUtils.java @@ -32,7 +32,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.function.Supplier; /** @@ -58,12 +57,13 @@ public final class ModuleUtils { URI uri = URI.create("module:/" + name); - Supplier supplier = () -> { - throw new UnsupportedOperationException(); + ModuleReference mref = new ModuleReference(descriptor, uri) { + @Override + public ModuleReader open() { + throw new UnsupportedOperationException(); + } }; - ModuleReference mref = new ModuleReference(descriptor, uri, supplier); - namesToReference.put(name, mref); } diff --git a/jdk/test/sun/misc/InvokeCleaner.java b/jdk/test/sun/misc/InvokeCleaner.java new file mode 100644 index 00000000000..3367d1574c6 --- /dev/null +++ b/jdk/test/sun/misc/InvokeCleaner.java @@ -0,0 +1,125 @@ +/* + * 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 + * @bug 8171377 + * @summary Basic test for Unsafe::invokeCleaner + * @modules jdk.unsupported + * @run testng/othervm InvokeCleaner + */ + +import java.io.Closeable; +import java.lang.reflect.Field; +import java.nio.ByteBuffer; +import java.nio.MappedByteBuffer; +import java.nio.channels.FileChannel; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.ArrayList; +import java.util.List; +import sun.misc.Unsafe; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; +import org.testng.annotations.DataProvider; + +public class InvokeCleaner { + + static Unsafe UNSAFE; + static Path bob = Paths.get("bob"); + static List closeables = new ArrayList<>(); + + @BeforeClass + static void init() throws Exception { + UNSAFE = getUnsafe(); + + byte[] srcData = new byte[20]; + for (int i=0; i<20; i++) + srcData[i] = (byte)i; + Files.write(bob, srcData); + } + + @DataProvider(name = "badBuffers") + static Object[][] createBadBuffers() throws Exception { + FileChannel fc = FileChannel.open(bob); + closeables.add(fc); + MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10); + + return new Object[][] { + { ByteBuffer.allocate(0) }, + { ByteBuffer.allocate(10) }, + { ByteBuffer.allocate(10).duplicate() }, + { ByteBuffer.allocate(10).slice() }, + { ByteBuffer.allocateDirect(10).duplicate() }, + { ByteBuffer.allocateDirect(10).slice() }, + { ByteBuffer.allocateDirect(0).duplicate() }, + { ByteBuffer.allocateDirect(0).slice() }, + { mbb.duplicate() }, + { mbb.slice() } + }; + } + + @Test(dataProvider="badBuffers", + expectedExceptions = IllegalArgumentException.class) + public void badBuffers(ByteBuffer buffer) throws Exception { + UNSAFE.invokeCleaner(buffer); + } + + @DataProvider(name = "goodBuffers") + static Object[][] createGoodBuffers() throws Exception { + FileChannel fc = FileChannel.open(bob); + closeables.add(fc); + MappedByteBuffer mbb = fc.map(FileChannel.MapMode.READ_ONLY, 0, 10); + mbb.load(); + + return new Object[][] { + { ByteBuffer.allocateDirect(0) }, + { ByteBuffer.allocateDirect(10) }, + { mbb }, + { fc.map(FileChannel.MapMode.READ_ONLY, 1, 11) } + }; + } + + @Test(dataProvider="goodBuffers") + public void goodBuffers(ByteBuffer buffer) throws Exception { + UNSAFE.invokeCleaner(buffer); + } + + @Test(expectedExceptions = NullPointerException.class) + public void npe() throws Exception { + UNSAFE.invokeCleaner(null); + } + + static Unsafe getUnsafe() throws ReflectiveOperationException { + Field f = Unsafe.class.getDeclaredField("theUnsafe"); + f.setAccessible(true); + return (Unsafe)f.get(null); + } + + @AfterClass + public void cleanup() throws Exception { + for(Closeable fc : closeables) + fc.close(); + } +} diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java index 96245002874..55f2d1a4d15 100644 --- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java +++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java @@ -23,10 +23,12 @@ /* * @test - * @bug 6578647 6829283 + * @bug 6578647 6829283 8171340 * @run main/othervm HttpNegotiateServer - * @summary Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() - * @summary HTTP/Negotiate: Authenticator triggered again when user cancels the first one + * @summary Undefined requesting URL in java.net.Authenticator + * .getPasswordAuthentication() + * @summary HTTP/Negotiate: Authenticator triggered again when + * user cancels the first one */ import com.sun.net.httpserver.Headers; @@ -240,16 +242,15 @@ public class HttpNegotiateServer { java.net.Authenticator.setDefault(new KnowAllAuthenticator()); reader = new BufferedReader(new InputStreamReader( - webUrl.openConnection().getInputStream())); + webUrl.openConnection(Proxy.NO_PROXY).getInputStream())); if (!reader.readLine().equals(CONTENT)) { throw new RuntimeException("Bad content"); } reader = new BufferedReader(new InputStreamReader( - proxyUrl.openConnection( - new Proxy(Proxy.Type.HTTP, - new InetSocketAddress(PROXY_HOST, proxyPort))) - .getInputStream())); + proxyUrl.openConnection(new Proxy(Proxy.Type.HTTP, + new InetSocketAddress(PROXY_HOST, proxyPort))) + .getInputStream())); if (!reader.readLine().equals(CONTENT)) { throw new RuntimeException("Bad content"); } @@ -260,7 +261,7 @@ public class HttpNegotiateServer { java.net.Authenticator.setDefault(new KnowNothingAuthenticator()); try { new BufferedReader(new InputStreamReader( - webUrl.openConnection().getInputStream())); + webUrl.openConnection(Proxy.NO_PROXY).getInputStream())); } catch (IOException ioe) { // Will fail since no username and password is provided. } @@ -274,7 +275,7 @@ public class HttpNegotiateServer { try { URL url = webUrl; - URLConnection conn = url.openConnection(); + URLConnection conn = url.openConnection(Proxy.NO_PROXY); conn.connect(); inputStream = conn.getInputStream(); byte[] b = new byte[inputStream.available()]; @@ -285,7 +286,7 @@ public class HttpNegotiateServer { System.out.println("Length: " + s.length()); System.out.println(s); } catch (Exception ex) { - throw new RuntimeException(ex); + throw new RuntimeException(ex); } finally { if (inputStream != null) { try { @@ -307,7 +308,8 @@ public class HttpNegotiateServer { CallbackHandler callback = new CallbackHandler() { @Override - public void handle(Callback[] pCallbacks) throws IOException, UnsupportedCallbackException { + public void handle(Callback[] pCallbacks) + throws IOException, UnsupportedCallbackException { for (Callback cb : pCallbacks) { if (cb instanceof NameCallback) { NameCallback ncb = (NameCallback)cb; @@ -323,7 +325,8 @@ public class HttpNegotiateServer { }; final String jaasConfigName = "oracle.test.kerberos.login"; - final String krb5LoginModule = "com.sun.security.auth.module.Krb5LoginModule"; + final String krb5LoginModule + = "com.sun.security.auth.module.Krb5LoginModule"; Configuration loginConfig = new Configuration() { @Override @@ -347,7 +350,8 @@ public class HttpNegotiateServer { // oracle context/subject/login LoginContext context = null; try { - context = new LoginContext("oracle.test.kerberos.login", null, callback, loginConfig); + context = new LoginContext( + "oracle.test.kerberos.login", null, callback, loginConfig); context.login(); } catch (LoginException ex) { @@ -358,29 +362,35 @@ public class HttpNegotiateServer { Subject subject = context.getSubject(); - final PrivilegedExceptionAction test_action = new PrivilegedExceptionAction() { + final PrivilegedExceptionAction test_action + = new PrivilegedExceptionAction() { public Object run() throws Exception { testConnect(); return null; } }; - System.err.println("\n\nExpecting to succeed when executing with the the logged in subject."); + System.err.println("\n\nExpecting to succeed when executing " + + "with the the logged in subject."); try { Subject.doAs(subject, test_action); - System.err.println("\n\nConnection succeed when executing with the the logged in subject."); + System.err.println("\n\nConnection succeed when executing " + + "with the the logged in subject."); } catch (PrivilegedActionException e) { - System.err.println("\n\nFailure unexpected when executing with the the logged in subject."); + System.err.println("\n\nFailure unexpected when executing " + + "with the the logged in subject."); e.printStackTrace(); throw new RuntimeException("Failed to login as subject"); } try { - System.err.println("\n\nExpecting to fail when running with the current user's login."); + System.err.println("\n\nExpecting to fail when running " + + "with the current user's login."); testConnect(); } catch (Exception ex) { - System.err.println("\nConnect failed when running with the current user's login:\n" + ex.getMessage()); + System.err.println("\nConnect failed when running " + + "with the current user's login:\n" + ex.getMessage()); } } @@ -450,8 +460,9 @@ public class HttpNegotiateServer { return m.createCredential( null, GSSCredential.INDEFINITE_LIFETIME, - MyServerAuthenticator.this.scheme.equalsIgnoreCase("Negotiate")? - GSSUtil.GSS_SPNEGO_MECH_OID: + MyServerAuthenticator.this.scheme + .equalsIgnoreCase("Negotiate") ? + GSSUtil.GSS_SPNEGO_MECH_OID : GSSUtil.GSS_KRB5_MECH_OID, GSSCredential.ACCEPT_ONLY); } @@ -465,7 +476,8 @@ public class HttpNegotiateServer { GSSContext c = null; String auth = exch.getRequestHeaders().getFirst(respHdr); try { - c = (GSSContext)exch.getHttpContext().getAttributes().get("GSSContext"); + c = (GSSContext)exch.getHttpContext() + .getAttributes().get("GSSContext"); if (auth == null) { // First request Headers map = exch.getResponseHeaders(); map.set (reqHdr, scheme); // Challenge! @@ -478,7 +490,8 @@ public class HttpNegotiateServer { exch.getHttpContext().getAttributes().put("GSSContext", c); return new com.sun.net.httpserver.Authenticator.Retry(err); } else { // Later requests - byte[] token = Base64.getMimeDecoder().decode(auth.split(" ")[1]); + byte[] token = Base64.getMimeDecoder() + .decode(auth.split(" ")[1]); token = c.acceptSecContext(token, 0, token.length); Headers map = exch.getResponseHeaders(); map.set (reqHdr, scheme + " " + Base64.getMimeEncoder() diff --git a/jdk/test/tools/jar/compat/CLICompatibility.java b/jdk/test/tools/jar/compat/CLICompatibility.java index 9355f18a66b..c31762eedc3 100644 --- a/jdk/test/tools/jar/compat/CLICompatibility.java +++ b/jdk/test/tools/jar/compat/CLICompatibility.java @@ -43,6 +43,7 @@ import org.testng.annotations.Test; import static java.lang.String.format; import static java.lang.System.out; import static java.nio.charset.StandardCharsets.UTF_8; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; /* @@ -428,10 +429,12 @@ public class CLICompatibility { jar("--help") .assertSuccess() - .resultChecker(r -> + .resultChecker(r -> { assertTrue(r.output.startsWith("Usage: jar [OPTION...] [ [--release VERSION] [-C dir] files]"), - "Failed, got [" + r.output + "]") - ); + "Failed, got [" + r.output + "]"); + assertFalse(r.output.contains("--do-not-resolve-by-default")); + assertFalse(r.output.contains("--warn-if-resolved")); + }); jar("--help:compat") .assertSuccess() @@ -439,6 +442,15 @@ public class CLICompatibility { assertTrue(r.output.startsWith("Compatibility Interface:"), "Failed, got [" + r.output + "]") ); + + jar("--help-extra") + .assertSuccess() + .resultChecker(r -> { + assertTrue(r.output.startsWith("Usage: jar [OPTION...] [ [--release VERSION] [-C dir] files]"), + "Failed, got [" + r.output + "]"); + assertTrue(r.output.contains("--do-not-resolve-by-default")); + assertTrue(r.output.contains("--warn-if-resolved")); + }); } // -- Infrastructure diff --git a/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java b/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java index 92329265533..2d1d844c818 100644 --- a/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java +++ b/jdk/test/tools/jar/modularJar/src/bar/jdk/test/bar/Bar.java @@ -25,16 +25,18 @@ package jdk.test.bar; import java.lang.module.ModuleDescriptor; import java.lang.module.ModuleDescriptor.Exports; -import java.lang.module.ModuleDescriptor.Requires; import java.lang.module.ModuleDescriptor.Provides; +import java.lang.module.ModuleReference; +import java.lang.module.ResolvedModule; +import java.lang.reflect.Module; import java.util.Optional; import java.util.StringJoiner; import java.util.HashSet; import java.util.Set; - import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.JavaLangModuleAccess; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModuleReferenceImpl; import jdk.test.bar.internal.Message; public class Bar { @@ -71,9 +73,14 @@ public class Bar { if (!sj.toString().equals("")) System.out.println("contains:" + sj.toString()); - ModuleDescriptor foo = jdk.test.foo.Foo.class.getModule().getDescriptor(); - JavaLangModuleAccess jlma = SharedSecrets.getJavaLangModuleAccess(); - Optional oHashes = jlma.hashes(foo); - System.out.println("hashes:" + oHashes.get().hashFor("bar")); + + Module foo = jdk.test.foo.Foo.class.getModule(); + Optional om = foo.getLayer().configuration().findModule(foo.getName()); + assert om.isPresent(); + ModuleReference mref = om.get().reference(); + assert mref instanceof ModuleReferenceImpl; + ModuleHashes hashes = ((ModuleReferenceImpl) mref).recordedHashes(); + assert hashes != null; + System.out.println("hashes:" + hashes.hashFor("bar")); } } diff --git a/jdk/test/tools/jimage/VerifyJimage.java b/jdk/test/tools/jimage/VerifyJimage.java index 30628ad9921..d5415af35b0 100644 --- a/jdk/test/tools/jimage/VerifyJimage.java +++ b/jdk/test/tools/jimage/VerifyJimage.java @@ -49,7 +49,7 @@ import jdk.internal.jimage.ImageLocation; * @test * @summary Verify jimage * @modules java.base/jdk.internal.jimage - * @run main/othervm --add-modules=ALL-SYSTEM VerifyJimage + * @run main/othervm --add-modules=ALL-SYSTEM,jdk.incubator.httpclient VerifyJimage */ /** diff --git a/jdk/test/tools/jlink/IntegrationTest.java b/jdk/test/tools/jlink/IntegrationTest.java index 8d6bb303bdc..e9666676b25 100644 --- a/jdk/test/tools/jlink/IntegrationTest.java +++ b/jdk/test/tools/jlink/IntegrationTest.java @@ -186,7 +186,7 @@ public class IntegrationTest { lst.add(new MyPostProcessor()); } // Image builder - DefaultImageBuilder builder = new DefaultImageBuilder(output); + DefaultImageBuilder builder = new DefaultImageBuilder(output, Collections.emptyMap()); PluginsConfiguration plugins = new Jlink.PluginsConfiguration(lst, builder, null); diff --git a/jdk/test/tools/jlink/ReleaseImplementorTest.java b/jdk/test/tools/jlink/ReleaseImplementorTest.java new file mode 100644 index 00000000000..7f935ea5a1c --- /dev/null +++ b/jdk/test/tools/jlink/ReleaseImplementorTest.java @@ -0,0 +1,60 @@ +/* + * 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. + */ + +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Properties; + +/* + * @test + * @bug 8171316 + * @summary Add IMPLEMENTOR property to the release file + * @run main ReleaseImplementorTest + */ +public class ReleaseImplementorTest { + public static void main(String[] args) throws Exception { + Properties props = new Properties(); + Path release = Paths.get(System.getProperty("test.jdk"), "release"); + try (InputStream in = Files.newInputStream(release)) { + props.load(in); + } + + if (!props.containsKey("IMPLEMENTOR")) { + throw new RuntimeException("IMPLEMENTOR key is missing"); + } + + String implementor = props.getProperty("IMPLEMENTOR"); + if (implementor.length() < 3) { + throw new RuntimeException("IMPLEMENTOR value is not expected length"); + } + + if (implementor.charAt(0) != '"' || + implementor.charAt(implementor.length() - 1) != '"') { + throw new RuntimeException("IMPLEMENTOR value not quoted property"); + } + + System.out.println("IMPLEMENTOR is " + implementor); + } +} diff --git a/jdk/test/tools/jlink/basic/BasicTest.java b/jdk/test/tools/jlink/basic/BasicTest.java index 87b2b0ef69d..ae49a01820c 100644 --- a/jdk/test/tools/jlink/basic/BasicTest.java +++ b/jdk/test/tools/jlink/basic/BasicTest.java @@ -87,20 +87,29 @@ public class BasicTest { JarUtils.createJarFile(jarfile, classes); Path image = Paths.get("mysmallimage"); - runJmod(jarfile.toString(), TEST_MODULE); - runJlink(image, TEST_MODULE, "--compress", "2"); - execute(image, TEST_MODULE); + runJmod(jarfile.toString(), TEST_MODULE, true); + runJlink(image, TEST_MODULE, "--compress", "2", "--launcher", "foo=" + TEST_MODULE); + execute(image, "foo"); Files.delete(jmods.resolve(TEST_MODULE + ".jmod")); image = Paths.get("myimage"); - runJmod(classes.toString(), TEST_MODULE); - runJlink(image, TEST_MODULE); - execute(image, TEST_MODULE); + runJmod(classes.toString(), TEST_MODULE, true); + runJlink(image, TEST_MODULE, "--launcher", "bar=" + TEST_MODULE); + execute(image, "bar"); + + Files.delete(jmods.resolve(TEST_MODULE + ".jmod")); + + image = Paths.get("myimage2"); + runJmod(classes.toString(), TEST_MODULE, false /* no ModuleMainClass! */); + // specify main class in --launcher command line + runJlink(image, TEST_MODULE, "--launcher", "bar2=" + TEST_MODULE + "/jdk.test.Test"); + execute(image, "bar2"); + } - private void execute(Path image, String moduleName) throws Throwable { - String cmd = image.resolve("bin").resolve(moduleName).toString(); + private void execute(Path image, String scriptName) throws Throwable { + String cmd = image.resolve("bin").resolve(scriptName).toString(); OutputAnalyzer analyzer; if (System.getProperty("os.name").startsWith("Windows")) { analyzer = ProcessTools.executeProcess("sh.exe", cmd, "1", "2", "3"); @@ -127,14 +136,25 @@ public class BasicTest { } } - private void runJmod(String cp, String modName) { - int rc = JMOD_TOOL.run(System.out, System.out, new String[] { + private void runJmod(String cp, String modName, boolean main) { + int rc; + if (main) { + rc = JMOD_TOOL.run(System.out, System.out, new String[] { "create", "--class-path", cp, "--module-version", "1.0", "--main-class", "jdk.test.Test", + jmods.resolve(modName + ".jmod").toString() + }); + } else { + rc = JMOD_TOOL.run(System.out, System.out, new String[] { + "create", + "--class-path", cp, + "--module-version", "1.0", jmods.resolve(modName + ".jmod").toString(), - }); + }); + } + if (rc != 0) { throw new AssertionError("Jmod failed: rc = " + rc); } diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java new file mode 100644 index 00000000000..fb7f5569e06 --- /dev/null +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/CompiledVersionTest.java @@ -0,0 +1,129 @@ +/* + * 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. + */ + +import java.io.File; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Arrays; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import jdk.testlibrary.FileUtils; +import static jdk.testlibrary.ProcessTools.*; + + +import org.testng.annotations.BeforeTest; +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +/** + * @test + * @library /lib/testlibrary + * @modules jdk.compiler jdk.jlink + * @build CompiledVersionTest CompilerUtils jdk.testlibrary.FileUtils jdk.testlibrary.ProcessTools + * @run testng CompiledVersionTest + */ + +public class CompiledVersionTest { + private static final String JAVA_HOME = System.getProperty("java.home"); + private static final String TEST_SRC = System.getProperty("test.src"); + + private static final Path SRC_DIR = Paths.get(TEST_SRC, "src"); + private static final Path MODS_DIR = Paths.get("mods"); + private static final Path IMAGE = Paths.get("image"); + private static final Path JMODS = Paths.get(JAVA_HOME, "jmods"); + private static final String MAIN_MID = "test/jdk.test.Main"; + + // the names of the modules in this test + private static String[] modules = new String[] { "m1", "m2", "test"}; + private static String[] versions = new String[] { "1.0", "2-ea", "3-internal"}; + + + private static boolean hasJmods() { + if (!Files.exists(JMODS)) { + System.err.println("Test skipped. NO jmods directory"); + return false; + } + return true; + } + + /* + * Compiles all modules used by the test + */ + @BeforeTest + public void compileAll() throws Throwable { + if (!hasJmods()) return; + + for (int i=0; i < modules.length; i++) { + String mn = modules[i]; + String version = versions[i]; + Path msrc = SRC_DIR.resolve(mn); + if (version.equals("0")) { + assertTrue(CompilerUtils.compile(msrc, MODS_DIR, + "--module-source-path", SRC_DIR.toString())); + } else { + assertTrue(CompilerUtils.compile(msrc, MODS_DIR, + "--module-source-path", SRC_DIR.toString(), + "--module-version", version)); + } + } + + if (Files.exists(IMAGE)) { + FileUtils.deleteFileTreeUnchecked(IMAGE); + } + + createImage(IMAGE, modules); + } + + private void createImage(Path outputDir, String... modules) throws Throwable { + Path jlink = Paths.get(JAVA_HOME, "bin", "jlink"); + String mp = JMODS.toString() + File.pathSeparator + MODS_DIR.toString(); + assertTrue(executeProcess(jlink.toString(), "--output", outputDir.toString(), + "--add-modules", Arrays.stream(modules).collect(Collectors.joining(",")), + "--module-path", mp) + .outputTo(System.out) + .errorTo(System.out) + .getExitValue() == 0); + } + + /* + * Test the image created when linking with a module with + * no Packages attribute + */ + @Test + public void testCompiledVersions() throws Throwable { + if (!hasJmods()) return; + + Path java = IMAGE.resolve("bin").resolve("java"); + Stream options = Stream.concat( + Stream.of(java.toString(), "-m", MAIN_MID, String.valueOf(modules.length)), + Stream.concat(Arrays.stream(modules), Arrays.stream(versions)) + ); + + assertTrue(executeProcess(options.toArray(String[]::new)) + .outputTo(System.out) + .errorTo(System.out) + .getExitValue() == 0); + } +} diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java index d74b6b84152..83559fb30b7 100644 --- a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/SystemModulesTest.java @@ -59,7 +59,7 @@ public class SystemModulesTest { private void testModuleDescriptor(ModuleDescriptor md) { assertUnmodifiable(md.packages(), "package"); assertUnmodifiable(md.requires(), - jlma.newRequires(Set.of(Requires.Modifier.TRANSITIVE), "require")); + jlma.newRequires(Set.of(Requires.Modifier.TRANSITIVE), "require", null)); for (Requires req : md.requires()) { assertUnmodifiable(req.modifiers(), Requires.Modifier.TRANSITIVE); } diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java index 0875db2585c..35d1eec67dc 100644 --- a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/UserModuleTest.java @@ -39,7 +39,7 @@ import static org.testng.Assert.*; /** * @test * @library /lib/testlibrary - * @modules jdk.compiler + * @modules jdk.compiler jdk.jlink * @build UserModuleTest CompilerUtils jdk.testlibrary.FileUtils jdk.testlibrary.ProcessTools * @run testng UserModuleTest */ diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java new file mode 100644 index 00000000000..e5c6fe8e6ca --- /dev/null +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/jdk/test/Main.java @@ -0,0 +1,104 @@ +/* + * 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 jdk.test; + +import java.lang.module.ModuleDescriptor; +import java.lang.reflect.Layer; +import java.lang.reflect.Module; +import java.net.URI; +import java.nio.file.FileSystem; +import java.nio.file.FileSystems; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; + + +/* + * Main class to verify if ModuleDescriptor carries the correct version + */ +public class Main { + static final Map nameToVersion = new HashMap<>(); + + // jdk.test.Main $count $module-name... $version... + public static void main(String... args) throws Exception { + int count = args.length > 0 ? Integer.valueOf(args[0]) : 0; + if (count < 1 || args.length != count*2+1) { + throw new IllegalArgumentException(Arrays.toString(args)); + } + + List modules = List.of(Arrays.copyOfRange(args, 1, 1+count)); + List versions = List.of(Arrays.copyOfRange(args, 1+count, args.length)); + for (int i=0; i < modules.size(); i++) { + System.out.format("module %s expects %s version%n", + modules.get(i), versions.get(i)); + nameToVersion.put(modules.get(i), versions.get(i)); + } + + FileSystem fs = FileSystems.newFileSystem(URI.create("jrt:/"), + Collections.emptyMap()); + // check the module descriptor of a system module + for (int i=0; i < modules.size(); i++) { + String mn = modules.get(i); + Module module = Layer.boot().findModule(mn).orElseThrow( + () -> new RuntimeException(mn + " not found") + ); + + // check ModuleDescriptor from the run-time + validate(module.getDescriptor()); + + // check module-info.class in the image + Path path = fs.getPath("/", "modules", modules.get(i), "module-info.class"); + validate(ModuleDescriptor.read(Files.newInputStream(path))); + } + } + + static void validate(ModuleDescriptor descriptor) { + checkVersion(descriptor.name(), descriptor.version()); + descriptor.requires() + .stream() + .filter(r -> !r.name().equals("java.base")) + .forEach(r -> checkVersion(r.name(), r.compiledVersion())); + } + + static void checkVersion(String mn, Optional version) { + boolean matched; + String v = nameToVersion.get(mn); + if (version.isPresent()) { + matched = version.get().toString().equals(v); + } else { + // 0 indicate no version + matched = v.equals("0"); + } + + if (!matched) { + throw new RuntimeException(mn + " mismatched version " + version + + " expected: " + v); + } + } +} diff --git a/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/module-info.java new file mode 100644 index 00000000000..83e15da97bf --- /dev/null +++ b/jdk/test/tools/jlink/plugins/SystemModuleDescriptors/src/test/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 test { + requires m1; + requires m2; + exports jdk.test; +} diff --git a/jdk/test/tools/jmod/JmodTest.java b/jdk/test/tools/jmod/JmodTest.java index 9e19eef37e1..970320ad9a5 100644 --- a/jdk/test/tools/jmod/JmodTest.java +++ b/jdk/test/tools/jmod/JmodTest.java @@ -470,9 +470,22 @@ public class JmodTest { public void testHelp() { jmod("--help") .assertSuccess() - .resultChecker(r -> - assertTrue(r.output.startsWith("Usage: jmod"), "Help not printed") - ); + .resultChecker(r -> { + assertTrue(r.output.startsWith("Usage: jmod"), "Help not printed"); + assertFalse(r.output.contains("--do-not-resolve-by-default")); + assertFalse(r.output.contains("--warn-if-resolved")); + }); + } + + @Test + public void testHelpExtra() { + jmod("--help-extra") + .assertSuccess() + .resultChecker(r -> { + assertTrue(r.output.startsWith("Usage: jmod"), "Extra help not printed"); + assertContains(r.output, "--do-not-resolve-by-default"); + assertContains(r.output, "--warn-if-resolved"); + }); } @Test diff --git a/jdk/test/tools/jmod/hashes/HashesTest.java b/jdk/test/tools/jmod/hashes/HashesTest.java index 22752e759f1..8d4b2f68300 100644 --- a/jdk/test/tools/jmod/hashes/HashesTest.java +++ b/jdk/test/tools/jmod/hashes/HashesTest.java @@ -50,14 +50,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.Set; import java.util.spi.ToolProvider; import java.util.stream.Collectors; -import jdk.internal.misc.SharedSecrets; -import jdk.internal.misc.JavaLangModuleAccess; +import jdk.internal.module.ModuleInfo; import jdk.internal.module.ModuleHashes; +import jdk.internal.module.ModulePath; import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; @@ -103,54 +102,53 @@ public class HashesTest { @Test public void test() throws Exception { for (String mn : modules) { - assertFalse(hashes(mn).isPresent()); + assertTrue(hashes(mn) == null); } // hash m1 in m2 jmod("m2", "--module-path", jmods.toString(), "--hash-modules", "m1"); - checkHashes(hashes("m2").get(), "m1"); + checkHashes(hashes("m2"), "m1"); // hash m1 in m2 jmod("m2", "--module-path", jmods.toString(), "--hash-modules", ".*"); - checkHashes(hashes("m2").get(), "m1"); + checkHashes(hashes("m2"), "m1"); // create m2.jmod with no hash jmod("m2"); // run jmod hash command to hash m1 in m2 and m3 runJmod(Arrays.asList("hash", "--module-path", jmods.toString(), "--hash-modules", ".*")); - checkHashes(hashes("m2").get(), "m1"); - checkHashes(hashes("m3").get(), "m1"); + checkHashes(hashes("m2"), "m1"); + checkHashes(hashes("m3"), "m1"); jmod("org.bar"); jmod("org.foo"); jmod("org.bar", "--module-path", jmods.toString(), "--hash-modules", "org.*"); - checkHashes(hashes("org.bar").get(), "org.foo"); + checkHashes(hashes("org.bar"), "org.foo"); jmod("m3", "--module-path", jmods.toString(), "--hash-modules", ".*"); - checkHashes(hashes("m3").get(), "org.foo", "org.bar", "m1"); + checkHashes(hashes("m3"), "org.foo", "org.bar", "m1"); } private void checkHashes(ModuleHashes hashes, String... hashModules) { assertTrue(hashes.names().equals(Set.of(hashModules))); } - private Optional hashes(String name) throws Exception { - ModuleFinder finder = SharedSecrets.getJavaLangModuleAccess() - .newModulePath(Runtime.version(), true, jmods.resolve(name + ".jmod")); + private ModuleHashes hashes(String name) throws Exception { + ModuleFinder finder = new ModulePath(Runtime.version(), + true, + jmods.resolve(name + ".jmod")); ModuleReference mref = finder.find(name).orElseThrow(RuntimeException::new); ModuleReader reader = mref.open(); try (InputStream in = reader.open("module-info.class").get()) { - ModuleDescriptor md = ModuleDescriptor.read(in); - JavaLangModuleAccess jmla = SharedSecrets.getJavaLangModuleAccess(); - Optional hashes = jmla.hashes(md); + ModuleHashes hashes = ModuleInfo.read(in, null).recordedHashes(); System.out.format("hashes in module %s %s%n", name, - hashes.isPresent() ? "present" : "absent"); - if (hashes.isPresent()) { - hashes.get().names().stream() + (hashes != null) ? "present" : "absent"); + if (hashes != null) { + hashes.names().stream() .sorted() - .forEach(n -> System.out.format(" %s %s%n", n, hashes.get().hashFor(n))); + .forEach(n -> System.out.format(" %s %s%n", n, hashes.hashFor(n))); } return hashes; } finally { diff --git a/jdk/test/tools/launcher/RunpathTest.java b/jdk/test/tools/launcher/RunpathTest.java index 00e757343c3..2730f5da464 100644 --- a/jdk/test/tools/launcher/RunpathTest.java +++ b/jdk/test/tools/launcher/RunpathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 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 @@ -64,7 +64,7 @@ public class RunpathTest extends TestHelper { } void testRpath() { - String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib/" + getJreArch() + ".*"; + String expectedRpath = ".*RPATH.*\\$ORIGIN/../lib.*"; elfCheck(javaCmd, expectedRpath); } diff --git a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java b/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java index 144405e5ddf..97e5f767b6e 100644 --- a/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java +++ b/jdk/test/tools/pack200/pack200-verifier/src/xmlkit/ClassReader.java @@ -41,6 +41,8 @@ import com.sun.tools.classfile.Code_attribute; import com.sun.tools.classfile.CompilationID_attribute; import com.sun.tools.classfile.ConstantPool; import com.sun.tools.classfile.ConstantPool.CONSTANT_Class_info; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Module_info; +import com.sun.tools.classfile.ConstantPool.CONSTANT_Package_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Double_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Fieldref_info; import com.sun.tools.classfile.ConstantPool.CONSTANT_Float_info; @@ -80,9 +82,9 @@ import com.sun.tools.classfile.Module_attribute.RequiresEntry; import com.sun.tools.classfile.ModuleHashes_attribute; import com.sun.tools.classfile.ModuleHashes_attribute.Entry; import com.sun.tools.classfile.ModuleMainClass_attribute; +import com.sun.tools.classfile.ModuleResolution_attribute; import com.sun.tools.classfile.ModuleTarget_attribute; import com.sun.tools.classfile.ModulePackages_attribute; -import com.sun.tools.classfile.ModuleVersion_attribute; import com.sun.tools.classfile.Opcode; import com.sun.tools.classfile.RuntimeInvisibleAnnotations_attribute; import com.sun.tools.classfile.RuntimeInvisibleParameterAnnotations_attribute; @@ -669,6 +671,40 @@ class ConstantPoolVisitor implements ConstantPool.Visitor { return value; } + @Override + public String visitModule(CONSTANT_Module_info info, Integer p) { + String value = slist.get(p); + if (value == null) { + try { + value = visit(cfpool.get(info.name_index), info.name_index); + slist.set(p, value); + xpool.add(new Element("CONSTANT_Module", + new String[]{"id", p.toString()}, + value)); + } catch (ConstantPoolException ex) { + ex.printStackTrace(); + } + } + return value; + } + + @Override + public String visitPackage(CONSTANT_Package_info info, Integer p) { + String value = slist.get(p); + if (value == null) { + try { + value = visit(cfpool.get(info.name_index), info.name_index); + slist.set(p, value); + xpool.add(new Element("CONSTANT_Package", + new String[]{"id", p.toString()}, + value)); + } catch (ConstantPoolException ex) { + ex.printStackTrace(); + } + } + return value; + } + @Override public String visitDouble(CONSTANT_Double_info c, Integer p) { String value = slist.get(p); @@ -1495,20 +1531,20 @@ class AttributeVisitor implements Attribute.Visitor { } @Override - public Element visitModuleTarget(ModuleTarget_attribute attr, Element p) { - Element e = new Element(x.getCpString(attr.attribute_name_index)); - e.add(x.getCpString(attr.os_name_index)); - e.add(x.getCpString(attr.os_arch_index)); - e.add(x.getCpString(attr.os_version_index)); + public Element visitModuleResolution(ModuleResolution_attribute attr, Element p) { + Element e = new Element("ModuleResolution"); + e.setAttr("flags", Integer.toString(attr.resolution_flags)); e.trimToSize(); p.add(e); return null; } @Override - public Element visitModuleVersion(ModuleVersion_attribute attr, Element p) { + public Element visitModuleTarget(ModuleTarget_attribute attr, Element p) { Element e = new Element(x.getCpString(attr.attribute_name_index)); - e.add(x.getCpString(attr.version_index)); + e.add(x.getCpString(attr.os_name_index)); + e.add(x.getCpString(attr.os_arch_index)); + e.add(x.getCpString(attr.os_version_index)); e.trimToSize(); p.add(e); return null;