Fix PMD

Author: AB-xdev

vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/business/AbstractDateRange.java

@@ -34,14 +34,8 @@ public abstract class AbstractDateRange<SELF extends AbstractDateRange<SELF>> im
 	private String defaultDesc;
 	private Function<LocalDate, Optional<DateRangeResult>> calcForFunc;
 	private BiFunction<LocalDate, Integer, Optional<DateRangeResult>> moveFunc = (date, count) ->
-	{
-		if(this.optMovePeriod.isEmpty())
-		{
-			return Optional.empty();
-		}
-		
-		return this.calcForFunc.apply(count != 0 ? date.plus(this.optMovePeriod.get().multipliedBy(count)) : date);
-	};
+		this.optMovePeriod.flatMap(movePeriod ->
+			this.calcForFunc.apply(count != 0 ? date.plus(movePeriod.multipliedBy(count)) : date));
 	private boolean movable = true;
 	private boolean calcable = true;
 	private boolean setable = true;

vaadin-date-range-picker/src/main/java/software/xdev/vaadin/daterange_picker/ui/DateRangePickerOverlay.java

@@ -174,14 +174,10 @@ protected void moveRange(final int dif)
 
 	protected void calcModel(final Optional<DateRangeResult> optResult, final DateRangeModel<D> model)
 	{
-		if(optResult.isEmpty())
-		{
-			return;
-		}
-		
-		final DateRangeResult result = optResult.get();
-		model.setStart(result.getStart());
-		model.setEnd(result.getEnd());
+		optResult.ifPresent(result -> {
+			model.setStart(result.getStart());
+			model.setEnd(result.getEnd());
+		});
 	}
 
 	protected void onValueChange(final Function<DateRangeModel<D>, Optional<DateRangeResult>> calcFunc)