format added

Author: Ramaswamy

Diff for: .gradle/6.6.1/executionHistory/executionHistory.bin

@@ -7,10 +7,9 @@ springcacherestapi
   * Gradle 6.0
 
 # Compile & build
-  Gradle clean build 
-# Create  uber jar to deploy
-  gradle clean build ubarJar
- 
+  gradle clean build 
+# Create  a jar to deploy
+   gradle clean build bootJar  
 ## API Details   
 
 Below Get API to access trip data
@@ -26,6 +25,8 @@ Send a POST request to
 http://<url>/clear
 
 
+Look for "Reading from DB" for cache miss in log
+
 You can use Amazon RDS for DB and AWS memcache for redis
 
 Add EKS for container based solutions

Diff for: .gradle/6.6.1/executionHistory/executionHistory.lock

@@ -9,6 +9,7 @@
 plugins {
     // Apply the java-library plugin to add support for Java Library
     id 'java-library'
+    id 'org.springframework.boot' version '2.0.0.RELEASE'
 }
 
 repositories {
@@ -43,15 +44,6 @@ dependencies {
     testImplementation 'junit:junit:4.13'
 }
 
-
-task ubarJar(type: Jar) {
-    manifest {
-        attributes 'Main-Class': 'software.spring.caching.CabApplication'
-    }
-    archiveClassifier = "webapp"
-    from {
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
-    }
-    with jar
+springBoot {
+    mainClassName = 'software.spring.caching.CabApplication'
 }

Diff for: .gradle/6.6.1/fileContent/fileContent.lock

@@ -5,7 +5,7 @@
 
 public interface CabTripService {
 
-    public Map<String, Integer> getTotaltripsBydate(String pickup_datetime);
-    public Map<String, Integer> getTotaltripsBymedal(List<String> medallions);
+    public Map<String, List<Map<String,String>>> getTotaltripsBydate(String pickup_datetime);
+    public Map<String, List<Map<String,String>>> getTotaltripsBymedal(List<String> medallions);
     public void clearCache();
 }

Diff for: .gradle/6.6.1/fileHashes/fileHashes.bin

@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Service;
 import software.spring.caching.repo.TripRepository;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -33,17 +34,21 @@ public class CabTripServiceImpl implements CabTripService {
      */
     @Cacheable(value = "getTotaltrips", key = "#pickup_datetime")
     @Override
-    public Map<String, Integer> getTotaltripsBydate(String pickup_datetime){
-        Map<String, Integer> resultset = new HashMap<>();
+    public Map<String, List<Map<String,String>>> getTotaltripsBydate(String pickup_datetime){
+        Map<String, List<Map<String,String>>> resultset = new HashMap<>();
         List<Object[]> results = CabTripService.findtotaltripBydate(pickup_datetime);
+        List<Map<String,String>> items=new ArrayList<>();
         for (Object[] result : results) {
+            Map<String,String> item = new HashMap<>();
             String medal = (String) result[0];
-            int count = ((Number) result[1]).intValue();
-            resultset.put(medal,count);
+            String count =  result[1].toString();
+            item.put("medallion",medal);
+            item.put("trips",count);
+            items.add(item);
         }
 
         logger.debug("Reading from DB");
-
+       resultset.put("medallions",items);
       return resultset;
     }
 
@@ -54,17 +59,20 @@ public Map<String, Integer> getTotaltripsBydate(String pickup_datetime){
      */
     @Cacheable(value = "getTotaltrips", key = "#medallions.toString()")
     @Override
-    public Map<String, Integer> getTotaltripsBymedal(List<String> medallions){
-
-        Map<String, Integer> resultset = new HashMap<>();
+    public Map<String, List<Map<String,String>>> getTotaltripsBymedal(List<String> medallions){
+        Map<String, List<Map<String,String>>> resultset = new HashMap<>();
+        List<Map<String,String>> items=new ArrayList<>();
         List<Object[]> results = CabTripService.findtotaltripBymedallion(medallions);
         for (Object[] result : results) {
+            Map<String,String> item = new HashMap<>();
             String medal = (String) result[0];
-            int count = ((Number) result[1]).intValue();
-            resultset.put(medal,count);
+            String count =  result[1].toString();
+            item.put("medallion",medal);
+            item.put("trips",count);
+            items.add(item);
         }
         logger.debug("Reading from DB");
-
+        resultset.put("medallions",items);
         return resultset;
     }
 

Diff for: .gradle/6.6.1/fileHashes/fileHashes.lock

@@ -21,14 +21,14 @@ public class TripController {
     CabTripServiceImpl CabTripServiceImpl;
 
     @GetMapping(path="/tripsbyday", produces = "application/json")
-    public Map<String, Integer> gettotalTripsBydate(@RequestParam(value = "pickup_date", defaultValue = "")
+    public Map<String, List<Map<String,String>>> gettotalTripsBydate(@RequestParam(value = "pickup_date", defaultValue = "")
                                                                 String pickup_date) {
         return  CabTripServiceImpl.getTotaltripsBydate(pickup_date);
     }
 
 
     @GetMapping(path="/tripsbymed", produces = "application/json")
-    public Map<String, Integer> gettotalTripsBymedallion(
+    public Map<String, List<Map<String,String>>> gettotalTripsBymedallion(
                                               @RequestParam(value = "medallions", defaultValue = "")
                                                       List<String> medallions) {
         return  CabTripServiceImpl.getTotaltripsBymedal(medallions);