author | alanb |
Fri, 10 Feb 2017 09:06:10 +0000 | |
changeset 43767 | 9cff98a149cb |
parent 43026 | 8e8b50c7491d |
permissions | -rw-r--r-- |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
1 |
/* |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
2 |
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
4 |
* |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
10 |
* |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
15 |
* accompanied this code). |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
16 |
* |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
20 |
* |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
23 |
* questions. |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
24 |
*/ |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
25 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
26 |
package com.sun.tools.jdeps; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
27 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
28 |
import java.io.IOException; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
29 |
import java.io.PrintWriter; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
30 |
import java.lang.module.ModuleDescriptor; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
31 |
import java.util.Comparator; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
32 |
import java.util.HashMap; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
33 |
import java.util.HashSet; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
34 |
import java.util.Map; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
35 |
import java.util.Set; |
41998
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
36 |
import java.util.stream.Collectors; |
43026
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
37 |
import java.util.stream.Stream; |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
38 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
39 |
import static com.sun.tools.jdeps.Analyzer.NOT_FOUND; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
40 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
41 |
/** |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
42 |
* Analyze module dependences and any reference to JDK internal APIs. |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
43 |
* It can apply transition reduction on the resulting module graph. |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
44 |
* |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
45 |
* The result prints one line per module it depends on |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
46 |
* one line per JDK internal API package it references: |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
47 |
* $MODULE[/$PACKAGE] |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
48 |
* |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
49 |
*/ |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
50 |
public class ModuleExportsAnalyzer extends DepsAnalyzer { |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
51 |
// source archive to its dependences and JDK internal APIs it references |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
52 |
private final Map<Archive, Map<Archive,Set<String>>> deps = new HashMap<>(); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
53 |
private final boolean reduced; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
54 |
private final PrintWriter writer; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
55 |
public ModuleExportsAnalyzer(JdepsConfiguration config, |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
56 |
JdepsFilter filter, |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
57 |
boolean reduced, |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
58 |
PrintWriter writer) { |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
59 |
super(config, filter, null, |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
60 |
Analyzer.Type.PACKAGE, |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
61 |
false /* all classes */); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
62 |
this.reduced = reduced; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
63 |
this.writer = writer; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
64 |
} |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
65 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
66 |
@Override |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
67 |
public boolean run() throws IOException { |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
68 |
// analyze dependences |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
69 |
boolean rc = super.run(); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
70 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
71 |
// A visitor to record the module-level dependences as well as |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
72 |
// use of JDK internal APIs |
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
73 |
Analyzer.Visitor visitor = (origin, originArchive, target, targetArchive) -> { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
74 |
Set<String> jdkInternals = |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
75 |
deps.computeIfAbsent(originArchive, _k -> new HashMap<>()) |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
76 |
.computeIfAbsent(targetArchive, _k -> new HashSet<>()); |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
77 |
|
42827
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
78 |
Module module = targetArchive.getModule(); |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
79 |
if (originArchive.getModule() != module && |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
80 |
module.isJDK() && !module.isExported(target)) { |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
81 |
// use of JDK internal APIs |
36468b5fa7f4
8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents:
42407
diff
changeset
|
82 |
jdkInternals.add(target); |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
83 |
} |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
84 |
}; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
85 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
86 |
// visit the dependences |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
87 |
archives.stream() |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
88 |
.filter(analyzer::hasDependences) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
89 |
.sorted(Comparator.comparing(Archive::getName)) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
90 |
.forEach(archive -> analyzer.visitDependences(archive, visitor)); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
91 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
92 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
93 |
// print the dependences on named modules |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
94 |
printDependences(); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
95 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
96 |
// print the dependences on unnamed module |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
97 |
deps.values().stream() |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
98 |
.flatMap(map -> map.keySet().stream()) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
99 |
.filter(archive -> !archive.getModule().isNamed()) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
100 |
.map(archive -> archive != NOT_FOUND |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
101 |
? "unnamed module: " + archive.getPathName() |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
102 |
: archive.getPathName()) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
103 |
.distinct() |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
104 |
.sorted() |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
105 |
.forEach(archive -> writer.format(" %s%n", archive)); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
106 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
107 |
return rc; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
108 |
} |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
109 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
110 |
private void printDependences() { |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
111 |
// find use of JDK internals |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
112 |
Map<Module, Set<String>> jdkinternals = new HashMap<>(); |
43026
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
113 |
dependenceStream() |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
114 |
.flatMap(map -> map.entrySet().stream()) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
115 |
.filter(e -> e.getValue().size() > 0) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
116 |
.forEach(e -> jdkinternals.computeIfAbsent(e.getKey().getModule(), |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
117 |
_k -> new HashSet<>()) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
118 |
.addAll(e.getValue())); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
119 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
120 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
121 |
// build module graph |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
122 |
ModuleGraphBuilder builder = new ModuleGraphBuilder(configuration); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
123 |
Module root = new RootModule("root"); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
124 |
builder.addModule(root); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
125 |
// find named module dependences |
43026
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
126 |
dependenceStream() |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
127 |
.flatMap(map -> map.keySet().stream()) |
43026
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
128 |
.filter(m -> m.getModule().isNamed() |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
129 |
&& !configuration.rootModules().contains(m)) |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
130 |
.map(Archive::getModule) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
131 |
.forEach(m -> builder.addEdge(root, m)); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
132 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
133 |
// module dependences |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
134 |
Set<Module> modules = builder.build().adjacentNodes(root); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
135 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
136 |
// if reduced is set, apply transition reduction |
41998
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
137 |
Set<Module> reducedSet; |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
138 |
if (reduced) { |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
139 |
Set<Module> nodes = builder.reduced().adjacentNodes(root); |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
140 |
if (nodes.size() == 1) { |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
141 |
// java.base only |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
142 |
reducedSet = nodes; |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
143 |
} else { |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
144 |
// java.base is mandated and can be excluded from the reduced graph |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
145 |
reducedSet = nodes.stream() |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
146 |
.filter(m -> !"java.base".equals(m.name()) || |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
147 |
jdkinternals.containsKey("java.base")) |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
148 |
.collect(Collectors.toSet()); |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
149 |
} |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
150 |
} else { |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
151 |
reducedSet = modules; |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
152 |
} |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
153 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
154 |
modules.stream() |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
155 |
.sorted(Comparator.comparing(Module::name)) |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
156 |
.forEach(m -> { |
41998
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
157 |
if (jdkinternals.containsKey(m)) { |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
158 |
jdkinternals.get(m).stream() |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
159 |
.sorted() |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
160 |
.forEach(pn -> writer.format(" %s/%s%n", m, pn)); |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
161 |
} else if (reducedSet.contains(m)){ |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
162 |
// if the transition reduction is applied, show the reduced graph |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
163 |
writer.format(" %s%n", m); |
feae61dc2280
8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents:
41860
diff
changeset
|
164 |
} |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
165 |
}); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
166 |
} |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
167 |
|
43026
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
168 |
/* |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
169 |
* Returns a stream of dependence map from an Archive to the set of JDK |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
170 |
* internal APIs being used. |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
171 |
*/ |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
172 |
private Stream<Map<Archive, Set<String>>> dependenceStream() { |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
173 |
return deps.keySet().stream() |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
174 |
.filter(source -> !source.getModule().isNamed() |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
175 |
|| configuration.rootModules().contains(source)) |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
176 |
.map(deps::get); |
8e8b50c7491d
8172212: jdeps --require and --check should detect the specified module in the image
mchung
parents:
42827
diff
changeset
|
177 |
} |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
178 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
179 |
private class RootModule extends Module { |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
180 |
final ModuleDescriptor descriptor; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
181 |
RootModule(String name) { |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
182 |
super(name); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
183 |
|
43767
9cff98a149cb
8173393: Module system implementation refresh (2/2017)
alanb
parents:
43026
diff
changeset
|
184 |
ModuleDescriptor.Builder builder = ModuleDescriptor.newModule(name); |
41860
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
185 |
this.descriptor = builder.build(); |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
186 |
} |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
187 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
188 |
@Override |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
189 |
public ModuleDescriptor descriptor() { |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
190 |
return descriptor; |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
191 |
} |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
192 |
} |
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
193 |
|
906670ff49c7
8167057: jdeps option to list modules and internal APIs for @modules for test dev
mchung
parents:
diff
changeset
|
194 |
} |