Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed PMD issues #33

Merged
merged 1 commit into from
Oct 20, 2024
Merged

Fixed PMD issues #33

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
4 changes: 2 additions & 2 deletions src/main/java/io/jenkins/plugins/view/calendar/event/CalendarEventFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ private abstract class CalendarEventImpl implements CalendarEvent {
protected long duration;
private transient List<StartedCalendarEvent> lastEvents;

protected String initId(final String url, final long startTimeInMillis) {
/* default */ final String initId(final String url, final long startTimeInMillis) {
return StringUtils.defaultString(url, "")
.replace("/", "-")
.toLowerCase(Locale.ENGLISH) + startTimeInMillis;
}

protected Moment initEnd(final long timeInMillis, final long duration) {
/* default */ final Moment initEnd(final long timeInMillis, final long duration) {
// duration needs to be at least 1sec otherwise
// fullcalendar will not properly display the event
final long dur = (duration < 1000) ? 1000 : duration;
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/io/jenkins/plugins/view/calendar/service/CalendarEventService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
import hudson.model.Result;
import hudson.model.Run;
import hudson.scheduler.CronTab;
import hudson.util.RunList;
import io.jenkins.plugins.view.calendar.CalendarView.CalendarViewEventsType;
import io.jenkins.plugins.view.calendar.event.CalendarEvent;
import io.jenkins.plugins.view.calendar.event.CalendarEventComparator;
Expand Down Expand Up @@ -222,7 +221,7 @@ public List<StartedCalendarEvent> getStartedEvents(final List<? extends Job> job
if (state == CalendarEventState.RUNNING && !job.isBuilding()) {
continue;
}
final RunList<Run> builds = job.getBuilds();
final List<Run> builds = job.getBuilds();
for (final Run build : builds) {
if (state == CalendarEventState.RUNNING && !build.isBuilding()) {
continue;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/jenkins/plugins/view/calendar/service/CronJobService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public List<CronTab> getCronTabs(final Trigger trigger, final Hash hash) {

@SuppressWarnings("PMD.CyclomaticComplexity")
public List<Trigger> getCronTriggers(final Job job, final CalendarViewEventsType eventsType) {
Collection<Trigger<?>> jobTriggers;
final Collection<Trigger<?>> jobTriggers;
if (job instanceof AbstractProject) {
jobTriggers = ((AbstractProject)job).getTriggers().values();
} else if (PluginUtil.hasWorkflowJobPluginInstalled() && job instanceof WorkflowJob) {
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/io/jenkins/plugins/view/calendar/time/Moment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ public int hashCode() {

@Override
public boolean equals(final Object o) {
if (!(o instanceof Moment)) {
return false;
}
return calendar.equals(((Moment)o).calendar);
return (o instanceof Moment) && calendar.equals(((Moment)o).calendar);
}

@Override
Expand Down