Use Jenkins annotation to control HTTP protocol

jenkinsci · May 18, 2022 · c62420e · c62420e
1 parent 554b639
commit c62420e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 12 deletions.
diff --git a/.../plugins/maven_artifact_choicelistprovider/artifactory/ArtifactoryChoiceListProvider.java b/.../plugins/maven_artifact_choicelistprovider/artifactory/ArtifactoryChoiceListProvider.java
@@ -3,8 +3,6 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.ws.rs.POST;
-
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactDescriptorImpl;
@@ -26,6 +24,7 @@
 import hudson.security.ACL;
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class ArtifactoryChoiceListProvider extends AbstractMavenArtifactChoiceListProvider {
 
@@ -67,7 +66,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item pItem) {
             return retVal;
         }
 
-        @POST
+        @RequirePOST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String groupId,
                 @QueryParameter String artifactId, @QueryParameter String packaging, @QueryParameter String classifier,
                 @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {

diff --git a/...nsci/plugins/maven_artifact_choicelistprovider/maven/MavenMetadataChoiceListProvider.java b/...nsci/plugins/maven_artifact_choicelistprovider/maven/MavenMetadataChoiceListProvider.java
@@ -3,8 +3,6 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.ws.rs.POST;
-
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.IVersionReader;
@@ -26,6 +24,7 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import jp.ikedam.jenkins.plugins.extensible_choice_parameter.ChoiceListProvider;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 
 
 /**
@@ -107,7 +106,7 @@ public FormValidation doCheckArtifactId(@QueryParameter String artifactId) {
             return FormValidation.ok();
         }
 
-        @POST
+        @RequirePOST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String repositoryId,
                                      @QueryParameter String groupId, @QueryParameter String artifactId,
                                      @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {

diff --git a/...rg/jenkinsci/plugins/maven_artifact_choicelistprovider/nexus/NexusChoiceListProvider.java b/...rg/jenkinsci/plugins/maven_artifact_choicelistprovider/nexus/NexusChoiceListProvider.java
@@ -4,8 +4,6 @@
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javax.ws.rs.POST;
-
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactDescriptorImpl;
@@ -29,6 +27,7 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import net.sf.json.JSONObject;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class NexusChoiceListProvider extends AbstractMavenArtifactChoiceListProvider {
 
@@ -80,7 +79,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item pItem) {
             return retVal;
         }
 
-        @POST
+        @RequirePOST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String repositoryId,
                 @QueryParameter String groupId, @QueryParameter String artifactId, @QueryParameter String packaging, @QueryParameter String classifier,
                 @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {

diff --git a/.../jenkinsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3ChoiceListProvider.java b/.../jenkinsci/plugins/maven_artifact_choicelistprovider/nexus3/Nexus3ChoiceListProvider.java
@@ -3,8 +3,6 @@
 import java.util.Collections;
 import java.util.Map;
 
-import javax.ws.rs.POST;
-
 import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactChoiceListProvider;
 import org.jenkinsci.plugins.maven_artifact_choicelistprovider.AbstractMavenArtifactDescriptorImpl;
@@ -28,6 +26,7 @@
 import hudson.util.FormValidation;
 import hudson.util.ListBoxModel;
 import net.sf.json.JSONObject;
+import org.kohsuke.stapler.interceptor.RequirePOST;
 
 public class Nexus3ChoiceListProvider extends AbstractMavenArtifactChoiceListProvider {
 
@@ -74,7 +73,7 @@ public ListBoxModel doFillCredentialsIdItems(@AncestorInPath Item pItem) {
             return retVal;
         }
 
-        @POST
+        @RequirePOST
         public FormValidation doTest(@AncestorInPath Item pItem, @QueryParameter String url, @QueryParameter String credentialsId, @QueryParameter String repositoryId,
                 @QueryParameter String groupId, @QueryParameter String artifactId, @QueryParameter String packaging, @QueryParameter String classifier,
                 @QueryParameter boolean inverseFilter, @QueryParameter String filterExpression, @QueryParameter boolean reverseOrder) {