From f4acaf0af859970348f0c854695ddef44e9ce66f Mon Sep 17 00:00:00 2001
From: Dmitry Batkovich <dmitry.batkovich@jetbrains.com>
Date: Mon, 18 Mar 2019 21:41:15 +0300
Subject: [PATCH] Revert: use api method instead of private

---
 .../intellij/util/indexing/SnapshotInputMappingIndex.java  | 2 +-
 .../com/intellij/util/indexing/SnapshotInputMappings.java  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappingIndex.java b/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappingIndex.java
index be829db30d3c..ae02d1a9b699 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappingIndex.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappingIndex.java
@@ -10,7 +10,7 @@ import java.util.Map;
 
 @ApiStatus.Experimental
 public interface SnapshotInputMappingIndex<Key, Value, Input> {
-  @Nullable
+  @NotNull
   Map<Key, Value> readData(int hashId) throws IOException;
 
   @NotNull
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappings.java b/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappings.java
index 2be45730551b..8e2b0c348103 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappings.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/SnapshotInputMappings.java
@@ -55,7 +55,7 @@ class SnapshotInputMappings<Key, Value, Input> implements SnapshotInputMappingIn
     return myHashIdForwardIndexAccessor;
   }
 
-  @Nullable
+  @NotNull
   @Override
   public Map<Key, Value> readData(int hashId) throws IOException {
     ByteArraySequence byteSequence = readContents(hashId);
@@ -79,9 +79,10 @@ class SnapshotInputMappings<Key, Value, Input> implements SnapshotInputMappingIn
       hashId = getHashOfContent(fileContent);
       if (doReadSavedPersistentData) {
         if (myContents == null || !myContents.isBusyReading() || DebugAssertions.EXTRA_SANITY_CHECKS) { // avoid blocking read, we can calculate index value
-          data = readData(hashId);
+          ByteArraySequence bytes = readContents(hashId);
 
-          if (data != null) {
+          if (bytes != null) {
+            data = AbstractForwardIndexAccessor.deserializeFromByteSeq(bytes, myMapExternalizer);
             havePersistentData = true;
             if (DebugAssertions.EXTRA_SANITY_CHECKS) {
               Map<Key, Value> contentData = myIndexer.map(content);