Move java specific logic into the new java package.

This keeps the main `qsync` package more language agnostic, and keeps language support better encapulated. PiperOrigin-RevId: 588763291
bazelbuild · Dec 7, 2023 · f992f52 · f992f52
1 parent 3e35774
commit f992f52
Show file tree

Hide file tree

Showing 23 changed files with 35 additions and 22 deletions.
diff --git a/base/src/com/google/idea/blaze/base/qsync/ProjectLoader.java b/base/src/com/google/idea/blaze/base/qsync/ProjectLoader.java
@@ -47,10 +47,10 @@
 import com.google.idea.blaze.qsync.BlazeProject;
 import com.google.idea.blaze.qsync.BlazeProjectSnapshotBuilder;
 import com.google.idea.blaze.qsync.BlazeProjectSnapshotBuilder.ProjectProtoTransform;
-import com.google.idea.blaze.qsync.PackageStatementParser;
-import com.google.idea.blaze.qsync.ParallelPackageReader;
 import com.google.idea.blaze.qsync.ProjectRefresher;
 import com.google.idea.blaze.qsync.VcsStateDiffer;
+import com.google.idea.blaze.qsync.java.PackageStatementParser;
+import com.google.idea.blaze.qsync.java.ParallelPackageReader;
 import com.google.idea.blaze.qsync.project.ProjectDefinition;
 import com.google.idea.blaze.qsync.project.ProjectPath;
 import com.intellij.openapi.project.Project;

diff --git a/base/src/com/google/idea/blaze/base/qsync/cache/ArtifactTrackerImpl.java b/base/src/com/google/idea/blaze/base/qsync/cache/ArtifactTrackerImpl.java
@@ -69,14 +69,14 @@
 import com.google.idea.blaze.common.Label;
 import com.google.idea.blaze.common.PrintOutput;
 import com.google.idea.blaze.exception.BuildException;
-import com.google.idea.blaze.qsync.GeneratedSourceProjectUpdater;
-import com.google.idea.blaze.qsync.GeneratedSourceProjectUpdater.GeneratedSourceJar;
-import com.google.idea.blaze.qsync.SrcJarProjectUpdater;
 import com.google.idea.blaze.qsync.TestSourceGlobMatcher;
 import com.google.idea.blaze.qsync.cc.CcDependenciesInfo;
+import com.google.idea.blaze.qsync.java.GeneratedSourceProjectUpdater;
+import com.google.idea.blaze.qsync.java.GeneratedSourceProjectUpdater.GeneratedSourceJar;
 import com.google.idea.blaze.qsync.java.JavaArtifactInfo;
 import com.google.idea.blaze.qsync.java.JavaTargetInfo.JavaArtifacts;
 import com.google.idea.blaze.qsync.java.JavaTargetInfo.JavaTargetArtifacts;
+import com.google.idea.blaze.qsync.java.SrcJarProjectUpdater;
 import com.google.idea.blaze.qsync.project.BuildGraphData;
 import com.google.idea.blaze.qsync.project.ProjectDefinition;
 import com.google.idea.blaze.qsync.project.ProjectPath;

diff --git a/base/src/com/google/idea/blaze/base/qsync/cache/JavaSourceOutputArtifactDestination.java b/base/src/com/google/idea/blaze/base/qsync/cache/JavaSourceOutputArtifactDestination.java
@@ -17,7 +17,7 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.idea.blaze.base.qsync.cache.FileCache.OutputArtifactDestinationAndLayout;
-import com.google.idea.blaze.qsync.PackageStatementParser;
+import com.google.idea.blaze.qsync.java.PackageStatementParser;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.nio.file.Files;

diff --git a/querysync/java/com/google/idea/blaze/qsync/BUILD b/querysync/java/com/google/idea/blaze/qsync/BUILD
@@ -6,6 +6,7 @@ java_library(
         "//querysync:__subpackages__",
     ],
     deps = [
+        "//querysync/java/com/google/idea/blaze/qsync/java",
         "//querysync/java/com/google/idea/blaze/qsync/project",
         "//querysync/java/com/google/idea/blaze/qsync/project:language_class_java_proto",
         "//querysync/java/com/google/idea/blaze/qsync/project:project_java_proto",

diff --git a/querysync/java/com/google/idea/blaze/qsync/BlazeProjectSnapshotBuilder.java b/querysync/java/com/google/idea/blaze/qsync/BlazeProjectSnapshotBuilder.java
@@ -19,6 +19,8 @@
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.idea.blaze.common.Context;
 import com.google.idea.blaze.exception.BuildException;
+import com.google.idea.blaze.qsync.java.PackageReader;
+import com.google.idea.blaze.qsync.java.WorkspaceResolvingPackageReader;
 import com.google.idea.blaze.qsync.project.BlazeProjectSnapshot;
 import com.google.idea.blaze.qsync.project.BuildGraphData;
 import com.google.idea.blaze.qsync.project.PostQuerySyncData;

diff --git a/querysync/java/com/google/idea/blaze/qsync/GraphToProjectConverter.java b/querysync/java/com/google/idea/blaze/qsync/GraphToProjectConverter.java
@@ -41,6 +41,7 @@
 import com.google.idea.blaze.common.PrintOutput;
 import com.google.idea.blaze.common.RuleKinds;
 import com.google.idea.blaze.exception.BuildException;
+import com.google.idea.blaze.qsync.java.PackageReader;
 import com.google.idea.blaze.qsync.project.BlazeProjectDataStorage;
 import com.google.idea.blaze.qsync.project.BuildGraphData;
 import com.google.idea.blaze.qsync.project.LanguageClassProto.LanguageClass;

diff --git a/querysync/java/com/google/idea/blaze/qsync/java/BUILD b/querysync/java/com/google/idea/blaze/qsync/java/BUILD
@@ -21,6 +21,8 @@ java_library(
     srcs = glob(["*.java"]),
     deps = [
         ":java_target_info_java_proto",
+        "//querysync/java/com/google/idea/blaze/qsync/project",
+        "//querysync/java/com/google/idea/blaze/qsync/project:project_java_proto",
         "//shared",
         "//third_party/auto_value",
         "@com_google_guava_guava//jar",

diff --git a/.../qsync/GeneratedSourceProjectUpdater.java → ...c/java/GeneratedSourceProjectUpdater.java b/.../qsync/GeneratedSourceProjectUpdater.java → ...c/java/GeneratedSourceProjectUpdater.java
@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.qsync;
+package com.google.idea.blaze.qsync.java;
 
-import static com.google.idea.blaze.qsync.SrcJarInnerPathFinder.AllowPackagePrefixes.ALLOW_NON_EMPTY_PACKAGE_PREFIXES;
+import static com.google.idea.blaze.qsync.java.SrcJarInnerPathFinder.AllowPackagePrefixes.ALLOW_NON_EMPTY_PACKAGE_PREFIXES;
 
 import com.google.auto.value.AutoValue;
 import com.google.common.collect.ImmutableSet;
-import com.google.idea.blaze.qsync.SrcJarInnerPathFinder.JarPath;
+import com.google.idea.blaze.qsync.java.SrcJarInnerPathFinder.JarPath;
 import com.google.idea.blaze.qsync.project.ProjectPath;
 import com.google.idea.blaze.qsync.project.ProjectProto;
 import com.google.idea.blaze.qsync.project.ProjectProto.Project;

diff --git a/...oogle/idea/blaze/qsync/PackageReader.java → .../idea/blaze/qsync/java/PackageReader.java b/...oogle/idea/blaze/qsync/PackageReader.java → .../idea/blaze/qsync/java/PackageReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.qsync;
+package com.google.idea.blaze.qsync.java;
 
 import java.io.IOException;
 import java.nio.file.Path;

diff --git a/...a/blaze/qsync/PackageStatementParser.java → ...ze/qsync/java/PackageStatementParser.java b/...a/blaze/qsync/PackageStatementParser.java → ...ze/qsync/java/PackageStatementParser.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.qsync;
+package com.google.idea.blaze.qsync.java;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 

diff --git a/...ea/blaze/qsync/ParallelPackageReader.java → ...aze/qsync/java/ParallelPackageReader.java b/...ea/blaze/qsync/ParallelPackageReader.java → ...aze/qsync/java/ParallelPackageReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.qsync;
+package com.google.idea.blaze.qsync.java;
 
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;

diff --git a/...ea/blaze/qsync/SrcJarInnerPathFinder.java → ...aze/qsync/java/SrcJarInnerPathFinder.java b/...ea/blaze/qsync/SrcJarInnerPathFinder.java → ...aze/qsync/java/SrcJarInnerPathFinder.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.qsync;
+package com.google.idea.blaze.qsync.java;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;

diff --git a/...dea/blaze/qsync/SrcJarProjectUpdater.java → ...laze/qsync/java/SrcJarProjectUpdater.java b/...dea/blaze/qsync/SrcJarProjectUpdater.java → ...laze/qsync/java/SrcJarProjectUpdater.java
@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.qsync;
+package com.google.idea.blaze.qsync.java;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.idea.blaze.qsync.SrcJarInnerPathFinder.AllowPackagePrefixes.EMPTY_PACKAGE_PREFIXES_ONLY;
+import static com.google.idea.blaze.qsync.java.SrcJarInnerPathFinder.AllowPackagePrefixes.EMPTY_PACKAGE_PREFIXES_ONLY;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;

diff --git a/...sync/WorkspaceResolvingPackageReader.java → ...java/WorkspaceResolvingPackageReader.java b/...sync/WorkspaceResolvingPackageReader.java → ...java/WorkspaceResolvingPackageReader.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.idea.blaze.qsync;
+package com.google.idea.blaze.qsync.java;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
 

diff --git a/querysync/java/com/google/idea/blaze/qsync/util/GetJarRoots.java b/querysync/java/com/google/idea/blaze/qsync/util/GetJarRoots.java
@@ -19,7 +19,7 @@
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
-import com.google.idea.blaze.qsync.SrcJarProjectUpdater;
+import com.google.idea.blaze.qsync.java.SrcJarProjectUpdater;
 import com.google.idea.blaze.qsync.project.ProjectPath;
 import com.google.idea.blaze.qsync.project.ProjectPath.Root;
 import com.google.idea.blaze.qsync.project.ProjectProto;

diff --git a/querysync/java/com/google/idea/blaze/qsync/util/ProjectSpecBuilder.java b/querysync/java/com/google/idea/blaze/qsync/util/ProjectSpecBuilder.java
@@ -22,10 +22,10 @@
 import com.google.idea.blaze.exception.BuildException;
 import com.google.idea.blaze.qsync.BlazeQueryParser;
 import com.google.idea.blaze.qsync.GraphToProjectConverter;
-import com.google.idea.blaze.qsync.PackageReader;
-import com.google.idea.blaze.qsync.PackageStatementParser;
-import com.google.idea.blaze.qsync.ParallelPackageReader;
-import com.google.idea.blaze.qsync.WorkspaceResolvingPackageReader;
+import com.google.idea.blaze.qsync.java.PackageReader;
+import com.google.idea.blaze.qsync.java.PackageStatementParser;
+import com.google.idea.blaze.qsync.java.ParallelPackageReader;
+import com.google.idea.blaze.qsync.java.WorkspaceResolvingPackageReader;
 import com.google.idea.blaze.qsync.project.BuildGraphData;
 import com.google.idea.blaze.qsync.project.PostQuerySyncData;
 import com.google.idea.blaze.qsync.project.SnapshotDeserializer;

diff --git a/querysync/javatests/com/google/idea/blaze/qsync/BUILD b/querysync/javatests/com/google/idea/blaze/qsync/BUILD
@@ -14,6 +14,7 @@ java_library(
     ],
     deps = [
         "//querysync/java/com/google/idea/blaze/qsync",
+        "//querysync/java/com/google/idea/blaze/qsync/java",
         "//querysync/java/com/google/idea/blaze/qsync/project",
         "//querysync/java/com/google/idea/blaze/qsync/project:project_java_proto",
         "//querysync/java/com/google/idea/blaze/qsync/query",

diff --git a/querysync/javatests/com/google/idea/blaze/qsync/GeneratedSourceProjectUpdaterTest.java b/querysync/javatests/com/google/idea/blaze/qsync/GeneratedSourceProjectUpdaterTest.java
@@ -20,7 +20,8 @@
 import static com.google.idea.blaze.qsync.QuerySyncTestUtils.createSrcJar;
 
 import com.google.common.collect.ImmutableSet;
-import com.google.idea.blaze.qsync.GeneratedSourceProjectUpdater.GeneratedSourceJar;
+import com.google.idea.blaze.qsync.java.GeneratedSourceProjectUpdater;
+import com.google.idea.blaze.qsync.java.GeneratedSourceProjectUpdater.GeneratedSourceJar;
 import com.google.idea.blaze.qsync.QuerySyncTestUtils.PathPackage;
 import com.google.idea.blaze.qsync.project.ProjectPath;
 import com.google.idea.blaze.qsync.project.ProjectPath.Resolver;

diff --git a/querysync/javatests/com/google/idea/blaze/qsync/GraphToProjectConverters.java b/querysync/javatests/com/google/idea/blaze/qsync/GraphToProjectConverters.java
@@ -22,6 +22,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableSet;
+import com.google.idea.blaze.qsync.java.PackageReader;
 import com.google.idea.blaze.qsync.project.ProjectDefinition;
 import com.google.idea.blaze.qsync.project.QuerySyncLanguage;
 import java.nio.file.Path;

diff --git a/querysync/javatests/com/google/idea/blaze/qsync/PackageStatementParserTest.java b/querysync/javatests/com/google/idea/blaze/qsync/PackageStatementParserTest.java
@@ -18,6 +18,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.common.base.Joiner;
+import com.google.idea.blaze.qsync.java.PackageStatementParser;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;

diff --git a/querysync/javatests/com/google/idea/blaze/qsync/QuerySyncTestUtils.java b/querysync/javatests/com/google/idea/blaze/qsync/QuerySyncTestUtils.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.idea.blaze.common.Context;
 import com.google.idea.blaze.common.vcs.VcsState;
+import com.google.idea.blaze.qsync.java.PackageReader;
 import com.google.idea.blaze.qsync.query.QuerySummary;
 import com.google.idea.blaze.qsync.testdata.TestData;
 import java.io.IOException;

diff --git a/querysync/javatests/com/google/idea/blaze/qsync/SrcJarProjectUpdaterTest.java b/querysync/javatests/com/google/idea/blaze/qsync/SrcJarProjectUpdaterTest.java
@@ -21,6 +21,7 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.idea.blaze.qsync.QuerySyncTestUtils.PathPackage;
+import com.google.idea.blaze.qsync.java.SrcJarProjectUpdater;
 import com.google.idea.blaze.qsync.project.ProjectPath;
 import com.google.idea.blaze.qsync.project.ProjectPath.Resolver;
 import com.google.idea.blaze.qsync.project.ProjectProto;

diff --git a/querysync/javatests/com/google/idea/blaze/qsync/TestDataSyncRunner.java b/querysync/javatests/com/google/idea/blaze/qsync/TestDataSyncRunner.java
@@ -22,6 +22,7 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.idea.blaze.common.Context;
 import com.google.idea.blaze.exception.BuildException;
+import com.google.idea.blaze.qsync.java.PackageReader;
 import com.google.idea.blaze.qsync.project.BlazeProjectSnapshot;
 import com.google.idea.blaze.qsync.project.BuildGraphData;
 import com.google.idea.blaze.qsync.project.PostQuerySyncData;