src/jdk.zipfs/share/classes/jdk/nio/zipfs/JarFileSystem.java
author clanger
Fri, 17 May 2019 09:00:39 +0100
changeset 54920 6a6935abebe8
parent 54630 04b17e84c87d
child 58467 72ef2c0faf47
permissions -rw-r--r--
8222276: (zipfs) Refactoring and cleanups to prepare for JDK-8213031 Reviewed-by: lancea
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     1
/*
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
     2
 * Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     3
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     4
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     5
 * This code is free software; you can redistribute it and/or modify it
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     6
 * under the terms of the GNU General Public License version 2 only, as
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     7
 * published by the Free Software Foundation.  Oracle designates this
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     8
 * particular file as subject to the "Classpath" exception as provided
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
     9
 * by Oracle in the LICENSE file that accompanied this code.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    10
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    11
 * This code is distributed in the hope that it will be useful, but WITHOUT
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    12
 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    13
 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    14
 * version 2 for more details (a copy is included in the LICENSE file that
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    15
 * accompanied this code).
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    16
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    17
 * You should have received a copy of the GNU General Public License version
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    18
 * 2 along with this work; if not, write to the Free Software Foundation,
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    19
 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    20
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    21
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    22
 * or visit www.oracle.com if you need additional information or have any
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    23
 * questions.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    24
 */
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    25
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    26
package jdk.nio.zipfs;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    27
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    28
import java.io.IOException;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    29
import java.io.InputStream;
38432
892603099bb0 8144062: Move jdk.Version to java.lang.Runtime.Version
iris
parents: 37803
diff changeset
    30
import java.lang.Runtime.Version;
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 43193
diff changeset
    31
import java.nio.file.NoSuchFileException;
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    32
import java.nio.file.Path;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    33
import java.util.Arrays;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    34
import java.util.HashMap;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    35
import java.util.Map;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    36
import java.util.TreeMap;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    37
import java.util.function.Consumer;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    38
import java.util.function.Function;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    39
import java.util.jar.Attributes;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    40
import java.util.jar.Manifest;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    41
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    42
/**
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    43
 * Adds aliasing to ZipFileSystem to support multi-release jar files.  An alias map
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    44
 * is created by {@link JarFileSystem#createVersionedLinks(int)}.  The map is then
54920
6a6935abebe8 8222276: (zipfs) Refactoring and cleanups to prepare for JDK-8213031
clanger
parents: 54630
diff changeset
    45
 * consulted when an entry is looked up in {@link JarFileSystem#getInode(byte[])}
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    46
 * to determine if the entry has a corresponding versioned entry.  If so, the
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    47
 * versioned entry is returned.
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    48
 *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    49
 * @author Steve Drach
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    50
 */
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    51
class JarFileSystem extends ZipFileSystem {
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
    52
    // lookup needs to be initialized because isMultiReleaseJar is called before createVersionedLinks
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
    53
    private Function<byte[], byte[]> lookup = path -> path;
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    54
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    55
    @Override
37803
ac955d7f5271 8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents: 36012
diff changeset
    56
    IndexNode getInode(byte[] path) {
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    57
        // check for an alias to a versioned entry
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
    58
        return super.getInode(lookup.apply(path));
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    59
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    60
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
    61
    JarFileSystem(ZipFileSystemProvider provider, Path zfpath, Map<String,?> env) throws IOException {
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    62
        super(provider, zfpath, env);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    63
        if (isMultiReleaseJar()) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    64
            int version;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    65
            Object o = env.get("multi-release");
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    66
            if (o instanceof String) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    67
                String s = (String)o;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    68
                if (s.equals("runtime")) {
48327
d2a837cf9ff1 8192833: JEP 322: Time-Based Release Versioning
mr
parents: 47216
diff changeset
    69
                    version = Runtime.version().feature();
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    70
                } else {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    71
                    version = Integer.parseInt(s);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    72
                }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    73
            } else if (o instanceof Integer) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    74
                version = (Integer)o;
36012
2d47efae7da3 8150163: JarFileSystem support for MRJARs should use the JDK specific Version API
chegar
parents: 34835
diff changeset
    75
            } else if (o instanceof Version) {
48327
d2a837cf9ff1 8192833: JEP 322: Time-Based Release Versioning
mr
parents: 47216
diff changeset
    76
                version = ((Version)o).feature();
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    77
            } else {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    78
                throw new IllegalArgumentException("env parameter must be String, Integer, "
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    79
                        + "or Version");
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    80
            }
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
    81
            createVersionedLinks(version < 0 ? 0 : version);
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    82
            setReadOnly();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    83
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    84
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    85
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 43193
diff changeset
    86
    private boolean isMultiReleaseJar() throws IOException {
37803
ac955d7f5271 8150496: (zipfs) Fix performance issues in zip-fs
sherman
parents: 36012
diff changeset
    87
        try (InputStream is = newInputStream(getBytes("/META-INF/MANIFEST.MF"))) {
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 43193
diff changeset
    88
            String multiRelease = new Manifest(is).getMainAttributes()
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
    89
                .getValue(Attributes.Name.MULTI_RELEASE);
44257
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 43193
diff changeset
    90
            return "true".equalsIgnoreCase(multiRelease);
3220d2ac3cee 8176709: JarFileSystem::isMultiReleaseJar is incorrect
redestad
parents: 43193
diff changeset
    91
        } catch (NoSuchFileException x) {
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    92
            return false;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    93
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    94
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    95
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    96
    /**
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    97
     * create a map of aliases for versioned entries, for example:
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    98
     *   version/PackagePrivate.class -> META-INF/versions/9/version/PackagePrivate.class
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
    99
     *   version/PackagePrivate.java -> META-INF/versions/9/version/PackagePrivate.java
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   100
     *   version/Version.class -> META-INF/versions/10/version/Version.class
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   101
     *   version/Version.java -> META-INF/versions/10/version/Version.java
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   102
     *
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   103
     * then wrap the map in a function that getEntry can use to override root
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   104
     * entry lookup for entries that have corresponding versioned entries
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   105
     */
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   106
    private void createVersionedLinks(int version) {
48691
554cb38e0caf 8193802: NullPointerException from JarFileSystem.getVersionMap()
sherman
parents: 48327
diff changeset
   107
        IndexNode verdir = getInode(getBytes("/META-INF/versions"));
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   108
        // nothing to do, if no /META-INF/versions
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   109
        if (verdir == null) {
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   110
            return;
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   111
        }
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   112
        // otherwise, create a map and for each META-INF/versions/{n} directory
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   113
        // put all the leaf inodes, i.e. entries, into the alias map
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   114
        // possibly shadowing lower versioned entries
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   115
        HashMap<IndexNode, byte[]> aliasMap = new HashMap<>();
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   116
        getVersionMap(version, verdir).values().forEach(versionNode ->
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   117
            walk(versionNode.child, entryNode ->
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   118
                aliasMap.put(
54920
6a6935abebe8 8222276: (zipfs) Refactoring and cleanups to prepare for JDK-8213031
clanger
parents: 54630
diff changeset
   119
                    getOrCreateInode(getRootName(entryNode, versionNode), entryNode.isdir),
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   120
                    entryNode.name))
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   121
        );
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   122
        lookup = path -> {
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   123
            byte[] entry = aliasMap.get(IndexNode.keyOf(path));
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   124
            return entry == null ? path : entry;
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   125
        };
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   126
    }
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   127
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   128
    /**
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   129
     * create a sorted version map of version -> inode, for inodes <= max version
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   130
     *   9 -> META-INF/versions/9
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   131
     *  10 -> META-INF/versions/10
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   132
     */
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   133
    private TreeMap<Integer, IndexNode> getVersionMap(int version, IndexNode metaInfVersions) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   134
        TreeMap<Integer,IndexNode> map = new TreeMap<>();
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   135
        IndexNode child = metaInfVersions.child;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   136
        while (child != null) {
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   137
            Integer key = getVersion(child, metaInfVersions);
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   138
            if (key != null && key <= version) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   139
                map.put(key, child);
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   140
            }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   141
            child = child.sibling;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   142
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   143
        return map;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   144
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   145
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   146
    /**
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   147
     * extract the integer version number -- META-INF/versions/9 returns 9
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   148
     */
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   149
    private Integer getVersion(IndexNode inode, IndexNode metaInfVersions) {
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   150
        try {
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   151
            byte[] fullName = inode.name;
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   152
            return Integer.parseInt(getString(Arrays
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   153
                .copyOfRange(fullName, metaInfVersions.name.length + 1, fullName.length)));
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   154
        } catch (NumberFormatException x) {
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   155
            // ignore this even though it might indicate issues with the JAR structure
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   156
            return null;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   157
        }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   158
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   159
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   160
    /**
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   161
     * walk the IndexNode tree processing all leaf nodes
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   162
     */
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   163
    private void walk(IndexNode inode, Consumer<IndexNode> consumer) {
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   164
        if (inode == null) return;
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   165
        if (inode.isDir()) {
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   166
            walk(inode.child, consumer);
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   167
        } else {
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   168
            consumer.accept(inode);
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   169
        }
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   170
        walk(inode.sibling, consumer);
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   171
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   172
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   173
    /**
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   174
     * extract the root name from a versioned entry name
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   175
     *   given inode for META-INF/versions/9/foo/bar.class
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   176
     *   and prefix META-INF/versions/9/
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   177
     *   returns foo/bar.class
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   178
     */
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   179
    private byte[] getRootName(IndexNode inode, IndexNode prefix) {
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   180
        byte[] fullName = inode.name;
54630
04b17e84c87d 8222440: (zipfs) JarFileSystem does not correctly handle versioned entries if no root entry is present
clanger
parents: 53043
diff changeset
   181
        return Arrays.copyOfRange(fullName, prefix.name.length, fullName.length);
34835
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   182
    }
ee52702b8d1b 8144355: JDK 9 changes to ZipFileSystem to support multi-release jar files
sdrach
parents:
diff changeset
   183
}