diff --git a/pom.xml b/pom.xml index 54d43ab..4cd8838 100644 --- a/pom.xml +++ b/pom.xml @@ -204,12 +204,6 @@ 4.3.0 test - - org.jenkins-ci.plugins - extended-choice-parameter - 388.ve7b_d0b_920e10 - test - org.jenkins-ci.plugins git diff --git a/src/main/java/io/jenkins/plugins/mcp/server/extensions/util/ParameterValueFactory.java b/src/main/java/io/jenkins/plugins/mcp/server/extensions/util/ParameterValueFactory.java index f8d3939..fb6f883 100644 --- a/src/main/java/io/jenkins/plugins/mcp/server/extensions/util/ParameterValueFactory.java +++ b/src/main/java/io/jenkins/plugins/mcp/server/extensions/util/ParameterValueFactory.java @@ -36,7 +36,6 @@ import hudson.model.StringParameterDefinition; import hudson.model.TextParameterDefinition; import java.util.List; -import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; /** @@ -50,8 +49,6 @@ public final class ParameterValueFactory { "net.uaznia.lukanus.hudson.plugins.gitparameter.GitParameterDefinition"; public static final String LIST_GIT_BRANCHES_PARAMETER_DEFINITION = "com.syhuang.hudson.plugins.listgitbranchesparameter.ListGitBranchesParameterDefinition"; - public static final String EXTENDED_CHOICE_PARAMETER_DEFINITION = - "com.cwctravel.hudson.plugins.extended_choice_parameter.ExtendedChoiceParameterDefinition"; public static final String VALIDATING_STRING_PARAMETER_DEFINITION = "hudson.plugins.validating_string_parameter.ValidatingStringParameterDefinition"; @@ -69,8 +66,6 @@ public static ParameterValue createParameterValue(ParameterDefinition param, Obj return createGitParameterValue(param, inputValue); } else if (isParameterDefinitionOf(param, LIST_GIT_BRANCHES_PARAMETER_DEFINITION)) { return createListGitBranchesParameterValue(param, inputValue); - } else if (isParameterDefinitionOf(param, EXTENDED_CHOICE_PARAMETER_DEFINITION)) { - return createExtendedChoiceParameterValue(param, inputValue); } else if (isParameterDefinitionOf(param, VALIDATING_STRING_PARAMETER_DEFINITION)) { return createParameterValueViaCli(param, String.valueOf(inputValue)); } else if (param instanceof StringParameterDefinition) { @@ -190,16 +185,6 @@ private static ParameterValue createListGitBranchesParameterValue(ParameterDefin return createParameterValueViaCli(param, String.valueOf(inputValue)); } - private static ParameterValue createExtendedChoiceParameterValue(ParameterDefinition param, Object inputValue) { - String valuesAsString; - if (inputValue instanceof List l) { - valuesAsString = l.stream().map(Object::toString).collect(Collectors.joining(",")); - } else { - valuesAsString = String.valueOf(inputValue); - } - return createParameterValueViaCli(param, valuesAsString); - } - private static ParameterValue createParameterValueViaCli(ParameterDefinition param, String inputValue) { String paramTypeName = param.getClass().getSimpleName(); try { diff --git a/src/test/java/io/jenkins/plugins/mcp/server/extensions/util/ParameterValueFactoryExtendedChoiceParameterTest.java b/src/test/java/io/jenkins/plugins/mcp/server/extensions/util/ParameterValueFactoryExtendedChoiceParameterTest.java deleted file mode 100644 index eb7b0f5..0000000 --- a/src/test/java/io/jenkins/plugins/mcp/server/extensions/util/ParameterValueFactoryExtendedChoiceParameterTest.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.jenkins.plugins.mcp.server.extensions.util; - -import static com.cwctravel.hudson.plugins.extended_choice_parameter.ExtendedChoiceParameterDefinition.PARAMETER_TYPE_CHECK_BOX; -import static org.assertj.core.api.Assertions.assertThat; - -import com.cwctravel.hudson.plugins.extended_choice_parameter.ExtendedChoiceParameterDefinition; -import com.cwctravel.hudson.plugins.extended_choice_parameter.ExtendedChoiceParameterValue; -import hudson.model.ParameterValue; -import java.util.List; -import java.util.stream.Stream; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; - -class ParameterValueFactoryExtendedChoiceParameterTest { - - public static Stream extendedChoiceSources() { - return Stream.of(Arguments.of("feature, bug"), Arguments.of(List.of("feature", "bug"))); - } - - @ParameterizedTest - @MethodSource("extendedChoiceSources") - void createsExtendedChoiceParameterValueUsingCliOverload(Object inputValue) { - var param = new ExtendedChoiceParameterDefinition( - "test", - PARAMETER_TYPE_CHECK_BOX, - "feature,bug,fix", - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - null, - false, - false, - 5, - "test", - ","); - ParameterValue value = ParameterValueFactory.createParameterValue(param, inputValue); - - assertThat(value) - .isInstanceOfSatisfying( - ExtendedChoiceParameterValue.class, - v -> assertThat(v.getValue()).isEqualTo("feature,bug")); - } -}