Removing obsolete parameters

base/src/com/google/idea/blaze/base/model/AspectSyncProjectData.java

@@ -52,7 +52,6 @@ public final class AspectSyncProjectData implements BlazeProjectData {
   private final WorkspacePathResolver workspacePathResolver;
   private final ArtifactLocationDecoder artifactLocationDecoder;
   private final WorkspaceLanguageSettings workspaceLanguageSettings;
-  private final ExternalWorkspaceData externalWorkspaceData;
   private final SyncState syncState;
 
   public AspectSyncProjectData(
@@ -62,15 +61,13 @@ public AspectSyncProjectData(
       WorkspacePathResolver workspacePathResolver,
       ArtifactLocationDecoder artifactLocationDecoder,
       WorkspaceLanguageSettings workspaceLanguageSettings,
-      ExternalWorkspaceData externalWorkspaceData,
       SyncState syncState) {
     this.targetData = targetData;
     this.blazeInfo = blazeInfo;
     this.blazeVersionData = blazeVersionData;
     this.workspacePathResolver = workspacePathResolver;
     this.artifactLocationDecoder = artifactLocationDecoder;
     this.workspaceLanguageSettings = workspaceLanguageSettings;
-    this.externalWorkspaceData = externalWorkspaceData;
     this.syncState = syncState;
   }
 
@@ -88,7 +85,6 @@ public static AspectSyncProjectData fromProto(
         workspacePathResolver,
         new ArtifactLocationDecoderImpl(blazeInfo, workspacePathResolver, targetData.remoteOutputs),
         WorkspaceLanguageSettings.fromProto(proto.getWorkspaceLanguageSettings()),
-        ExternalWorkspaceData.fromProto(proto.getExternalWorkspaceData()),
         SyncState.fromProto(proto.getSyncState()));
   }
 
@@ -116,7 +112,6 @@ public ProjectData.BlazeProjectData toProto() {
         .setWorkspacePathResolver(workspacePathResolver.toProto())
         .setWorkspaceLanguageSettings(workspaceLanguageSettings.toProto())
         .setSyncState(syncState.toProto())
-        .setExternalWorkspaceData(externalWorkspaceData.toProto())
         .build();
   }
 
@@ -227,7 +222,6 @@ public boolean equals(Object o) {
     AspectSyncProjectData other = (AspectSyncProjectData) o;
     return Objects.equals(targetData, other.targetData)
         && Objects.equals(blazeInfo, other.blazeInfo)
-        && Objects.equals(externalWorkspaceData, other.externalWorkspaceData)
         && Objects.equals(blazeVersionData, other.blazeVersionData)
         && Objects.equals(workspacePathResolver, other.workspacePathResolver)
         && Objects.equals(artifactLocationDecoder, other.artifactLocationDecoder)
@@ -244,7 +238,6 @@ public int hashCode() {
         workspaceLanguageSettings,
         artifactLocationDecoder,
         workspaceLanguageSettings,
-        externalWorkspaceData,
         syncState);
   }
 }

base/src/com/google/idea/blaze/base/sync/ProjectUpdateSyncTask.java

@@ -229,7 +229,6 @@ private void run(BlazeContext context) throws SyncCanceledException, SyncFailedE
             projectState.getWorkspacePathResolver(),
             artifactLocationDecoder,
             projectState.getLanguageSettings(),
-            projectState.getExternalWorkspaceData(),
             syncStateBuilder.build());
 
     FileCaches.onSync(

base/src/com/google/idea/blaze/base/sync/workspace/WorkspaceHelper.java

@@ -33,19 +33,21 @@
 import com.google.idea.blaze.base.sync.data.BlazeProjectDataManager;
 import com.google.idea.blaze.qsync.QuerySyncProjectSnapshot;
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
 
+import javax.annotation.Nullable;
 import java.io.File;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import javax.annotation.Nullable;
 
-/** External-workspace-aware resolution of workspace paths. */
+/**
+ * External-workspace-aware resolution of workspace paths.
+ */
 public class WorkspaceHelper {
 
   private static BlazeProjectData blazeProjectData;
@@ -75,7 +77,9 @@ public static WorkspaceRoot getExternalWorkspace(Project project, String workspa
     return resolveExternalWorkspaceRoot(project, workspaceName, null);
   }
 
-  /** Resolves the parent blaze package corresponding to this label. */
+  /**
+   * Resolves the parent blaze package corresponding to this label.
+   */
   @Nullable
   public static File resolveBlazePackage(Project project, Label label) {
     logger.debug("resolveBlazePackage: " + label + " in project " + project.getName());
@@ -95,7 +99,9 @@ public static WorkspacePath resolveWorkspacePath(Project project, File absoluteF
     return workspace != null ? workspace.root.workspacePathForSafe(absoluteFile) : null;
   }
 
-  /** Converts a file to the corresponding BUILD label for this project, if valid. */
+  /**
+   * Converts a file to the corresponding BUILD label for this project, if valid.
+   */
   @Nullable
   public static Label getBuildLabel(Project project, File absoluteFile) {
     logger.debug("getBuildLabel for file " + absoluteFile.getAbsolutePath());
@@ -191,7 +197,9 @@ public static Path getExternalSourceRoot(Project project, BlazeProjectData proje
     return getExternalBase(project, projectData).toPath().normalize();
   }
 
-  /** resolve workspace root for a named external repository. needs context since the same name can mean something different in different workspaces. */
+  /**
+   * resolve workspace root for a named external repository. needs context since the same name can mean something different in different workspaces.
+   */
   @Nullable
   private static synchronized WorkspaceRoot resolveExternalWorkspaceRoot(
       Project project, String workspaceName, @Nullable BuildFile buildFile) {
@@ -220,9 +228,7 @@ private static synchronized WorkspaceRoot resolveExternalWorkspaceRoot(
     BlazeProjectData blazeProjectData = BlazeProjectDataManager.getInstance(project).getBlazeProjectData();
     if (blazeProjectData != null) {
 
-
-      File externalBase = null;
-      externalBase = getExternalBase(project, blazeProjectData);
+      File externalBase = getExternalBase(project, blazeProjectData);
       if (externalBase == null) return null;
 
       File workspaceDir = new File(externalBase, workspaceName);
@@ -243,12 +249,12 @@ private static synchronized WorkspaceRoot resolveExternalWorkspaceRoot(
 
   private static @Nullable File getExternalBase(Project project, BlazeProjectData blazeProjectData) {
     File externalBase;
-    if(blazeProjectData.isQuerySync()) {
+    if (blazeProjectData.isQuerySync()) {
       QuerySyncProjectSnapshot snapshot =
-              QuerySyncManager.getInstance(project).getCurrentSnapshot().orElse(null);
-      if(snapshot == null) return null;
+          QuerySyncManager.getInstance(project).getCurrentSnapshot().orElse(null);
+      if (snapshot == null) return null;
       externalBase = snapshot.queryData().outputBase()
-              .map(pathname -> new File(pathname, "external")).orElse(null);
+          .map(pathname -> new File(pathname, "external")).orElse(null);
     } else {
       BlazeInfo blazeInfo = blazeProjectData.getBlazeInfo();
       externalBase = new File(blazeInfo.getOutputBase(), "external");

base/tests/utils/unit/com/google/idea/blaze/base/model/MockBlazeProjectDataBuilder.java

@@ -46,7 +46,6 @@ public class MockBlazeProjectDataBuilder {
   private WorkspacePathResolver workspacePathResolver;
   private ArtifactLocationDecoder artifactLocationDecoder;
   private WorkspaceLanguageSettings workspaceLanguageSettings;
-  private ExternalWorkspaceData externalWorkspaceData;
   private SyncState syncState;
 
   private MockBlazeProjectDataBuilder(WorkspaceRoot workspaceRoot) {
@@ -106,13 +105,6 @@ public MockBlazeProjectDataBuilder setWorkspaceLanguageSettings(
     return this;
   }
 
-  @CanIgnoreReturnValue
-  public MockBlazeProjectDataBuilder setExternalWorkspaceData(
-      ExternalWorkspaceData externalWorkspaceData) {
-    this.externalWorkspaceData = externalWorkspaceData;
-    return this;
-  }
-
   @CanIgnoreReturnValue
   public MockBlazeProjectDataBuilder setSyncState(SyncState syncState) {
     this.syncState = syncState;
@@ -143,18 +135,14 @@ public BlazeProjectData build() {
         this.artifactLocationDecoder != null
             ? this.artifactLocationDecoder
             : new ArtifactLocationDecoderImpl(
-                blazeInfo, workspacePathResolver, RemoteOutputArtifacts.EMPTY);
+            blazeInfo, workspacePathResolver, RemoteOutputArtifacts.EMPTY);
     WorkspaceLanguageSettings workspaceLanguageSettings =
         this.workspaceLanguageSettings != null
             ? this.workspaceLanguageSettings
             : new WorkspaceLanguageSettings(WorkspaceType.JAVA, ImmutableSet.of());
     SyncState syncState =
         this.syncState != null ? this.syncState : new SyncState(ImmutableMap.of());
 
-    ExternalWorkspaceData externalWorkspaceData =
-        this.externalWorkspaceData != null
-            ? this.externalWorkspaceData
-            : ExternalWorkspaceData.EMPTY;
 
     return new AspectSyncProjectData(
         new ProjectTargetData(
@@ -164,7 +152,6 @@ public BlazeProjectData build() {
         workspacePathResolver,
         artifactLocationDecoder,
         workspaceLanguageSettings,
-        externalWorkspaceData,
         syncState);
   }
 }