From 57f229c69ef2edcc33949dcde6d885eedea8ab30 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 17 Sep 2025 08:38:25 -0700 Subject: [PATCH] Remove implementation of set compatible versions task (#134896) This task will go away with the new transport version system. In the meantime, this commit removes the implementation so that the task still exists so release automation can proceed. Co-authored-by: Mariusz Jozala --- .../release/SetCompatibleVersionsTask.java | 37 -------------- .../SetCompatibleVersionsTaskTests.java | 51 ------------------- 2 files changed, 88 deletions(-) delete mode 100644 build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTaskTests.java diff --git a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTask.java b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTask.java index f2fa39cef860a..36ebfb19320da 100644 --- a/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTask.java +++ b/build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTask.java @@ -9,22 +9,14 @@ package org.elasticsearch.gradle.internal.release; -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; -import com.github.javaparser.ast.body.ClassOrInterfaceDeclaration; -import com.github.javaparser.ast.expr.NameExpr; -import com.github.javaparser.printer.lexicalpreservation.LexicalPreservingPrinter; - import org.elasticsearch.gradle.Version; import org.gradle.api.tasks.TaskAction; import org.gradle.api.tasks.options.Option; import org.gradle.initialization.layout.BuildLayout; import java.io.IOException; -import java.nio.file.Path; import java.util.List; import java.util.Map; -import java.util.Optional; import javax.inject.Inject; @@ -68,34 +60,5 @@ public void executeTask() throws IOException { if (transportVersion == null) { throw new IllegalArgumentException("TransportVersion id not specified"); } - Path versionJava = rootDir.resolve(TRANSPORT_VERSIONS_FILE_PATH); - CompilationUnit file = LexicalPreservingPrinter.setup(StaticJavaParser.parse(versionJava)); - - Optional modifiedFile; - - modifiedFile = setMinimumCcsTransportVersion(file, transportVersion); - - if (modifiedFile.isPresent()) { - writeOutNewContents(versionJava, modifiedFile.get()); - } - } - - static Optional setMinimumCcsTransportVersion(CompilationUnit unit, int transportVersion) { - ClassOrInterfaceDeclaration transportVersions = unit.getClassByName("TransportVersions").get(); - - String tvConstantName = transportVersions.getFields().stream().filter(f -> { - var i = findSingleIntegerExpr(f); - return i.isPresent() && i.getAsInt() == transportVersion; - }) - .map(f -> f.getVariable(0).getNameAsString()) - .findFirst() - .orElseThrow(() -> new IllegalStateException("Could not find constant for id " + transportVersion)); - - transportVersions.getFieldByName("MINIMUM_CCS_VERSION") - .orElseThrow(() -> new IllegalStateException("Could not find MINIMUM_CCS_VERSION constant")) - .getVariable(0) - .setInitializer(new NameExpr(tvConstantName)); - - return Optional.of(unit); } } diff --git a/build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTaskTests.java b/build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTaskTests.java deleted file mode 100644 index 5ae252e3d8d44..0000000000000 --- a/build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/SetCompatibleVersionsTaskTests.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one - * or more contributor license agreements. Licensed under the "Elastic License - * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side - * Public License v 1"; you may not use this file except in compliance with, at - * your election, the "Elastic License 2.0", the "GNU Affero General Public - * License v3.0 only", or the "Server Side Public License, v 1". - */ - -package org.elasticsearch.gradle.internal.release; - -import com.github.javaparser.StaticJavaParser; -import com.github.javaparser.ast.CompilationUnit; - -import org.junit.Test; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasToString; - -public class SetCompatibleVersionsTaskTests { - - @Test - public void updateMinCcsVersion() { - final String transportVersionsJava = """ - public class TransportVersions { - public static final TransportVersion V1 = def(100); - public static final TransportVersion V2 = def(200); - public static final TransportVersion V3 = def(300); - - public static final TransportVersion MINIMUM_CCS_VERSION = V2; - }"""; - final String updatedJava = """ - public class TransportVersions { - - public static final TransportVersion V1 = def(100); - - public static final TransportVersion V2 = def(200); - - public static final TransportVersion V3 = def(300); - - public static final TransportVersion MINIMUM_CCS_VERSION = V3; - } - """; - - CompilationUnit unit = StaticJavaParser.parse(transportVersionsJava); - - SetCompatibleVersionsTask.setMinimumCcsTransportVersion(unit, 300); - - assertThat(unit, hasToString(updatedJava)); - } -}