jdk/src/java.base/share/classes/java/lang/module/Resolver.java
author alanb
Fri, 17 Jun 2016 08:41:39 +0100
changeset 39050 9de41b79ec7e
parent 37779 7c84df693837
child 42338 a60f280f803c
permissions -rw-r--r--
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class 8159248: ModuleFinder.of not clear that FindException thrown if module descriptor cannot be derived for automatic module Reviewed-by: chegar, mchung
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     1
/*
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
     2
 * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
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;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    29
import java.lang.module.ModuleDescriptor.Requires.Modifier;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    30
import java.util.ArrayDeque;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    31
import java.util.ArrayList;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    32
import java.util.Collection;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    33
import java.util.Deque;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    34
import java.util.HashMap;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    35
import java.util.HashSet;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    36
import java.util.LinkedHashSet;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    37
import java.util.List;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    38
import java.util.Map;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    39
import java.util.Objects;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    40
import java.util.Optional;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    41
import java.util.Set;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    42
import java.util.StringJoiner;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    43
import java.util.stream.Collectors;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    44
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
    45
import jdk.internal.module.ModuleHashes;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    46
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    47
/**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    48
 * The resolver used by {@link Configuration#resolveRequires} and
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    49
 * {@link Configuration#resolveRequiresAndUses}.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    50
 */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    51
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    52
final class Resolver {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    53
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    54
    private final ModuleFinder beforeFinder;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    55
    private final Configuration parent;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    56
    private final ModuleFinder afterFinder;
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
    57
    private final PrintStream traceOutput;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    58
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    59
    // maps module name to module reference
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    60
    private final Map<String, ModuleReference> nameToReference = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    61
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    62
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    63
    Resolver(ModuleFinder beforeFinder,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    64
             Configuration parent,
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
    65
             ModuleFinder afterFinder,
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
    66
             PrintStream traceOutput) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    67
        this.beforeFinder = beforeFinder;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    68
        this.parent = parent;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    69
        this.afterFinder = afterFinder;
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
    70
        this.traceOutput = traceOutput;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    71
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    72
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    73
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    74
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    75
     * Resolves the given named modules.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    76
     *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    77
     * @throws ResolutionException
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    78
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    79
    Resolver resolveRequires(Collection<String> roots) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    80
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    81
        // create the visit stack to get us started
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    82
        Deque<ModuleDescriptor> q = new ArrayDeque<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    83
        for (String root : roots) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    84
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    85
            // find root module
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    86
            ModuleReference mref = findWithBeforeFinder(root);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    87
            if (mref == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    88
                if (parent.findModule(root).isPresent()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    89
                    // in parent, nothing to do
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    90
                    continue;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    91
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    92
                mref = findWithAfterFinder(root);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    93
                if (mref == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    94
                    fail("Module %s not found", root);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    95
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    96
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    97
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
    98
            if (isTracing()) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
    99
                trace("Root module %s located", root);
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   100
                mref.location().ifPresent(uri -> trace("  (%s)", uri));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   101
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   102
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   103
            assert mref.descriptor().name().equals(root);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   104
            nameToReference.put(root, mref);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   105
            q.push(mref.descriptor());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   106
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   107
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   108
        resolve(q);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   109
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   110
        return this;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   111
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   112
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   113
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   114
     * Resolve all modules in the given queue. On completion the queue will be
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   115
     * empty and any resolved modules will be added to {@code nameToReference}.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   116
     *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   117
     * @return The set of module resolved by this invocation of resolve
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   118
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   119
    private Set<ModuleDescriptor> resolve(Deque<ModuleDescriptor> q) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   120
        Set<ModuleDescriptor> resolved = new HashSet<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   121
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   122
        while (!q.isEmpty()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   123
            ModuleDescriptor descriptor = q.poll();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   124
            assert nameToReference.containsKey(descriptor.name());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   125
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   126
            // process dependences
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   127
            for (ModuleDescriptor.Requires requires : descriptor.requires()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   128
                String dn = requires.name();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   129
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   130
                // find dependence
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   131
                ModuleReference mref = findWithBeforeFinder(dn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   132
                if (mref == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   133
                    if (parent.findModule(dn).isPresent())
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   134
                        continue;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   135
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   136
                    mref = findWithAfterFinder(dn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   137
                    if (mref == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   138
                        fail("Module %s not found, required by %s",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   139
                                dn, descriptor.name());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   140
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   141
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   142
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   143
                if (!nameToReference.containsKey(dn)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   144
                    nameToReference.put(dn, mref);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   145
                    q.offer(mref.descriptor());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   146
                    resolved.add(mref.descriptor());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   147
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   148
                    if (isTracing()) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   149
                        trace("Module %s located, required by %s",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   150
                                dn, descriptor.name());
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   151
                        mref.location().ifPresent(uri -> trace("  (%s)", uri));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   152
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   153
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   154
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   155
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   156
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   157
            resolved.add(descriptor);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   158
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   159
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   160
        return resolved;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   161
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   162
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   163
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   164
     * Augments the set of resolved modules with modules induced by the
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   165
     * service-use relation.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   166
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   167
    Resolver resolveUses() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   168
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   169
        // Scan the finders for all available service provider modules. As
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   170
        // java.base uses services then then module finders will be scanned
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   171
        // anyway.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   172
        Map<String, Set<ModuleReference>> availableProviders = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   173
        for (ModuleReference mref : findAll()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   174
            ModuleDescriptor descriptor = mref.descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   175
            if (!descriptor.provides().isEmpty()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   176
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   177
                for (String sn : descriptor.provides().keySet()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   178
                    // computeIfAbsent
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   179
                    Set<ModuleReference> providers = availableProviders.get(sn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   180
                    if (providers == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   181
                        providers = new HashSet<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   182
                        availableProviders.put(sn, providers);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   183
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   184
                    providers.add(mref);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   185
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   186
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   187
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   188
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   189
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   190
        // create the visit stack
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   191
        Deque<ModuleDescriptor> q = new ArrayDeque<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   192
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   193
        // the initial set of modules that may use services
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   194
        Set<ModuleDescriptor> candidateConsumers = new HashSet<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   195
        Configuration p = parent;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   196
        while (p != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   197
            candidateConsumers.addAll(p.descriptors());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   198
            p = p.parent().orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   199
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   200
        for (ModuleReference mref : nameToReference.values()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   201
            candidateConsumers.add(mref.descriptor());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   202
        }
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
        // Where there is a consumer of a service then resolve all modules
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   206
        // that provide an implementation of that service
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   207
        do {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   208
            for (ModuleDescriptor descriptor : candidateConsumers) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   209
                if (!descriptor.uses().isEmpty()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   210
                    for (String service : descriptor.uses()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   211
                        Set<ModuleReference> mrefs = availableProviders.get(service);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   212
                        if (mrefs != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   213
                            for (ModuleReference mref : mrefs) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   214
                                ModuleDescriptor provider = mref.descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   215
                                if (!provider.equals(descriptor)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   216
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   217
                                    trace("Module %s provides %s, used by %s",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   218
                                            provider.name(), service, descriptor.name());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   219
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   220
                                    String pn = provider.name();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   221
                                    if (!nameToReference.containsKey(pn)) {
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   222
                                        if (isTracing()) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   223
                                            mref.location()
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   224
                                                .ifPresent(uri -> trace("  (%s)", uri));
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   225
                                        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   226
                                        nameToReference.put(pn, mref);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   227
                                        q.push(provider);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   228
                                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   229
                                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   230
                            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   231
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   232
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   233
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   234
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   235
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   236
            candidateConsumers = resolve(q);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   237
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   238
        } while (!candidateConsumers.isEmpty());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   239
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   240
        return this;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   241
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   242
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   243
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   244
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   245
     * Execute post-resolution checks and returns the module graph of resolved
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   246
     * modules as {@code Map}. The resolved modules will be in the given
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   247
     * configuration.
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   248
     *
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   249
     * @param check {@true} to execute the post resolution checks
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   250
     */
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   251
    Map<ResolvedModule, Set<ResolvedModule>> finish(Configuration cf,
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   252
                                                    boolean check)
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   253
    {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   254
        if (isTracing()) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   255
            trace("Result:");
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   256
            Set<String> names = nameToReference.keySet();
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   257
            names.stream().sorted().forEach(name -> trace("  %s", name));
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   258
        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   259
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   260
        if (check) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   261
            detectCycles();
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   262
            checkPlatformConstraints();
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   263
            checkHashes();
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   264
        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   265
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   266
        Map<ResolvedModule, Set<ResolvedModule>> graph = makeGraph(cf);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   267
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   268
        if (check) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   269
            checkExportSuppliers(graph);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   270
        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   271
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   272
        return graph;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   273
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   274
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   275
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   276
     * Checks the given module graph for cycles.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   277
     *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   278
     * For now the implementation is a simple depth first search on the
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   279
     * dependency graph. We'll replace this later, maybe with Tarjan.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   280
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   281
    private void detectCycles() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   282
        visited = new HashSet<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   283
        visitPath = new LinkedHashSet<>(); // preserve insertion order
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   284
        for (ModuleReference mref : nameToReference.values()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   285
            visit(mref.descriptor());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   286
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   287
        visited.clear();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   288
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   289
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   290
    // the modules that were visited
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   291
    private Set<ModuleDescriptor> visited;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   292
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   293
    // the modules in the current visit path
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   294
    private Set<ModuleDescriptor> visitPath;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   295
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   296
    private void visit(ModuleDescriptor descriptor) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   297
        if (!visited.contains(descriptor)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   298
            boolean added = visitPath.add(descriptor);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   299
            if (!added) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   300
                throw new ResolutionException("Cycle detected: " +
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   301
                        cycleAsString(descriptor));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   302
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   303
            for (ModuleDescriptor.Requires requires : descriptor.requires()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   304
                String dn = requires.name();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   305
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   306
                ModuleReference mref = nameToReference.get(dn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   307
                if (mref != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   308
                    ModuleDescriptor other = mref.descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   309
                    if (other != descriptor) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   310
                        // dependency is in this configuration
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   311
                        visit(other);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   312
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   313
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   314
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   315
            visitPath.remove(descriptor);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   316
            visited.add(descriptor);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   317
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   318
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   319
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   320
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   321
     * Returns a String with a list of the modules in a detected cycle.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   322
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   323
    private String cycleAsString(ModuleDescriptor descriptor) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   324
        List<ModuleDescriptor> list = new ArrayList<>(visitPath);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   325
        list.add(descriptor);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   326
        int index = list.indexOf(descriptor);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   327
        return list.stream()
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   328
                .skip(index)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   329
                .map(ModuleDescriptor::name)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   330
                .collect(Collectors.joining(" -> "));
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   331
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   332
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   333
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   334
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   335
     * If there are platform specific modules then check that the OS name,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   336
     * architecture and version match.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   337
     *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   338
     * @apiNote This method does not currently check if the OS matches
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   339
     *          platform specific modules in parent configurations.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   340
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   341
    private void checkPlatformConstraints() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   342
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   343
        // first module encountered that is platform specific
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   344
        String savedModuleName = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   345
        String savedOsName = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   346
        String savedOsArch = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   347
        String savedOsVersion = null;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   348
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   349
        for (ModuleReference mref : nameToReference.values()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   350
            ModuleDescriptor descriptor = mref.descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   351
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   352
            String osName = descriptor.osName().orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   353
            String osArch = descriptor.osArch().orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   354
            String osVersion = descriptor.osVersion().orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   355
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   356
            if (osName != null || osArch != null || osVersion != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   357
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   358
                if (savedModuleName == null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   359
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   360
                    savedModuleName = descriptor.name();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   361
                    savedOsName = osName;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   362
                    savedOsArch = osArch;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   363
                    savedOsVersion = osVersion;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   364
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   365
                } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   366
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   367
                    boolean matches = platformMatches(osName, savedOsName)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   368
                            && platformMatches(osArch, savedOsArch)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   369
                            && platformMatches(osVersion, savedOsVersion);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   370
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   371
                    if (!matches) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   372
                        String s1 = platformAsString(savedOsName,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   373
                                                     savedOsArch,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   374
                                                     savedOsVersion);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   375
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   376
                        String s2 = platformAsString(osName, osArch, osVersion);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   377
                        fail("Mismatching constraints on target platform: "
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   378
                                + savedModuleName + ": " + s1
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   379
                                + ", " + descriptor.name() + ": " + s2);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   380
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   381
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   382
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   383
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   384
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   385
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   386
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   387
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   388
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   389
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   390
     * Returns true if the s1 and s2 are equal or one of them is null.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   391
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   392
    private boolean platformMatches(String s1, String s2) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   393
        if (s1 == null || s2 == null)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   394
            return true;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   395
        else
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   396
            return Objects.equals(s1, s2);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   397
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   398
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   399
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   400
     * Return a string that encodes the OS name/arch/version.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   401
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   402
    private String platformAsString(String osName,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   403
                                    String osArch,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   404
                                    String osVersion) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   405
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   406
        return new StringJoiner("-")
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   407
                .add(Objects.toString(osName, "*"))
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   408
                .add(Objects.toString(osArch, "*"))
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   409
                .add(Objects.toString(osVersion, "*"))
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   410
                .toString();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   411
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   412
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   413
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   414
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   415
     * 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
   416
     * any recorded hashes.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   417
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   418
    private void checkHashes() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   419
        for (ModuleReference mref : nameToReference.values()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   420
            ModuleDescriptor descriptor = mref.descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   421
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   422
            // get map of module hashes
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   423
            Optional<ModuleHashes> ohashes = descriptor.hashes();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   424
            if (!ohashes.isPresent())
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   425
                continue;
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   426
            ModuleHashes hashes = ohashes.get();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   427
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   428
            String algorithm = hashes.algorithm();
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   429
            for (String dn : hashes.names()) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   430
                ModuleReference other = nameToReference.get(dn);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   431
                if (other == null) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   432
                    other = parent.findModule(dn)
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   433
                            .map(ResolvedModule::reference)
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   434
                            .orElse(null);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   435
                }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   436
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   437
                // skip checking the hash if the module has been patched
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   438
                if (other != null && !other.isPatched()) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   439
                    String recordedHash = hashes.hashFor(dn);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   440
                    String actualHash = other.computeHash(algorithm);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   441
                    if (actualHash == null)
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   442
                        fail("Unable to compute the hash of module %s", dn);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   443
                    if (!recordedHash.equals(actualHash)) {
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   444
                        fail("Hash of %s (%s) differs to expected hash (%s)" +
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   445
                             " recorded in %s", dn, actualHash, recordedHash,
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   446
                             descriptor.name());
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   447
                    }
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   448
                }
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   449
            }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   450
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   451
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   452
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   453
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   454
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   455
    /**
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   456
     * Computes the readability graph for the modules in the given Configuration.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   457
     *
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   458
     * The readability graph is created by propagating "requires" through the
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   459
     * "public requires" edges of the module dependence graph. So if the module
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   460
     * dependence graph has m1 requires m2 && m2 requires public m3 then the
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   461
     * resulting readability graph will contain m1 reads m2, m1 reads m3, and
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   462
     * m2 reads m3.
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   463
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   464
    private Map<ResolvedModule, Set<ResolvedModule>> makeGraph(Configuration cf) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   465
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   466
        // the "reads" graph starts as a module dependence graph and
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   467
        // is iteratively updated to be the readability graph
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   468
        Map<ResolvedModule, Set<ResolvedModule>> g1 = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   469
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   470
        // the "requires public" graph, contains requires public edges only
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   471
        Map<ResolvedModule, Set<ResolvedModule>> g2 = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   472
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   473
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   474
        // need "requires public" from the modules in parent configurations as
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   475
        // there may be selected modules that have a dependency on modules in
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   476
        // the parent configuration.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   477
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   478
        Configuration p = parent;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   479
        while (p != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   480
            for (ModuleDescriptor descriptor : p.descriptors()) {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   481
                String name = descriptor.name();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   482
                ResolvedModule m1 = p.findModule(name)
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   483
                    .orElseThrow(() -> new InternalError(name + " not found"));
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   484
                for (ModuleDescriptor.Requires requires : descriptor.requires()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   485
                    if (requires.modifiers().contains(Modifier.PUBLIC)) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   486
                        String dn = requires.name();
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   487
                        ResolvedModule m2 = p.findModule(dn)
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   488
                            .orElseThrow(() -> new InternalError(dn + " not found"));
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   489
                        g2.computeIfAbsent(m1, k -> new HashSet<>()).add(m2);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   490
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   491
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   492
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   493
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   494
            p = p.parent().orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   495
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   496
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   497
        // 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
   498
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   499
        Map<String, ResolvedModule> nameToResolved = new HashMap<>();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   500
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   501
        for (ModuleReference mref : nameToReference.values()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   502
            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
   503
            String name = descriptor.name();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   504
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   505
            ResolvedModule m1 = computeIfAbsent(nameToResolved, name, cf, mref);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   506
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   507
            Set<ResolvedModule> reads = new HashSet<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   508
            Set<ResolvedModule> requiresPublic = new HashSet<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   509
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   510
            for (ModuleDescriptor.Requires requires : descriptor.requires()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   511
                String dn = requires.name();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   512
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   513
                ResolvedModule m2;
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   514
                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
   515
                if (mref2 != null) {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   516
                    // same configuration
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   517
                    m2 = computeIfAbsent(nameToResolved, dn, cf, mref2);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   518
                } else {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   519
                    // parent configuration
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   520
                    m2 = parent.findModule(dn).orElse(null);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   521
                    if (m2 == null) {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   522
                        continue;
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   523
                    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   524
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   525
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   526
                // 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
   527
                reads.add(m2);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   528
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   529
                // m1 requires public m2
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   530
                if (requires.modifiers().contains(Modifier.PUBLIC)) {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   531
                    requiresPublic.add(m2);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   532
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   533
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   534
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   535
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   536
            // automatic modules read all selected modules and all modules
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   537
            // in parent configurations
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   538
            if (descriptor.isAutomatic()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   539
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   540
                // reads all selected modules
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   541
                // `requires public` all selected automatic modules
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   542
                for (ModuleReference mref2 : nameToReference.values()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   543
                    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
   544
                    String name2 = descriptor2.name();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   545
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   546
                    if (!name.equals(name2)) {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   547
                        ResolvedModule m2
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   548
                            = 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
   549
                        reads.add(m2);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   550
                        if (descriptor2.isAutomatic())
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   551
                            requiresPublic.add(m2);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   552
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   553
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   554
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   555
                // reads all modules in parent configurations
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   556
                // `requires public` all automatic modules in parent configurations
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   557
                p = parent;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   558
                while (p != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   559
                    for (ResolvedModule m : p.modules()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   560
                        reads.add(m);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   561
                        if (m.reference().descriptor().isAutomatic())
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   562
                            requiresPublic.add(m);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   563
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   564
                    p = p.parent().orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   565
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   566
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   567
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   568
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   569
            g1.put(m1, reads);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   570
            g2.put(m1, requiresPublic);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   571
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   572
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   573
        // Iteratively update g1 until there are no more requires public to propagate
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   574
        boolean changed;
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   575
        Set<ResolvedModule> toAdd = new HashSet<>();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   576
        do {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   577
            changed = false;
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   578
            for (Set<ResolvedModule> m1Reads : g1.values()) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   579
                for (ResolvedModule m2 : m1Reads) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   580
                    Set<ResolvedModule> m2RequiresPublic = g2.get(m2);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   581
                    if (m2RequiresPublic != null) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   582
                        for (ResolvedModule m3 : m2RequiresPublic) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   583
                            if (!m1Reads.contains(m3)) {
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   584
                                // m1 reads m2, m2 requires public m3
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   585
                                // => 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
   586
                                toAdd.add(m3);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   587
                            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   588
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   589
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   590
                }
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   591
                if (!toAdd.isEmpty()) {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   592
                    m1Reads.addAll(toAdd);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   593
                    toAdd.clear();
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   594
                    changed = true;
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   595
                }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   596
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   597
        } while (changed);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   598
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   599
        return g1;
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   600
    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   601
39050
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   602
    /**
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   603
     * Equivalent to
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   604
     * <pre>{@code
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   605
     *     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
   606
     * </pre>}
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   607
     */
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   608
    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
   609
                                           String name,
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   610
                                           Configuration cf,
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   611
                                           ModuleReference mref)
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   612
    {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   613
        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
   614
        if (m == null) {
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   615
            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
   616
            map.put(name, m);
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   617
        }
9de41b79ec7e 8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents: 37779
diff changeset
   618
        return m;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   619
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   620
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   621
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   622
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   623
     * Checks the readability graph to ensure that no two modules export the
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   624
     * same package to a module. This includes the case where module M has
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   625
     * a local package P and M reads another module that exports P to M.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   626
     * Also checks the uses/provides of module M to ensure that it reads a
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   627
     * module that exports the package of the service type to M.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   628
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   629
    private void checkExportSuppliers(Map<ResolvedModule, Set<ResolvedModule>> graph) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   630
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   631
        for (Map.Entry<ResolvedModule, Set<ResolvedModule>> e : graph.entrySet()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   632
            ModuleDescriptor descriptor1 = e.getKey().descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   633
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   634
            // the map of packages that are local or exported to descriptor1
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   635
            Map<String, ModuleDescriptor> packageToExporter = new HashMap<>();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   636
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   637
            // local packages
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   638
            Set<String> packages = descriptor1.packages();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   639
            for (String pn : packages) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   640
                packageToExporter.put(pn, descriptor1);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   641
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   642
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   643
            // descriptor1 reads descriptor2
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   644
            Set<ResolvedModule> reads = e.getValue();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   645
            for (ResolvedModule endpoint : reads) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   646
                ModuleDescriptor descriptor2 = endpoint.descriptor();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   647
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   648
                for (ModuleDescriptor.Exports export : descriptor2.exports()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   649
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   650
                    if (export.isQualified()) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   651
                        if (!export.targets().contains(descriptor1.name()))
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   652
                            continue;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   653
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   654
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   655
                    // source is exported to descriptor2
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   656
                    String source = export.source();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   657
                    ModuleDescriptor other
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   658
                        = packageToExporter.put(source, descriptor2);
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   659
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   660
                    if (other != null && other != descriptor2) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   661
                        // package might be local to descriptor1
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   662
                        if (other == descriptor1) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   663
                            fail("Module %s contains package %s"
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   664
                                 + ", module %s exports package %s to %s",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   665
                                    descriptor1.name(),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   666
                                    source,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   667
                                    descriptor2.name(),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   668
                                    source,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   669
                                    descriptor1.name());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   670
                        } else {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   671
                            fail("Modules %s and %s export package %s to module %s",
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   672
                                    descriptor2.name(),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   673
                                    other.name(),
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   674
                                    source,
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   675
                                    descriptor1.name());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   676
                        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   677
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   678
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   679
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   680
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   681
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   682
            // uses/provides checks not applicable to automatic modules
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   683
            if (!descriptor1.isAutomatic()) {
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   684
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   685
                // uses S
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   686
                for (String service : descriptor1.uses()) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   687
                    String pn = packageName(service);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   688
                    if (!packageToExporter.containsKey(pn)) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   689
                        fail("Module %s does not read a module that exports %s",
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   690
                             descriptor1.name(), pn);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   691
                    }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   692
                }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   693
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   694
                // provides S
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   695
                for (Map.Entry<String, ModuleDescriptor.Provides> entry :
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   696
                        descriptor1.provides().entrySet()) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   697
                    String service = entry.getKey();
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   698
                    ModuleDescriptor.Provides provides = entry.getValue();
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   699
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   700
                    String pn = packageName(service);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   701
                    if (!packageToExporter.containsKey(pn)) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   702
                        fail("Module %s does not read a module that exports %s",
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   703
                             descriptor1.name(), pn);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   704
                    }
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   705
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   706
                    for (String provider : provides.providers()) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   707
                        if (!packages.contains(packageName(provider))) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   708
                            fail("Provider %s not in module %s",
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   709
                                 provider, descriptor1.name());
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   710
                        }
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   711
                    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   712
                }
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   713
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   714
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   715
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   716
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   717
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   718
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   719
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   720
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   721
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   722
     * Invokes the beforeFinder to find method to find the given module.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   723
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   724
    private ModuleReference findWithBeforeFinder(String mn) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   725
        try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   726
            return beforeFinder.find(mn).orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   727
        } catch (FindException e) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   728
            // unwrap
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   729
            throw new ResolutionException(e.getMessage(), e.getCause());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   730
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   731
    }
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
     * Invokes the afterFinder to find method to find the given module.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   735
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   736
    private ModuleReference findWithAfterFinder(String mn) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   737
        try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   738
            return afterFinder.find(mn).orElse(null);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   739
        } catch (FindException e) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   740
            // unwrap
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   741
            throw new ResolutionException(e.getMessage(), e.getCause());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   742
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   743
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   744
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   745
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   746
     * Returns the set of all modules that are observable with the before
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   747
     * and after ModuleFinders.
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   748
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   749
    private Set<ModuleReference> findAll() {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   750
        try {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   751
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   752
            Set<ModuleReference> beforeModules = beforeFinder.findAll();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   753
            Set<ModuleReference> afterModules = afterFinder.findAll();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   754
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   755
            if (afterModules.isEmpty())
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   756
                return beforeModules;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   757
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   758
            if (beforeModules.isEmpty() && parent == Configuration.empty())
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   759
                return afterModules;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   760
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   761
            Set<ModuleReference> result = new HashSet<>(beforeModules);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   762
            for (ModuleReference mref : afterModules) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   763
                String name = mref.descriptor().name();
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   764
                if (!beforeFinder.find(name).isPresent()
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   765
                        && !parent.findModule(name).isPresent())
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   766
                    result.add(mref);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   767
            }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   768
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   769
            return result;
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   770
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   771
        } catch (FindException e) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   772
            // unwrap
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   773
            throw new ResolutionException(e.getMessage(), e.getCause());
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   774
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   775
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   776
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   777
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   778
     * Returns the package name
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   779
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   780
    private static String packageName(String cn) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   781
        int index = cn.lastIndexOf(".");
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   782
        return (index == -1) ? "" : cn.substring(0, index);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   783
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   784
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   785
    /**
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   786
     * Throw ResolutionException with the given format string and arguments
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   787
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   788
    private static void fail(String fmt, Object ... args) {
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   789
        String msg = String.format(fmt, args);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   790
        throw new ResolutionException(msg);
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   791
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   792
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   793
    /**
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   794
     * Tracing support
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   795
     */
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   796
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   797
    private boolean isTracing() {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   798
        return traceOutput != null;
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   799
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   800
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   801
    private void trace(String fmt, Object ... args) {
37779
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   802
        if (traceOutput != null) {
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   803
            traceOutput.format("[Resolver] " + fmt, args);
7c84df693837 8154956: Module system implementation refresh (4/2016)
alanb
parents: 36511
diff changeset
   804
            traceOutput.println();
36511
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   805
        }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   806
    }
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   807
9d0388c6b336 8142968: Module System implementation
alanb
parents:
diff changeset
   808
}