Spring/spring-data-mongodb
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Fix ComputedFieldAppender as it is used in public API. Add missing Nullable annotation.

Switch to switch expressions.

Original pull request #4751
See #4745
This commit is contained in:
Mark Paluch
2024-08-29 11:34:26 +02:00
parent f3929840a3
commit ffca3db964
1 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java
View File

@@ -175,7 +175,7 @@ public class SetWindowFieldsOperation
/**
* Tiny little helper to allow fluent API usage for {@link #append(ComputedField)}.
*/
interface ComputedFieldAppender {
public interface ComputedFieldAppender {
/**
* Specify the target field name.
@@ -249,6 +249,7 @@ public class SetWindowFieldsOperation
return windowOperator;
}
@Nullable
public Window getWindow() {
return window;
}
@@ -638,20 +639,15 @@ public class SetWindowFieldsOperation
Assert.notNull(timeUnit, "TimeUnit must not be null");
switch (timeUnit) {
case DAYS:
return WindowUnits.DAY;
case HOURS:
return WindowUnits.HOUR;
case MINUTES:
return WindowUnits.MINUTE;
case SECONDS:
return WindowUnits.SECOND;
case MILLISECONDS:
return WindowUnits.MILLISECOND;
}
return switch (timeUnit) {
case DAYS -> WindowUnits.DAY;
case HOURS -> WindowUnits.HOUR;
case MINUTES -> WindowUnits.MINUTE;
case SECONDS -> WindowUnits.SECOND;
case MILLISECONDS -> WindowUnits.MILLISECOND;
default -> throw new IllegalArgumentException(String.format("Cannot create WindowUnit from %s", timeUnit));
};
throw new IllegalArgumentException(String.format("Cannot create WindowUnit from %s", timeUnit));
}
/**
@@ -664,26 +660,18 @@ public class SetWindowFieldsOperation
*/
static WindowUnit from(ChronoUnit chronoUnit) {
switch (chronoUnit) {
case YEARS:
return WindowUnits.YEAR;
case WEEKS:
return WindowUnits.WEEK;
case MONTHS:
return WindowUnits.MONTH;
case DAYS:
return WindowUnits.DAY;
case HOURS:
return WindowUnits.HOUR;
case MINUTES:
return WindowUnits.MINUTE;
case SECONDS:
return WindowUnits.SECOND;
case MILLIS:
return WindowUnits.MILLISECOND;
}
return switch (chronoUnit) {
case YEARS -> WindowUnits.YEAR;
case WEEKS -> WindowUnits.WEEK;
case MONTHS -> WindowUnits.MONTH;
case DAYS -> WindowUnits.DAY;
case HOURS -> WindowUnits.HOUR;
case MINUTES -> WindowUnits.MINUTE;
case SECONDS -> WindowUnits.SECOND;
case MILLIS -> WindowUnits.MILLISECOND;
default -> throw new IllegalArgumentException(String.format("Cannot create WindowUnit from %s", chronoUnit));
};
throw new IllegalArgumentException(String.format("Cannot create WindowUnit from %s", chronoUnit));
}
}