UCT-722: Enhanced API coverage index

Author: bohdan-harniuk

src/com/magento/idea/magento2uct/versioning/VersionStateManager.java

@@ -94,17 +94,6 @@ public boolean isApi(final @NotNull String fqn) {
         return apiCoverageStateIndex.has(fqn);
     }
 
-    /**
-     * Get version in which an FQN was marked as an API.
-     *
-     * @param fqn String
-     *
-     * @return String
-     */
-    public String getMarkedAsApiInVersion(final @NotNull String fqn) {
-        return apiCoverageStateIndex.getVersion(fqn);
-    }
-
     /**
      * Version state manager constructor.
      */
@@ -121,7 +110,7 @@ private VersionStateManager(final @NotNull Project project) {
         existenceStateIndex = new ExistenceStateIndex();
         compute(existenceStateIndex);
 
-        apiCoverageStateIndex = new ApiCoverageStateIndex();
+        apiCoverageStateIndex = new ApiCoverageStateIndex(existenceStateIndex.getAllData());
         compute(apiCoverageStateIndex);
     }
 

src/com/magento/idea/magento2uct/versioning/indexes/data/ApiCoverageStateIndex.java

@@ -27,16 +27,27 @@ public class ApiCoverageStateIndex implements VersionStateIndex {
 
     private final Map<String, Map<String, Boolean>> versioningData;
     private final Map<String, Boolean> targetVersionData;
-    private final Map<String, String> changelog;
+    private final Map<String, Boolean> codebaseSet;
     private String projectBasePath;
 
     /**
      * Api coverage state index constructor.
      */
     public ApiCoverageStateIndex() {
+        this(new HashMap<>());
+    }
+
+    /**
+     * Api coverage state index constructor.
+     *
+     * @param existenceVersioningData Map
+     */
+    public ApiCoverageStateIndex(final Map<String, Map<String, Boolean>> existenceVersioningData) {
         versioningData = new LinkedHashMap<>();
         targetVersionData = new HashMap<>();
-        changelog = new HashMap<>();
+        codebaseSet = new HashMap<>(
+                VersioningDataOperationsUtil.unionVersionData(existenceVersioningData)
+        );
     }
 
     /**
@@ -59,20 +70,11 @@ public void setProjectBasePath(final @NotNull String projectBasePath) {
     public synchronized boolean has(final @NotNull String fqn) {
         groupLoadedData();
 
-        return targetVersionData.containsKey(fqn);
-    }
-
-    /**
-     * Get version state after lookup.
-     *
-     * @param fqn String
-     *
-     * @return String
-     */
-    public String getVersion(final @NotNull String fqn) {
-        final String version = changelog.get(fqn);
+        if (targetVersionData.containsKey(fqn)) {
+            return true;
+        }
 
-        return version == null ? "some" : version;
+        return !codebaseSet.containsKey(fqn);
     }
 
     /**
@@ -173,7 +175,6 @@ private void groupLoadedData() {
                             true
                     );
             targetVersionData.putAll(gatheredData.getFirst());
-            changelog.putAll(gatheredData.getSecond());
         }
     }
 }

src/com/magento/idea/magento2uct/versioning/indexes/data/DeprecationStateIndex.java

@@ -11,8 +11,8 @@
 import com.magento.idea.magento2uct.versioning.indexes.storage.FileLoader;
 import com.magento.idea.magento2uct.versioning.indexes.storage.IndexLoader;
 import com.magento.idea.magento2uct.versioning.indexes.storage.ResourceLoader;
+import com.magento.idea.magento2uct.versioning.processors.util.VersioningDataOperationsUtil;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -92,13 +92,7 @@ public void loadFromFile(final @NotNull List<SupportedVersion> versions) {
      * @return Map[String, Boolean]
      */
     public Map<String, Boolean> getIndexData() {
-        final Map<String, Boolean> data = new HashMap<>();
-
-        for (final Map.Entry<String, Map<String, Boolean>> vData : versioningData.entrySet()) {
-            data.putAll(vData.getValue());
-        }
-
-        return data;
+        return VersioningDataOperationsUtil.unionVersionData(versioningData);
     }
 
     /**

src/com/magento/idea/magento2uct/versioning/indexes/data/ExistenceStateIndex.java

@@ -79,6 +79,15 @@ public String getVersion(final @NotNull String fqn) {
         return version == null ? "some" : version;
     }
 
+    /**
+     * Get versioning data.
+     *
+     * @return Map
+     */
+    public Map<String, Map<String, Boolean>> getAllData() {
+        return versioningData;
+    }
+
     /**
      * Get deprecation index data.
      *

src/com/magento/idea/magento2uct/versioning/processors/util/VersioningDataOperationsUtil.java

@@ -115,4 +115,23 @@ public static Pair<Map<String, Boolean>, Map<String, String>> unionVersionDataWi
 
         return new Pair<>(new HashMap<>(filteredUnion), new HashMap<>(changelog));
     }
+
+    /**
+     * Union versioning data into single set.
+     *
+     * @param versioningData Map
+     *
+     * @return Map[String, Boolean]
+     */
+    public static Map<String, Boolean> unionVersionData(
+            final Map<String, Map<String, Boolean>> versioningData
+    ) {
+        final Map<String, Boolean> union = new HashMap<>();
+
+        for (final Map.Entry<String, Map<String, Boolean>> vData : versioningData.entrySet()) {
+            union.putAll(vData.getValue());
+        }
+
+        return union;
+    }
 }