archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8209003: Consolidate use of empty collections in java.lang.module

Browse source 
Reviewed-by: alanb, mchung
This commit is contained in:
Claes Redestad 2018-08-07 23:08:52 +02:00
parent 3be8d256e9
commit db4913ba5a
14 changed files with 76 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/java.base/share/classes/java/lang/module/Configuration.java
View file

@ -31,7 +31,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@ -119,10 +118,10 @@ public final class Configuration {
String targetPlatform() { return targetPlatform; }
private Configuration() {
this.parents = Collections.emptyList();
this.graph = Collections.emptyMap();
this.modules = Collections.emptySet();
this.nameToModule = Collections.emptyMap();
this.parents = List.of();
this.graph = Map.of();
this.modules = Set.of();
this.nameToModule = Map.of();
this.targetPlatform = null;
}
@ -140,7 +139,7 @@ public final class Configuration {
i++;
}
this.parents = Collections.unmodifiableList(parents);
this.parents = List.copyOf(parents);
this.graph = g;
this.modules = Set.of(moduleArray);
this.nameToModule = Map.ofEntries(nameEntries);
@ -554,7 +553,7 @@ public final class Configuration {
Set<ModuleDescriptor> descriptors() {
if (modules.isEmpty()) {
return Collections.emptySet();
return Set.of();
} else {
return modules.stream()
.map(ResolvedModule::reference)
@ -596,7 +595,7 @@ public final class Configuration {
}
}
}
this.allConfigurations = Collections.unmodifiableList(allConfigurations);
this.allConfigurations = allConfigurations; // no need to do defensive copy
}
return allConfigurations.stream();
}