refine GetResolvedDomAction to query for the declarative schema once …

…only
gradle · Jun 6, 2024 · 05e9d06 · 05e9d06
1 parent 1c93720
commit 05e9d06
Showing 1 changed file with 3 additions and 12 deletions.
diff --git a/build-action/src/main/java/org/gradle/client/build/action/GetResolvedDomAction.java b/build-action/src/main/java/org/gradle/client/build/action/GetResolvedDomAction.java
@@ -18,22 +18,13 @@ public class GetResolvedDomAction implements BuildAction<ResolvedDomPrerequisite
 
     @Override
     public ResolvedDomPrerequisites execute(BuildController controller) {
-        InterpretationSequence settingsSchema = getSettingsInterpretationSequence(controller);
-        InterpretationSequence projectSchema = getProjectInterpretationSequence(controller);
+        DeclarativeSchemaModel declarativeSchemaModel = controller.getModel(DeclarativeSchemaModel.class);
+        InterpretationSequence settingsSchema = declarativeSchemaModel.getSettingsSequence();
+        InterpretationSequence projectSchema = declarativeSchemaModel.getProjectSequence();
         Pair<File, List<File>> buildFiles = getDeclarativeBuildFiles(controller);
         return new ResolvedDomPrerequisitesImpl(settingsSchema, projectSchema, buildFiles.getLeft(), buildFiles.getRight());
     }
 
-    private static InterpretationSequence getSettingsInterpretationSequence(BuildController controller) {
-        DeclarativeSchemaModel declarativeSchemaModel = controller.getModel(DeclarativeSchemaModel.class);
-        return declarativeSchemaModel.getSettingsSequence();
-    }
-
-    private static InterpretationSequence getProjectInterpretationSequence(BuildController controller) {
-        DeclarativeSchemaModel declarativeSchemaModel = controller.getModel(DeclarativeSchemaModel.class);
-        return declarativeSchemaModel.getProjectSequence();
-    }
-
     private static Pair<File, List<File>> getDeclarativeBuildFiles(BuildController controller) {
         GradleBuild gradleBuild = controller.getModel(GradleBuild.class);
         File rootProjectDirectory = gradleBuild.getRootProject().getProjectDirectory();