Migrate to API v2 and try-cb-frontend 2.0.0 (#4)

API v2 aims at specifying and harmonizing the endpoints between all
SDKs. It also adds an hotels endpoint.

The frontend is developed separately at:
https://github.com/couchbaselabs/try-cb-frontend/tree/v2.0.0
The API spec is in:
https://github.com/couchbaselabs/try-cb-frontend/blob/v2.0.0/documentation/try-cb-api-spec-v2.adoc

The `try-cb-frontend` project is up to date with Angular2 2.0.0 GA, is
versioned `v2.0.0` as well and is bundled and embedded in the backend
by this commit.

squashed commit, main changes:
---------------------------------------
* Added an Hotel service/controller to do FTS/subdoc
* support location-only search, keyword search in content/desc,
  location only search is done by providing "*" as a description.
* added Result class, notion of context (for hotels)
* Standardize result JSON structure through Error and Result
* Return empty list if user document exists but has no flights
* fix error codes for flight booking, check bookings
* airport and flightPath endpoints modified according to v2
* flighPaths adds random price to each route
* v2: login/signup separated POST endpoints, token authentication support
* accounts now in default bucket & can expire (configurable)
* add context message for signup
* make sure to return an empty collection if no user document
* remove Angular1/api v1 frontend
* Added try-cb-frontend bundled files

Author: simonbasle

README.md

@@ -1,27 +1,29 @@
 # Couchbase Java Travel-Sample Application
-This is a sample application for getting started with Couchbase Server 4.0. The application runs a single page UI for
-demonstrating SQL for Documents (N1QL) querying capabilities. It uses Couchbase Server 4.0 (developer preview or later) 
-together with Spring Boot, Angular and Bootstrap.
+This is a sample application for getting started with Couchbase Server 4.5. The application runs a single page UI for
+demonstrating SQL for Documents (N1QL) and Full Text Search (FTS) querying capabilities. It uses Couchbase Server 4.5 
+together with Spring Boot, Angular2 and Bootstrap.
 
 The application is a flight planner that allows the user to search for and select a flight route (including the
 return flight) based on airports and dates. Airport selection is done dynamically using an angular autocomplete box
-bound to N1QL queries on the server side. Date selection uses date time pickers and then searches for applicable air 
-flight routes from a previously populated database.
+bound to N1QL queries on the server side. After selecting a date, it then searches for applicable air flight routes from
+a previously populated database. An additional page allows users to search for Hotels using less structured keywords.
 
 ![Application](app.png)
 
 ## Prerequisites
 The following pieces need to be in place in order to run the application.
 
-1. Couchbase Server 4.0 DP or later with the `travel-sample` bucket.
+1. Couchbase Server 4.5 or later with the `travel-sample` bucket.
 2. Java 6 or later
 3. Maven 3 or later
 
 If you want to run the application from your IDE rather than from the command line you also need your IDE set up to
 work with maven-based projects. We recommend running IntelliJ IDEA, but Eclipse or Netbeans will also work.
 
+Note that the project uses Lombok, so code generation through annotation processing must be enabled.
+
 ## Running the Application
-To download the application you can either download [the archive](https://github.com/couchbaselabs/try-cb-java/archive/master.zip) or
+To download the application you can either download [the archive](https://github.com/couchbaselabs/try-cb-java/archive/2.0.0.zip) or
 clone the repository:
 
 ```
@@ -41,33 +43,43 @@ $ mvn spring-boot:run
 [INFO] Scanning for projects...
 [INFO]                                                                         
 [INFO] ------------------------------------------------------------------------
-[INFO] Building try-cb-java 1.0-SNAPSHOT
+[INFO] Building try-cb-java 2.0.0
 [INFO] ------------------------------------------------------------------------
 [INFO] 
-...
-
   .   ____          _            __ _ _
  /\\ / ___'_ __ _ _(_)_ __  __ _ \ \ \ \
 ( ( )\___ | '_ | '_| | '_ \/ _` | \ \ \ \
  \\/  ___)| |_)| | | | | || (_| |  ) ) ) )
   '  |____| .__|_| |_|_| |_\__, | / / / /
  =========|_|==============|___/=/_/_/_/
- :: Spring Boot ::        (v1.2.3.RELEASE)
-
-2015-04-07 13:28:18.186  INFO 64284 --- [lication.main()] trycb.Application                        : Starting Application on daschlbook.local with PID 64284 (/Users/michael/couchbase/try-cb-java/target/classes started by michael in /Users/michael/couchbase/try-cb-java)
-2015-04-07 13:28:18.234  INFO 64284 --- [lication.main()] ationConfigEmbeddedWebApplicationContext : Refreshing org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@52f887ba: startup date [Tue Apr 07 13:28:18 CEST 2015]; root of context hierarchy
-...
-2015-04-07 13:28:20.665  INFO 64284 --- [lication.main()] com.couchbase.client.core.CouchbaseCore  : CouchbaseEnvironment: {sslEnabled=false, sslKeystoreFile='null', sslKeystorePassword='null', queryEnabled=false, queryPort=8093, bootstrapHttpEnabled=true, bootstrapCarrierEnabled=true, bootstrapHttpDirectPort=8091, bootstrapHttpSslPort=18091, bootstrapCarrierDirectPort=11210, bootstrapCarrierSslPort=11207, ioPoolSize=8, computationPoolSize=8, responseBufferSize=16384, requestBufferSize=16384, kvServiceEndpoints=1, viewServiceEndpoints=1, queryServiceEndpoints=1, ioPool=NioEventLoopGroup, coreScheduler=CoreScheduler, eventBus=DefaultEventBus, packageNameAndVersion=couchbase-java-client/2.1.2 (git: 2.1.2), dcpEnabled=false, retryStrategy=BestEffort, maxRequestLifetime=75000, retryDelay=com.couchbase.client.core.time.ExponentialDelay@5ac22970, reconnectDelay=com.couchbase.client.core.time.ExponentialDelay@2003d27d, observeIntervalDelay=com.couchbase.client.core.time.ExponentialDelay@1a9e3545, keepAliveInterval=30000, autoreleaseAfter=2000, bufferPoolingEnabled=true, queryTimeout=75000, viewTimeout=75000, kvTimeout=2500, connectTimeout=5000, disconnectTimeout=25000, dnsSrvEnabled=false}
-2015-04-07 13:28:21.043  INFO 64284 --- [      cb-io-1-1] com.couchbase.client.core.node.Node      : Connected to Node localhost
-2015-04-07 13:28:21.354  INFO 64284 --- [-computations-5] c.c.c.core.config.ConfigurationProvider  : Opened bucket travel-sample
-2015-04-07 13:28:21.559  INFO 64284 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerAdapter : Looking for @ControllerAdvice: org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@52f887ba: startup date [Tue Apr 07 13:28:18 CEST 2015]; root of context hierarchy
-2015-04-07 13:28:21.622  INFO 64284 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/flightPath/findAll],methods=[],params=[],headers=[],consumes=[],produces=[],custom=[]}" onto public java.util.List<java.util.Map<java.lang.String, java.lang.Object>> trycb.Application.all(java.lang.String,java.lang.String,java.lang.String) throws java.lang.Exception
-2015-04-07 13:28:21.623  INFO 64284 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/airport/findAll],methods=[],params=[],headers=[],consumes=[],produces=[],custom=[]}" onto public java.util.List<java.util.Map<java.lang.String, java.lang.Object>> trycb.Application.airports(java.lang.String)
-2015-04-07 13:28:21.624  INFO 64284 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error],methods=[],params=[],headers=[],consumes=[],produces=[],custom=[]}" onto public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)
-2015-04-07 13:28:21.624  INFO 64284 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error],methods=[],params=[],headers=[],consumes=[],produces=[text/html],custom=[]}" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest)
-...
-2015-04-07 13:28:21.853  INFO 64284 --- [lication.main()] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat started on port(s): 8080 (http)
-2015-04-07 13:28:21.854  INFO 64284 --- [lication.main()] trycb.Application                        : Started Application in 3.943 seconds (JVM running for 8.494)
+ :: Spring Boot ::        (v1.2.5.RELEASE)
+
+2016-09-12 14:15:36.438  INFO 64357 --- [lication.main()] trycb.Application                        : Starting Application on SimonBookPro.local with PID 64357 (/Users/edralzar/dev/couchbase/misc/try-cb-java/target/classes started by edralzar in /Users/edralzar/dev/couchbase/misc/try-cb-java)
+2016-09-12 14:15:37.606  INFO 64357 --- [lication.main()] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat initialized with port(s): 8080 (http)
+2016-09-12 14:15:37.979  INFO 64357 --- [lication.main()] o.apache.catalina.core.StandardService   : Starting service Tomcat
+2016-09-12 14:15:37.980  INFO 64357 --- [lication.main()] org.apache.catalina.core.StandardEngine  : Starting Servlet Engine: Apache Tomcat/8.0.23
+2016-09-12 14:15:38.062  INFO 64357 --- [ost-startStop-1] o.a.c.c.C.[Tomcat].[localhost].[/]       : Initializing Spring embedded WebApplicationContext
+2016-09-12 14:15:38.063  INFO 64357 --- [ost-startStop-1] o.s.web.context.ContextLoader            : Root WebApplicationContext: initialization completed in 1594 ms
+2016-09-12 14:15:38.870  INFO 64357 --- [lication.main()] com.couchbase.client.core.CouchbaseCore  : CouchbaseEnvironment: {sslEnabled=false, sslKeystoreFile='null', sslKeystorePassword=false, sslKeystore=null, bootstrapHttpEnabled=true, bootstrapCarrierEnabled=true, bootstrapHttpDirectPort=8091, bootstrapHttpSslPort=18091, bootstrapCarrierDirectPort=11210, bootstrapCarrierSslPort=11207, ioPoolSize=8, computationPoolSize=8, responseBufferSize=16384, requestBufferSize=16384, kvServiceEndpoints=1, viewServiceEndpoints=1, queryServiceEndpoints=1, searchServiceEndpoints=1, ioPool=NioEventLoopGroup, coreScheduler=CoreScheduler, eventBus=DefaultEventBus, packageNameAndVersion=couchbase-java-client/2.3.3 (git: 2.3.3, core: 1.3.3), dcpEnabled=false, retryStrategy=BestEffort, maxRequestLifetime=75000, retryDelay=ExponentialDelay{growBy 1.0 MICROSECONDS, powers of 2; lower=100, upper=100000}, reconnectDelay=ExponentialDelay{growBy 1.0 MILLISECONDS, powers of 2; lower=32, upper=4096}, observeIntervalDelay=ExponentialDelay{growBy 1.0 MICROSECONDS, powers of 2; lower=10, upper=100000}, keepAliveInterval=30000, autoreleaseAfter=2000, bufferPoolingEnabled=true, tcpNodelayEnabled=true, mutationTokensEnabled=false, socketConnectTimeout=1000, dcpConnectionBufferSize=20971520, dcpConnectionBufferAckThreshold=0.2, dcpConnectionName=dcp/core-io, callbacksOnIoPool=false, disconnectTimeout=25000, requestBufferWaitStrategy=com.couchbase.client.core.env.DefaultCoreEnvironment$2@6bf79f80, queryTimeout=75000, viewTimeout=75000, kvTimeout=2500, connectTimeout=5000, dnsSrvEnabled=false}
+2016-09-12 14:15:39.456  INFO 64357 --- [      cb-io-1-1] com.couchbase.client.core.node.Node      : Connected to Node localhost
+2016-09-12 14:15:39.822  INFO 64357 --- [-computations-1] c.c.c.core.config.ConfigurationProvider  : Opened bucket travel-sample
+2016-09-12 14:15:39.895  INFO 64357 --- [-computations-5] c.c.c.core.config.ConfigurationProvider  : Opened bucket default
+2016-09-12 14:15:39.905  INFO 64357 --- [lication.main()] trycb.util.StartupPreparations           : Ensuring all Indexes are created.
+2016-09-12 14:15:40.017  INFO 64357 --- [lication.main()] trycb.util.StartupPreparations           : All indexes are already in place, nothing to build
+2016-09-12 14:15:40.183  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerAdapter : Looking for @ControllerAdvice: org.springframework.boot.context.embedded.AnnotationConfigEmbeddedWebApplicationContext@6f7e827: startup date [Mon Sep 12 14:15:36 CEST 2016]; root of context hierarchy
+2016-09-12 14:15:40.232  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/airports]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.AirportController.airports(java.lang.String)
+2016-09-12 14:15:40.233  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/flightPaths/{from}/{to}]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.FlightPathController.all(java.lang.String,java.lang.String,java.lang.String)
+2016-09-12 14:15:40.234  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/hotel/],methods=[GET],produces=[application/json]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.HotelController.findAllHotels()
+2016-09-12 14:15:40.234  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/hotel/{description}/{location}/],methods=[GET],produces=[application/json]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.HotelController.findHotelsByDescriptionAndLocation(java.lang.String,java.lang.String)
+2016-09-12 14:15:40.234  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/hotel/{description}/],methods=[GET],produces=[application/json]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.HotelController.findHotelsByDescription(java.lang.String)
+2016-09-12 14:15:40.235  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/user/{username}/flights],methods=[POST]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.UserController.book(java.lang.String,java.lang.String,java.lang.String)
+2016-09-12 14:15:40.235  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/user/{username}/flights],methods=[GET]}" onto public java.lang.Object trycb.web.UserController.booked(java.lang.String,java.lang.String)
+2016-09-12 14:15:40.235  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/user/login],methods=[POST]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.UserController.login(java.util.Map<java.lang.String, java.lang.String>)
+2016-09-12 14:15:40.235  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/api/user/signup],methods=[POST]}" onto public org.springframework.http.ResponseEntity<? extends trycb.model.IValue> trycb.web.UserController.createLogin(java.lang.String)
+2016-09-12 14:15:40.236  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error]}" onto public org.springframework.http.ResponseEntity<java.util.Map<java.lang.String, java.lang.Object>> org.springframework.boot.autoconfigure.web.BasicErrorController.error(javax.servlet.http.HttpServletRequest)
+2016-09-12 14:15:40.236  INFO 64357 --- [lication.main()] s.w.s.m.m.a.RequestMappingHandlerMapping : Mapped "{[/error],produces=[text/html]}" onto public org.springframework.web.servlet.ModelAndView org.springframework.boot.autoconfigure.web.BasicErrorController.errorHtml(javax.servlet.http.HttpServletRequest)
+2016-09-12 14:15:40.398  INFO 64357 --- [lication.main()] s.b.c.e.t.TomcatEmbeddedServletContainer : Tomcat started on port(s): 8080 (http)
+2016-09-12 14:15:40.400  INFO 64357 --- [lication.main()] trycb.Application                        : Started Application in 4.172 seconds (JVM running for 16.45)
 ```
 
 Note that when you run the application for the first time, it will make sure that all indexes are created for best
@@ -87,8 +99,10 @@ can check the command line which prints all the executed N1QL queries:
 ```
 
 ## Custom Options
-By default it will connect to the `travel-sample` bucket on `127.0.0.1`. You can conveniently change those options through
-the command line on bootstrap:
+By default it will connect to the `travel-sample` bucket on `127.0.0.1`. It will however separate user account data into
+the `default` bucket (and these documents can be set to expire). All these options can be tuned in the
+`src/main/resources/application.properties`. You can also conveniently change those options through the command line at
+bootstrap:
 
 ```
 $ mvn spring-boot:run -Dhostname=127.0.0.1 -Dbucket=travel-sample -Dpassword=

app.png

@@ -6,7 +6,7 @@
 
     <groupId>com.couchbase.example</groupId>
     <artifactId>try-cb-java</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>2.0.0</version>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
@@ -21,11 +21,18 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 
+        <!-- lombok for leaner POJOs -->
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>1.16.8</version>
+        </dependency>
+
         <!-- the couchbase java sdk -->
         <dependency>
             <groupId>com.couchbase.client</groupId>
             <artifactId>java-client</artifactId>
-            <version>2.2.0</version>
+            <version>2.3.3</version>
         </dependency>
 
         <!-- tx for some data exceptions -->
@@ -40,6 +47,13 @@
         	<artifactId>spring-security-core</artifactId>
         	<version>4.0.1.RELEASE</version>
         </dependency>
+
+        <!-- json web token support -->
+        <dependency>
+            <groupId>io.jsonwebtoken</groupId>
+            <artifactId>jjwt</artifactId>
+            <version>0.6.0</version>
+        </dependency>
     </dependencies>
 
     <!-- for couchbase prereleases, use the couchbase repo -->