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 f4a47a5d0669c11f486c2f69143afc9831a337fc
Author: Oleh Fuks <[email protected]>
AuthorDate: Tue Apr 7 14:59:14 2020 +0300

    Remote billing gcp
---
 .../epam/dlab/billing/gcp/controller/BillingController.java  |  3 +--
 .../com/epam/dlab/billing/gcp/service/BillingService.java    |  3 +--
 .../dlab/billing/gcp/service/impl/BillingServiceImpl.java    | 12 +++++-------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
index e3537eb..c1b178a 100644
--- 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
+++ 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/controller/BillingController.java
@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Map;
 
 @RestController
 public class BillingController {
@@ -39,7 +38,7 @@ public class BillingController {
     }
 
     @GetMapping
-    public ResponseEntity<Map<String, List<BillingData>>> getBilling() {
+    public ResponseEntity<List<BillingData>> getBilling() {
         return new ResponseEntity<>(billingService.getBillingData(), 
HttpStatus.OK);
     }
 
diff --git 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java
 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java
index 282e896..7bb3246 100644
--- 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java
+++ 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/BillingService.java
@@ -22,8 +22,7 @@ package com.epam.dlab.billing.gcp.service;
 import com.epam.dlab.dto.billing.BillingData;
 
 import java.util.List;
-import java.util.Map;
 
 public interface BillingService {
-    Map<String, List<BillingData>> getBillingData();
+    List<BillingData> getBillingData();
 }
diff --git 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/impl/BillingServiceImpl.java
 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/impl/BillingServiceImpl.java
index e297e83..12e526b 100644
--- 
a/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/impl/BillingServiceImpl.java
+++ 
b/services/billing-gcp/src/main/java/com/epam/dlab/billing/gcp/service/impl/BillingServiceImpl.java
@@ -28,8 +28,6 @@ import org.springframework.stereotype.Service;
 
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -44,11 +42,11 @@ public class BillingServiceImpl implements BillingService {
        }
 
        @Override
-       public Map<String, List<BillingData>> getBillingData() {
+       public List<BillingData> getBillingData() {
                try {
-                       return billingDAO.getBillingData()
-                                       .stream()
-                                       .collect(Collectors.groupingBy(bd -> 
bd.getUsageDate().substring(0, USAGE_DATE_FORMAT.length())));
+                       return billingDAO.getBillingData();
+//                                     .stream()
+//                                     .collect(Collectors.groupingBy(bd -> 
bd.getUsageDate().substring(0, USAGE_DATE_FORMAT.length())));
 
 //                     billingData.forEach((usageDate, billingDataList) -> {
 //                             log.info("Updating billing information for 
month {}", usageDate);
@@ -57,7 +55,7 @@ public class BillingServiceImpl implements BillingService {
 //                     });
                } catch (Exception e) {
                        log.error("Can not update billing due to: {}", 
e.getMessage(), e);
-                       return Collections.emptyMap();
+                       return Collections.emptyList();
                }
        }
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to