You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by of...@apache.org on 2020/03/03 11:39:22 UTC
[incubator-dlab] 07/08: Refactoring
This is an automated email from the ASF dual-hosted git repository.
ofuks pushed a commit to branch DLAB-1571
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a2bd9faec4f707b34f614f7fe6a856c75dcf16aa
Author: Oleh Fuks <ol...@gmail.com>
AuthorDate: Mon Mar 2 19:08:55 2020 +0200
Refactoring
---
.../dlab/backendapi/service/impl/BillingServiceImplNew.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java
index 2753270..386188f 100644
--- a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java
+++ b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/BillingServiceImplNew.java
@@ -51,7 +51,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
-import java.util.Optional;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
@@ -83,17 +82,17 @@ public class BillingServiceImplNew implements BillingServiceNew {
@Override
public BillingReport getBillingReport(UserInfo user, BillingFilter filter) {
List<BillingReportLines> billingReportLines = getBillingReportLines(user, filter);
- Optional<LocalDate> min = billingReportLines.stream().min(Comparator.comparing(BillingReportLines::getUsageDateFrom)).map(BillingReportLines::getUsageDateFrom);
- Optional<LocalDate> max = billingReportLines.stream().max(Comparator.comparing(BillingReportLines::getUsageDateTo)).map(BillingReportLines::getUsageDateTo);
+ LocalDate min = billingReportLines.stream().min(Comparator.comparing(BillingReportLines::getUsageDateFrom)).map(BillingReportLines::getUsageDateFrom).orElse(null);
+ LocalDate max = billingReportLines.stream().max(Comparator.comparing(BillingReportLines::getUsageDateTo)).map(BillingReportLines::getUsageDateTo).orElse(null);
double sum = billingReportLines.stream().mapToDouble(BillingReportLines::getCost).sum();
- Optional<String> currency = billingReportLines.stream().findAny().map(BillingReportLines::getCurrency);
+ String currency = billingReportLines.stream().findAny().map(BillingReportLines::getCurrency).orElse(null);
return BillingReport.builder()
.sbn(configuration.getServiceBaseName())
.reportLines(billingReportLines)
- .usageDateFrom(min.orElse(null))
- .usageDateTo(max.orElse(null))
+ .usageDateFrom(min)
+ .usageDateTo(max)
.totalCost(sum)
- .currency(currency.orElse(null))
+ .currency(currency)
.build();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org