author | sdrach |
Tue, 19 Jul 2016 10:05:22 -0700 | |
changeset 39758 | 28c2c63fc09f |
parent 39646 | 2bf99fe5023b |
child 41352 | f9844bad9052 |
permissions | -rw-r--r-- |
36511 | 1 |
/* |
2 |
* Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved. |
|
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 |
||
28 |
import java.io.BufferedInputStream; |
|
29 |
import java.io.BufferedReader; |
|
30 |
import java.io.File; |
|
31 |
import java.io.IOException; |
|
32 |
import java.io.InputStream; |
|
33 |
import java.io.InputStreamReader; |
|
34 |
import java.io.UncheckedIOException; |
|
35 |
import java.lang.module.ModuleDescriptor.Requires; |
|
36 |
import java.nio.file.DirectoryStream; |
|
37 |
import java.nio.file.Files; |
|
38 |
import java.nio.file.NoSuchFileException; |
|
39 |
import java.nio.file.Path; |
|
40 |
import java.nio.file.attribute.BasicFileAttributes; |
|
41 |
import java.util.Collections; |
|
42 |
import java.util.HashMap; |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
43 |
import java.util.LinkedHashSet; |
36511 | 44 |
import java.util.Map; |
45 |
import java.util.Objects; |
|
46 |
import java.util.Optional; |
|
47 |
import java.util.Set; |
|
48 |
import java.util.jar.Attributes; |
|
49 |
import java.util.jar.JarEntry; |
|
50 |
import java.util.jar.JarFile; |
|
51 |
import java.util.jar.Manifest; |
|
52 |
import java.util.regex.Matcher; |
|
53 |
import java.util.regex.Pattern; |
|
54 |
import java.util.stream.Collectors; |
|
39758
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
55 |
import java.util.stream.Stream; |
36511 | 56 |
import java.util.zip.ZipEntry; |
57 |
import java.util.zip.ZipFile; |
|
58 |
||
59 |
import jdk.internal.module.ConfigurableModuleFinder; |
|
60 |
import jdk.internal.perf.PerfCounter; |
|
61 |
||
62 |
||
63 |
/** |
|
64 |
* A {@code ModuleFinder} that locates modules on the file system by searching |
|
65 |
* a sequence of directories or packaged modules. |
|
66 |
* |
|
67 |
* The {@code ModuleFinder} can be configured to work in either the run-time |
|
68 |
* or link-time phases. In both cases it locates modular JAR and exploded |
|
69 |
* modules. When configured for link-time then it additionally locates |
|
70 |
* modules in JMOD files. |
|
71 |
*/ |
|
72 |
||
73 |
class ModulePath implements ConfigurableModuleFinder { |
|
74 |
private static final String MODULE_INFO = "module-info.class"; |
|
75 |
||
76 |
// the entries on this module path |
|
77 |
private final Path[] entries; |
|
78 |
private int next; |
|
79 |
||
80 |
// true if in the link phase |
|
81 |
private boolean isLinkPhase; |
|
82 |
||
83 |
// map of module name to module reference map for modules already located |
|
84 |
private final Map<String, ModuleReference> cachedModules = new HashMap<>(); |
|
85 |
||
86 |
ModulePath(Path... entries) { |
|
87 |
this.entries = entries.clone(); |
|
88 |
for (Path entry : this.entries) { |
|
89 |
Objects.requireNonNull(entry); |
|
90 |
} |
|
91 |
} |
|
92 |
||
93 |
@Override |
|
94 |
public void configurePhase(Phase phase) { |
|
95 |
isLinkPhase = (phase == Phase.LINK_TIME); |
|
96 |
} |
|
97 |
||
98 |
@Override |
|
99 |
public Optional<ModuleReference> find(String name) { |
|
100 |
Objects.requireNonNull(name); |
|
101 |
||
102 |
// try cached modules |
|
103 |
ModuleReference m = cachedModules.get(name); |
|
104 |
if (m != null) |
|
105 |
return Optional.of(m); |
|
106 |
||
107 |
// the module may not have been encountered yet |
|
108 |
while (hasNextEntry()) { |
|
109 |
scanNextEntry(); |
|
110 |
m = cachedModules.get(name); |
|
111 |
if (m != null) |
|
112 |
return Optional.of(m); |
|
113 |
} |
|
114 |
return Optional.empty(); |
|
115 |
} |
|
116 |
||
117 |
@Override |
|
118 |
public Set<ModuleReference> findAll() { |
|
119 |
// need to ensure that all entries have been scanned |
|
120 |
while (hasNextEntry()) { |
|
121 |
scanNextEntry(); |
|
122 |
} |
|
123 |
return cachedModules.values().stream().collect(Collectors.toSet()); |
|
124 |
} |
|
125 |
||
126 |
/** |
|
127 |
* Returns {@code true} if there are additional entries to scan |
|
128 |
*/ |
|
129 |
private boolean hasNextEntry() { |
|
130 |
return next < entries.length; |
|
131 |
} |
|
132 |
||
133 |
/** |
|
134 |
* Scans the next entry on the module path. A no-op if all entries have |
|
135 |
* already been scanned. |
|
136 |
* |
|
137 |
* @throws FindException if an error occurs scanning the next entry |
|
138 |
*/ |
|
139 |
private void scanNextEntry() { |
|
140 |
if (hasNextEntry()) { |
|
141 |
||
142 |
long t0 = System.nanoTime(); |
|
143 |
||
144 |
Path entry = entries[next]; |
|
145 |
Map<String, ModuleReference> modules = scan(entry); |
|
146 |
next++; |
|
147 |
||
148 |
// update cache, ignoring duplicates |
|
149 |
int initialSize = cachedModules.size(); |
|
150 |
for (Map.Entry<String, ModuleReference> e : modules.entrySet()) { |
|
151 |
cachedModules.putIfAbsent(e.getKey(), e.getValue()); |
|
152 |
} |
|
153 |
||
154 |
// update counters |
|
155 |
int added = cachedModules.size() - initialSize; |
|
156 |
moduleCount.add(added); |
|
157 |
||
158 |
scanTime.addElapsedTimeFrom(t0); |
|
159 |
} |
|
160 |
} |
|
161 |
||
162 |
||
163 |
/** |
|
164 |
* Scan the given module path entry. If the entry is a directory then it is |
|
165 |
* a directory of modules or an exploded module. If the entry is a regular |
|
166 |
* file then it is assumed to be a packaged module. |
|
167 |
* |
|
168 |
* @throws FindException if an error occurs scanning the entry |
|
169 |
*/ |
|
170 |
private Map<String, ModuleReference> scan(Path entry) { |
|
171 |
||
172 |
BasicFileAttributes attrs; |
|
173 |
try { |
|
174 |
attrs = Files.readAttributes(entry, BasicFileAttributes.class); |
|
175 |
} catch (NoSuchFileException e) { |
|
176 |
return Collections.emptyMap(); |
|
177 |
} catch (IOException ioe) { |
|
178 |
throw new FindException(ioe); |
|
179 |
} |
|
180 |
||
181 |
try { |
|
182 |
||
183 |
if (attrs.isDirectory()) { |
|
184 |
Path mi = entry.resolve(MODULE_INFO); |
|
185 |
if (!Files.exists(mi)) { |
|
186 |
// does not exist or unable to determine so assume a |
|
187 |
// directory of modules |
|
188 |
return scanDirectory(entry); |
|
189 |
} |
|
190 |
} |
|
191 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
192 |
// packaged or exploded module |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
193 |
ModuleReference mref = readModule(entry, attrs); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
194 |
if (mref != null) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
195 |
String name = mref.descriptor().name(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
196 |
return Collections.singletonMap(name, mref); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
197 |
} else { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
198 |
// skipped |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
199 |
return Collections.emptyMap(); |
36511 | 200 |
} |
201 |
||
202 |
} catch (IOException ioe) { |
|
203 |
throw new FindException(ioe); |
|
204 |
} |
|
205 |
} |
|
206 |
||
207 |
||
208 |
/** |
|
209 |
* Scans the given directory for packaged or exploded modules. |
|
210 |
* |
|
211 |
* @return a map of module name to ModuleReference for the modules found |
|
212 |
* in the directory |
|
213 |
* |
|
214 |
* @throws IOException if an I/O error occurs |
|
215 |
* @throws FindException if an error occurs scanning the entry or the |
|
216 |
* directory contains two or more modules with the same name |
|
217 |
*/ |
|
218 |
private Map<String, ModuleReference> scanDirectory(Path dir) |
|
219 |
throws IOException |
|
220 |
{ |
|
221 |
// The map of name -> mref of modules found in this directory. |
|
222 |
Map<String, ModuleReference> nameToReference = new HashMap<>(); |
|
223 |
||
224 |
try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir)) { |
|
225 |
for (Path entry : stream) { |
|
226 |
BasicFileAttributes attrs; |
|
227 |
try { |
|
228 |
attrs = Files.readAttributes(entry, BasicFileAttributes.class); |
|
229 |
} catch (NoSuchFileException ignore) { |
|
230 |
// file has been removed or moved, ignore for now |
|
231 |
continue; |
|
232 |
} |
|
233 |
||
234 |
ModuleReference mref = readModule(entry, attrs); |
|
235 |
||
236 |
// module found |
|
237 |
if (mref != null) { |
|
238 |
// can have at most one version of a module in the directory |
|
239 |
String name = mref.descriptor().name(); |
|
240 |
if (nameToReference.put(name, mref) != null) { |
|
241 |
throw new FindException("Two versions of module " |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
242 |
+ name + " found in " + dir); |
36511 | 243 |
} |
244 |
} |
|
245 |
} |
|
246 |
} |
|
247 |
||
248 |
return nameToReference; |
|
249 |
} |
|
250 |
||
251 |
||
252 |
/** |
|
253 |
* Locates a packaged or exploded module, returning a {@code ModuleReference} |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
254 |
* to the module. Returns {@code null} if the entry is skipped because it is |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
255 |
* to a directory that does not contain a module-info.class or it's a hidden |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
256 |
* file. |
36511 | 257 |
* |
258 |
* @throws IOException if an I/O error occurs |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
259 |
* @throws FindException if the file is not recognized as a module or an |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
260 |
* error occurs parsing its module descriptor |
36511 | 261 |
*/ |
262 |
private ModuleReference readModule(Path entry, BasicFileAttributes attrs) |
|
263 |
throws IOException |
|
264 |
{ |
|
265 |
try { |
|
266 |
||
267 |
if (attrs.isDirectory()) { |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
268 |
return readExplodedModule(entry); // may return null |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
269 |
} |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
270 |
|
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
271 |
String fn = entry.getFileName().toString(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
272 |
if (attrs.isRegularFile()) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
273 |
if (fn.endsWith(".jar")) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
274 |
return readJar(entry); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
275 |
} else if (fn.endsWith(".jmod")) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
276 |
if (isLinkPhase) |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
277 |
return readJMod(entry); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
278 |
throw new FindException("JMOD files not supported: " + entry); |
36511 | 279 |
} |
280 |
} |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
281 |
|
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
282 |
// skip hidden files |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
283 |
if (fn.startsWith(".") || Files.isHidden(entry)) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
284 |
return null; |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
285 |
} else { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
286 |
throw new FindException("Unrecognized module: " + entry); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
287 |
} |
36511 | 288 |
|
289 |
} catch (InvalidModuleDescriptorException e) { |
|
290 |
throw new FindException("Error reading module: " + entry, e); |
|
291 |
} |
|
292 |
} |
|
293 |
||
294 |
||
295 |
// -- jmod files -- |
|
296 |
||
297 |
private Set<String> jmodPackages(ZipFile zf) { |
|
298 |
return zf.stream() |
|
299 |
.filter(e -> e.getName().startsWith("classes/") && |
|
300 |
e.getName().endsWith(".class")) |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
301 |
.map(e -> toPackageName(e.getName().substring(8))) |
36511 | 302 |
.filter(pkg -> pkg.length() > 0) // module-info |
303 |
.collect(Collectors.toSet()); |
|
304 |
} |
|
305 |
||
306 |
/** |
|
307 |
* Returns a {@code ModuleReference} to a module in jmod file on the |
|
308 |
* file system. |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
309 |
* |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
310 |
* @throws IOException |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
311 |
* @throws InvalidModuleDescriptorException |
36511 | 312 |
*/ |
313 |
private ModuleReference readJMod(Path file) throws IOException { |
|
314 |
try (ZipFile zf = new ZipFile(file.toString())) { |
|
315 |
ZipEntry ze = zf.getEntry("classes/" + MODULE_INFO); |
|
316 |
if (ze == null) { |
|
317 |
throw new IOException(MODULE_INFO + " is missing: " + file); |
|
318 |
} |
|
319 |
ModuleDescriptor md; |
|
320 |
try (InputStream in = zf.getInputStream(ze)) { |
|
321 |
md = ModuleDescriptor.read(in, () -> jmodPackages(zf)); |
|
322 |
} |
|
323 |
return ModuleReferences.newJModModule(md, file); |
|
324 |
} |
|
325 |
} |
|
326 |
||
327 |
||
328 |
// -- JAR files -- |
|
329 |
||
330 |
private static final String SERVICES_PREFIX = "META-INF/services/"; |
|
331 |
||
332 |
/** |
|
333 |
* Returns a container with the service type corresponding to the name of |
|
334 |
* a services configuration file. |
|
335 |
* |
|
336 |
* For example, if called with "META-INF/services/p.S" then this method |
|
337 |
* returns a container with the value "p.S". |
|
338 |
*/ |
|
339 |
private Optional<String> toServiceName(String cf) { |
|
340 |
assert cf.startsWith(SERVICES_PREFIX); |
|
341 |
int index = cf.lastIndexOf("/") + 1; |
|
342 |
if (index < cf.length()) { |
|
343 |
String prefix = cf.substring(0, index); |
|
344 |
if (prefix.equals(SERVICES_PREFIX)) { |
|
345 |
String sn = cf.substring(index); |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
346 |
return Optional.of(sn); |
36511 | 347 |
} |
348 |
} |
|
349 |
return Optional.empty(); |
|
350 |
} |
|
351 |
||
352 |
/** |
|
353 |
* Reads the next line from the given reader and trims it of comments and |
|
354 |
* leading/trailing white space. |
|
355 |
* |
|
356 |
* Returns null if the reader is at EOF. |
|
357 |
*/ |
|
358 |
private String nextLine(BufferedReader reader) throws IOException { |
|
359 |
String ln = reader.readLine(); |
|
360 |
if (ln != null) { |
|
361 |
int ci = ln.indexOf('#'); |
|
362 |
if (ci >= 0) |
|
363 |
ln = ln.substring(0, ci); |
|
364 |
ln = ln.trim(); |
|
365 |
} |
|
366 |
return ln; |
|
367 |
} |
|
368 |
||
369 |
/** |
|
370 |
* Treat the given JAR file as a module as follows: |
|
371 |
* |
|
372 |
* 1. The module name (and optionally the version) is derived from the file |
|
373 |
* name of the JAR file |
|
374 |
* 2. The packages of all .class files in the JAR file are exported |
|
375 |
* 3. It has no module-private/concealed packages |
|
376 |
* 4. The contents of any META-INF/services configuration files are mapped |
|
377 |
* to "provides" declarations |
|
378 |
* 5. The Main-Class attribute in the main attributes of the JAR manifest |
|
379 |
* is mapped to the module descriptor mainClass |
|
380 |
*/ |
|
381 |
private ModuleDescriptor deriveModuleDescriptor(JarFile jf) |
|
382 |
throws IOException |
|
383 |
{ |
|
384 |
// Derive module name and version from JAR file name |
|
385 |
||
386 |
String fn = jf.getName(); |
|
387 |
int i = fn.lastIndexOf(File.separator); |
|
388 |
if (i != -1) |
|
389 |
fn = fn.substring(i+1); |
|
390 |
||
391 |
// drop .jar |
|
392 |
String mn = fn.substring(0, fn.length()-4); |
|
393 |
String vs = null; |
|
394 |
||
395 |
// find first occurrence of -${NUMBER}. or -${NUMBER}$ |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
396 |
Matcher matcher = Patterns.DASH_VERSION.matcher(mn); |
36511 | 397 |
if (matcher.find()) { |
398 |
int start = matcher.start(); |
|
399 |
||
400 |
// attempt to parse the tail as a version string |
|
401 |
try { |
|
402 |
String tail = mn.substring(start+1); |
|
403 |
ModuleDescriptor.Version.parse(tail); |
|
404 |
vs = tail; |
|
405 |
} catch (IllegalArgumentException ignore) { } |
|
406 |
||
407 |
mn = mn.substring(0, start); |
|
408 |
} |
|
409 |
||
410 |
// finally clean up the module name |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
411 |
mn = cleanModuleName(mn); |
36511 | 412 |
|
413 |
// Builder throws IAE if module name is empty or invalid |
|
414 |
ModuleDescriptor.Builder builder |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
415 |
= new ModuleDescriptor.Builder(mn) |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
416 |
.automatic() |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
417 |
.requires(Set.of(Requires.Modifier.MANDATED), "java.base"); |
36511 | 418 |
if (vs != null) |
419 |
builder.version(vs); |
|
420 |
||
421 |
// scan the entries in the JAR file to locate the .class and service |
|
422 |
// configuration file |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
423 |
Map<Boolean, Set<String>> map = |
39758
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
424 |
versionedStream(jf) |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
425 |
.map(JarEntry::getName) |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
426 |
.filter(s -> (s.endsWith(".class") ^ s.startsWith(SERVICES_PREFIX))) |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
427 |
.collect(Collectors.partitioningBy(s -> s.endsWith(".class"), |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
428 |
Collectors.toSet())); |
36511 | 429 |
Set<String> classFiles = map.get(Boolean.TRUE); |
430 |
Set<String> configFiles = map.get(Boolean.FALSE); |
|
431 |
||
432 |
// all packages are exported |
|
433 |
classFiles.stream() |
|
434 |
.map(c -> toPackageName(c)) |
|
435 |
.distinct() |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
436 |
.forEach(builder::exports); |
36511 | 437 |
|
438 |
// map names of service configuration files to service names |
|
439 |
Set<String> serviceNames = configFiles.stream() |
|
440 |
.map(this::toServiceName) |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
441 |
.flatMap(Optional::stream) |
36511 | 442 |
.collect(Collectors.toSet()); |
443 |
||
444 |
// parse each service configuration file |
|
445 |
for (String sn : serviceNames) { |
|
446 |
JarEntry entry = jf.getJarEntry(SERVICES_PREFIX + sn); |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
447 |
Set<String> providerClasses = new LinkedHashSet<>(); |
36511 | 448 |
try (InputStream in = jf.getInputStream(entry)) { |
449 |
BufferedReader reader |
|
450 |
= new BufferedReader(new InputStreamReader(in, "UTF-8")); |
|
451 |
String cn; |
|
452 |
while ((cn = nextLine(reader)) != null) { |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
453 |
if (cn.length() > 0) { |
36511 | 454 |
providerClasses.add(cn); |
455 |
} |
|
456 |
} |
|
457 |
} |
|
458 |
if (!providerClasses.isEmpty()) |
|
459 |
builder.provides(sn, providerClasses); |
|
460 |
} |
|
461 |
||
462 |
// Main-Class attribute if it exists |
|
463 |
Manifest man = jf.getManifest(); |
|
464 |
if (man != null) { |
|
465 |
Attributes attrs = man.getMainAttributes(); |
|
466 |
String mainClass = attrs.getValue(Attributes.Name.MAIN_CLASS); |
|
467 |
if (mainClass != null) |
|
468 |
builder.mainClass(mainClass); |
|
469 |
} |
|
470 |
||
471 |
return builder.build(); |
|
472 |
} |
|
473 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
474 |
/** |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
475 |
* Patterns used to derive the module name from a JAR file name. |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
476 |
*/ |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
477 |
private static class Patterns { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
478 |
static final Pattern DASH_VERSION = Pattern.compile("-(\\d+(\\.|$))"); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
479 |
static final Pattern NON_ALPHANUM = Pattern.compile("[^A-Za-z0-9]"); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
480 |
static final Pattern REPEATING_DOTS = Pattern.compile("(\\.)(\\1)+"); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
481 |
static final Pattern LEADING_DOTS = Pattern.compile("^\\."); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
482 |
static final Pattern TRAILING_DOTS = Pattern.compile("\\.$"); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
483 |
} |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
484 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
485 |
/** |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
486 |
* Clean up candidate module name derived from a JAR file name. |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
487 |
*/ |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
488 |
private static String cleanModuleName(String mn) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
489 |
// replace non-alphanumeric |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
490 |
mn = Patterns.NON_ALPHANUM.matcher(mn).replaceAll("."); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
491 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
492 |
// collapse repeating dots |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
493 |
mn = Patterns.REPEATING_DOTS.matcher(mn).replaceAll("."); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
494 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
495 |
// drop leading dots |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
496 |
if (mn.length() > 0 && mn.charAt(0) == '.') |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
497 |
mn = Patterns.LEADING_DOTS.matcher(mn).replaceAll(""); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
498 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
499 |
// drop trailing dots |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
500 |
int len = mn.length(); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
501 |
if (len > 0 && mn.charAt(len-1) == '.') |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
502 |
mn = Patterns.TRAILING_DOTS.matcher(mn).replaceAll(""); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
503 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
504 |
return mn; |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
505 |
} |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
506 |
|
39758
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
507 |
private Stream<JarEntry> versionedStream(JarFile jf) { |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
508 |
if (jf.isMultiRelease()) { |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
509 |
// a stream of JarEntries whose names are base names and whose |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
510 |
// contents are from the corresponding versioned entries in |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
511 |
// a multi-release jar file |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
512 |
return jf.stream().map(JarEntry::getName) |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
513 |
.filter(name -> !name.startsWith("META-INF/versions/")) |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
514 |
.map(jf::getJarEntry); |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
515 |
} else { |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
516 |
return jf.stream(); |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
517 |
} |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
518 |
} |
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
519 |
|
36511 | 520 |
private Set<String> jarPackages(JarFile jf) { |
39758
28c2c63fc09f
8157524: Revert JarFile methods "entries" and "stream" to Java 8 behavior
sdrach
parents:
39646
diff
changeset
|
521 |
return versionedStream(jf) |
36511 | 522 |
.filter(e -> e.getName().endsWith(".class")) |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
523 |
.map(e -> toPackageName(e.getName())) |
36511 | 524 |
.filter(pkg -> pkg.length() > 0) // module-info |
525 |
.collect(Collectors.toSet()); |
|
526 |
} |
|
527 |
||
528 |
/** |
|
529 |
* Returns a {@code ModuleReference} to a module in modular JAR file on |
|
530 |
* the file system. |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
531 |
* |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
532 |
* @throws IOException |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
533 |
* @throws FindException |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
534 |
* @throws InvalidModuleDescriptorException |
36511 | 535 |
*/ |
536 |
private ModuleReference readJar(Path file) throws IOException { |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
537 |
try (JarFile jf = new JarFile(file.toFile(), |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
538 |
true, // verify |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
539 |
ZipFile.OPEN_READ, |
39646
2bf99fe5023b
8150680: JarFile.Release enum needs reconsideration with respect to it's values
sdrach
parents:
39050
diff
changeset
|
540 |
JarFile.runtimeVersion())) |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
541 |
{ |
36511 | 542 |
ModuleDescriptor md; |
543 |
JarEntry entry = jf.getJarEntry(MODULE_INFO); |
|
544 |
if (entry == null) { |
|
545 |
||
546 |
// no module-info.class so treat it as automatic module |
|
547 |
try { |
|
548 |
md = deriveModuleDescriptor(jf); |
|
549 |
} catch (IllegalArgumentException iae) { |
|
550 |
throw new FindException( |
|
551 |
"Unable to derive module descriptor for: " |
|
552 |
+ jf.getName(), iae); |
|
553 |
} |
|
554 |
||
555 |
} else { |
|
556 |
md = ModuleDescriptor.read(jf.getInputStream(entry), |
|
557 |
() -> jarPackages(jf)); |
|
558 |
} |
|
559 |
||
560 |
return ModuleReferences.newJarModule(md, file); |
|
561 |
} |
|
562 |
} |
|
563 |
||
564 |
||
565 |
// -- exploded directories -- |
|
566 |
||
567 |
private Set<String> explodedPackages(Path dir) { |
|
568 |
try { |
|
569 |
return Files.find(dir, Integer.MAX_VALUE, |
|
570 |
((path, attrs) -> attrs.isRegularFile() && |
|
571 |
path.toString().endsWith(".class"))) |
|
572 |
.map(path -> toPackageName(dir.relativize(path))) |
|
573 |
.filter(pkg -> pkg.length() > 0) // module-info |
|
574 |
.collect(Collectors.toSet()); |
|
575 |
} catch (IOException x) { |
|
576 |
throw new UncheckedIOException(x); |
|
577 |
} |
|
578 |
} |
|
579 |
||
580 |
/** |
|
581 |
* Returns a {@code ModuleReference} to an exploded module on the file |
|
582 |
* system or {@code null} if {@code module-info.class} not found. |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
583 |
* |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
584 |
* @throws IOException |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
585 |
* @throws InvalidModuleDescriptorException |
36511 | 586 |
*/ |
587 |
private ModuleReference readExplodedModule(Path dir) throws IOException { |
|
588 |
Path mi = dir.resolve(MODULE_INFO); |
|
589 |
ModuleDescriptor md; |
|
590 |
try (InputStream in = Files.newInputStream(mi)) { |
|
591 |
md = ModuleDescriptor.read(new BufferedInputStream(in), |
|
592 |
() -> explodedPackages(dir)); |
|
593 |
} catch (NoSuchFileException e) { |
|
594 |
// for now |
|
595 |
return null; |
|
596 |
} |
|
597 |
return ModuleReferences.newExplodedModule(md, dir); |
|
598 |
} |
|
599 |
||
600 |
||
601 |
// |
|
602 |
||
603 |
// p/q/T.class => p.q |
|
604 |
private String toPackageName(String cn) { |
|
605 |
assert cn.endsWith(".class"); |
|
606 |
int start = 0; |
|
607 |
int index = cn.lastIndexOf("/"); |
|
608 |
if (index > start) { |
|
609 |
return cn.substring(start, index).replace('/', '.'); |
|
610 |
} else { |
|
611 |
return ""; |
|
612 |
} |
|
613 |
} |
|
614 |
||
615 |
private String toPackageName(Path path) { |
|
616 |
String name = path.toString(); |
|
617 |
assert name.endsWith(".class"); |
|
618 |
int index = name.lastIndexOf(File.separatorChar); |
|
619 |
if (index != -1) { |
|
620 |
return name.substring(0, index).replace(File.separatorChar, '.'); |
|
621 |
} else { |
|
622 |
return ""; |
|
623 |
} |
|
624 |
} |
|
625 |
||
626 |
private static final PerfCounter scanTime |
|
627 |
= PerfCounter.newPerfCounter("jdk.module.finder.modulepath.scanTime"); |
|
628 |
private static final PerfCounter moduleCount |
|
629 |
= PerfCounter.newPerfCounter("jdk.module.finder.modulepath.modules"); |
|
630 |
} |