Use interface types at method boundaries

Author: jupblb

scip-semanticdb/src/main/java/com/sourcegraph/scip_semanticdb/ScipShardAggregator.java

@@ -193,7 +193,7 @@ private void mergeInto(Document.Builder target, Document fresh) {
     target.clearSymbols().addAllSymbols(bySymbol.values());
   }
 
-  private static void putOccurrence(LinkedHashMap<OccurrenceKey, Occurrence> out, Occurrence occ) {
+  private static void putOccurrence(Map<OccurrenceKey, Occurrence> out, Occurrence occ) {
     OccurrenceKey key = OccurrenceKey.of(occ);
     Occurrence existing = out.get(key);
     if (existing == null) {

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipOccurrences.java

@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -24,7 +25,7 @@ static List<Occurrence> deduplicate(List<Occurrence> occurrences) {
   }
 
   /** Inserts {@code occ} into {@code out}, collapsing duplicates by {@link Key}. */
-  static void put(LinkedHashMap<Key, Occurrence> out, Occurrence occ) {
+  static void put(Map<Key, Occurrence> out, Occurrence occ) {
     Key key = Key.of(occ);
     Occurrence existing = out.get(key);
     if (existing == null) {

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipShardWriter.java

@@ -13,7 +13,6 @@
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Writes and merges per-source SCIP shards produced by the compiler plugin.
@@ -91,7 +90,7 @@ private static Document mergeDocuments(Document a, Document b) {
     builder.addAllOccurrences(occurrences.values());
 
     // Deduplicate symbols by symbol string; merge relationships and documentation.
-    Map<String, SymbolInformation> bySymbol = new LinkedHashMap<>();
+    LinkedHashMap<String, SymbolInformation> bySymbol = new LinkedHashMap<>();
     for (SymbolInformation info : a.getSymbolsList()) bySymbol.put(info.getSymbol(), info);
     for (SymbolInformation info : b.getSymbolsList()) {
       SymbolInformation existing = bySymbol.get(info.getSymbol());
@@ -105,7 +104,7 @@ private static Document mergeDocuments(Document a, Document b) {
   private static SymbolInformation mergeSymbol(SymbolInformation a, SymbolInformation b) {
     SymbolInformation.Builder builder = b.toBuilder();
     // Merge relationships, deduplicating by structural equality with deterministic ordering.
-    Map<Relationship, Relationship> rels = new LinkedHashMap<>();
+    LinkedHashMap<Relationship, Relationship> rels = new LinkedHashMap<>();
     for (Relationship r : a.getRelationshipsList()) rels.put(r, r);
     for (Relationship r : b.getRelationshipsList()) rels.put(r, r);
     builder.clearRelationships().addAllRelationships(rels.values());

semanticdb-javac/src/main/java/com/sourcegraph/semanticdb_javac/ScipVisitor.java

@@ -640,7 +640,7 @@ private void semanticdbParentSymbol(TypeMirror elementType, Set<TypeElement> res
   }
 
   private Set<String> semanticdbOverrides(
-      ExecutableElement sym, Element enclosingElement, HashSet<String> overriddenSymbols) {
+      ExecutableElement sym, Element enclosingElement, Set<String> overriddenSymbols) {
     if (enclosingElement instanceof TypeElement) {
       List<? extends TypeMirror> superTypes = types.directSupertypes(enclosingElement.asType());
       for (TypeMirror superType : superTypes) {