Skip to content

Refactoring code smells #713

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

Open
Sujana798 wants to merge 13 commits into
base: master
Choose a base branch
from
+487 −439
Open

Refactoring code smells #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3199090
Refactor duplicate code in CronBuilder
Sujana798 Jun 23, 2026
7848c21
Refactor duplicate code in CronBuilder
Sujana798 Jun 23, 2026
8bbddc2
Refactor data clumps in CronBuilder
Sujana798 Jun 23, 2026
d169749
Refactor long method in CronMapper
Sujana798 Jun 24, 2026
58b75d1
Refactor duplicate code in CronMapper
Sujana798 Jun 24, 2026
cc960a0
Refactor data clumps in CronMapper
Sujana798 Jun 24, 2026
c5de57e
Refactor long method in cron-parser
Sujana798 Jun 24, 2026
03ee53e
Refactor duplicate code in CronParser
Sujana798 Jun 24, 2026
e1ab39a
Refactor duplicate code in ExecutionTime
Sujana798 Jun 24, 2026
3e9559f
Refactor long method in SingleExecutionTime
Sujana798 Jun 25, 2026
a30ed08
Refactor long method in SingleExecutionTime
Sujana798 Jun 25, 2026
90d16f1
Refactor duplicate code in SingleExecutionTime
Sujana798 Jun 25, 2026
a69bcf5
Refactor duplicate code&long method in execution time
Sujana798 Jun 27, 2026
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
167 changes: 55 additions & 112 deletions src/main/java/com/cronutils/builder/CronBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,132 +83,75 @@ public Cron instance() {
return new SingleCron(definition, new ArrayList<>(fields.values())).validate();
}

private CronBuilder applyIfPresent(
CronFieldName fieldName,
FieldExpression expression) {





public static Cron yearly(final CronDefinition definition){
CronBuilder builder = new CronBuilder(definition);
if(definition.containsFieldDefinition(SECOND)){
builder = builder.withSecond(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(MINUTE)){
builder = builder.withMinute(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(HOUR)){
builder = builder.withHour(new On(new IntegerFieldValue(0)));
if (definition.containsFieldDefinition(fieldName)) {
addField(fieldName, expression);
}
if(definition.containsFieldDefinition(DAY_OF_MONTH)){
builder = builder.withDoM(new On(new IntegerFieldValue(1)));
}
if(definition.containsFieldDefinition(MONTH)){
builder = builder.withMonth(new On(new IntegerFieldValue(1)));
}
if(definition.containsFieldDefinition(DAY_OF_WEEK)){
builder = builder.withDoW(FieldExpression.always());
}
return builder.instance();
return this;
}

public static Cron yearly(final CronDefinition definition) {
return new CronBuilder(definition)
.applyIfPresent(SECOND, new On(new IntegerFieldValue(0)))
.applyIfPresent(MINUTE, new On(new IntegerFieldValue(0)))
.applyIfPresent(HOUR, new On(new IntegerFieldValue(0)))
.applyIfPresent(DAY_OF_MONTH, new On(new IntegerFieldValue(1)))
.applyIfPresent(MONTH, new On(new IntegerFieldValue(1)))
.applyIfPresent(DAY_OF_WEEK, FieldExpression.always())
.instance();
}
public static Cron annually(final CronDefinition definition){
return yearly(definition);
}

public static Cron monthly(final CronDefinition definition){
CronBuilder builder = new CronBuilder(definition);
if(definition.containsFieldDefinition(SECOND)){
builder = builder.withSecond(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(MINUTE)){
builder = builder.withMinute(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(HOUR)){
builder = builder.withHour(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(DAY_OF_MONTH)){
builder = builder.withDoM(new On(new IntegerFieldValue(1)));
}
if(definition.containsFieldDefinition(MONTH)){
builder = builder.withMonth(FieldExpression.always());
}
if(definition.containsFieldDefinition(DAY_OF_WEEK)){
builder = builder.withDoW(FieldExpression.always());
}
return builder.instance();
}

public static Cron weekly(final CronDefinition definition){
CronBuilder builder = new CronBuilder(definition);
if(definition.containsFieldDefinition(SECOND)){
builder = builder.withSecond(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(MINUTE)){
builder = builder.withMinute(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(HOUR)){
builder = builder.withHour(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(DAY_OF_MONTH)){
builder = builder.withDoM(FieldExpression.always());
}
if(definition.containsFieldDefinition(MONTH)){
builder = builder.withMonth(FieldExpression.always());
}
if(definition.containsFieldDefinition(DAY_OF_WEEK)){
builder = builder.withDoW(new On(new IntegerFieldValue(0)));
}
return builder.instance();
}

public static Cron daily(final CronDefinition definition){
CronBuilder builder = new CronBuilder(definition);
if(definition.containsFieldDefinition(SECOND)){
builder = builder.withSecond(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(MINUTE)){
builder = builder.withMinute(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(HOUR)){
builder = builder.withHour(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(DAY_OF_MONTH)){
builder = builder.withDoM(FieldExpression.always());
}
if(definition.containsFieldDefinition(MONTH)){
builder = builder.withMonth(FieldExpression.always());
}
if(definition.containsFieldDefinition(DAY_OF_WEEK)){
builder = builder.withDoW(FieldExpression.always());
}
return builder.instance();
public static Cron monthly(final CronDefinition definition) {
return new CronBuilder(definition)
.applyIfPresent(SECOND, new On(new IntegerFieldValue(0)))
.applyIfPresent(MINUTE, new On(new IntegerFieldValue(0)))
.applyIfPresent(HOUR, new On(new IntegerFieldValue(0)))
.applyIfPresent(DAY_OF_MONTH, new On(new IntegerFieldValue(1)))
.applyIfPresent(MONTH, FieldExpression.always())
.applyIfPresent(DAY_OF_WEEK, FieldExpression.always())
.instance();
}
public static Cron weekly(final CronDefinition definition) {
return new CronBuilder(definition)
.applyIfPresent(SECOND, new On(new IntegerFieldValue(0)))
.applyIfPresent(MINUTE, new On(new IntegerFieldValue(0)))
.applyIfPresent(HOUR, new On(new IntegerFieldValue(0)))
.applyIfPresent(DAY_OF_MONTH, FieldExpression.always())
.applyIfPresent(MONTH, FieldExpression.always())
.applyIfPresent(DAY_OF_WEEK, new On(new IntegerFieldValue(0)))
.instance();
}

public static Cron daily(final CronDefinition definition) {
return new CronBuilder(definition)
.applyIfPresent(SECOND, new On(new IntegerFieldValue(0)))
.applyIfPresent(MINUTE, new On(new IntegerFieldValue(0)))
.applyIfPresent(HOUR, new On(new IntegerFieldValue(0)))
.applyIfPresent(DAY_OF_MONTH, FieldExpression.always())
.applyIfPresent(MONTH, FieldExpression.always())
.applyIfPresent(DAY_OF_WEEK, FieldExpression.always())
.instance();
}

public static Cron midnight(final CronDefinition definition){
return daily(definition);
}

public static Cron hourly(final CronDefinition definition){
CronBuilder builder = new CronBuilder(definition);
if(definition.containsFieldDefinition(SECOND)){
builder = builder.withSecond(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(MINUTE)){
builder = builder.withMinute(new On(new IntegerFieldValue(0)));
}
if(definition.containsFieldDefinition(HOUR)){
builder = builder.withHour(FieldExpression.always());
}
if(definition.containsFieldDefinition(DAY_OF_MONTH)){
builder = builder.withDoM(FieldExpression.always());
}
if(definition.containsFieldDefinition(MONTH)){
builder = builder.withMonth(FieldExpression.always());
}
if(definition.containsFieldDefinition(DAY_OF_WEEK)){
builder = builder.withDoW(FieldExpression.always());
}
return builder.instance();
public static Cron hourly(final CronDefinition definition) {
return new CronBuilder(definition)
.applyIfPresent(SECOND, new On(new IntegerFieldValue(0)))
.applyIfPresent(MINUTE, new On(new IntegerFieldValue(0)))
.applyIfPresent(HOUR, FieldExpression.always())
.applyIfPresent(DAY_OF_MONTH, FieldExpression.always())
.applyIfPresent(MONTH, FieldExpression.always())
.applyIfPresent(DAY_OF_WEEK, FieldExpression.always())
.instance();
}

public static Cron reboot(final CronDefinition definition){
Expand Down
Loading