Update .gitignore and remove unused settings.json file. Refactor repository annotations.

Author: teetangh

.gitignore

@@ -1,5 +1,6 @@
 .gradle
 build/
+.vscode/
 
 # Default ignored files
 shelf/

.vscode/settings.json

@@ -8,14 +8,12 @@
 import org.springframework.data.couchbase.repository.Scope;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
 
 @Scope("inventory")
 @Collection("airline")
 @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-@Repository("airlineRepository")
 public interface AirlineRepository extends CouchbaseRepository<Airline, String> {
 
     @Query("#{#n1ql.selectEntity}")

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

@@ -3,23 +3,20 @@
 import org.couchbase.quickstart.springdata.model.Airport;
 import org.springframework.data.couchbase.repository.Collection;
 import org.springframework.data.couchbase.repository.CouchbaseRepository;
-import org.springframework.data.couchbase.repository.DynamicProxyable;
 import org.springframework.data.couchbase.repository.Query;
 import org.springframework.data.couchbase.repository.ScanConsistency;
 import org.springframework.data.couchbase.repository.Scope;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
 
-@Repository("airportRepository")
 @Scope("inventory")
 @Collection("airport")
 @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
-public interface AirportRepository extends CouchbaseRepository<Airport, String>, DynamicProxyable<AirportRepository> {
+public interface AirportRepository extends CouchbaseRepository<Airport, String> {
 
-    @Query("SELECT META().id AS _ID, type, airportname, city, country, faa, icao, tz, geo AS geo FROM #{#n1ql.bucket} WHERE type = 'airport'")
+    @Query("#{#n1ql.selectEntity}")
     Page<Airport> findAll(Pageable pageable);
 
     @Query("SELECT DISTINCT META(airport).id AS __id,airport.* " +

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

@@ -9,16 +9,14 @@
 import org.springframework.data.couchbase.repository.Scope;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Repository;
 
 import com.couchbase.client.java.query.QueryScanConsistency;
 
-@Repository("routeRepository")
 @Scope("inventory")
 @Collection("route")
 @ScanConsistency(query = QueryScanConsistency.REQUEST_PLUS)
 public interface RouteRepository extends CouchbaseRepository<Route, String>, DynamicProxyable<RouteRepository> {
 
-    @Query("SELECT META().id AS _ID, type, airline, airlineid, sourceairport, destinationairport, stops, equipment, schedule FROM #{#n1ql.bucket} WHERE type = 'route'")
+    @Query("#{#n1ql.selectEntity}")
     Page<Route> findAll(Pageable pageable);
 }