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