langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java
author mcimadamore
Fri, 16 Dec 2016 15:27:34 +0000
changeset 42827 36468b5fa7f4
parent 42822 a84956e7ee4d
child 42840 dfe1a03d4db4
permissions -rw-r--r--
8181370: Convert anonymous inner classes into lambdas/method references Reviewed-by: jjg, rfield, mchung
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     2
 * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     4
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    10
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    15
 * accompanied this code).
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    16
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    20
 *
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    23
 * questions.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    24
 */
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    25
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    26
package com.sun.tools.jdeps;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    27
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    28
import static com.sun.tools.jdeps.Module.trace;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    29
import static java.util.stream.Collectors.*;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    30
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    31
import com.sun.tools.classfile.Dependency;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    32
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    33
import java.io.BufferedInputStream;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    34
import java.io.File;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    35
import java.io.FileNotFoundException;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    36
import java.io.IOException;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    37
import java.io.InputStream;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    38
import java.io.UncheckedIOException;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    39
import java.lang.module.Configuration;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    40
import java.lang.module.ModuleDescriptor;
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
    41
import java.lang.module.ModuleDescriptor.Exports;
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
    42
import java.lang.module.ModuleDescriptor.Opens;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    43
import java.lang.module.ModuleFinder;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    44
import java.lang.module.ModuleReader;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    45
import java.lang.module.ModuleReference;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    46
import java.lang.module.ResolvedModule;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    47
import java.net.URI;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    48
import java.nio.file.DirectoryStream;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    49
import java.nio.file.FileSystem;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    50
import java.nio.file.FileSystems;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    51
import java.nio.file.Files;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    52
import java.nio.file.Path;
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    53
import java.nio.file.Paths;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    54
import java.util.ArrayList;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    55
import java.util.Collections;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    56
import java.util.HashMap;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    57
import java.util.HashSet;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    58
import java.util.LinkedHashMap;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    59
import java.util.LinkedHashSet;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    60
import java.util.List;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    61
import java.util.Map;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    62
import java.util.Objects;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    63
import java.util.Optional;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    64
import java.util.Set;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    65
import java.util.function.Function;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    66
import java.util.function.Supplier;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    67
import java.util.stream.Stream;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    68
38530
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
    69
public class JdepsConfiguration implements AutoCloseable {
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
    70
    // the token for "all modules on the module path"
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
    71
    public static final String ALL_MODULE_PATH = "ALL-MODULE-PATH";
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
    72
    public static final String ALL_DEFAULT = "ALL-DEFAULT";
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
    73
    public static final String MODULE_INFO = "module-info.class";
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    74
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    75
    private final SystemModuleFinder system;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    76
    private final ModuleFinder finder;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
    77
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    78
    private final Map<String, Module> nameToModule = new LinkedHashMap<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    79
    private final Map<String, Module> packageToModule = new HashMap<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    80
    private final Map<String, List<Archive>> packageToUnnamedModule = new HashMap<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    81
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    82
    private final List<Archive> classpathArchives = new ArrayList<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    83
    private final List<Archive> initialArchives = new ArrayList<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    84
    private final Set<Module> rootModules = new HashSet<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    85
    private final Configuration configuration;
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
    86
    private final Runtime.Version version;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    87
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    88
    private JdepsConfiguration(SystemModuleFinder systemModulePath,
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    89
                               ModuleFinder finder,
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    90
                               Set<String> roots,
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    91
                               List<Path> classpaths,
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
    92
                               List<Archive> initialArchives,
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
    93
                               boolean allDefaultModules,
41998
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
    94
                               boolean allSystemModules,
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
    95
                               Runtime.Version version)
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    96
        throws IOException
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    97
    {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    98
        trace("root: %s%n", roots);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
    99
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   100
        this.system = systemModulePath;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   101
        this.finder = finder;
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   102
        this.version = version;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   103
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   104
        // build root set for resolution
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   105
        Set<String> mods = new HashSet<>(roots);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   106
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   107
        // add default modules to the root set
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   108
        // unnamed module
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   109
        if (!initialArchives.isEmpty() || !classpaths.isEmpty() ||
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   110
                roots.isEmpty() || allDefaultModules) {
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   111
            mods.addAll(systemModulePath.defaultSystemRoots());
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   112
        }
41998
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   113
        if (allSystemModules) {
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   114
            systemModulePath.findAll().stream()
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   115
                .map(mref -> mref.descriptor().name())
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   116
                .forEach(mods::add);
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   117
        }
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   118
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   119
        this.configuration = Configuration.empty()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   120
                .resolveRequires(finder, ModuleFinder.of(), mods);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   121
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   122
        this.configuration.modules().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   123
                .map(ResolvedModule::reference)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   124
                .forEach(this::addModuleReference);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   125
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   126
        // packages in unnamed module
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   127
        initialArchives.forEach(archive -> {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   128
            addPackagesInUnnamedModule(archive);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   129
            this.initialArchives.add(archive);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   130
        });
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   131
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   132
        // classpath archives
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   133
        for (Path p : classpaths) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   134
            if (Files.exists(p)) {
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   135
                Archive archive = Archive.getInstance(p, version);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   136
                addPackagesInUnnamedModule(archive);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   137
                classpathArchives.add(archive);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   138
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   139
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   140
40762
f8883aa0053c 8160851: Remove old launcher module-related options
mchung
parents: 40308
diff changeset
   141
        // all roots specified in --add-modules or -m are included
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   142
        // as the initial set for analysis.
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   143
        roots.stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   144
             .map(nameToModule::get)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   145
             .forEach(this.rootModules::add);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   146
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   147
        initProfiles();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   148
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   149
        trace("resolved modules: %s%n", nameToModule.keySet().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   150
                .sorted().collect(joining("\n", "\n", "")));
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   151
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   152
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   153
    private void initProfiles() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   154
        // other system modules are not observed and not added in nameToModule map
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   155
        Map<String, Module> systemModules =
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   156
            system.moduleNames()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   157
                .collect(toMap(Function.identity(), (mn) -> {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   158
                    Module m = nameToModule.get(mn);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   159
                    if (m == null) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   160
                        ModuleReference mref = finder.find(mn).get();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   161
                        m = toModule(mref);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   162
                    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   163
                    return m;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   164
                }));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   165
        Profile.init(systemModules);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   166
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   167
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   168
    private void addModuleReference(ModuleReference mref) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   169
        Module module = toModule(mref);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   170
        nameToModule.put(mref.descriptor().name(), module);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   171
        mref.descriptor().packages()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   172
            .forEach(pn -> packageToModule.putIfAbsent(pn, module));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   173
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   174
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   175
    private void addPackagesInUnnamedModule(Archive archive) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   176
        archive.reader().entries().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   177
               .filter(e -> e.endsWith(".class") && !e.equals(MODULE_INFO))
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   178
               .map(this::toPackageName)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   179
               .distinct()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   180
               .forEach(pn -> packageToUnnamedModule
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   181
                   .computeIfAbsent(pn, _n -> new ArrayList<>()).add(archive));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   182
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   183
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   184
    private String toPackageName(String name) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   185
        int i = name.lastIndexOf('/');
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   186
        return i > 0 ? name.replace('/', '.').substring(0, i) : "";
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   187
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   188
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   189
    public Optional<Module> findModule(String name) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   190
        Objects.requireNonNull(name);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   191
        Module m = nameToModule.get(name);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   192
        return m!= null ? Optional.of(m) : Optional.empty();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   193
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   194
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   195
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   196
    public Optional<ModuleDescriptor> findModuleDescriptor(String name) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   197
        Objects.requireNonNull(name);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   198
        Module m = nameToModule.get(name);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   199
        return m!= null ? Optional.of(m.descriptor()) : Optional.empty();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   200
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   201
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   202
    boolean isSystem(Module m) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   203
        return system.find(m.name()).isPresent();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   204
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   205
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   206
    boolean isValidToken(String name) {
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   207
        return ALL_MODULE_PATH.equals(name) || ALL_DEFAULT.equals(name);
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   208
    }
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   209
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   210
    /**
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   211
     * Returns the modules that the given module can read
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   212
     */
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   213
    public Stream<Module> reads(Module module) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   214
        return configuration.findModule(module.name()).get()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   215
            .reads().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   216
            .map(ResolvedModule::name)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   217
            .map(nameToModule::get);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   218
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   219
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   220
    /**
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   221
     * Returns the list of packages that split between resolved module and
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   222
     * unnamed module
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   223
     */
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   224
    public Map<String, Set<String>> splitPackages() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   225
        Set<String> splitPkgs = packageToModule.keySet().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   226
                                       .filter(packageToUnnamedModule::containsKey)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   227
                                       .collect(toSet());
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   228
        if (splitPkgs.isEmpty())
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   229
            return Collections.emptyMap();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   230
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   231
        return splitPkgs.stream().collect(toMap(Function.identity(), (pn) -> {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   232
            Set<String> sources = new LinkedHashSet<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   233
            sources.add(packageToModule.get(pn).getModule().location().toString());
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   234
            packageToUnnamedModule.get(pn).stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   235
                .map(Archive::getPathName)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   236
                .forEach(sources::add);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   237
            return sources;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   238
        }));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   239
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   240
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   241
    /**
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   242
     * Returns an optional archive containing the given Location
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   243
     */
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   244
    public Optional<Archive> findClass(Dependency.Location location) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   245
        String name = location.getName();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   246
        int i = name.lastIndexOf('/');
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   247
        String pn = i > 0 ? name.substring(0, i).replace('/', '.') : "";
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   248
        Archive archive = packageToModule.get(pn);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   249
        if (archive != null) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   250
            return archive.contains(name + ".class")
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   251
                        ? Optional.of(archive)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   252
                        : Optional.empty();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   253
        }
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   254
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   255
        if (packageToUnnamedModule.containsKey(pn)) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   256
            return packageToUnnamedModule.get(pn).stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   257
                    .filter(a -> a.contains(name + ".class"))
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   258
                    .findFirst();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   259
        }
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   260
        return Optional.empty();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   261
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   262
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   263
    /**
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   264
     * Returns the list of Modules that can be found in the specified
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   265
     * module paths.
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   266
     */
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   267
    public Map<String, Module> getModules() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   268
        return nameToModule;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   269
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   270
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   271
    public Stream<Module> resolve(Set<String> roots) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   272
        if (roots.isEmpty()) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   273
            return nameToModule.values().stream();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   274
        } else {
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   275
            return Configuration.empty()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   276
                    .resolveRequires(finder, ModuleFinder.of(), roots)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   277
                    .modules().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   278
                    .map(ResolvedModule::name)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   279
                    .map(nameToModule::get);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   280
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   281
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   282
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   283
    public List<Archive> classPathArchives() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   284
        return classpathArchives;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   285
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   286
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   287
    public List<Archive> initialArchives() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   288
        return initialArchives;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   289
    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   290
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   291
    public Set<Module> rootModules() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   292
        return rootModules;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   293
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   294
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   295
    public Module toModule(ModuleReference mref) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   296
        try {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   297
            String mn = mref.descriptor().name();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   298
            URI location = mref.location().orElseThrow(FileNotFoundException::new);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   299
            ModuleDescriptor md = mref.descriptor();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   300
            Module.Builder builder = new Module.Builder(md, system.find(mn).isPresent());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   301
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   302
            final ClassFileReader reader;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   303
            if (location.getScheme().equals("jrt")) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   304
                reader = system.getClassReader(mn);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   305
            } else {
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   306
                reader = ClassFileReader.newInstance(Paths.get(location), version);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   307
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   308
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   309
            builder.classes(reader);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   310
            builder.location(location);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   311
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   312
            return builder.build();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   313
        } catch (IOException e) {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   314
            throw new UncheckedIOException(e);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   315
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   316
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   317
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   318
    public Runtime.Version getVersion() {
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   319
        return version;
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   320
    }
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   321
38530
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   322
    /*
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   323
     * Close all archives e.g. JarFile
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   324
     */
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   325
    @Override
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   326
    public void close() throws IOException {
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   327
        for (Archive archive : initialArchives)
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   328
            archive.close();
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   329
        for (Archive archive : classpathArchives)
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   330
            archive.close();
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   331
        for (Module module : nameToModule.values())
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   332
            module.close();
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   333
    }
8e89d567748c 8157391: jdeps left JarFile open
mchung
parents: 38529
diff changeset
   334
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   335
    static class SystemModuleFinder implements ModuleFinder {
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   336
        private static final String JAVA_HOME = System.getProperty("java.home");
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   337
        private static final String JAVA_SE = "java.se";
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   338
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   339
        private final FileSystem fileSystem;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   340
        private final Path root;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   341
        private final Map<String, ModuleReference> systemModules;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   342
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   343
        SystemModuleFinder() {
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   344
            if (Files.isRegularFile(Paths.get(JAVA_HOME, "lib", "modules"))) {
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   345
                // jrt file system
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   346
                this.fileSystem = FileSystems.getFileSystem(URI.create("jrt:/"));
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   347
                this.root = fileSystem.getPath("/modules");
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   348
                this.systemModules = walk(root);
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   349
            } else {
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   350
                // exploded image
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   351
                this.fileSystem = FileSystems.getDefault();
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   352
                root = Paths.get(JAVA_HOME, "modules");
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   353
                this.systemModules = ModuleFinder.ofSystem().findAll().stream()
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   354
                    .collect(toMap(mref -> mref.descriptor().name(), Function.identity()));
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   355
            }
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   356
        }
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   357
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   358
        SystemModuleFinder(String javaHome) throws IOException {
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   359
            if (javaHome == null) {
40762
f8883aa0053c 8160851: Remove old launcher module-related options
mchung
parents: 40308
diff changeset
   360
                // --system none
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   361
                this.fileSystem = null;
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   362
                this.root = null;
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   363
                this.systemModules = Collections.emptyMap();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   364
            } else {
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   365
                if (Files.isRegularFile(Paths.get(javaHome, "lib", "modules")))
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   366
                    throw new IllegalArgumentException("Invalid java.home: " + javaHome);
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   367
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   368
                // alternate java.home
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   369
                Map<String, String> env = new HashMap<>();
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   370
                env.put("java.home", javaHome);
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   371
                // a remote run-time image
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   372
                this.fileSystem = FileSystems.newFileSystem(URI.create("jrt:/"), env);
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   373
                this.root = fileSystem.getPath("/modules");
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   374
                this.systemModules = walk(root);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   375
            }
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   376
        }
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   377
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   378
        private Map<String, ModuleReference> walk(Path root) {
38529
58cf7e51c16d 8152502: tools/jdeps/modules/GenModuleInfo.java and TransitiveDeps fails on windows
mchung
parents: 38525
diff changeset
   379
            try (Stream<Path> stream = Files.walk(root, 1)) {
58cf7e51c16d 8152502: tools/jdeps/modules/GenModuleInfo.java and TransitiveDeps fails on windows
mchung
parents: 38525
diff changeset
   380
                return stream.filter(path -> !path.equals(root))
58cf7e51c16d 8152502: tools/jdeps/modules/GenModuleInfo.java and TransitiveDeps fails on windows
mchung
parents: 38525
diff changeset
   381
                             .map(this::toModuleReference)
58cf7e51c16d 8152502: tools/jdeps/modules/GenModuleInfo.java and TransitiveDeps fails on windows
mchung
parents: 38525
diff changeset
   382
                             .collect(toMap(mref -> mref.descriptor().name(),
58cf7e51c16d 8152502: tools/jdeps/modules/GenModuleInfo.java and TransitiveDeps fails on windows
mchung
parents: 38525
diff changeset
   383
                                            Function.identity()));
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   384
            } catch (IOException e) {
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   385
                throw new UncheckedIOException(e);
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   386
            }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   387
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   388
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   389
        private ModuleReference toModuleReference(Path path) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   390
            Path minfo = path.resolve(MODULE_INFO);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   391
            try (InputStream in = Files.newInputStream(minfo);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   392
                 BufferedInputStream bin = new BufferedInputStream(in)) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   393
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   394
                ModuleDescriptor descriptor = dropHashes(ModuleDescriptor.read(bin));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   395
                String mn = descriptor.name();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   396
                URI uri = URI.create("jrt:/" + path.getFileName().toString());
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   397
                Supplier<ModuleReader> readerSupplier = () -> new ModuleReader() {
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   398
                    @Override
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   399
                    public Optional<URI> find(String name) throws IOException {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   400
                        return name.equals(mn)
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   401
                            ? Optional.of(uri) : Optional.empty();
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   402
                    }
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   403
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   404
                    @Override
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   405
                    public Stream<String> list() {
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   406
                        return Stream.empty();
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   407
                    }
41859
85710a227743 8168789: ModuleReader.list and ModuleFinder.of update
alanb
parents: 41164
diff changeset
   408
42827
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   409
                    @Override
36468b5fa7f4 8181370: Convert anonymous inner classes into lambdas/method references
mcimadamore
parents: 42822
diff changeset
   410
                    public void close() {
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   411
                    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   412
                };
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   413
42822
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42407
diff changeset
   414
                return new ModuleReference(descriptor, uri) {
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42407
diff changeset
   415
                    @Override
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42407
diff changeset
   416
                    public ModuleReader open() {
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42407
diff changeset
   417
                        return readerSupplier.get();
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42407
diff changeset
   418
                    }
a84956e7ee4d 8170987: Module system implementation refresh (12/2016)
alanb
parents: 42407
diff changeset
   419
                };
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   420
            } catch (IOException e) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   421
                throw new UncheckedIOException(e);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   422
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   423
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   424
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   425
        private ModuleDescriptor dropHashes(ModuleDescriptor md) {
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   426
            ModuleDescriptor.Builder builder = ModuleDescriptor.module(md.name());
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   427
            md.requires().forEach(builder::requires);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   428
            md.exports().forEach(builder::exports);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   429
            md.opens().forEach(builder::opens);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   430
            md.provides().stream().forEach(builder::provides);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   431
            md.uses().stream().forEach(builder::uses);
42407
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   432
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   433
            Set<String> concealed = new HashSet<>(md.packages());
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   434
            md.exports().stream().map(Exports::source).forEach(concealed::remove);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   435
            md.opens().stream().map(Opens::source).forEach(concealed::remove);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   436
            concealed.forEach(builder::contains);
f3702cff2933 8169069: Module system implementation refresh (11/2016)
alanb
parents: 41998
diff changeset
   437
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   438
            return builder.build();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   439
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   440
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   441
        @Override
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   442
        public Set<ModuleReference> findAll() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   443
            return systemModules.values().stream().collect(toSet());
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   444
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   445
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   446
        @Override
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   447
        public Optional<ModuleReference> find(String mn) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   448
            return systemModules.containsKey(mn)
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   449
                    ? Optional.of(systemModules.get(mn)) : Optional.empty();
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   450
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   451
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   452
        public Stream<String> moduleNames() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   453
            return systemModules.values().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   454
                .map(mref -> mref.descriptor().name());
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   455
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   456
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   457
        public ClassFileReader getClassReader(String modulename) throws IOException {
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   458
            Path mp = root.resolve(modulename);
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   459
            if (Files.exists(mp) && Files.isDirectory(mp)) {
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   460
                return ClassFileReader.newInstance(fileSystem, mp);
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   461
            } else {
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   462
                throw new FileNotFoundException(mp.toString());
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   463
            }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   464
        }
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   465
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   466
        public Set<String> defaultSystemRoots() {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   467
            Set<String> roots = new HashSet<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   468
            boolean hasJava = false;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   469
            if (systemModules.containsKey(JAVA_SE)) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   470
                // java.se is a system module
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   471
                hasJava = true;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   472
                roots.add(JAVA_SE);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   473
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   474
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   475
            for (ModuleReference mref : systemModules.values()) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   476
                String mn = mref.descriptor().name();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   477
                if (hasJava && mn.startsWith("java."))
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   478
                    continue;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   479
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   480
                // add as root if observable and exports at least one package
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   481
                ModuleDescriptor descriptor = mref.descriptor();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   482
                for (ModuleDescriptor.Exports e : descriptor.exports()) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   483
                    if (!e.isQualified()) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   484
                        roots.add(mn);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   485
                        break;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   486
                    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   487
                }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   488
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   489
            return roots;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   490
        }
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   491
    }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   492
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   493
    public static class Builder {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   494
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   495
        final SystemModuleFinder systemModulePath;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   496
        final Set<String> rootModules = new HashSet<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   497
        final List<Archive> initialArchives = new ArrayList<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   498
        final List<Path> paths = new ArrayList<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   499
        final List<Path> classPaths = new ArrayList<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   500
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   501
        ModuleFinder upgradeModulePath;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   502
        ModuleFinder appModulePath;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   503
        boolean addAllApplicationModules;
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   504
        boolean addAllDefaultModules;
41998
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   505
        boolean addAllSystemModules;
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   506
        Runtime.Version version;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   507
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   508
        public Builder() {
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   509
            this.systemModulePath = new SystemModuleFinder();
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   510
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   511
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   512
        public Builder(String javaHome) throws IOException {
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   513
            this.systemModulePath = SystemModuleFinder.JAVA_HOME.equals(javaHome)
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   514
                ? new SystemModuleFinder()
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   515
                : new SystemModuleFinder(javaHome);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   516
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   517
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   518
        public Builder upgradeModulePath(String upgradeModulePath) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   519
            this.upgradeModulePath = createModulePathFinder(upgradeModulePath);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   520
            return this;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   521
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   522
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   523
        public Builder appModulePath(String modulePath) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   524
            this.appModulePath = createModulePathFinder(modulePath);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   525
            return this;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   526
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   527
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   528
        public Builder addmods(Set<String> addmods) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   529
            for (String mn : addmods) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   530
                switch (mn) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   531
                    case ALL_MODULE_PATH:
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   532
                        this.addAllApplicationModules = true;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   533
                        break;
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   534
                    case ALL_DEFAULT:
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   535
                        this.addAllDefaultModules = true;
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   536
                        break;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   537
                    default:
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   538
                        this.rootModules.add(mn);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   539
                }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   540
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   541
            return this;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   542
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   543
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   544
        /*
40308
274367a99f98 8136930: Simplify use of module-system options by custom launchers
jjg
parents: 38530
diff changeset
   545
         * This method is for --check option to find all target modules specified
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   546
         * in qualified exports.
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   547
         *
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   548
         * Include all system modules and modules found on modulepath
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   549
         */
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   550
        public Builder allModules() {
41998
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   551
            this.addAllSystemModules = true;
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   552
            this.addAllApplicationModules = true;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   553
            return this;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   554
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   555
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   556
        public Builder multiRelease(Runtime.Version version) {
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   557
            this.version = version;
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   558
            return this;
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   559
        }
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   560
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   561
        public Builder addRoot(Path path) {
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   562
            Archive archive = Archive.getInstance(path, version);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   563
            if (archive.contains(MODULE_INFO)) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   564
                paths.add(path);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   565
            } else {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   566
                initialArchives.add(archive);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   567
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   568
            return this;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   569
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   570
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   571
        public Builder addClassPath(String classPath) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   572
            this.classPaths.addAll(getClassPaths(classPath));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   573
            return this;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   574
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   575
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   576
        public JdepsConfiguration build() throws  IOException {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   577
            ModuleFinder finder = systemModulePath;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   578
            if (upgradeModulePath != null) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   579
                finder = ModuleFinder.compose(upgradeModulePath, systemModulePath);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   580
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   581
            if (appModulePath != null) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   582
                finder = ModuleFinder.compose(finder, appModulePath);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   583
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   584
            if (!paths.isEmpty()) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   585
                ModuleFinder otherModulePath = ModuleFinder.of(paths.toArray(new Path[0]));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   586
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   587
                finder = ModuleFinder.compose(finder, otherModulePath);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   588
                // add modules specified on command-line (convenience) as root set
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   589
                otherModulePath.findAll().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   590
                        .map(mref -> mref.descriptor().name())
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   591
                        .forEach(rootModules::add);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   592
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   593
            if (addAllApplicationModules && appModulePath != null) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   594
                appModulePath.findAll().stream()
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   595
                    .map(mref -> mref.descriptor().name())
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   596
                    .forEach(rootModules::add);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   597
            }
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   598
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   599
            return new JdepsConfiguration(systemModulePath,
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   600
                                          finder,
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   601
                                          rootModules,
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   602
                                          classPaths,
38525
a2169f8fa712 8156575: Add jdeps -addmods, -system, -inverse options
mchung
parents: 38524
diff changeset
   603
                                          initialArchives,
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   604
                                          addAllDefaultModules,
41998
feae61dc2280 8169606: jdeps --list-reduced-deps should not show java.base as all modules require it
mchung
parents: 41859
diff changeset
   605
                                          addAllSystemModules,
41164
69167c89e68f 8153654: Update jdeps to be multi-release jar aware
sdrach
parents: 40762
diff changeset
   606
                                          version);
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   607
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   608
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   609
        private static ModuleFinder createModulePathFinder(String mpaths) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   610
            if (mpaths == null) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   611
                return null;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   612
            } else {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   613
                String[] dirs = mpaths.split(File.pathSeparator);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   614
                Path[] paths = new Path[dirs.length];
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   615
                int i = 0;
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   616
                for (String dir : dirs) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   617
                    paths[i++] = Paths.get(dir);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   618
                }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   619
                return ModuleFinder.of(paths);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   620
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   621
        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   622
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   623
        /*
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   624
         * Returns the list of Archive specified in cpaths and not included
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   625
         * initialArchives
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   626
         */
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   627
        private List<Path> getClassPaths(String cpaths) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   628
            if (cpaths.isEmpty()) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   629
                return Collections.emptyList();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   630
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   631
            List<Path> paths = new ArrayList<>();
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   632
            for (String p : cpaths.split(File.pathSeparator)) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   633
                if (p.length() > 0) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   634
                    // wildcard to parse all JAR files e.g. -classpath dir/*
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   635
                    int i = p.lastIndexOf(".*");
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   636
                    if (i > 0) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   637
                        Path dir = Paths.get(p.substring(0, i));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   638
                        try (DirectoryStream<Path> stream = Files.newDirectoryStream(dir, "*.jar")) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   639
                            for (Path entry : stream) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   640
                                paths.add(entry);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   641
                            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   642
                        } catch (IOException e) {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   643
                            throw new UncheckedIOException(e);
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   644
                        }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   645
                    } else {
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   646
                        paths.add(Paths.get(p));
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   647
                    }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   648
                }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   649
            }
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   650
            return paths;
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   651
        }
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   652
    }
38524
badd925c1d2f 8156680: jdeps implementation refresh
mchung
parents: 36526
diff changeset
   653
36526
3b41f1c69604 8142968: Module System implementation
alanb
parents:
diff changeset
   654
}