From 77d1c5a6b5df87f2814ee414aa7445069b2ed415 Mon Sep 17 00:00:00 2001 From: programbeginnerTW Date: Sun, 16 Jul 2023 14:41:29 +0800 Subject: [PATCH 1/6] 1. Clean up HTTP authentication reference 2. Update constructors in JiraSite.java and JireSiteTest.java 3. Leave the `@Deprecated` annotation in case any error should occur --- .../java/hudson/plugins/jira/JiraSite.java | 37 +++++++++++++++---- .../hudson/plugins/jira/JiraSite/config.jelly | 5 +-- .../hudson/plugins/jira/JiraSiteTest.java | 16 +++++--- 3 files changed, 41 insertions(+), 17 deletions(-) diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java index 3f4cfa30..c54db49d 100644 --- a/src/main/java/hudson/plugins/jira/JiraSite.java +++ b/src/main/java/hudson/plugins/jira/JiraSite.java @@ -263,7 +263,8 @@ public JiraSite( boolean updateJiraIssueForAllStatus, @CheckForNull String groupVisibility, @CheckForNull String roleVisibility, - boolean useHTTPAuth) { + boolean useHTTPAuth, + boolean useBearerAuth) { this( url, alternativeUrl, @@ -275,6 +276,7 @@ public JiraSite( groupVisibility, roleVisibility, useHTTPAuth, + useBearerAuth, DEFAULT_TIMEOUT, DEFAULT_READ_TIMEOUT, DEFAULT_THREAD_EXECUTOR_NUMBER); @@ -293,7 +295,8 @@ public JiraSite( boolean updateJiraIssueForAllStatus, @CheckForNull String groupVisibility, @CheckForNull String roleVisibility, - boolean useHTTPAuth) { + boolean useHTTPAuth, + boolean useBearerAuth) { this( url, alternativeUrl, @@ -304,7 +307,8 @@ public JiraSite( updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth); + useHTTPAuth, + useBearerAuth); } // Deprecate the previous constructor but leave it in place for Java-level compatibility. @@ -319,7 +323,8 @@ public JiraSite( boolean updateJiraIssueForAllStatus, String groupVisibility, String roleVisibility, - boolean useHTTPAuth) { + boolean useHTTPAuth, + boolean useBearerAuth) { this( url, alternativeUrl, @@ -331,6 +336,7 @@ public JiraSite( groupVisibility, roleVisibility, useHTTPAuth, + useBearerAuth, DEFAULT_TIMEOUT, DEFAULT_READ_TIMEOUT, DEFAULT_THREAD_EXECUTOR_NUMBER); @@ -359,6 +365,7 @@ public JiraSite( String groupVisibility, String roleVisibility, boolean useHTTPAuth, + boolean useBearerAuth, int timeout, int readTimeout, int threadExecutorNumber) { @@ -383,6 +390,7 @@ public JiraSite( setGroupVisibility(groupVisibility); setRoleVisibility(roleVisibility); this.useHTTPAuth = useHTTPAuth; + this.useBearerAuth = useBearerAuth; this.jiraSession = null; } @@ -408,6 +416,7 @@ public JiraSite( String groupVisibility, String roleVisibility, boolean useHTTPAuth, + boolean useBearerAuth, int timeout, int readTimeout, int threadExecutorNumber) { @@ -422,6 +431,7 @@ public JiraSite( groupVisibility, roleVisibility, useHTTPAuth, + useBearerAuth, timeout, readTimeout, threadExecutorNumber); @@ -455,10 +465,11 @@ public JiraSite( groupVisibility, roleVisibility, useHTTPAuth, + useBearerAuth, timeout, readTimeout, - threadExecutorNumber); - this.useBearerAuth = useBearerAuth; + threadExecutorNumber + ); } static URL toURL(String url) { @@ -647,7 +658,8 @@ protected Object readResolve() { updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth); + useHTTPAuth, + useBearerAuth); } else { jiraSite = new JiraSite( url, @@ -660,6 +672,7 @@ protected Object readResolve() { groupVisibility, roleVisibility, useHTTPAuth, + useBearerAuth, timeout, readTimeout, threadExecutorNumber); @@ -1355,6 +1368,7 @@ public FormValidation doValidate( .withGroupVisibility(groupVisibility) .withRoleVisibility(roleVisibility) .withUseHTTPAuth(useHTTPAuth) + .withUseBearerAuth(useBearerAuth) .build(); if (threadExecutorNumber < 1) { @@ -1417,6 +1431,7 @@ static class Builder { private String groupVisibility; private String roleVisibility; private boolean useHTTPAuth; + private boolean useBearerAuth; public Builder withMainURL(URL mainURL) { this.mainURL = mainURL; @@ -1468,6 +1483,11 @@ public Builder withUseHTTPAuth(boolean useHTTPAuth) { return this; } + public Builder withUseBearerAuth(boolean useBearerAuth) { + this.useBearerAuth = useBearerAuth; + return this; + } + public JiraSite build() { return new JiraSite( mainURL, @@ -1479,7 +1499,8 @@ public JiraSite build() { updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth); + useHTTPAuth, + useBearerAuth); } } diff --git a/src/main/resources/hudson/plugins/jira/JiraSite/config.jelly b/src/main/resources/hudson/plugins/jira/JiraSite/config.jelly index 7e939f4e..d733f01a 100644 --- a/src/main/resources/hudson/plugins/jira/JiraSite/config.jelly +++ b/src/main/resources/hudson/plugins/jira/JiraSite/config.jelly @@ -6,9 +6,6 @@ - - - @@ -53,7 +50,7 @@ + method="validate" with="url,credentialsId,groupVisibility,roleVisibility,alternativeUrl,timeout,readTimeout,threadExecutorNumber,useBearerAuth" />
diff --git a/src/test/java/hudson/plugins/jira/JiraSiteTest.java b/src/test/java/hudson/plugins/jira/JiraSiteTest.java index cb63c2bb..c9be14eb 100644 --- a/src/test/java/hudson/plugins/jira/JiraSiteTest.java +++ b/src/test/java/hudson/plugins/jira/JiraSiteTest.java @@ -73,6 +73,7 @@ public void createSessionWithProvidedCredentials() { false, null, null, + true, true); site.setTimeout(1); JiraSession session = site.getSession(null); @@ -93,6 +94,7 @@ public void createSessionWithGlobalCredentials() { false, null, null, + true, true); site.setTimeout(1); JiraSession session = site.getSession(mock(Job.class)); @@ -112,6 +114,7 @@ public void createSessionReturnsNullIfCredentialsIsNull() { false, null, null, + true, true); site.setTimeout(1); JiraSession session = site.getSession(null); @@ -122,7 +125,7 @@ public void createSessionReturnsNullIfCredentialsIsNull() { @Test public void deserializeMigrateCredentials() throws MalformedURLException { JiraSiteOld old = new JiraSiteOld( - validPrimaryUrl, null, ANY_USER, ANY_PASSWORD, false, false, null, false, null, null, true); + validPrimaryUrl, null, ANY_USER, ANY_PASSWORD, false, false, null, false, null, null, true, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(old); @@ -162,7 +165,7 @@ public void deserializeNormal() throws IOException { new UsernamePasswordCredentialsImpl(CredentialsScope.SYSTEM, null, null, ANY_USER, ANY_PASSWORD); CredentialsProvider.lookupStores(j.jenkins).iterator().next().addDomain(domain, c); - JiraSite site = new JiraSite(exampleOrg, null, c.getId(), false, false, null, false, null, null, true); + JiraSite site = new JiraSite(exampleOrg, null, c.getId(), false, false, null, false, null, null, true, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(site); @@ -178,7 +181,7 @@ public void deserializeNormal() throws IOException { @WithoutJenkins @Test public void deserializeWithoutCredentials() { - JiraSite site = new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true); + JiraSite site = new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(site); @@ -207,7 +210,8 @@ private static class JiraSiteOld extends JiraSite { boolean updateJiraIssueForAllStatus, String groupVisibility, String roleVisibility, - boolean useHTTPAuth) { + boolean useHTTPAuth, + boolean useBearerAuth) { super( url, alternativeUrl, @@ -218,7 +222,8 @@ private static class JiraSiteOld extends JiraSite { updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth); + useHTTPAuth, + useBearerAuth); this.userName = userName; this.password = Secret.fromString(password); } @@ -237,6 +242,7 @@ public void alternativeURLNotNull() { false, null, null, + true, true); assertNotNull(site.getAlternativeUrl()); assertEquals(exampleOrg, site.getAlternativeUrl()); From 69f849e03b8cb681dfa413801fdccd437f72be35 Mon Sep 17 00:00:00 2001 From: programbeginnerTW Date: Sun, 16 Jul 2023 16:10:00 +0800 Subject: [PATCH 2/6] Remove duplicated JiraSite object --- .../java/hudson/plugins/jira/JiraSite.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java index c54db49d..d5420319 100644 --- a/src/main/java/hudson/plugins/jira/JiraSite.java +++ b/src/main/java/hudson/plugins/jira/JiraSite.java @@ -437,41 +437,6 @@ public JiraSite( threadExecutorNumber); } - // Deprecate the previous constructor but leave it in place for Java-level compatibility. - @Deprecated - public JiraSite( - URL url, - URL alternativeUrl, - StandardUsernamePasswordCredentials credentials, - boolean supportsWikiStyleComment, - boolean recordScmChanges, - String userPattern, - boolean updateJiraIssueForAllStatus, - String groupVisibility, - String roleVisibility, - boolean useHTTPAuth, - int timeout, - int readTimeout, - int threadExecutorNumber, - boolean useBearerAuth) { - this( - url, - alternativeUrl, - credentials == null ? null : credentials.getId(), - supportsWikiStyleComment, - recordScmChanges, - userPattern, - updateJiraIssueForAllStatus, - groupVisibility, - roleVisibility, - useHTTPAuth, - useBearerAuth, - timeout, - readTimeout, - threadExecutorNumber - ); - } - static URL toURL(String url) { url = Util.fixEmptyAndTrim(url); if (url == null) { From 6333c27e3c81d06dc55922db8bee222d6a6b54ee Mon Sep 17 00:00:00 2001 From: programbeginnerTW Date: Sun, 16 Jul 2023 16:36:56 +0800 Subject: [PATCH 3/6] Fix Spotless check format violations --- src/test/java/hudson/plugins/jira/JiraSiteTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/java/hudson/plugins/jira/JiraSiteTest.java b/src/test/java/hudson/plugins/jira/JiraSiteTest.java index c9be14eb..154d3cbb 100644 --- a/src/test/java/hudson/plugins/jira/JiraSiteTest.java +++ b/src/test/java/hudson/plugins/jira/JiraSiteTest.java @@ -181,7 +181,8 @@ public void deserializeNormal() throws IOException { @WithoutJenkins @Test public void deserializeWithoutCredentials() { - JiraSite site = new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true, true); + JiraSite site = + new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(site); From 5b1eb3d7af445e3f37ad1e83fb247004e9c495e3 Mon Sep 17 00:00:00 2001 From: programbeginnerTW Date: Wed, 19 Jul 2023 17:43:54 +0800 Subject: [PATCH 4/6] Remove all deprecated `useHTTPAuth` constructor according to change requests --- .../java/hudson/plugins/jira/JiraSite.java | 45 +++---------------- .../hudson/plugins/jira/JiraSiteTest.java | 16 +++---- 2 files changed, 12 insertions(+), 49 deletions(-) diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java index d5420319..7cda4a48 100644 --- a/src/main/java/hudson/plugins/jira/JiraSite.java +++ b/src/main/java/hudson/plugins/jira/JiraSite.java @@ -128,11 +128,6 @@ public class JiraSite extends AbstractDescribableImpl { */ public URL alternativeUrl; - /** - * Jira requires HTTP Authentication for login - */ - public boolean useHTTPAuth; - /** * The id of the credentials to use. Optional. */ @@ -252,7 +247,7 @@ public class JiraSite extends AbstractDescribableImpl { private static ExecutorService executorService; // Deprecate the previous constructor but leave it in place for Java-level compatibility. - @Deprecated + // Contruct Test succeeded in JiraSiteTest.java, removal attempt for the first time. public JiraSite( URL url, @CheckForNull URL alternativeUrl, @@ -263,7 +258,6 @@ public JiraSite( boolean updateJiraIssueForAllStatus, @CheckForNull String groupVisibility, @CheckForNull String roleVisibility, - boolean useHTTPAuth, boolean useBearerAuth) { this( url, @@ -275,7 +269,6 @@ public JiraSite( updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth, DEFAULT_TIMEOUT, DEFAULT_READ_TIMEOUT, @@ -283,7 +276,7 @@ public JiraSite( } // Deprecate the previous constructor but leave it in place for Java-level compatibility. - @Deprecated + // Contruct Test succeeded in JiraSiteTest.java, removal attempt for the first time. public JiraSite( URL url, @CheckForNull URL alternativeUrl, @@ -295,7 +288,6 @@ public JiraSite( boolean updateJiraIssueForAllStatus, @CheckForNull String groupVisibility, @CheckForNull String roleVisibility, - boolean useHTTPAuth, boolean useBearerAuth) { this( url, @@ -307,12 +299,11 @@ public JiraSite( updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth); } // Deprecate the previous constructor but leave it in place for Java-level compatibility. - @Deprecated + // Contruct Test succeeded in JiraSiteTest.java, removal attempt for the first time. public JiraSite( URL url, URL alternativeUrl, @@ -323,7 +314,6 @@ public JiraSite( boolean updateJiraIssueForAllStatus, String groupVisibility, String roleVisibility, - boolean useHTTPAuth, boolean useBearerAuth) { this( url, @@ -335,7 +325,6 @@ public JiraSite( updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth, DEFAULT_TIMEOUT, DEFAULT_READ_TIMEOUT, @@ -353,7 +342,7 @@ public JiraSite( } // Deprecate the previous constructor but leave it in place for Java-level compatibility. - @Deprecated + // Contruct Test succeeded in JiraSiteTest.java, removal attempt for the first time. public JiraSite( URL url, URL alternativeUrl, @@ -364,7 +353,6 @@ public JiraSite( boolean updateJiraIssueForAllStatus, String groupVisibility, String roleVisibility, - boolean useHTTPAuth, boolean useBearerAuth, int timeout, int readTimeout, @@ -389,7 +377,6 @@ public JiraSite( this.updateJiraIssueForAllStatus = updateJiraIssueForAllStatus; setGroupVisibility(groupVisibility); setRoleVisibility(roleVisibility); - this.useHTTPAuth = useHTTPAuth; this.useBearerAuth = useBearerAuth; this.jiraSession = null; } @@ -404,7 +391,7 @@ public JiraSite(String url) { } // Deprecate the previous constructor but leave it in place for Java-level compatibility. - @Deprecated + // Contruct Test succeeded in JiraSiteTest.java, removal attempt for the first time. public JiraSite( URL url, URL alternativeUrl, @@ -415,7 +402,6 @@ public JiraSite( boolean updateJiraIssueForAllStatus, String groupVisibility, String roleVisibility, - boolean useHTTPAuth, boolean useBearerAuth, int timeout, int readTimeout, @@ -430,7 +416,6 @@ public JiraSite( updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth, timeout, readTimeout, @@ -529,10 +514,6 @@ public URL getAlternativeUrl() { return alternativeUrl; } - public boolean isUseHTTPAuth() { - return useHTTPAuth; - } - public boolean isUseBearerAuth() { return useBearerAuth; } @@ -562,11 +543,6 @@ public void setAlternativeUrl(String alternativeUrl) { this.alternativeUrl = toURL(alternativeUrl); } - @DataBoundSetter - public void setUseHTTPAuth(boolean useHTTPAuth) { - this.useHTTPAuth = useHTTPAuth; - } - @DataBoundSetter public void setUseBearerAuth(boolean useBearerAuth) { this.useBearerAuth = useBearerAuth; @@ -623,7 +599,6 @@ protected Object readResolve() { updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth); } else { jiraSite = new JiraSite( @@ -636,7 +611,6 @@ protected Object readResolve() { updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth, timeout, readTimeout, @@ -1290,7 +1264,6 @@ public FormValidation doValidate( @QueryParameter String credentialsId, @QueryParameter String groupVisibility, @QueryParameter String roleVisibility, - @QueryParameter boolean useHTTPAuth, @QueryParameter String alternativeUrl, @QueryParameter int timeout, @QueryParameter int readTimeout, @@ -1332,7 +1305,6 @@ public FormValidation doValidate( .withCredentialsId(credentialsId) .withGroupVisibility(groupVisibility) .withRoleVisibility(roleVisibility) - .withUseHTTPAuth(useHTTPAuth) .withUseBearerAuth(useBearerAuth) .build(); @@ -1395,7 +1367,6 @@ static class Builder { private boolean updateJiraIssueForAllStatus; private String groupVisibility; private String roleVisibility; - private boolean useHTTPAuth; private boolean useBearerAuth; public Builder withMainURL(URL mainURL) { @@ -1443,11 +1414,6 @@ public Builder withRoleVisibility(String roleVisibility) { return this; } - public Builder withUseHTTPAuth(boolean useHTTPAuth) { - this.useHTTPAuth = useHTTPAuth; - return this; - } - public Builder withUseBearerAuth(boolean useBearerAuth) { this.useBearerAuth = useBearerAuth; return this; @@ -1464,7 +1430,6 @@ public JiraSite build() { updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth); } } diff --git a/src/test/java/hudson/plugins/jira/JiraSiteTest.java b/src/test/java/hudson/plugins/jira/JiraSiteTest.java index 154d3cbb..55c64eb1 100644 --- a/src/test/java/hudson/plugins/jira/JiraSiteTest.java +++ b/src/test/java/hudson/plugins/jira/JiraSiteTest.java @@ -73,7 +73,7 @@ public void createSessionWithProvidedCredentials() { false, null, null, - true, + // true, true); site.setTimeout(1); JiraSession session = site.getSession(null); @@ -94,7 +94,7 @@ public void createSessionWithGlobalCredentials() { false, null, null, - true, + // true, true); site.setTimeout(1); JiraSession session = site.getSession(mock(Job.class)); @@ -114,7 +114,7 @@ public void createSessionReturnsNullIfCredentialsIsNull() { false, null, null, - true, + // true, true); site.setTimeout(1); JiraSession session = site.getSession(null); @@ -125,7 +125,7 @@ public void createSessionReturnsNullIfCredentialsIsNull() { @Test public void deserializeMigrateCredentials() throws MalformedURLException { JiraSiteOld old = new JiraSiteOld( - validPrimaryUrl, null, ANY_USER, ANY_PASSWORD, false, false, null, false, null, null, true, true); + validPrimaryUrl, null, ANY_USER, ANY_PASSWORD, false, false, null, false, null, null, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(old); @@ -165,7 +165,7 @@ public void deserializeNormal() throws IOException { new UsernamePasswordCredentialsImpl(CredentialsScope.SYSTEM, null, null, ANY_USER, ANY_PASSWORD); CredentialsProvider.lookupStores(j.jenkins).iterator().next().addDomain(domain, c); - JiraSite site = new JiraSite(exampleOrg, null, c.getId(), false, false, null, false, null, null, true, true); + JiraSite site = new JiraSite(exampleOrg, null, c.getId(), false, false, null, false, null, null, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(site); @@ -182,7 +182,7 @@ public void deserializeNormal() throws IOException { @Test public void deserializeWithoutCredentials() { JiraSite site = - new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true, true); + new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(site); @@ -211,7 +211,6 @@ private static class JiraSiteOld extends JiraSite { boolean updateJiraIssueForAllStatus, String groupVisibility, String roleVisibility, - boolean useHTTPAuth, boolean useBearerAuth) { super( url, @@ -223,7 +222,6 @@ private static class JiraSiteOld extends JiraSite { updateJiraIssueForAllStatus, groupVisibility, roleVisibility, - useHTTPAuth, useBearerAuth); this.userName = userName; this.password = Secret.fromString(password); @@ -243,7 +241,7 @@ public void alternativeURLNotNull() { false, null, null, - true, + // true, true); assertNotNull(site.getAlternativeUrl()); assertEquals(exampleOrg, site.getAlternativeUrl()); From 34c2dee52a4a547a048787262b4eb07fb2867318 Mon Sep 17 00:00:00 2001 From: programbeginnerTW Date: Wed, 19 Jul 2023 17:54:18 +0800 Subject: [PATCH 5/6] Fix compilation error on JiraSite.java and remove unused parameters in JiraSiteTest.java --- src/main/java/hudson/plugins/jira/JiraSite.java | 2 +- src/test/java/hudson/plugins/jira/JiraSiteTest.java | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java index 7cda4a48..83b312d3 100644 --- a/src/main/java/hudson/plugins/jira/JiraSite.java +++ b/src/main/java/hudson/plugins/jira/JiraSite.java @@ -1264,11 +1264,11 @@ public FormValidation doValidate( @QueryParameter String credentialsId, @QueryParameter String groupVisibility, @QueryParameter String roleVisibility, + @QueryParameter boolean useBearerAuth, @QueryParameter String alternativeUrl, @QueryParameter int timeout, @QueryParameter int readTimeout, @QueryParameter int threadExecutorNumber, - @QueryParameter boolean useBearerAuth, @AncestorInPath Item item) { if (item == null) { diff --git a/src/test/java/hudson/plugins/jira/JiraSiteTest.java b/src/test/java/hudson/plugins/jira/JiraSiteTest.java index 55c64eb1..b326de34 100644 --- a/src/test/java/hudson/plugins/jira/JiraSiteTest.java +++ b/src/test/java/hudson/plugins/jira/JiraSiteTest.java @@ -73,7 +73,6 @@ public void createSessionWithProvidedCredentials() { false, null, null, - // true, true); site.setTimeout(1); JiraSession session = site.getSession(null); @@ -94,7 +93,6 @@ public void createSessionWithGlobalCredentials() { false, null, null, - // true, true); site.setTimeout(1); JiraSession session = site.getSession(mock(Job.class)); @@ -114,7 +112,6 @@ public void createSessionReturnsNullIfCredentialsIsNull() { false, null, null, - // true, true); site.setTimeout(1); JiraSession session = site.getSession(null); @@ -181,8 +178,7 @@ public void deserializeNormal() throws IOException { @WithoutJenkins @Test public void deserializeWithoutCredentials() { - JiraSite site = - new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true); + JiraSite site = new JiraSite(exampleOrg, null, (String) null, false, false, null, false, null, null, true); XStream2 xStream2 = new XStream2(); String xml = xStream2.toXML(site); @@ -241,7 +237,6 @@ public void alternativeURLNotNull() { false, null, null, - // true, true); assertNotNull(site.getAlternativeUrl()); assertEquals(exampleOrg, site.getAlternativeUrl()); From f3005df1d3ac7038a7adcf61f840bfb8f9e2ce95 Mon Sep 17 00:00:00 2001 From: programbeginnerTW Date: Wed, 19 Jul 2023 18:03:15 +0800 Subject: [PATCH 6/6] Fix wrong parameters in DescriptorImplTest.java --- src/main/java/hudson/plugins/jira/JiraSite.java | 2 +- src/test/java/hudson/plugins/jira/DescriptorImplTest.java | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/hudson/plugins/jira/JiraSite.java b/src/main/java/hudson/plugins/jira/JiraSite.java index 83b312d3..7cda4a48 100644 --- a/src/main/java/hudson/plugins/jira/JiraSite.java +++ b/src/main/java/hudson/plugins/jira/JiraSite.java @@ -1264,11 +1264,11 @@ public FormValidation doValidate( @QueryParameter String credentialsId, @QueryParameter String groupVisibility, @QueryParameter String roleVisibility, - @QueryParameter boolean useBearerAuth, @QueryParameter String alternativeUrl, @QueryParameter int timeout, @QueryParameter int readTimeout, @QueryParameter int threadExecutorNumber, + @QueryParameter boolean useBearerAuth, @AncestorInPath Item item) { if (item == null) { diff --git a/src/test/java/hudson/plugins/jira/DescriptorImplTest.java b/src/test/java/hudson/plugins/jira/DescriptorImplTest.java index 5c9c0afa..47e78adc 100644 --- a/src/test/java/hudson/plugins/jira/DescriptorImplTest.java +++ b/src/test/java/hudson/plugins/jira/DescriptorImplTest.java @@ -133,7 +133,6 @@ public void validateFormConnectionErrors() throws Exception { null, null, null, - false, null, JiraSite.DEFAULT_TIMEOUT, JiraSite.DEFAULT_READ_TIMEOUT, @@ -149,7 +148,6 @@ public void validateFormConnectionErrors() throws Exception { null, null, null, - false, null, -1, JiraSite.DEFAULT_READ_TIMEOUT, @@ -165,7 +163,6 @@ public void validateFormConnectionErrors() throws Exception { null, null, null, - false, null, JiraSite.DEFAULT_TIMEOUT, -1, @@ -182,7 +179,6 @@ public void validateFormConnectionErrors() throws Exception { null, null, null, - false, null, JiraSite.DEFAULT_TIMEOUT, JiraSite.DEFAULT_READ_TIMEOUT, @@ -208,7 +204,6 @@ public void validateFormConnectionOK() throws Exception { null, null, null, - false, null, JiraSite.DEFAULT_TIMEOUT, JiraSite.DEFAULT_READ_TIMEOUT,