stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8152650: ModuleFinder.compose should accept varargs

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Alan Bateman 2016-05-21 08:00:33 +01:00
parent 0eb01672dd
commit 8fe0416551
25 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/test/runtime/modules/AccessCheck/CheckRead.java
View File

@ -103,7 +103,7 @@ public class CheckRead {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java
View File

@ -103,7 +103,7 @@ public class DiffCL_CheckRead {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java
View File

@ -105,7 +105,7 @@ public class DiffCL_ExpQualOther {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java
View File

@ -91,7 +91,7 @@ public class DiffCL_ExpQualToM1 {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java
View File

@ -92,7 +92,7 @@ public class DiffCL_ExpUnqual {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java
View File

@ -91,7 +91,7 @@ public class DiffCL_PkgNotExp {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

6
hotspot/test/runtime/modules/AccessCheck/DiffCL_Umod.java
View File

@ -92,7 +92,7 @@ public class DiffCL_Umod {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@ -141,7 +141,7 @@ public class DiffCL_Umod {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@ -190,7 +190,7 @@ public class DiffCL_Umod {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();

4
hotspot/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java
View File

@ -87,7 +87,7 @@ public class DiffCL_UmodUpkg {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();
@ -136,7 +136,7 @@ public class DiffCL_UmodUpkg {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MyDiffClassLoader.loader1 = new MyDiffClassLoader();
MyDiffClassLoader.loader2 = new MyDiffClassLoader();

2
hotspot/test/runtime/modules/AccessCheck/ExpQualOther.java
View File

@ -105,7 +105,7 @@ public class ExpQualOther {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/ExpQualToM1.java
View File

@ -81,7 +81,7 @@ public class ExpQualToM1 {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/ExpUnqual.java
View File

@ -81,7 +81,7 @@ public class ExpUnqual {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java
View File

@ -93,7 +93,7 @@ public class ExportAllUnnamed {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/PkgNotExp.java
View File

@ -91,7 +91,7 @@ public class PkgNotExp {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();

6
hotspot/test/runtime/modules/AccessCheck/Umod.java
View File

@ -92,7 +92,7 @@ public class Umod {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map module m1 to class loader.
// class c2 will be loaded in an unnamed module/loader.
@ -138,7 +138,7 @@ public class Umod {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MySameClassLoader loader = new MySameClassLoader();
// map module m1 to class loader.
@ -184,7 +184,7 @@ public class Umod {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MySameClassLoader loader = new MySameClassLoader();
// map module m1 to class loader.

2
hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java
View File

@ -92,7 +92,7 @@ public class UmodDiffCL_ExpQualOther {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java
View File

@ -92,7 +92,7 @@ public class UmodDiffCL_ExpUnqual {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java
View File

@ -91,7 +91,7 @@ public class UmodDiffCL_PkgNotExp {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

4
hotspot/test/runtime/modules/AccessCheck/UmodUPkg.java
View File

@ -87,7 +87,7 @@ public class UmodUPkg {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map module m1 to class loader.
// class c4 will be loaded in an unnamed module/loader.
@ -133,7 +133,7 @@ public class UmodUPkg {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
MySameClassLoader loader = new MySameClassLoader();
// map module m1 to class loader.

2
hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java
View File

@ -92,7 +92,7 @@ public class UmodUpkgDiffCL_ExpQualOther {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java
View File

@ -91,7 +91,7 @@ public class UmodUpkgDiffCL_NotExp {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java
View File

@ -101,7 +101,7 @@ public class UmodUpkg_ExpQualOther {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java
View File

@ -89,7 +89,7 @@ public class UmodUpkg_NotExp {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java
View File

@ -101,7 +101,7 @@ public class Umod_ExpQualOther {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java
View File

@ -91,7 +91,7 @@ public class Umod_ExpUnqual {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to differing class loaders for this test
Map<String, ClassLoader> map = new HashMap<>();

2
hotspot/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java
View File

@ -89,7 +89,7 @@ public class Umod_PkgNotExp {
// Resolves "m1"
Configuration cf = Layer.boot()
.configuration()
.resolveRequires(finder, ModuleFinder.empty(), Set.of("m1"));
.resolveRequires(finder, ModuleFinder.of(), Set.of("m1"));
// map each module to the same class loader for this test
Map<String, ClassLoader> map = new HashMap<>();