MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-385795 [gradle|tooling] cleanup GradleBuildScriptClasspathSerializationService: use existing ToolingStreamApiUtils

Browse Source 
Replaces manual stepIn/stepOut/loop boilerplate with the existing ToolingStreamApiUtils's readList/writeCollection serialization helpers.

GitOrigin-RevId: 5897d3fec6cbb19e9f8bb9e5db402914e94103e1
This commit is contained in:
Sergei Vorobyov
2026-04-28 20:32:32 +00:00
committed by intellij-monorepo-bot
parent cb6b37c22f
commit e05708156a
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/tooling-extension-impl/src/com/intellij/gradle/toolingExtension/impl/model/buildScriptClasspathModel/GradleBuildScriptClasspathSerializationService.java
+8 -16
View File
@@ -18,7 +18,6 @@ import org.jetbrains.plugins.gradle.tooling.util.ObjectCollector;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.OBJECT_ID_FIELD;
@@ -27,7 +26,9 @@ import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamAp
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.readFile;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.readFileSet;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.readInt;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.readList;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.readString;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.writeCollection;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.writeFile;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.writeString;
import static org.jetbrains.plugins.gradle.tooling.serialization.ToolingStreamApiUtils.writeStrings;
@@ -83,12 +84,9 @@ public final class GradleBuildScriptClasspathSerializationService implements Ser
}
private static void writeClasspath(IonWriter writer, List<? extends ClasspathEntryModel> classpath) throws IOException {
writer.setFieldName("classpath");
writer.stepIn(IonType.LIST);
for (ClasspathEntryModel entry : classpath) {
writeClasspathEntry(writer, entry);
}
writer.stepOut();
writeCollection(writer, "classpath", classpath, entry ->
writeClasspathEntry(writer, entry)
);
}
private static void writeClasspathEntry(IonWriter writer, ClasspathEntryModel entry) throws IOException {
@@ -124,15 +122,9 @@ public final class GradleBuildScriptClasspathSerializationService implements Ser
}
private static List<ClasspathEntryModel> readClasspath(IonReader reader) {
List<ClasspathEntryModel> list = new ArrayList<>();
reader.next();
reader.stepIn();
ClasspathEntryModel entry;
while ((entry = readClasspathEntry(reader)) != null) {
list.add(entry);
}
reader.stepOut();
return list;
return readList(reader, "classpath", () ->
readClasspathEntry(reader)
);
}
private static ClasspathEntryModel readClasspathEntry(IonReader reader) {