author | prappo |
Wed, 30 Jan 2019 00:24:32 +0000 | |
changeset 53563 | a4b7ea85d668 |
parent 47866 | 39db80b32b69 |
child 59133 | 580fb715b29d |
permissions | -rw-r--r-- |
36511 | 1 |
/* |
53563 | 2 |
* Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. |
36511 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package java.lang.module; |
|
27 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
28 |
import java.io.PrintStream; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
29 |
import java.lang.module.ModuleDescriptor.Provides; |
36511 | 30 |
import java.lang.module.ModuleDescriptor.Requires.Modifier; |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
31 |
import java.net.URI; |
36511 | 32 |
import java.util.ArrayDeque; |
33 |
import java.util.ArrayList; |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
34 |
import java.util.Arrays; |
36511 | 35 |
import java.util.Collection; |
36 |
import java.util.Deque; |
|
37 |
import java.util.HashMap; |
|
38 |
import java.util.HashSet; |
|
39 |
import java.util.LinkedHashSet; |
|
40 |
import java.util.List; |
|
41 |
import java.util.Map; |
|
42 |
import java.util.Optional; |
|
43 |
import java.util.Set; |
|
44 |
import java.util.stream.Collectors; |
|
45 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
46 |
import jdk.internal.module.ModuleHashes; |
42703
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
47 |
import jdk.internal.module.ModuleReferenceImpl; |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
48 |
import jdk.internal.module.ModuleTarget; |
36511 | 49 |
|
50 |
/** |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
51 |
* The resolver used by {@link Configuration#resolve} and {@link |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
52 |
* Configuration#resolveAndBind}. |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
53 |
* |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
54 |
* @implNote The resolver is used at VM startup and so deliberately avoids |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
55 |
* using lambda and stream usages in code paths used during startup. |
36511 | 56 |
*/ |
57 |
||
58 |
final class Resolver { |
|
59 |
||
60 |
private final ModuleFinder beforeFinder; |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
61 |
private final List<Configuration> parents; |
36511 | 62 |
private final ModuleFinder afterFinder; |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
63 |
private final PrintStream traceOutput; |
36511 | 64 |
|
65 |
// maps module name to module reference |
|
66 |
private final Map<String, ModuleReference> nameToReference = new HashMap<>(); |
|
67 |
||
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
68 |
// true if all automatic modules have been found |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
69 |
private boolean haveAllAutomaticModules; |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
70 |
|
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
71 |
// constraint on target platform |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
72 |
private String targetPlatform; |
36511 | 73 |
|
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
74 |
String targetPlatform() { return targetPlatform; } |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
75 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
76 |
/** |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
77 |
* @throws IllegalArgumentException if there are more than one parent and |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
78 |
* the constraints on the target platform conflict |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
79 |
*/ |
36511 | 80 |
Resolver(ModuleFinder beforeFinder, |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
81 |
List<Configuration> parents, |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
82 |
ModuleFinder afterFinder, |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
83 |
PrintStream traceOutput) { |
36511 | 84 |
this.beforeFinder = beforeFinder; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
85 |
this.parents = parents; |
36511 | 86 |
this.afterFinder = afterFinder; |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
87 |
this.traceOutput = traceOutput; |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
88 |
|
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
89 |
// record constraint on target platform, checking for conflicts |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
90 |
for (Configuration parent : parents) { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
91 |
String value = parent.targetPlatform(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
92 |
if (value != null) { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
93 |
if (targetPlatform == null) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
94 |
targetPlatform = value; |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
95 |
} else { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
96 |
if (!value.equals(targetPlatform)) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
97 |
String msg = "Parents have conflicting constraints on target" + |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
98 |
" platform: " + targetPlatform + ", " + value; |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
99 |
throw new IllegalArgumentException(msg); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
100 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
101 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
102 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
103 |
} |
36511 | 104 |
} |
105 |
||
106 |
/** |
|
107 |
* Resolves the given named modules. |
|
108 |
* |
|
109 |
* @throws ResolutionException |
|
110 |
*/ |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
111 |
Resolver resolve(Collection<String> roots) { |
36511 | 112 |
|
113 |
// create the visit stack to get us started |
|
114 |
Deque<ModuleDescriptor> q = new ArrayDeque<>(); |
|
115 |
for (String root : roots) { |
|
116 |
||
117 |
// find root module |
|
118 |
ModuleReference mref = findWithBeforeFinder(root); |
|
119 |
if (mref == null) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
120 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
121 |
if (findInParent(root) != null) { |
36511 | 122 |
// in parent, nothing to do |
123 |
continue; |
|
124 |
} |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
125 |
|
36511 | 126 |
mref = findWithAfterFinder(root); |
127 |
if (mref == null) { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
128 |
findFail("Module %s not found", root); |
36511 | 129 |
} |
130 |
} |
|
131 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
132 |
if (isTracing()) { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
133 |
trace("root %s", nameAndInfo(mref)); |
36511 | 134 |
} |
135 |
||
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
136 |
addFoundModule(mref); |
36511 | 137 |
q.push(mref.descriptor()); |
138 |
} |
|
139 |
||
140 |
resolve(q); |
|
141 |
||
142 |
return this; |
|
143 |
} |
|
144 |
||
145 |
/** |
|
146 |
* Resolve all modules in the given queue. On completion the queue will be |
|
147 |
* empty and any resolved modules will be added to {@code nameToReference}. |
|
148 |
* |
|
149 |
* @return The set of module resolved by this invocation of resolve |
|
150 |
*/ |
|
151 |
private Set<ModuleDescriptor> resolve(Deque<ModuleDescriptor> q) { |
|
152 |
Set<ModuleDescriptor> resolved = new HashSet<>(); |
|
153 |
||
154 |
while (!q.isEmpty()) { |
|
155 |
ModuleDescriptor descriptor = q.poll(); |
|
156 |
assert nameToReference.containsKey(descriptor.name()); |
|
157 |
||
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
158 |
// if the module is an automatic module then all automatic |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
159 |
// modules need to be resolved |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
160 |
if (descriptor.isAutomatic() && !haveAllAutomaticModules) { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
161 |
addFoundAutomaticModules().forEach(mref -> { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
162 |
ModuleDescriptor other = mref.descriptor(); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
163 |
q.offer(other); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
164 |
if (isTracing()) { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
165 |
trace("%s requires %s", descriptor.name(), nameAndInfo(mref)); |
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
166 |
} |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
167 |
}); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
168 |
haveAllAutomaticModules = true; |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
169 |
} |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
170 |
|
36511 | 171 |
// process dependences |
172 |
for (ModuleDescriptor.Requires requires : descriptor.requires()) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
173 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
174 |
// only required at compile-time |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
175 |
if (requires.modifiers().contains(Modifier.STATIC)) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
176 |
continue; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
177 |
|
36511 | 178 |
String dn = requires.name(); |
179 |
||
180 |
// find dependence |
|
181 |
ModuleReference mref = findWithBeforeFinder(dn); |
|
182 |
if (mref == null) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
183 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
184 |
if (findInParent(dn) != null) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
185 |
// dependence is in parent |
36511 | 186 |
continue; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
187 |
} |
36511 | 188 |
|
189 |
mref = findWithAfterFinder(dn); |
|
190 |
if (mref == null) { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
191 |
findFail("Module %s not found, required by %s", |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
192 |
dn, descriptor.name()); |
36511 | 193 |
} |
194 |
} |
|
195 |
||
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
196 |
if (isTracing() && !dn.equals("java.base")) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
197 |
trace("%s requires %s", descriptor.name(), nameAndInfo(mref)); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
198 |
} |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
199 |
|
36511 | 200 |
if (!nameToReference.containsKey(dn)) { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
201 |
addFoundModule(mref); |
36511 | 202 |
q.offer(mref.descriptor()); |
203 |
} |
|
204 |
||
205 |
} |
|
206 |
||
207 |
resolved.add(descriptor); |
|
208 |
} |
|
209 |
||
210 |
return resolved; |
|
211 |
} |
|
212 |
||
213 |
/** |
|
214 |
* Augments the set of resolved modules with modules induced by the |
|
215 |
* service-use relation. |
|
216 |
*/ |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
217 |
Resolver bind() { |
36511 | 218 |
|
219 |
// Scan the finders for all available service provider modules. As |
|
47866
39db80b32b69
8191632: Typos in comments due to duplicating words
igerasim
parents:
47216
diff
changeset
|
220 |
// java.base uses services then the module finders will be scanned |
36511 | 221 |
// anyway. |
222 |
Map<String, Set<ModuleReference>> availableProviders = new HashMap<>(); |
|
223 |
for (ModuleReference mref : findAll()) { |
|
224 |
ModuleDescriptor descriptor = mref.descriptor(); |
|
225 |
if (!descriptor.provides().isEmpty()) { |
|
226 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
227 |
for (Provides provides : descriptor.provides()) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
228 |
String sn = provides.service(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
229 |
|
36511 | 230 |
// computeIfAbsent |
231 |
Set<ModuleReference> providers = availableProviders.get(sn); |
|
232 |
if (providers == null) { |
|
233 |
providers = new HashSet<>(); |
|
234 |
availableProviders.put(sn, providers); |
|
235 |
} |
|
236 |
providers.add(mref); |
|
237 |
} |
|
238 |
||
239 |
} |
|
240 |
} |
|
241 |
||
242 |
// create the visit stack |
|
243 |
Deque<ModuleDescriptor> q = new ArrayDeque<>(); |
|
244 |
||
245 |
// the initial set of modules that may use services |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
246 |
Set<ModuleDescriptor> initialConsumers; |
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
247 |
if (ModuleLayer.boot() == null) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
248 |
initialConsumers = new HashSet<>(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
249 |
} else { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
250 |
initialConsumers = parents.stream() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
251 |
.flatMap(Configuration::configurations) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
252 |
.distinct() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
253 |
.flatMap(c -> c.descriptors().stream()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
254 |
.collect(Collectors.toSet()); |
36511 | 255 |
} |
256 |
for (ModuleReference mref : nameToReference.values()) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
257 |
initialConsumers.add(mref.descriptor()); |
36511 | 258 |
} |
259 |
||
260 |
// Where there is a consumer of a service then resolve all modules |
|
261 |
// that provide an implementation of that service |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
262 |
Set<ModuleDescriptor> candidateConsumers = initialConsumers; |
36511 | 263 |
do { |
264 |
for (ModuleDescriptor descriptor : candidateConsumers) { |
|
265 |
if (!descriptor.uses().isEmpty()) { |
|
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
266 |
|
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
267 |
// the modules that provide at least one service |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
268 |
Set<ModuleDescriptor> modulesToBind = null; |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
269 |
if (isTracing()) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
270 |
modulesToBind = new HashSet<>(); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
271 |
} |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
272 |
|
36511 | 273 |
for (String service : descriptor.uses()) { |
274 |
Set<ModuleReference> mrefs = availableProviders.get(service); |
|
275 |
if (mrefs != null) { |
|
276 |
for (ModuleReference mref : mrefs) { |
|
277 |
ModuleDescriptor provider = mref.descriptor(); |
|
278 |
if (!provider.equals(descriptor)) { |
|
279 |
||
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
280 |
if (isTracing() && modulesToBind.add(provider)) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
281 |
trace("%s binds %s", descriptor.name(), |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
282 |
nameAndInfo(mref)); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
283 |
} |
36511 | 284 |
|
285 |
String pn = provider.name(); |
|
286 |
if (!nameToReference.containsKey(pn)) { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
287 |
addFoundModule(mref); |
36511 | 288 |
q.push(provider); |
289 |
} |
|
290 |
} |
|
291 |
} |
|
292 |
} |
|
293 |
} |
|
294 |
} |
|
295 |
} |
|
296 |
||
297 |
candidateConsumers = resolve(q); |
|
298 |
} while (!candidateConsumers.isEmpty()); |
|
299 |
||
300 |
return this; |
|
301 |
} |
|
302 |
||
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
303 |
/** |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
304 |
* Add all automatic modules that have not already been found to the |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
305 |
* nameToReference map. |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
306 |
*/ |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
307 |
private Set<ModuleReference> addFoundAutomaticModules() { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
308 |
Set<ModuleReference> result = new HashSet<>(); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
309 |
findAll().forEach(mref -> { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
310 |
String mn = mref.descriptor().name(); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
311 |
if (mref.descriptor().isAutomatic() && !nameToReference.containsKey(mn)) { |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
312 |
addFoundModule(mref); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
313 |
result.add(mref); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
314 |
} |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
315 |
}); |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
316 |
return result; |
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
317 |
} |
36511 | 318 |
|
319 |
/** |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
320 |
* Add the module to the nameToReference map. Also check any constraints on |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
321 |
* the target platform with the constraints of other modules. |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
322 |
*/ |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
323 |
private void addFoundModule(ModuleReference mref) { |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
324 |
String mn = mref.descriptor().name(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
325 |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
326 |
if (mref instanceof ModuleReferenceImpl) { |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
327 |
ModuleTarget target = ((ModuleReferenceImpl)mref).moduleTarget(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
328 |
if (target != null) |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
329 |
checkTargetPlatform(mn, target); |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
330 |
} |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
331 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
332 |
nameToReference.put(mn, mref); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
333 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
334 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
335 |
/** |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
336 |
* Check that the module's constraints on the target platform does |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
337 |
* conflict with the constraint of other modules resolved so far. |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
338 |
*/ |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
339 |
private void checkTargetPlatform(String mn, ModuleTarget target) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
340 |
String value = target.targetPlatform(); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
341 |
if (value != null) { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
342 |
if (targetPlatform == null) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
343 |
targetPlatform = value; |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
344 |
} else { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
345 |
if (!value.equals(targetPlatform)) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
346 |
findFail("Module %s has constraints on target platform (%s)" |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
347 |
+ " that conflict with other modules: %s", mn, |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
348 |
value, targetPlatform); |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
349 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
350 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
351 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
352 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
353 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
354 |
/** |
36511 | 355 |
* Execute post-resolution checks and returns the module graph of resolved |
46096
62c77b334012
8185853: Generate readability graph at link time and other startup improvements
alanb
parents:
45004
diff
changeset
|
356 |
* modules as a map. |
36511 | 357 |
*/ |
46096
62c77b334012
8185853: Generate readability graph at link time and other startup improvements
alanb
parents:
45004
diff
changeset
|
358 |
Map<ResolvedModule, Set<ResolvedModule>> finish(Configuration cf) { |
62c77b334012
8185853: Generate readability graph at link time and other startup improvements
alanb
parents:
45004
diff
changeset
|
359 |
detectCycles(); |
62c77b334012
8185853: Generate readability graph at link time and other startup improvements
alanb
parents:
45004
diff
changeset
|
360 |
checkHashes(); |
36511 | 361 |
Map<ResolvedModule, Set<ResolvedModule>> graph = makeGraph(cf); |
46096
62c77b334012
8185853: Generate readability graph at link time and other startup improvements
alanb
parents:
45004
diff
changeset
|
362 |
checkExportSuppliers(graph); |
36511 | 363 |
return graph; |
364 |
} |
|
365 |
||
366 |
/** |
|
367 |
* Checks the given module graph for cycles. |
|
368 |
* |
|
369 |
* For now the implementation is a simple depth first search on the |
|
370 |
* dependency graph. We'll replace this later, maybe with Tarjan. |
|
371 |
*/ |
|
372 |
private void detectCycles() { |
|
373 |
visited = new HashSet<>(); |
|
374 |
visitPath = new LinkedHashSet<>(); // preserve insertion order |
|
375 |
for (ModuleReference mref : nameToReference.values()) { |
|
376 |
visit(mref.descriptor()); |
|
377 |
} |
|
378 |
visited.clear(); |
|
379 |
} |
|
380 |
||
381 |
// the modules that were visited |
|
382 |
private Set<ModuleDescriptor> visited; |
|
383 |
||
384 |
// the modules in the current visit path |
|
385 |
private Set<ModuleDescriptor> visitPath; |
|
386 |
||
387 |
private void visit(ModuleDescriptor descriptor) { |
|
388 |
if (!visited.contains(descriptor)) { |
|
389 |
boolean added = visitPath.add(descriptor); |
|
390 |
if (!added) { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
391 |
resolveFail("Cycle detected: %s", cycleAsString(descriptor)); |
36511 | 392 |
} |
393 |
for (ModuleDescriptor.Requires requires : descriptor.requires()) { |
|
394 |
String dn = requires.name(); |
|
395 |
||
396 |
ModuleReference mref = nameToReference.get(dn); |
|
397 |
if (mref != null) { |
|
398 |
ModuleDescriptor other = mref.descriptor(); |
|
399 |
if (other != descriptor) { |
|
400 |
// dependency is in this configuration |
|
401 |
visit(other); |
|
402 |
} |
|
403 |
} |
|
404 |
} |
|
405 |
visitPath.remove(descriptor); |
|
406 |
visited.add(descriptor); |
|
407 |
} |
|
408 |
} |
|
409 |
||
410 |
/** |
|
411 |
* Returns a String with a list of the modules in a detected cycle. |
|
412 |
*/ |
|
413 |
private String cycleAsString(ModuleDescriptor descriptor) { |
|
414 |
List<ModuleDescriptor> list = new ArrayList<>(visitPath); |
|
415 |
list.add(descriptor); |
|
416 |
int index = list.indexOf(descriptor); |
|
417 |
return list.stream() |
|
418 |
.skip(index) |
|
419 |
.map(ModuleDescriptor::name) |
|
420 |
.collect(Collectors.joining(" -> ")); |
|
421 |
} |
|
422 |
||
423 |
||
424 |
/** |
|
425 |
* Checks the hashes in the module descriptor to ensure that they match |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
426 |
* any recorded hashes. |
36511 | 427 |
*/ |
428 |
private void checkHashes() { |
|
429 |
for (ModuleReference mref : nameToReference.values()) { |
|
430 |
||
42703
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
431 |
// get the recorded hashes, if any |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
432 |
if (!(mref instanceof ModuleReferenceImpl)) |
36511 | 433 |
continue; |
42703
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
434 |
ModuleHashes hashes = ((ModuleReferenceImpl)mref).recordedHashes(); |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
435 |
if (hashes == null) |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
436 |
continue; |
36511 | 437 |
|
42703
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
438 |
ModuleDescriptor descriptor = mref.descriptor(); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
439 |
String algorithm = hashes.algorithm(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
440 |
for (String dn : hashes.names()) { |
42703
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
441 |
ModuleReference mref2 = nameToReference.get(dn); |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
442 |
if (mref2 == null) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
443 |
ResolvedModule resolvedModule = findInParent(dn); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
444 |
if (resolvedModule != null) |
42703
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
445 |
mref2 = resolvedModule.reference(); |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
446 |
} |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
447 |
if (mref2 == null) |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
448 |
continue; |
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
449 |
|
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
450 |
if (!(mref2 instanceof ModuleReferenceImpl)) { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
451 |
findFail("Unable to compute the hash of module %s", dn); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
452 |
} |
36511 | 453 |
|
42703
20c39ea4a507
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42338
diff
changeset
|
454 |
ModuleReferenceImpl other = (ModuleReferenceImpl)mref2; |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
455 |
if (other != null) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
456 |
byte[] recordedHash = hashes.hashFor(dn); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
457 |
byte[] actualHash = other.computeHash(algorithm); |
36511 | 458 |
if (actualHash == null) |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
459 |
findFail("Unable to compute the hash of module %s", dn); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
460 |
if (!Arrays.equals(recordedHash, actualHash)) { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
461 |
findFail("Hash of %s (%s) differs to expected hash (%s)" + |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
462 |
" recorded in %s", dn, toHexString(actualHash), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
463 |
toHexString(recordedHash), descriptor.name()); |
36511 | 464 |
} |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
465 |
} |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
466 |
} |
36511 | 467 |
|
468 |
} |
|
469 |
} |
|
470 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
471 |
private static String toHexString(byte[] ba) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
472 |
StringBuilder sb = new StringBuilder(ba.length * 2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
473 |
for (byte b: ba) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
474 |
sb.append(String.format("%02x", b & 0xff)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
475 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
476 |
return sb.toString(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
477 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
478 |
|
36511 | 479 |
|
480 |
/** |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
481 |
* Computes the readability graph for the modules in the given Configuration. |
36511 | 482 |
* |
483 |
* The readability graph is created by propagating "requires" through the |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
484 |
* "requires transitive" edges of the module dependence graph. So if the |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
485 |
* module dependence graph has m1 requires m2 && m2 requires transitive m3 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
486 |
* then the resulting readability graph will contain m1 reads m2, m1 reads m3, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
487 |
* and m2 reads m3. |
36511 | 488 |
*/ |
489 |
private Map<ResolvedModule, Set<ResolvedModule>> makeGraph(Configuration cf) { |
|
490 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
491 |
// initial capacity of maps to avoid resizing |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
492 |
int capacity = 1 + (4 * nameToReference.size())/ 3; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
493 |
|
36511 | 494 |
// the "reads" graph starts as a module dependence graph and |
495 |
// is iteratively updated to be the readability graph |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
496 |
Map<ResolvedModule, Set<ResolvedModule>> g1 = new HashMap<>(capacity); |
36511 | 497 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
498 |
// the "requires transitive" graph, contains requires transitive edges only |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
499 |
Map<ResolvedModule, Set<ResolvedModule>> g2; |
36511 | 500 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
501 |
// need "requires transitive" from the modules in parent configurations |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
502 |
// as there may be selected modules that have a dependency on modules in |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
503 |
// the parent configuration. |
44545
83b611b88ac8
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44359
diff
changeset
|
504 |
if (ModuleLayer.boot() == null) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
505 |
g2 = new HashMap<>(capacity); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
506 |
} else { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
507 |
g2 = parents.stream() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
508 |
.flatMap(Configuration::configurations) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
509 |
.distinct() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
510 |
.flatMap(c -> |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
511 |
c.modules().stream().flatMap(m1 -> |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
512 |
m1.descriptor().requires().stream() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
513 |
.filter(r -> r.modifiers().contains(Modifier.TRANSITIVE)) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
514 |
.flatMap(r -> { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
515 |
Optional<ResolvedModule> m2 = c.findModule(r.name()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
516 |
assert m2.isPresent() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
517 |
|| r.modifiers().contains(Modifier.STATIC); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
518 |
return m2.stream(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
519 |
}) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
520 |
.map(m2 -> Map.entry(m1, m2)) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
521 |
) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
522 |
) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
523 |
// stream of m1->m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
524 |
.collect(Collectors.groupingBy(Map.Entry::getKey, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
525 |
HashMap::new, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
526 |
Collectors.mapping(Map.Entry::getValue, Collectors.toSet()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
527 |
)); |
36511 | 528 |
} |
529 |
||
530 |
// populate g1 and g2 with the dependences from the selected modules |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
531 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
532 |
Map<String, ResolvedModule> nameToResolved = new HashMap<>(capacity); |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
533 |
|
36511 | 534 |
for (ModuleReference mref : nameToReference.values()) { |
535 |
ModuleDescriptor descriptor = mref.descriptor(); |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
536 |
String name = descriptor.name(); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
537 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
538 |
ResolvedModule m1 = computeIfAbsent(nameToResolved, name, cf, mref); |
36511 | 539 |
|
540 |
Set<ResolvedModule> reads = new HashSet<>(); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
541 |
Set<ResolvedModule> requiresTransitive = new HashSet<>(); |
36511 | 542 |
|
543 |
for (ModuleDescriptor.Requires requires : descriptor.requires()) { |
|
544 |
String dn = requires.name(); |
|
545 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
546 |
ResolvedModule m2 = null; |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
547 |
ModuleReference mref2 = nameToReference.get(dn); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
548 |
if (mref2 != null) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
549 |
// same configuration |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
550 |
m2 = computeIfAbsent(nameToResolved, dn, cf, mref2); |
36511 | 551 |
} else { |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
552 |
// parent configuration |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
553 |
m2 = findInParent(dn); |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
554 |
if (m2 == null) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
555 |
assert requires.modifiers().contains(Modifier.STATIC); |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
556 |
continue; |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
557 |
} |
36511 | 558 |
} |
559 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
560 |
// m1 requires m2 => m1 reads m2 |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
561 |
reads.add(m2); |
36511 | 562 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
563 |
// m1 requires transitive m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
564 |
if (requires.modifiers().contains(Modifier.TRANSITIVE)) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
565 |
requiresTransitive.add(m2); |
36511 | 566 |
} |
567 |
||
568 |
} |
|
569 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
570 |
// automatic modules read all selected modules and all modules |
36511 | 571 |
// in parent configurations |
572 |
if (descriptor.isAutomatic()) { |
|
573 |
||
574 |
// reads all selected modules |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
575 |
// `requires transitive` all selected automatic modules |
36511 | 576 |
for (ModuleReference mref2 : nameToReference.values()) { |
577 |
ModuleDescriptor descriptor2 = mref2.descriptor(); |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
578 |
String name2 = descriptor2.name(); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
579 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
580 |
if (!name.equals(name2)) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
581 |
ResolvedModule m2 |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
582 |
= computeIfAbsent(nameToResolved, name2, cf, mref2); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
583 |
reads.add(m2); |
36511 | 584 |
if (descriptor2.isAutomatic()) |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
585 |
requiresTransitive.add(m2); |
36511 | 586 |
} |
587 |
} |
|
588 |
||
589 |
// reads all modules in parent configurations |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
590 |
// `requires transitive` all automatic modules in parent |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
591 |
// configurations |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
592 |
for (Configuration parent : parents) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
593 |
parent.configurations() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
594 |
.map(Configuration::modules) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
595 |
.flatMap(Set::stream) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
596 |
.forEach(m -> { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
597 |
reads.add(m); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
598 |
if (m.reference().descriptor().isAutomatic()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
599 |
requiresTransitive.add(m); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
600 |
}); |
36511 | 601 |
} |
602 |
} |
|
603 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
604 |
g1.put(m1, reads); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
605 |
g2.put(m1, requiresTransitive); |
36511 | 606 |
} |
607 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
608 |
// Iteratively update g1 until there are no more requires transitive |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
609 |
// to propagate |
36511 | 610 |
boolean changed; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
611 |
List<ResolvedModule> toAdd = new ArrayList<>(); |
36511 | 612 |
do { |
613 |
changed = false; |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
614 |
for (Set<ResolvedModule> m1Reads : g1.values()) { |
36511 | 615 |
for (ResolvedModule m2 : m1Reads) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
616 |
Set<ResolvedModule> m2RequiresTransitive = g2.get(m2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
617 |
if (m2RequiresTransitive != null) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
618 |
for (ResolvedModule m3 : m2RequiresTransitive) { |
36511 | 619 |
if (!m1Reads.contains(m3)) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
620 |
// m1 reads m2, m2 requires transitive m3 |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
621 |
// => need to add m1 reads m3 |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
622 |
toAdd.add(m3); |
36511 | 623 |
} |
624 |
} |
|
625 |
} |
|
626 |
} |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
627 |
if (!toAdd.isEmpty()) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
628 |
m1Reads.addAll(toAdd); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
629 |
toAdd.clear(); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
630 |
changed = true; |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
631 |
} |
36511 | 632 |
} |
633 |
} while (changed); |
|
634 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
635 |
return g1; |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
636 |
} |
36511 | 637 |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
638 |
/** |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
639 |
* Equivalent to |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
640 |
* <pre>{@code |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
641 |
* map.computeIfAbsent(name, k -> new ResolvedModule(cf, mref)) |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
642 |
* </pre>} |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
643 |
*/ |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
644 |
private ResolvedModule computeIfAbsent(Map<String, ResolvedModule> map, |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
645 |
String name, |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
646 |
Configuration cf, |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
647 |
ModuleReference mref) |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
648 |
{ |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
649 |
ResolvedModule m = map.get(name); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
650 |
if (m == null) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
651 |
m = new ResolvedModule(cf, mref); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
652 |
map.put(name, m); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
653 |
} |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
654 |
return m; |
36511 | 655 |
} |
656 |
||
657 |
||
658 |
/** |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
659 |
* Checks the readability graph to ensure that |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
660 |
* <ol> |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
661 |
* <li><p> A module does not read two or more modules with the same name. |
53563 | 662 |
* This includes the case where a module reads another module with the |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
663 |
* same name as itself. </p></li> |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
664 |
* <li><p> Two or more modules in the configuration don't export the same |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
665 |
* package to a module that reads both. This includes the case where a |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
666 |
* module {@code M} containing package {@code p} reads another module |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
667 |
* that exports {@code p} to {@code M}. </p></li> |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
668 |
* <li><p> A module {@code M} doesn't declare that it "{@code uses p.S}" |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
669 |
* or "{@code provides p.S with ...}" but package {@code p} is neither |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
670 |
* in module {@code M} nor exported to {@code M} by any module that |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
671 |
* {@code M} reads. </p></li> |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
672 |
* </ol> |
36511 | 673 |
*/ |
674 |
private void checkExportSuppliers(Map<ResolvedModule, Set<ResolvedModule>> graph) { |
|
675 |
||
676 |
for (Map.Entry<ResolvedModule, Set<ResolvedModule>> e : graph.entrySet()) { |
|
677 |
ModuleDescriptor descriptor1 = e.getKey().descriptor(); |
|
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
678 |
String name1 = descriptor1.name(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
679 |
|
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
680 |
// the names of the modules that are read (including self) |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
681 |
Set<String> names = new HashSet<>(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
682 |
names.add(name1); |
36511 | 683 |
|
684 |
// the map of packages that are local or exported to descriptor1 |
|
685 |
Map<String, ModuleDescriptor> packageToExporter = new HashMap<>(); |
|
686 |
||
687 |
// local packages |
|
688 |
Set<String> packages = descriptor1.packages(); |
|
689 |
for (String pn : packages) { |
|
690 |
packageToExporter.put(pn, descriptor1); |
|
691 |
} |
|
692 |
||
693 |
// descriptor1 reads descriptor2 |
|
694 |
Set<ResolvedModule> reads = e.getValue(); |
|
695 |
for (ResolvedModule endpoint : reads) { |
|
696 |
ModuleDescriptor descriptor2 = endpoint.descriptor(); |
|
697 |
||
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
698 |
String name2 = descriptor2.name(); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
699 |
if (descriptor2 != descriptor1 && !names.add(name2)) { |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
700 |
if (name2.equals(name1)) { |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
701 |
resolveFail("Module %s reads another module named %s", |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
702 |
name1, name1); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
703 |
} else{ |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
704 |
resolveFail("Module %s reads more than one module named %s", |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
705 |
name1, name2); |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
706 |
} |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
707 |
} |
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
708 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
709 |
if (descriptor2.isAutomatic()) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
710 |
// automatic modules read self and export all packages |
44359
c6761862ca0b
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43712
diff
changeset
|
711 |
if (descriptor2 != descriptor1) { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
712 |
for (String source : descriptor2.packages()) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
713 |
ModuleDescriptor supplier |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
714 |
= packageToExporter.putIfAbsent(source, descriptor2); |
36511 | 715 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
716 |
// descriptor2 and 'supplier' export source to descriptor1 |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
717 |
if (supplier != null) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
718 |
failTwoSuppliers(descriptor1, source, descriptor2, supplier); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
719 |
} |
36511 | 720 |
} |
721 |
||
722 |
} |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
723 |
} else { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
724 |
for (ModuleDescriptor.Exports export : descriptor2.exports()) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
725 |
if (export.isQualified()) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
726 |
if (!export.targets().contains(descriptor1.name())) |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
727 |
continue; |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
728 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
729 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
730 |
// source is exported by descriptor2 |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
731 |
String source = export.source(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
732 |
ModuleDescriptor supplier |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
733 |
= packageToExporter.putIfAbsent(source, descriptor2); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
734 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
735 |
// descriptor2 and 'supplier' export source to descriptor1 |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
736 |
if (supplier != null) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
737 |
failTwoSuppliers(descriptor1, source, descriptor2, supplier); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
738 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
739 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
740 |
|
36511 | 741 |
} |
742 |
} |
|
743 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
744 |
// uses/provides checks not applicable to automatic modules |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
745 |
if (!descriptor1.isAutomatic()) { |
36511 | 746 |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
747 |
// uses S |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
748 |
for (String service : descriptor1.uses()) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
749 |
String pn = packageName(service); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
750 |
if (!packageToExporter.containsKey(pn)) { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
751 |
resolveFail("Module %s does not read a module that exports %s", |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
752 |
descriptor1.name(), pn); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
753 |
} |
36511 | 754 |
} |
755 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
756 |
// provides S |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
757 |
for (ModuleDescriptor.Provides provides : descriptor1.provides()) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
758 |
String pn = packageName(provides.service()); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
759 |
if (!packageToExporter.containsKey(pn)) { |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
760 |
resolveFail("Module %s does not read a module that exports %s", |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
761 |
descriptor1.name(), pn); |
36511 | 762 |
} |
763 |
} |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
764 |
|
36511 | 765 |
} |
766 |
||
767 |
} |
|
768 |
||
769 |
} |
|
770 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
771 |
/** |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
772 |
* Fail because a module in the configuration exports the same package to |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
773 |
* a module that reads both. This includes the case where a module M |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
774 |
* containing a package p reads another module that exports p to at least |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
775 |
* module M. |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
776 |
*/ |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
777 |
private void failTwoSuppliers(ModuleDescriptor descriptor, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
778 |
String source, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
779 |
ModuleDescriptor supplier1, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
780 |
ModuleDescriptor supplier2) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
781 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
782 |
if (supplier2 == descriptor) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
783 |
ModuleDescriptor tmp = supplier1; |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
784 |
supplier1 = supplier2; |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
785 |
supplier2 = tmp; |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
786 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
787 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
788 |
if (supplier1 == descriptor) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
789 |
resolveFail("Module %s contains package %s" |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
790 |
+ ", module %s exports package %s to %s", |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
791 |
descriptor.name(), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
792 |
source, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
793 |
supplier2.name(), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
794 |
source, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
795 |
descriptor.name()); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
796 |
} else { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
797 |
resolveFail("Modules %s and %s export package %s to module %s", |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
798 |
supplier1.name(), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
799 |
supplier2.name(), |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
800 |
source, |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
801 |
descriptor.name()); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
802 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
803 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
804 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
805 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
806 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
807 |
/** |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
808 |
* Find a module of the given name in the parent configurations |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
809 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
810 |
private ResolvedModule findInParent(String mn) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
811 |
for (Configuration parent : parents) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
812 |
Optional<ResolvedModule> om = parent.findModule(mn); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
813 |
if (om.isPresent()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
814 |
return om.get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
815 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
816 |
return null; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
817 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
818 |
|
36511 | 819 |
|
820 |
/** |
|
821 |
* Invokes the beforeFinder to find method to find the given module. |
|
822 |
*/ |
|
823 |
private ModuleReference findWithBeforeFinder(String mn) { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
824 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
825 |
return beforeFinder.find(mn).orElse(null); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
826 |
|
36511 | 827 |
} |
828 |
||
829 |
/** |
|
830 |
* Invokes the afterFinder to find method to find the given module. |
|
831 |
*/ |
|
832 |
private ModuleReference findWithAfterFinder(String mn) { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
833 |
return afterFinder.find(mn).orElse(null); |
36511 | 834 |
} |
835 |
||
836 |
/** |
|
837 |
* Returns the set of all modules that are observable with the before |
|
838 |
* and after ModuleFinders. |
|
839 |
*/ |
|
840 |
private Set<ModuleReference> findAll() { |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
841 |
Set<ModuleReference> beforeModules = beforeFinder.findAll(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
842 |
Set<ModuleReference> afterModules = afterFinder.findAll(); |
36511 | 843 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
844 |
if (afterModules.isEmpty()) |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
845 |
return beforeModules; |
36511 | 846 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
847 |
if (beforeModules.isEmpty() |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
848 |
&& parents.size() == 1 |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
849 |
&& parents.get(0) == Configuration.empty()) |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
850 |
return afterModules; |
36511 | 851 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
852 |
Set<ModuleReference> result = new HashSet<>(beforeModules); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
853 |
for (ModuleReference mref : afterModules) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
854 |
String name = mref.descriptor().name(); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
855 |
if (!beforeFinder.find(name).isPresent() |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
856 |
&& findInParent(name) == null) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
857 |
result.add(mref); |
36511 | 858 |
} |
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
859 |
} |
36511 | 860 |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
861 |
return result; |
36511 | 862 |
} |
863 |
||
864 |
/** |
|
865 |
* Returns the package name |
|
866 |
*/ |
|
867 |
private static String packageName(String cn) { |
|
868 |
int index = cn.lastIndexOf("."); |
|
869 |
return (index == -1) ? "" : cn.substring(0, index); |
|
870 |
} |
|
871 |
||
872 |
/** |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
873 |
* Throw FindException with the given format string and arguments |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
874 |
*/ |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
875 |
private static void findFail(String fmt, Object ... args) { |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
876 |
String msg = String.format(fmt, args); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
877 |
throw new FindException(msg); |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
878 |
} |
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
879 |
|
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
880 |
/** |
36511 | 881 |
* Throw ResolutionException with the given format string and arguments |
882 |
*/ |
|
43712
5dfd0950317c
8173393: Module system implementation refresh (2/2017)
alanb
parents:
42703
diff
changeset
|
883 |
private static void resolveFail(String fmt, Object ... args) { |
36511 | 884 |
String msg = String.format(fmt, args); |
885 |
throw new ResolutionException(msg); |
|
886 |
} |
|
887 |
||
888 |
/** |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
889 |
* Tracing support |
36511 | 890 |
*/ |
891 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
892 |
private boolean isTracing() { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
893 |
return traceOutput != null; |
36511 | 894 |
} |
895 |
||
896 |
private void trace(String fmt, Object ... args) { |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
897 |
if (traceOutput != null) { |
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
898 |
traceOutput.format(fmt, args); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
899 |
traceOutput.println(); |
36511 | 900 |
} |
901 |
} |
|
902 |
||
45004
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
903 |
private String nameAndInfo(ModuleReference mref) { |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
904 |
ModuleDescriptor descriptor = mref.descriptor(); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
905 |
StringBuilder sb = new StringBuilder(descriptor.name()); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
906 |
mref.location().ifPresent(uri -> sb.append(" " + uri)); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
907 |
if (descriptor.isAutomatic()) |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
908 |
sb.append(" automatic"); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
909 |
return sb.toString(); |
ea3137042a61
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44545
diff
changeset
|
910 |
} |
36511 | 911 |
} |