Add SwaggerRedirectController and update AirportIntegrationTest

Author: teetangh

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

@@ -0,0 +1,17 @@
+package org.couchbase.quickstart.springboot.controllers;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.servlet.view.RedirectView;
+
+@Controller
+public class SwaggerRedirectController {
+
+    @GetMapping(value = { "/", "/swagger-ui", "/swagger-ui/" })
+    @ResponseStatus(HttpStatus.MOVED_PERMANENTLY)
+    public RedirectView redirect() {
+        return new RedirectView("/swagger-ui/index.html");
+    }
+}

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

@@ -133,7 +133,8 @@ void testUpdateAirline() {
                                 .build();
 
                 HttpEntity<Airline> requestEntity = new HttpEntity<>(updatedAirline);
-                ResponseEntity<Airline> responseEntity = restTemplate.exchange("/api/v1/airline/" + updatedAirline.getId(),
+                ResponseEntity<Airline> responseEntity = restTemplate.exchange(
+                                "/api/v1/airline/" + updatedAirline.getId(),
                                 HttpMethod.PUT, requestEntity, Airline.class);
 
                 assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -171,7 +172,7 @@ void testListAirlines() {
                                 "/api/v1/airline/list?limit=" + limit + "&offset="
                                                 + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<>() {
-                        });
+                                });
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
                 List<Airline> airlines = response.getBody();
@@ -198,7 +199,7 @@ void testListAirlinesByCountry() {
                                 "/api/v1/airline/country/" + country + "?limit=" + limit
                                                 + "&offset=" + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<>() {
-                        });
+                                });
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
                 List<Airline> airlines = response.getBody();
                 assertThat(airlines).hasSize(10);
@@ -220,7 +221,7 @@ void testListAirlinesByCountry() {
                                 "/api/v1/airline/country/" + country + "?limit=" + limit
                                                 + "&offset=" + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<>() {
-                        });
+                                });
                 assertThat(response2.getStatusCode()).isEqualTo(HttpStatus.OK);
                 List<Airline> airlines2 = response2.getBody();
                 assertThat(airlines2).hasSize(10);
@@ -267,7 +268,7 @@ void testListAirlinesByDestinationAirport() {
                                         "/api/v1/airline/destination/" + destinationAirport
                                                         + "?limit=" + limit + "&offset=" + offset,
                                         HttpMethod.GET, null, new ParameterizedTypeReference<>() {
-                                });
+                                        });
                         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
                         List<Airline> airlines = response.getBody();

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

@@ -73,15 +73,16 @@ void tearDown() {
         @Test
         void testGetAirport() {
                 ResponseEntity<Airport> response = restTemplate
-                                .getForEntity("/api/v1/airport/airport_1254",
+                                .getForEntity("/api/v1/airport/airport_1255",
                                                 Airport.class);
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
                 Airport airport = response.getBody();
                 assert airport != null;
 
-                Airport expectedAirport = Airport.builder().id("1254").type("airport").airportname("Calais Dunkerque")
-                                .city("Calais").country("France").faa("CQF").icao("LFAC").tz("Europe/Paris")
-                                .geo(Geo.builder().alt(14.0).lat(50.962097).lon(1.954764).build()).build();
+                Airport expectedAirport = Airport.builder().id("1255").type("airport")
+                                .airportname("Peronne St Quentin").city("Peronne").country("France").faa(null)
+                                .icao("LFAG").tz("Europe/Paris")
+                                .geo(Geo.builder().alt(295.0).lat(49.868547).lon(3.029578).build()).build();
                 assertThat(airport).isEqualTo(expectedAirport);
         }
 
@@ -110,10 +111,12 @@ void testUpdateAirport() {
                 Airport updatedAirport = Airport.builder().id("airport_update").type("airport")
                                 .airportname("Updated Test Airport").city("Updated Test City")
                                 .country("Updated Test Country").faa("TST").icao("TEST")
-                                .tz("Updated Test Timezone").geo(Geo.builder().alt(1.0).lat(2.0).lon(3.0).build()).build();
-                        
+                                .tz("Updated Test Timezone").geo(Geo.builder().alt(1.0).lat(2.0).lon(3.0).build())
+                                .build();
+
                 HttpEntity<Airport> requestEntity = new HttpEntity<>(updatedAirport);
-                ResponseEntity<Airport> responseEntity = restTemplate.exchange("/api/v1/airport/" + updatedAirport.getId(),
+                ResponseEntity<Airport> responseEntity = restTemplate.exchange(
+                                "/api/v1/airport/" + updatedAirport.getId(),
                                 HttpMethod.PUT, requestEntity, Airport.class);
 
                 assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
@@ -145,7 +148,7 @@ void testListAirports() {
                                 "/api/v1/airport/list?limit=" + limit + "&offset="
                                                 + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<>() {
-                        });
+                                });
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
                 List<Airport> airports = response.getBody();
@@ -155,11 +158,10 @@ void testListAirports() {
 
         @Test
         void testListDirectConnections() {
-                List<String> destinationAirportCodes = Arrays.asList("SFO", "LAX", "JFK", "MRS");
+                List<String> destinationAirportCodes = Arrays.asList("LAX", "JFK", "MRS");
 
                 Map<String, List<String>> expectedDirectConnections = new HashMap<>();
-                expectedDirectConnections.put("SFO",
-                                Arrays.asList("JFK", "HKG", "ICN", "ATL", "BJX", "GDL", "MEX", "MLM", "PVR", "SJD"));
+
                 expectedDirectConnections.put("LAX",
                                 Arrays.asList("NRT", "CUN", "GDL", "HMO", "MEX", "MZT", "PVR", "SJD", "ZIH", "ZLO"));
                 expectedDirectConnections.put("JFK",
@@ -175,7 +177,7 @@ void testListDirectConnections() {
                                         "/api/v1/airport/direct-connections/" + airportCode
                                                         + "?limit=" + limit + "&offset=" + offset,
                                         HttpMethod.GET, null, new ParameterizedTypeReference<>() {
-                                });
+                                        });
                         assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
                         List<String> routes = response.getBody();

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

@@ -202,9 +202,8 @@ void testUpdateRoute() {
 
                 restTemplate.postForEntity("/api/v1/route/" + route.getId(), route,
                                 Route.class);
-                
-                Route updatedRoute = Route.builder().
-                                id("route_update")
+
+                Route updatedRoute = Route.builder().id("route_update")
                                 .type("route")
                                 .airline("updated_airline")
                                 .airlineid("updated_airlineid")
@@ -304,7 +303,7 @@ void testListRoutes() {
                 ResponseEntity<List<Route>> response = restTemplate.exchange(
                                 "/api/v1/route/list?limit=" + limit + "&offset=" + offset,
                                 HttpMethod.GET, null, new ParameterizedTypeReference<>() {
-                        });
+                                });
                 assertThat(response.getStatusCode()).isEqualTo(HttpStatus.OK);
 
                 List<Route> routes = response.getBody();