fixed readme and removed unused files

Author: teetangh

.gitpod.Dockerfile

@@ -1,10 +1,10 @@
-t# Quickstart in Couchbase with Spring Boot and Java
+# Quickstart in Couchbase with Spring Boot and Java
 
 #### REST API using Couchbase Capella in Java using Spring Boot
 
-Often, the first step developers take after creating their database is to create a REST API that can perform Create, Read, Update, and Delete (CRUD) operations for that database. This repo is designed to teach you and give you a starter project (in Java using Spring Boot) to generate such a REST API. After you have installed the travel-sample bucket in your database, you can run this application which is a REST API with Swagger documentation so that you can learn:
+Often, the first step developers take after creating their database is to create a REST API that can perform Create, Read, Update, and Delete (CRUD) operations for that database. This repo is designed to teach you and give you a starter project (in Java using Spring Boot) to generate such a REST API. After you have loaded the travel-sample bucket in your database, you can run this application which is a REST API with Swagger documentation so that you can learn:
 
-1. How to create, read, update, and delete documents using Key-Value[ operations](https://docs.couchbase.com/java-sdk/current/howtos/kv-operations.html) (KV operations). KV operations are unique to Couchbase and provide super fast (think microseconds) queries.
+1. How to create, read, update, and delete documents using Key-Value[ operations](https://docs.couchbase.com/java-sdk/current/howtos/kv-operations.html) (KV operations). KV operations are unique to Couchbase and provide super fast (under millisecond) operations.
 2. How to write simple parametrized [N1QL queries](https://docs.couchbase.com/java-sdk/current/howtos/n1ql-queries-with-sdk.html) using the built-in travel-sample bucket.
 
 Full documentation for the tutorial can be found on the [Couchbase Developer Portal](https://developer.couchbase.com/tutorial-quickstart-java-springboot/).
@@ -15,13 +15,11 @@ To run this prebuilt project, you will need:
 
 - [Couchbase Capella](https://www.couchbase.com/products/capella/) cluster with [travel-sample](https://docs.couchbase.com/java-sdk/current/ref/travel-app-data-model.html) bucket loaded.
   - To run this tutorial using a self-managed Couchbase cluster, please refer to the [appendix](#running-self-managed-couchbase-cluster).
-- [Java](https://docs.couchbase.com/java-sdk/current/project-docs/compatibility.html#jdk-compat)
-  - Ensure that the Java version is compatible with the Couchbase SDK. (Please check the link for compatibility)
-- Loading Travel Sample Bucket
-  If travel-sample is not loaded in your Capella cluster, you can load it by following the instructions for your Capella Cluster:
-  - [Load travel-sample bucket in Couchbase Capella](https://docs.couchbase.com/cloud/clusters/data-service/import-data-documents.html#import-sample-data)
-- Maven
-  - [Install Maven](https://maven.apache.org/install.html)
+- [Java SDK 17+](
+  - Ensure that the Java version is compatible with the Couchbase SDK. [Please check the link for compatibility](https://docs.couchbase.com/java-sdk/current/project-docs/compatibility.html#jdk-compat)
+- Loading Travel Sample Bucket:
+  - If `travel-sample` is not loaded in your Capella cluster, you can load it by following the instructions for your Capella Cluster. [Load travel-sample bucket in Couchbase Capella](https://docs.couchbase.com/cloud/clusters/data-service/import-data-documents.html#import-sample-data)
+- [Maven 3.6.3+](https://maven.apache.org/install.html)
 
 ## App Setup
 
@@ -35,7 +33,7 @@ git clone https://github.com/couchbase-examples/java-springboot-quickstart.git
 
 ### Install Dependencies
 
-The dependencies for the application are specified in the `pom.xml` file in the source folder. Dependencies can be installed through `mvn` the default package manager for Java.
+The dependencies for the application are specified in the `pom.xml` file in the root folder. Dependencies can be installed through `mvn` the default package manager for Java.
 
 ```
 mvn clean install -DskipTests=true
@@ -56,8 +54,6 @@ Specifically, you need to do the following:
 
 All configuration for communication with the database is read from the application properties. We have provided a convenience feature in this quickstart to read the properties from a local file, `application.properties` in the `src/main/resources` folder.
 
-You can also use your system environment variables to set the properties. The properties are read from the environment variables if they are set. The properties are read from the `application.properties` file if the environment variables are not set.
-
 ```properties
 spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
 spring.couchbase.bucket.name=travel-sample
@@ -70,8 +66,12 @@ Instead of the DB_CONN_STR, DB_USERNAME and DB_PASSWORD, you need to add the val
 
 > Note: The connection string expects the `couchbases://` or `couchbase://` part.
 
+You can also use your system environment variables to set the properties. The properties are read from the environment variables if they are set. The properties are read from the `application.properties` file if the environment variables are not set.
+
 ## Running The Application
 
+You can add environment variables DB_CONN_STR, DB_USERNAME and DB_PASSWORD to your system environment variables or you can update the `application.properties` file in the `src/main/resources` folder.
+
 ### Directly on Machine
 
 At this point, we have installed the dependencies, loaded the travel-sample data and configured the application with the credentials. The application is now ready and you can run it.
@@ -106,6 +106,7 @@ Once the application starts, you can see the details of the application on the l
 The application will run on port 8080 of your local machine (http://localhost:8080). You will find the interactive Swagger documentation of the API if you go to the URL in your browser. Swagger documentation is used in this demo to showcase the different API endpoints and how they can be invoked. More details on the Swagger documentation can be found in the [appendix](#swagger-documentation).
 
 ![Swagger Documentation](./assets/images/swagger-documentation-spring-boot.png)
+
 ## Running Tests
 
 To test your application, you can use Maven (mvn) to run the test suite. Here are the steps to run the tests:
@@ -146,16 +147,16 @@ mvn test -Dtest=org.couchbase.quickstart.springboot.controllers.RouteIntegration
 
 For this quickstart, we use three collections, `airport`, `airline` and `routes` that contain sample airports, airlines and airline routes respectively. The routes collection connects the airports and airlines as seen in the figure below. We use these connections in the quickstart to generate airports that are directly connected and airlines connecting to a destination airport. Note that these are just examples to highlight how you can use SQL++ queries to join the collections.
 
-![travel-sample data model](/assets/images/travel_sample_data_model.png)
+![travel-sample data model](./assets/images/travel_sample_data_model.png)
 
 ### Extending API by Adding New Entity
 
 If you would like to add another entity to the APIs, these are the steps to follow:
 
-- Create the new entity (collection) in the Couchbase scope. You can create the collection using the [SDK](https://docs.couchbase.com/java-sdk/current/howtos/provisioning-cluster-resources.html#collection-management) or via the [Couchbase Server interface](https://docs.couchbase.com/cloud/n1ql/n1ql-language-reference/createcollection.html).
+- Create a new collection in the Couchbase scope. You can create new collections using the [SDK](https://docs.couchbase.com/java-sdk/current/howtos/provisioning-cluster-resources.html#collection-management) or via the [Couchbase Server interface](https://docs.couchbase.com/cloud/n1ql/n1ql-language-reference/createcollection.html).
 - Define the routes in a new class in the `controllers` package similar to the existing routes like `AirportController.java`.
-- Define the service in a new class in the `services` package similar to the existing services like `AirportService.java`. You'll have to implement the service interface `AirportServiceImpl.java`.
-- Define the repository in a new class in the `repositories` package similar to the existing repositories like `AirportRepository.java`. You'll have to implement the repository interface `AirportRepositoryImpl.java`.
+- Define the service in a new class in the `services` package similar to the existing services like `AirportService.java`.
+- Define the repository in a new class in the `repositories` package similar to the existing repositories like `AirportRepository.java`.
 
 ### Running Self-Managed Couchbase Cluster