1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8243596: ModuleLayer::parents should return an unmodifiable list

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Alan Bateman 2020-05-07 14:44:09 +01:00
parent 93b0516d5d
commit f6dda95113
4 changed files with 90 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java.base/share/classes/java/lang/ModuleLayer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, 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
@ -489,7 +489,7 @@ public final class ModuleLayer {
List<ModuleLayer> parentLayers,
ClassLoader parentLoader)
{
List<ModuleLayer> parents = new ArrayList<>(parentLayers);
List<ModuleLayer> parents = List.copyOf(parentLayers);
checkConfiguration(cf, parents);
checkCreateClassLoaderPermission();
@ -565,7 +565,7 @@ public final class ModuleLayer {
List<ModuleLayer> parentLayers,
ClassLoader parentLoader)
{
List<ModuleLayer> parents = new ArrayList<>(parentLayers);
List<ModuleLayer> parents = List.copyOf(parentLayers);
checkConfiguration(cf, parents);
checkCreateClassLoaderPermission();
@ -649,7 +649,7 @@ public final class ModuleLayer {
List<ModuleLayer> parentLayers,
Function<String, ClassLoader> clf)
{
List<ModuleLayer> parents = new ArrayList<>(parentLayers);
List<ModuleLayer> parents = List.copyOf(parentLayers);
checkConfiguration(cf, parents);
Objects.requireNonNull(clf);
@ -752,13 +752,12 @@ public final class ModuleLayer {
return cf;
}
/**
* Returns the list of this layer's parents unless this is the
* {@linkplain #empty empty layer}, which has no parents and so an
* Returns an unmodifiable list of this layer's parents, in search
* order. If this is the {@linkplain #empty() empty layer} then an
* empty list is returned.
*
* @return The list of this layer's parents
* @return A possibly-empty unmodifiable list of this layer's parents
*/
public List<ModuleLayer> parents() {
return parents;
@ -803,7 +802,7 @@ public final class ModuleLayer {
private volatile List<ModuleLayer> allLayers;
/**
* Returns the set of the modules in this layer.
* Returns an unmodifiable set of the modules in this layer.
*
* @return A possibly-empty unmodifiable set of the modules in this layer
*/

6
src/java.base/share/classes/java/lang/module/Configuration.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, 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
@ -509,7 +509,7 @@ public final class Configuration {
/**
* Returns an unmodifiable list of this configuration's parents, in search
* order. If this is the {@linkplain #empty empty configuration} then an
* order. If this is the {@linkplain #empty() empty configuration} then an
* empty list is returned.
*
* @return A possibly-empty unmodifiable list of this parent configurations
@ -520,7 +520,7 @@ public final class Configuration {
/**
* Returns an immutable set of the resolved modules in this configuration.
* Returns an unmodifiable set of the resolved modules in this configuration.
*
* @return A possibly-empty unmodifiable set of the resolved modules
* in this configuration

46
test/jdk/java/lang/ModuleLayer/BasicLayerTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, 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
@ -1195,14 +1195,48 @@ public class BasicLayerTest {
}
// immutable sets
// unmodifiable collections
@Test(expectedExceptions = { UnsupportedOperationException.class })
public void testImmutableSet() {
Module base = Object.class.getModule();
ModuleLayer.boot().modules().add(base);
@DataProvider(name = "layers")
public Object[][] layers() {
Configuration cf = resolve(ModuleFinder.of());
ModuleLayer layer1 = ModuleLayer.empty().defineModulesWithOneLoader(cf, null);
ModuleLayer layer2 = ModuleLayer.empty().defineModulesWithManyLoaders(cf, null);
ModuleLayer layer3 = ModuleLayer.empty().defineModules(cf, mn -> null);
// empty, boot, and custom layers
return new Object[][] {
{ ModuleLayer.empty(), null },
{ ModuleLayer.boot(), null },
{ layer1, null },
{ layer2, null },
{ layer3, null },
};
}
@Test(dataProvider = "layers",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableParents1(ModuleLayer layer, Object ignore) {
layer.parents().add(ModuleLayer.empty());
}
@Test(dataProvider = "layers",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableParents2(ModuleLayer layer, Object ignore) {
layer.parents().remove(ModuleLayer.empty());
}
@Test(dataProvider = "layers",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableModules1(ModuleLayer layer, Object ignore) {
layer.modules().add(Object.class.getModule());
}
@Test(dataProvider = "layers",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableModules2(ModuleLayer layer, Object ignore) {
layer.modules().remove(Object.class.getModule());
}
/**
* Resolve the given modules, by name, and returns the resulting

51
test/jdk/java/lang/module/ConfigurationTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2020, 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
@ -2033,22 +2033,49 @@ public class ConfigurationTest {
Configuration.empty().findModule(null);
}
// immutable sets
// unmodifiable collections
@Test(expectedExceptions = { UnsupportedOperationException.class })
public void testImmutableSet1() {
Configuration cf = ModuleLayer.boot().configuration();
ResolvedModule base = cf.findModule("java.base").get();
cf.modules().add(base);
@DataProvider(name = "configurations")
public Object[][] configurations() {
// empty, boot, and custom configurations
return new Object[][] {
{ Configuration.empty(), null },
{ ModuleLayer.boot().configuration(), null },
{ resolve(ModuleFinder.of()), null },
};
}
@Test(expectedExceptions = { UnsupportedOperationException.class })
public void testImmutableSet2() {
Configuration cf = ModuleLayer.boot().configuration();
ResolvedModule base = cf.findModule("java.base").get();
base.reads().add(base);
@Test(dataProvider = "configurations",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableParents1(Configuration cf, Object ignore) {
cf.parents().add(Configuration.empty());
}
@Test(dataProvider = "configurations",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableParents2(Configuration cf, Object ignore) {
cf.parents().remove(Configuration.empty());
}
@Test(dataProvider = "configurations",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableModules1(Configuration cf, Object ignore) {
ResolvedModule module = ModuleLayer.boot()
.configuration()
.findModule("java.base")
.orElseThrow();
cf.modules().add(module);
}
@Test(dataProvider = "configurations",
expectedExceptions = { UnsupportedOperationException.class })
public void testUnmodifiableModules2(Configuration cf, Object ignore) {
ResolvedModule module = ModuleLayer.boot()
.configuration()
.findModule("java.base")
.orElseThrow();
cf.modules().remove(module);
}
/**
* Invokes parent.resolve(...)