Update dependencies and fix code issues

Author: teetangh

pom.xml

@@ -22,7 +22,7 @@
         <maven.compiler.target>8</maven.compiler.target>
         <swagger.version>3.0.0</swagger.version>
         <springweb.version>3.0.0</springweb.version>
-        <couchbase.version>3.3.0</couchbase.version>
+        <couchbase.version>3.5.2</couchbase.version>
         <junit.version>4.13.2</junit.version>
         <mavensurefire.version>3.0.0-M5</mavensurefire.version>
     </properties>
@@ -67,12 +67,12 @@
             <artifactId>springfox-spring-web</artifactId>
             <version>${springweb.version}</version>
         </dependency>
-        <dependency>
+        <!-- <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>
             <version>${swagger.version}</version>
             <scope>compile</scope>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger-ui</artifactId>

src/main/java/org/couchbase/quickstart/springboot/configs/Swagger.java

@@ -11,16 +11,14 @@
 import springfox.documentation.service.Contact;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 
 @Configuration
-@EnableSwagger2
 public class Swagger {
 
     @Bean
     public Docket api() {
-        return new Docket(DocumentationType.SWAGGER_2)
+        return new Docket(DocumentationType.OAS_30)
                 .select()
                 .apis(RequestHandlerSelectors.basePackage(
                         "org.couchbase.quickstart.springboot.controllers"))

src/main/java/org/couchbase/quickstart/springboot/controllers/AirportController.java

@@ -1,6 +1,7 @@
 package org.couchbase.quickstart.springboot.controllers;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 import javax.validation.Valid;
 
@@ -127,7 +128,7 @@ public ResponseEntity<List<Airport>> listAirports() {
     public ResponseEntity<List<String>> listDirectConnections(@PathVariable String airportCode) {
         try {
             List<String> destinationAirports = airportService.listDirectConnections(airportCode).stream()
-                    .map(Route::getDestinationairport).toList();
+                    .map(Route::getDestinationairport).collect(Collectors.toList());
             return new ResponseEntity<>(destinationAirports, HttpStatus.OK);
         } catch (Exception e) {
             log.error(INTERNAL_SERVER_ERROR + ": " + e.getMessage());

src/test/java/org/couchbase/quickstart/springboot/controllers/AirportIntegrationTest.java

@@ -7,7 +7,6 @@
 
 import org.couchbase.quickstart.springboot.models.Airport;
 import org.couchbase.quickstart.springboot.models.Airport.Geo;
-import org.couchbase.quickstart.springboot.models.Route;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -20,9 +19,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
-import com.couchbase.client.java.query.QueryOptions;
-import com.couchbase.client.java.query.QueryScanConsistency;
-
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class AirportIntegrationTest {