Skip to content
This repository has been archived by the owner on Nov 19, 2024. It is now read-only.

EOL JSR 305 #232

Merged
merged 1 commit into from
Apr 24, 2023
Merged

EOL JSR 305 #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion src/main/java/hudson/plugins/jacoco/JacocoBuildAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import java.util.LinkedHashMap;
import java.util.Map;

import javax.annotation.Nullable;
import edu.umd.cs.findbugs.annotations.Nullable;

import org.jacoco.core.analysis.IBundleCoverage;
import org.jvnet.localizer.Localizable;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/jacoco/JacocoPublisher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.DataBoundSetter;

import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;
import hudson.plugins.jacoco.portlet.bean.JacocoDeltaCoverageResultSummary;

/**
Expand Down Expand Up @@ -821,7 +821,7 @@ public DescriptorImpl() {
setDescriptor(this);
}

@Nonnull
@NonNull
@Override
public String getDisplayName() {
return Messages.JacocoPublisher_DisplayName();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/jacoco/JacocoReportDir.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;

/**
* Encapsulates the directory structure in $JENKINS_HOME where we store jacoco related files.
Expand All @@ -28,7 +28,7 @@ public File getClassesDir() {
return new File(root,"classes");
}

public int saveClassesFrom(@Nonnull FilePath dir, @Nonnull String fileMask) throws IOException, InterruptedException {
public int saveClassesFrom(@NonNull FilePath dir, @NonNull String fileMask) throws IOException, InterruptedException {
FilePath d = new FilePath(getClassesDir());
d.mkdirs();
return dir.copyRecursiveTo(fileMask, d);
Expand All @@ -42,7 +42,7 @@ public File getSourcesDir() {
return new File(root,"sources");
}

public int saveSourcesFrom(@Nonnull FilePath dir, @Nonnull String inclusionMask, @Nonnull String exclusionMask) throws IOException, InterruptedException {
public int saveSourcesFrom(@NonNull FilePath dir, @NonNull String inclusionMask, @NonNull String exclusionMask) throws IOException, InterruptedException {
FilePath d = new FilePath(getSourcesDir());
d.mkdirs();
return dir.copyRecursiveTo(inclusionMask, exclusionMask, d);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/hudson/plugins/jacoco/report/CoverageReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.List;
import java.util.Locale;

import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;
import javax.servlet.ServletException;

import hudson.model.Run;
Expand Down Expand Up @@ -59,7 +59,7 @@ private CoverageReport(JacocoBuildAction action) {
* @param action Jacoco build action
* @param executionFileLoader execution file loader owning bundle coverage
*/
public CoverageReport(JacocoBuildAction action, @Nonnull ExecutionFileLoader executionFileLoader ) {
public CoverageReport(JacocoBuildAction action, @NonNull ExecutionFileLoader executionFileLoader ) {
this(action);
action.getLogger().println("[JaCoCo plugin] Loading packages..");

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/jacococoveragecolumn/BranchCoverageColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;

import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;

/**
* View column that shows the code branch coverage percentage
Expand Down Expand Up @@ -38,7 +38,7 @@ public Descriptor<ListViewColumn> getDescriptor() {
private static class DescriptorImpl extends ListViewColumnDescriptor {
@Override
public ListViewColumn newInstance(final StaplerRequest req,
@Nonnull final JSONObject formData) {
@NonNull final JSONObject formData) {
return new BranchCoverageColumn();
}

Expand All @@ -47,7 +47,7 @@ public boolean shownByDefault() {
return false;
}

@Nonnull
@NonNull
@Override
public String getDisplayName() {
return "JaCoCo Branch Coverage";
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/jacococoveragecolumn/JaCoCoColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.kohsuke.stapler.DataBoundConstructor;
import org.kohsuke.stapler.StaplerRequest;

import javax.annotation.Nonnull;
import edu.umd.cs.findbugs.annotations.NonNull;

/**
* View column that shows the code line coverage percentage
Expand Down Expand Up @@ -40,7 +40,7 @@ public Descriptor<ListViewColumn> getDescriptor() {
private static class DescriptorImpl extends ListViewColumnDescriptor {
@Override
public ListViewColumn newInstance(final StaplerRequest req,
@Nonnull final JSONObject formData) {
@NonNull final JSONObject formData) {
return new JaCoCoColumn();
}

Expand All @@ -49,7 +49,7 @@ public boolean shownByDefault() {
return false;
}

@Nonnull
@NonNull
@Override
public String getDisplayName() {
return "JaCoCo Line Coverage";
Expand Down