Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,5 @@ work/
*.iml
.vscode/
.idea/*
!.idea/checkstyle-idea.xml
!.idea/google-java-format.xml

atlassian-ide-plugin.xml
17 changes: 0 additions & 17 deletions .idea/checkstyle-idea.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/google-java-format.xml

This file was deleted.

4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/jira/JiraBuildAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ public JiraBuildAction(@NonNull Set<JiraIssue> issues) {

// Leave it in place for binary compatibility.
/**
* @deprecated use {@link #JiraBuildAction(java.util.Set)} instead
*
* @param owner the owner of this action
* @param issues the Jira issues
*
* @deprecated use {@link #JiraBuildAction(java.util.Set)} instead
*/
@Deprecated
public JiraBuildAction(Run<?, ?> owner, @NonNull Set<JiraIssue> issues) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ public class JiraChangeLogAnnotator extends ChangeLogAnnotator {
private static final Logger LOGGER = Logger.getLogger(JiraChangeLogAnnotator.class.getName());

public JiraChangeLogAnnotator() {
super();
LOGGER.fine("JiraChangeLogAnnotator created");
}

Expand Down
66 changes: 33 additions & 33 deletions src/main/java/hudson/plugins/jira/JiraCreateIssueNotifier.java
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
* assignee,components and summary.
* The created issue ID is saved to the file at "filename".
*
* @param build
* @param filename
* @param build build
* @param filename filename
* @return issue id
* @throws IOException
* @throws InterruptedException
* @throws IOException if IO fails
* @throws InterruptedException if thread is interrupted
*/
private Issue createJiraIssue(AbstractBuild<?, ?> build, String filename) throws IOException, InterruptedException {

Expand Down Expand Up @@ -227,10 +227,10 @@ private Issue createJiraIssue(AbstractBuild<?, ?> build, String filename) throws
/**
* Returns the status of the issue.
*
* @param build
* @param id
* @param build build
* @param id issue key
* @return Status of the issue
* @throws IOException
* @throws IOException if IO fails
*/
private Status getStatus(AbstractBuild<?, ?> build, String id) throws IOException {

Expand All @@ -242,11 +242,11 @@ private Status getStatus(AbstractBuild<?, ?> build, String id) throws IOExceptio
/**
* Adds a comment to the existing issue.
*
* @param build
* @param listener
* @param id
* @param comment
* @throws IOException
* @param build build
* @param listener listener
* @param id issue key
* @param comment comment text
* @throws IOException if IO fails
*/
private void addComment(AbstractBuild<?, ?> build, BuildListener listener, String id, String comment)
throws IOException {
Expand All @@ -258,10 +258,10 @@ private void addComment(AbstractBuild<?, ?> build, BuildListener listener, Strin
/**
* Returns the issue id
*
* @param filename
* @return
* @throws IOException
* @throws InterruptedException
* @param filename file from which to read the issue name
* @return issue ID
* @throws IOException if IO fails
* @throws InterruptedException if thread is interrupted
*/
private String getIssue(String filename) throws IOException, InterruptedException {
String issueId = "";
Expand All @@ -288,9 +288,9 @@ JiraSite getSiteForProject(AbstractProject<?, ?> project) {
/**
* Returns the jira session.
*
* @param build
* @param build build
* @return JiraSession
* @throws IOException
* @throws IOException if IO fails
*/
private JiraSession getJiraSession(AbstractBuild<?, ?> build) throws IOException {

Expand All @@ -310,7 +310,7 @@ private JiraSession getJiraSession(AbstractBuild<?, ?> build) throws IOException
}

/**
* @param filename
* @param filename filename
*/
private void deleteFile(String filename) {
File file = new File(filename);
Expand All @@ -320,11 +320,11 @@ private void deleteFile(String filename) {
}

/**
* write's the issue id in the file, which is stored in the Job's directory
* Writes the issue id in the file, which is stored in the Job's directory.
*
* @param filename
* @param issue
* @throws FileNotFoundException
* @param filename filenam
* @param issue issue
* @throws FileNotFoundException if file not found
*/
private void writeInFile(String filename, Issue issue) throws IOException {
// olamy really weird to write an empty file especially with null
Expand Down Expand Up @@ -394,12 +394,12 @@ private void currentBuildResultFailure(
* it checks for the previous build's result and adds comment until the
* previously created issue is closed.
*
* @param build
* @param previousBuildResult
* @param filename
* @param vars
* @throws InterruptedException
* @throws IOException
* @param build build
* @param previousBuildResult previous build result
* @param filename filename
* @param vars variables
* @throws InterruptedException if thread isinterrupted
* @throws IOException if IO fails
*/
private void currentBuildResultSuccess(
AbstractBuild<?, ?> build,
Expand Down Expand Up @@ -463,8 +463,8 @@ private void progressWorkflowAction(AbstractBuild<?, ?> build, String issueId, I
/**
* Returns build details string in wiki format, with hyperlinks.
*
* @param vars
* @return
* @param vars environment variables
* @return build details string
*/
private String getBuildDetailsString(EnvVars vars) {
final String buildURL = vars.get("BUILD_URL");
Expand All @@ -474,8 +474,8 @@ private String getBuildDetailsString(EnvVars vars) {
/**
* Returns build name in format BUILD#10
*
* @param vars
* @return String
* @param vars environment variables
* @return String build name
*/
private String getBuildName(EnvVars vars) {
final String jobName = vars.get("JOB_NAME");
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/hudson/plugins/jira/JiraFolderProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ public JiraSite[] getSites() {
}

/**
* @deprecated use {@link #setSites(List)} instead
*
* @param site the Jira site
* @deprecated use {@link #setSites(List)} instead
*/
@Deprecated
public void setSites(JiraSite site) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/hudson/plugins/jira/JiraIssueMigrator.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen

JiraSite site = getJiraSiteForProject(build.getProject());

if (addRelease == true) {
if (addRelease) {
site.addFixVersionToIssue(realProjectKey, realRelease, realQuery);
} else {
if (realReplace == null || realReplace.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package hudson.plugins.jira;

import com.atlassian.jira.rest.client.api.RestClientException;
Expand Down
1 change: 0 additions & 1 deletion src/main/java/hudson/plugins/jira/JiraIssueUpdater.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ public class JiraIssueUpdater extends Recorder implements MatrixAggregatable, Si

@DataBoundConstructor
public JiraIssueUpdater(AbstractIssueSelector issueSelector, SCM scm, List<String> labels) {
super();
this.issueSelector = issueSelector;
this.scm = scm;
if (labels != null) {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/hudson/plugins/jira/JiraProjectProperty.java
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@ public String getDisplayName() {
}

/**
* @deprecated use {@link JiraGlobalConfiguration#setSites(List)} instead
*
* @param site the Jira site
*
* @deprecated use {@link JiraGlobalConfiguration#setSites(List)} instead
*/
@Deprecated
public void setSites(JiraSite site) {
JiraGlobalConfiguration.get().getSites().add(site);
}

/**
* @deprecated use {@link JiraGlobalConfiguration#getSites()} instead
*
* @return array of sites
*
* @deprecated use {@link JiraGlobalConfiguration#getSites()} instead
*/
@Deprecated
public JiraSite[] getSites() {
Expand Down
1 change: 1 addition & 0 deletions src/main/java/hudson/plugins/jira/JiraRestService.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package hudson.plugins.jira;

import static java.util.logging.Level.FINE;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/hudson/plugins/jira/JiraSession.java
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,8 @@ private Map<Long, String> getKnownStatuses() {
* Returns issue-id of the created issue
*
* @return The issue id
*
* @deprecated use {@link #createIssue(String, String, String, Iterable, String, Long, Long)}
*/
@Deprecated
public Issue createIssue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*
* @author Artem Koshelev artkoshelev@gmail.com
* @deprecated Replaced by {@link JiraVersionCreatorBuilder}. Read its description to see why.
* Kept for backward compatibility.
* Kept for backward compatibility.
*/
@Deprecated
public class JiraVersionCreator extends Notifier {
Expand Down
21 changes: 10 additions & 11 deletions src/main/java/hudson/plugins/jira/Updater.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,11 @@ class Updater {
*/
public static boolean debug = false;

public Updater(SCM scm) {
Updater(SCM scm) {
this(scm, new ArrayList<>());
}

public Updater(SCM scm, List<String> labels) {
super();
Updater(SCM scm, List<String> labels) {
this.scm = scm;
if (labels == null) {
this.labels = new ArrayList<>();
Expand Down Expand Up @@ -144,14 +143,14 @@ boolean perform(Run<?, ?> run, TaskListener listener, AbstractIssueSelector sele
* Submits comments for the given issues.
* Removes from <code>issues</code> issues which have been successfully updated or are invalid
*
* @param build
* @param logger
* @param jenkinsRootUrl
* @param session
* @param useWikiStyleComments
* @param recordScmChanges
* @param groupVisibility
*
* @param build build
* @param logger logger
* @param jenkinsRootUrl jenkins root URL
* @param session session
* @param useWikiStyleComments whether to use wiki style comments
* @param recordScmChanges whether to record SCM changes
* @param groupVisibility group visibility
* @throws RestClientException when HTTP request fails
*/
void submitComments(
Run<?, ?> build,
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/jira/VersionCreator.java
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ protected boolean perform(

/**
* Creates given version in given project
* @param version
* @param projectKey
* @param session
* @param version version name
* @param projectKey project key
* @param session session
*/
protected void addVersion(String version, String projectKey, JiraSession session) {
if (session == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package hudson.plugins.jira.listissuesparameter;

import static hudson.Util.fixNull;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package hudson.plugins.jira.listissuesparameter;

import hudson.EnvVars;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public class JqlIssueSelector extends AbstractIssueSelector {

@DataBoundConstructor
public JqlIssueSelector(String jql) {
super();
this.jql = jql;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
*/
public abstract class JobIssueSelector extends DefaultIssueSelector {

@Override
/**
* See {@link #addJobIdsFromChangeLog(Run, JiraSite, TaskListener, Set)}
*/
@Override
protected void addIssuesFromChangeLog(Run<?, ?> build, JiraSite site, TaskListener listener, Set<String> issueIds) {
addJobIdsFromChangeLog(build, site, listener, issueIds);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,6 @@ void matchOnlyMatchGroup1() throws IOException {
/**
* Tests that setting the "alternative Url" property actually
* changes the link also.
*
* @throws Exception
*/
@Test
void alternativeURLAnnotate() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ private static class FakeJiraServlet implements HttpHandler {

private String pwdCollected;

public FakeJiraServlet(JenkinsRule jenkinsRule) {
FakeJiraServlet(JenkinsRule jenkinsRule) {
this.jenkinsRule = jenkinsRule;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

package hudson.plugins.jira;

import static org.hamcrest.CoreMatchers.is;
Expand Down
Loading
Loading