Update project settings and controller methods

Update AirlineRepository and AirlineService

Author: teetangh

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'example'
+rootProject.name = 'org.couchbase.quickstart.springdata'

src/main/java/org/couchbase/quickstart/springdata/controller/AirlineController.java

@@ -63,18 +63,23 @@ public ResponseEntity<Page<Airline>> listAirlines(@RequestParam(defaultValue = "
     }
 
     @GetMapping("/country/{country}")
-    public ResponseEntity<Page<Airline>> listAirlinesByCountry(@PathVariable String country, @RequestParam(defaultValue = "0") int page,
+    public ResponseEntity<Page<Airline>> listAirlinesByCountry(
+            @PathVariable String country,
+            @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
-        Page<Airline> airlines = airlineService.findByCountry(country,PageRequest.of(page, size));
+        Page<Airline> airlines = airlineService.findByCountry(country, PageRequest.of(page, size));
         return new ResponseEntity<>(airlines, HttpStatus.OK);
     }
 
     @GetMapping("/destination/{destinationAirport}")
-    public ResponseEntity<Page<Airline>> listAirlinesByDestinationAirport(@RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size, @PathVariable String destinationAirport) {
-        Page<Airline> airlines = airlineService.findByDestinationAirport(PageRequest.of(page, size),
-                destinationAirport);
+    public ResponseEntity<Page<Airline>> listAirlinesByDestinationAirport(
+            @PathVariable String destinationAirport,
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size) {
+
+        Page<Airline> airlines = airlineService.findByDestinationAirport(destinationAirport,
+                PageRequest.of(page, size));
+
         return new ResponseEntity<>(airlines, HttpStatus.OK);
     }
-
 }

src/main/java/org/couchbase/quickstart/springdata/repository/AirlineRepository.java

@@ -1,6 +1,5 @@
 package org.couchbase.quickstart.springdata.repository;
 
-
 import org.couchbase.quickstart.springdata.model.Airline;
 import org.springframework.data.couchbase.repository.Collection;
 import org.springframework.data.couchbase.repository.CouchbaseRepository;
@@ -21,28 +20,28 @@ public interface AirlineRepository extends CouchbaseRepository<Airline, String>
 
     // Create the query to find all airlines
 
-    //    @Query("SELECT META().id AS _ID, callsign, country, iata, icao, name, type FROM #{#n1ql.bucket}")
-//    @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter}")
+    // @Query("SELECT META().id AS _ID, callsign, country, iata, icao, name, type
+    // FROM #{#n1ql.bucket}")
+    // @Query("#{#n1ql.selectEntity} WHERE #{#n1ql.filter}")
     @Query("#{#n1ql.selectEntity}")
     Page<Airline> findAll(Pageable pageable);
 
-    // @Query("SELECT META().id AS _ID, callsign, country, iata, icao, name, type FROM #{#n1ql.bucket} AND country = 'United States'")   
+    // @Query("SELECT META().id AS _ID, callsign, country, iata, icao, name, type
+    // FROM #{#n1ql.bucket} AND country = 'United States'")
     @Query("#{#n1ql.selectEntity} WHERE country = $1")
     Page<Airline> findByCountry(String country, Pageable pageable);
 
-//    @Query("#{#n1ql.selectEntity} FROM (SELECT DISTINCT META(airline).id AS airlineId FROM route " +
-//            "JOIN airline ON route.airlineid = META(airline).id " +
-//            "WHERE route.destinationairport = $1) AS subquery " +
-//            "JOIN #{#n1ql.bucket} AS air ON META(air).id = subquery.airlineId")
+    // @Query("#{#n1ql.selectEntity} FROM (SELECT DISTINCT META(airline).id AS
+    // airlineId FROM route " +
+    // "JOIN airline ON route.airlineid = META(airline).id " +
+    // "WHERE route.destinationairport = $1) AS subquery " +
+    // "JOIN #{#n1ql.bucket} AS air ON META(air).id = subquery.airlineId")
 
     @Query("SELECT META(air).id AS __id, air.callsign, air.country, air.iata, air.icao, air.id, air.name, air.type " +
             "FROM (SELECT DISTINCT META(airline).id AS airlineId FROM route " +
             "JOIN airline ON route.airlineid = META(airline).id " +
             "WHERE route.destinationairport = 'MRS') AS subquery " +
             "JOIN #{#n1ql.bucket} AS air ON META(air).id = subquery.airlineId")
-    Page<Airline> findByDestinationAirport(Pageable pageable, String destinationAirport);
-
-
-
+    Page<Airline> findByDestinationAirport(String destinationAirport, Pageable pageable);
 
 }

src/main/java/org/couchbase/quickstart/springdata/services/AirlineService.java

@@ -46,8 +46,8 @@ public Page<Airline> findByCountry(String country, Pageable pageable) {
         return airlineRepository.findByCountry(country,pageable);
     }
 
-    public Page<Airline> findByDestinationAirport(Pageable pageable,String destinationAirport) {
-        return airlineRepository.findByDestinationAirport(pageable,destinationAirport);
+    public Page<Airline> findByDestinationAirport(String destinationAirport, Pageable pageable) {
+        return airlineRepository.findByDestinationAirport(destinationAirport, pageable);
     }
 
 }