Skip to content

Commit 0849dd7

Browse files
committed
fix(code): Small code clean up
1 parent 0d8a557 commit 0849dd7

File tree

15 files changed

+15
-16
lines changed

15 files changed

+15
-16
lines changed

src/main/java/com/cronutils/descriptor/CronDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public String describeDayOfWeek(final Map<CronFieldName, CronField> fields, fina
143143
final String description = DescriptionStrategyFactory.daysOfWeekInstance(
144144
resourceBundle,
145145
fields.containsKey(CronFieldName.DAY_OF_WEEK) ? fields.get(CronFieldName.DAY_OF_WEEK).getExpression() : null,
146-
definitions.containsKey(CronFieldName.DAY_OF_WEEK) ? definitions.get(CronFieldName.DAY_OF_WEEK) : null
146+
definitions.getOrDefault(CronFieldName.DAY_OF_WEEK, null)
147147
).describe();
148148
return addExpressions(description, resourceBundle.getString("day"), resourceBundle.getString("days"));
149149
}

src/main/java/com/cronutils/descriptor/TimeDescriptionStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ private void registerFunctions() {
303303
/**
304304
* Contains CronFieldExpression instances for hours, minutes and seconds.
305305
*/
306-
class TimeFields {
306+
static class TimeFields {
307307
private final FieldExpression seconds;
308308
private final FieldExpression minutes;
309309
private final FieldExpression hours;

src/main/java/com/cronutils/model/definition/CronDefinitionBuilder.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,7 @@ public void register(final FieldDefinition definition) {
240240
* @return returns CronDefinition instance, never null
241241
*/
242242
public CronDefinition instance() {
243-
final Set<CronConstraint> validations = new HashSet<>();
244-
validations.addAll(cronConstraints);
243+
final Set<CronConstraint> validations = new HashSet<>(cronConstraints);
245244
final List<FieldDefinition> values = new ArrayList<>(fields.values());
246245
values.sort(FieldDefinition.createFieldDefinitionComparator());
247246
return new CronDefinition(values, validations, cronNicknames, matchDayOfWeekAndDayOfMonth);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package com.cronutils.model.definition;
22

33
public enum CronNicknames {
4-
YEARLY, ANNUALLY, MONTHLY, WEEKLY, DAILY, MIDNIGHT, HOURLY, REBOOT;
4+
YEARLY, ANNUALLY, MONTHLY, WEEKLY, DAILY, MIDNIGHT, HOURLY, REBOOT
55
}

src/main/java/com/cronutils/model/field/CronFieldName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public enum CronFieldName {
2323
* effective bi-, tri- or quad-weekly schedules via proprietary cron expressions.
2424
*/
2525

26-
private int order;
26+
private final int order;
2727

2828
/**
2929
* Constructor.

src/main/java/com/cronutils/model/field/expression/And.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public String asString() {
5050
builder.append(expressions.get(j).asString());
5151
builder.append(",");
5252
}
53-
if(expressions.size()>0){
53+
if(!expressions.isEmpty()){
5454
builder.append(expressions.get(expressions.size() - 1).asString());
5555
}
5656
return builder.toString();

src/main/java/com/cronutils/model/field/expression/Weekdays.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
public enum Weekdays {
2323
MONDAY(1), TUESDAY(2), WEDNESDAY(3), THURSDAY(4), FRIDAY(5), SATURDAY(6), SUNDAY(7);
2424

25-
private int weekday;
25+
private final int weekday;
2626

2727
Weekdays(int weekday) {
2828
this.weekday = weekday;

src/main/java/com/cronutils/model/field/value/SpecialCharFieldValue.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
public class SpecialCharFieldValue extends FieldValue<SpecialChar> {
1919

2020
private static final long serialVersionUID = -2177180413324528746L;
21-
private SpecialChar specialChar = SpecialChar.NONE;
21+
private SpecialChar specialChar;
2222

2323
public SpecialCharFieldValue(final SpecialChar specialChar) {
2424
Preconditions.checkNotNull(specialChar, "special char must not be null");

src/main/java/com/cronutils/model/time/CompositeExecutionTime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ public Optional<Duration> timeFromLastExecution(ZonedDateTime date) {
5858

5959
@Override
6060
public boolean isMatch(ZonedDateTime date) {
61-
return executionTimes.parallelStream().map(e->e.isMatch(date)).filter(v-> v).count()>0;
61+
return executionTimes.parallelStream().map(e -> e.isMatch(date)).anyMatch(v -> v);
6262
}
6363
}

src/main/java/com/cronutils/model/time/ExecutionTime.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public interface ExecutionTime {
3535
* @param cron - Cron instance
3636
* @return ExecutionTime instance
3737
*/
38-
public static ExecutionTime forCron(final Cron cron) {
38+
static ExecutionTime forCron(final Cron cron) {
3939
if (cron instanceof SingleCron) {
4040
final Map<CronFieldName, CronField> fields = cron.retrieveFieldsAsMap();
4141
final ExecutionTimeBuilder executionTimeBuilder = new ExecutionTimeBuilder(cron);

0 commit comments

Comments
 (0)