src/jdk.jlink/share/classes/jdk/tools/jlink/internal/BasicImageWriter.java

*** 1,7 ***
  /*
!  * Copyright (c) 2014, 2020, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ---
  /*
!  * Copyright (c) 2014, 2025, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this

*** 34,25 ***
  import jdk.internal.jimage.ImageStringsReader;
  
  public final class BasicImageWriter {
      public static final String MODULES_IMAGE_NAME = "modules";
  
!     private ByteOrder byteOrder;
!     private ImageStringsWriter strings;
      private int length;
      private int[] redirect;
      private ImageLocationWriter[] locations;
!     private List<ImageLocationWriter> input;
!     private ImageStream headerStream;
!     private ImageStream redirectStream;
!     private ImageStream locationOffsetStream;
!     private ImageStream locationStream;
!     private ImageStream allIndexStream;
- 
-     public BasicImageWriter() {
-         this(ByteOrder.nativeOrder());
-     }
  
      public BasicImageWriter(ByteOrder byteOrder) {
          this.byteOrder = Objects.requireNonNull(byteOrder);
          this.input = new ArrayList<>();
          this.strings = new ImageStringsWriter();
--- 34,21 ---
  import jdk.internal.jimage.ImageStringsReader;
  
  public final class BasicImageWriter {
      public static final String MODULES_IMAGE_NAME = "modules";
  
!     private final ByteOrder byteOrder;
!     private final ImageStringsWriter strings;
      private int length;
      private int[] redirect;
      private ImageLocationWriter[] locations;
!     private final List<ImageLocationWriter> input;
!     private final ImageStream headerStream;
!     private final ImageStream redirectStream;
!     private final ImageStream locationOffsetStream;
!     private final ImageStream locationStream;
!     private final ImageStream allIndexStream;
  
      public BasicImageWriter(ByteOrder byteOrder) {
          this.byteOrder = Objects.requireNonNull(byteOrder);
          this.input = new ArrayList<>();
          this.strings = new ImageStringsWriter();

*** 73,27 ***
  
      public String getString(int offset) {
          return strings.get(offset);
      }
  
!     public void addLocation(String fullname, long contentOffset,
!             long compressedSize, long uncompressedSize) {
          ImageLocationWriter location =
                  ImageLocationWriter.newLocation(fullname, strings,
!                         contentOffset, compressedSize, uncompressedSize);
          input.add(location);
          length++;
      }
  
      ImageLocationWriter[] getLocations() {
          return locations;
      }
  
-     int getLocationsCount() {
-         return input.size();
-     }
- 
      private void generatePerfectHash() {
          PerfectHashBuilder<ImageLocationWriter> builder =
              new PerfectHashBuilder<>(
                          PerfectHashBuilder.Entry.class,
                          PerfectHashBuilder.Bucket.class);
--- 69,27 ---
  
      public String getString(int offset) {
          return strings.get(offset);
      }
  
!     public void addLocation(
!             String fullname,
+             long contentOffset,
+             long compressedSize,
+             long uncompressedSize,
+             int previewFlags) {
          ImageLocationWriter location =
                  ImageLocationWriter.newLocation(fullname, strings,
!                         contentOffset, compressedSize, uncompressedSize, previewFlags);
          input.add(location);
          length++;
      }
  
      ImageLocationWriter[] getLocations() {
          return locations;
      }
  
      private void generatePerfectHash() {
          PerfectHashBuilder<ImageLocationWriter> builder =
              new PerfectHashBuilder<>(
                          PerfectHashBuilder.Entry.class,
                          PerfectHashBuilder.Bucket.class);

*** 172,18 ***
              prepareTableBytes();
          }
  
          return allIndexStream.toArray();
      }
- 
-     ImageLocationWriter find(String key) {
-         int index = redirect[ImageStringsReader.hashCode(key) % length];
- 
-         if (index < 0) {
-             index = -index - 1;
-         } else {
-             index = ImageStringsReader.hashCode(key, index) % length;
-         }
- 
-         return locations[index];
-     }
  }
--- 168,6 ---