Skip to content

Commit d37555b

Browse files
teetanghteetangh
committed
swapped utc and flight
1 parent e96b623 commit d37555b

File tree

2 files changed

+95
-95
lines changed

2 files changed

+95
-95
lines changed

‎src/main/java/org/couchbase/quickstart/springboot/models/Route.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ public static class Schedule {
6262
@NotNull(message = "Day is mandatory")
6363
private int day;
6464

65+
@NotBlank(message = "Flight is mandatory")
66+
private String flight;
67+
6568
@NotBlank(message = "UTC is mandatory")
6669
private String utc;
6770

68-
@NotBlank(message = "Flight is mandatory")
69-
private String flight;
70-
7171
}
7272
}

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

Lines changed: 92 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -59,29 +59,29 @@ void testGetRoute() throws Exception {
5959
.stops(0)
6060
.equipment("320")
6161
.schedule(Arrays.asList(
62-
new Route.Schedule(0, "10:13:00", "AF198"),
63-
new Route.Schedule(0, "19:14:00", "AF547"),
64-
new Route.Schedule(0, "01:31:00", "AF943"),
65-
new Route.Schedule(1, "12:40:00", "AF356"),
66-
new Route.Schedule(1, "08:58:00", "AF480"),
67-
new Route.Schedule(1, "12:59:00", "AF250"),
68-
new Route.Schedule(1, "04:45:00", "AF130"),
69-
new Route.Schedule(2, "00:31:00", "AF997"),
70-
new Route.Schedule(2, "19:41:00", "AF223"),
71-
new Route.Schedule(2, "15:14:00", "AF890"),
72-
new Route.Schedule(2, "00:30:00", "AF399"),
73-
new Route.Schedule(2, "16:18:00", "AF328"),
74-
new Route.Schedule(3, "23:50:00", "AF074"),
75-
new Route.Schedule(3, "11:33:00", "AF556"),
76-
new Route.Schedule(4, "13:23:00", "AF064"),
77-
new Route.Schedule(4, "12:09:00", "AF596"),
78-
new Route.Schedule(4, "08:02:00", "AF818"),
79-
new Route.Schedule(5, "11:33:00", "AF967"),
80-
new Route.Schedule(5, "19:42:00", "AF730"),
81-
new Route.Schedule(6, "17:07:00", "AF882"),
82-
new Route.Schedule(6, "17:03:00", "AF485"),
83-
new Route.Schedule(6, "10:01:00", "AF898"),
84-
new Route.Schedule(6, "07:00:00", "AF496")))
62+
new Route.Schedule(0, "AF198", "10:13:00"),
63+
new Route.Schedule(0, "AF547", "19:14:00"),
64+
new Route.Schedule(0, "AF943", "01:31:00"),
65+
new Route.Schedule(1, "AF356", "12:40:00"),
66+
new Route.Schedule(1, "AF480", "08:58:00"),
67+
new Route.Schedule(1, "AF250", "12:59:00"),
68+
new Route.Schedule(1, "AF130", "04:45:00"),
69+
new Route.Schedule(2, "AF997", "00:31:00"),
70+
new Route.Schedule(2, "AF223", "19:41:00"),
71+
new Route.Schedule(2, "AF890", "15:14:00"),
72+
new Route.Schedule(2, "AF399", "00:30:00"),
73+
new Route.Schedule(2, "AF328", "16:18:00"),
74+
new Route.Schedule(3, "AF074", "23:50:00"),
75+
new Route.Schedule(3, "AF556", "11:33:00"),
76+
new Route.Schedule(4, "AF064", "13:23:00"),
77+
new Route.Schedule(4, "AF596", "12:09:00"),
78+
new Route.Schedule(4, "AF818", "08:02:00"),
79+
new Route.Schedule(5, "AF967", "11:33:00"),
80+
new Route.Schedule(5, "AF730", "19:42:00"),
81+
new Route.Schedule(6, "AF882", "17:07:00"),
82+
new Route.Schedule(6, "AF485", "17:03:00"),
83+
new Route.Schedule(6, "AF898", "10:01:00"),
84+
new Route.Schedule(6, "AF496", "07:00:00")))
8585
.distance(2881.617376098415)
8686
.build();
8787
assertThat(route).isEqualTo(expectedRoute);
@@ -100,29 +100,29 @@ void testCreateRoute() throws Exception {
100100
.stops(0)
101101
.equipment("320")
102102
.schedule(Arrays.asList(
103-
new Route.Schedule(0, "10:13:00", "AF198"),
104-
new Route.Schedule(0, "19:14:00", "AF547"),
105-
new Route.Schedule(0, "01:31:00", "AF943"),
106-
new Route.Schedule(1, "12:40:00", "AF356"),
107-
new Route.Schedule(1, "08:58:00", "AF480"),
108-
new Route.Schedule(1, "12:59:00", "AF250"),
109-
new Route.Schedule(1, "04:45:00", "AF130"),
110-
new Route.Schedule(2, "00:31:00", "AF997"),
111-
new Route.Schedule(2, "19:41:00", "AF223"),
112-
new Route.Schedule(2, "15:14:00", "AF890"),
113-
new Route.Schedule(2, "00:30:00", "AF399"),
114-
new Route.Schedule(2, "16:18:00", "AF328"),
115-
new Route.Schedule(3, "23:50:00", "AF074"),
116-
new Route.Schedule(3, "11:33:00", "AF556"),
117-
new Route.Schedule(4, "13:23:00", "AF064"),
118-
new Route.Schedule(4, "12:09:00", "AF596"),
119-
new Route.Schedule(4, "08:02:00", "AF818"),
120-
new Route.Schedule(5, "11:33:00", "AF967"),
121-
new Route.Schedule(5, "19:42:00", "AF730"),
122-
new Route.Schedule(6, "17:07:00", "AF882"),
123-
new Route.Schedule(6, "17:03:00", "AF485"),
124-
new Route.Schedule(6, "10:01:00", "AF898"),
125-
new Route.Schedule(6, "07:00:00", "AF496")))
103+
new Route.Schedule(0, "AF198", "10:13:00"),
104+
new Route.Schedule(0, "AF547", "19:14:00"),
105+
new Route.Schedule(0, "AF943", "01:31:00"),
106+
new Route.Schedule(1, "AF356", "12:40:00"),
107+
new Route.Schedule(1, "AF480", "08:58:00"),
108+
new Route.Schedule(1, "AF250", "12:59:00"),
109+
new Route.Schedule(1, "AF130", "04:45:00"),
110+
new Route.Schedule(2, "AF997", "00:31:00"),
111+
new Route.Schedule(2, "AF223", "19:41:00"),
112+
new Route.Schedule(2, "AF890", "15:14:00"),
113+
new Route.Schedule(2, "AF399", "00:30:00"),
114+
new Route.Schedule(2, "AF328", "16:18:00"),
115+
new Route.Schedule(3, "AF074", "23:50:00"),
116+
new Route.Schedule(3, "AF556", "11:33:00"),
117+
new Route.Schedule(4, "AF064", "13:23:00"),
118+
new Route.Schedule(4, "AF596", "12:09:00"),
119+
new Route.Schedule(4, "AF818", "08:02:00"),
120+
new Route.Schedule(5, "AF967", "11:33:00"),
121+
new Route.Schedule(5, "AF730", "19:42:00"),
122+
new Route.Schedule(6, "AF882", "17:07:00"),
123+
new Route.Schedule(6, "AF485", "17:03:00"),
124+
new Route.Schedule(6, "AF898", "10:01:00"),
125+
new Route.Schedule(6, "AF496", "07:00:00")))
126126
.distance(2881.617376098415)
127127
.build();
128128
ResponseEntity<Route> response = restTemplate
@@ -147,29 +147,29 @@ void testUpdateRoute() throws Exception {
147147
.stops(0)
148148
.equipment("320")
149149
.schedule(Arrays.asList(
150-
new Route.Schedule(0, "10:13:00", "AF198"),
151-
new Route.Schedule(0, "19:14:00", "AF547"),
152-
new Route.Schedule(0, "01:31:00", "AF943"),
153-
new Route.Schedule(1, "12:40:00", "AF356"),
154-
new Route.Schedule(1, "08:58:00", "AF480"),
155-
new Route.Schedule(1, "12:59:00", "AF250"),
156-
new Route.Schedule(1, "04:45:00", "AF130"),
157-
new Route.Schedule(2, "00:31:00", "AF997"),
158-
new Route.Schedule(2, "19:41:00", "AF223"),
159-
new Route.Schedule(2, "15:14:00", "AF890"),
160-
new Route.Schedule(2, "00:30:00", "AF399"),
161-
new Route.Schedule(2, "16:18:00", "AF328"),
162-
new Route.Schedule(3, "23:50:00", "AF074"),
163-
new Route.Schedule(3, "11:33:00", "AF556"),
164-
new Route.Schedule(4, "13:23:00", "AF064"),
165-
new Route.Schedule(4, "12:09:00", "AF596"),
166-
new Route.Schedule(4, "08:02:00", "AF818"),
167-
new Route.Schedule(5, "11:33:00", "AF967"),
168-
new Route.Schedule(5, "19:42:00", "AF730"),
169-
new Route.Schedule(6, "17:07:00", "AF882"),
170-
new Route.Schedule(6, "17:03:00", "AF485"),
171-
new Route.Schedule(6, "10:01:00", "AF898"),
172-
new Route.Schedule(6, "07:00:00", "AF496")))
150+
new Route.Schedule(0, "AF198", "10:13:00"),
151+
new Route.Schedule(0, "AF547", "19:14:00"),
152+
new Route.Schedule(0, "AF943", "01:31:00"),
153+
new Route.Schedule(1, "AF356", "12:40:00"),
154+
new Route.Schedule(1, "AF480", "08:58:00"),
155+
new Route.Schedule(1, "AF250", "12:59:00"),
156+
new Route.Schedule(1, "AF130", "04:45:00"),
157+
new Route.Schedule(2, "AF997", "00:31:00"),
158+
new Route.Schedule(2, "AF223", "19:41:00"),
159+
new Route.Schedule(2, "AF890", "15:14:00"),
160+
new Route.Schedule(2, "AF399", "00:30:00"),
161+
new Route.Schedule(2, "AF328", "16:18:00"),
162+
new Route.Schedule(3, "AF074", "23:50:00"),
163+
new Route.Schedule(3, "AF556", "11:33:00"),
164+
new Route.Schedule(4, "AF064", "13:23:00"),
165+
new Route.Schedule(4, "AF596", "12:09:00"),
166+
new Route.Schedule(4, "AF818", "08:02:00"),
167+
new Route.Schedule(5, "AF967", "11:33:00"),
168+
new Route.Schedule(5, "AF730", "19:42:00"),
169+
new Route.Schedule(6, "AF882", "17:07:00"),
170+
new Route.Schedule(6, "AF485", "17:03:00"),
171+
new Route.Schedule(6, "AF898", "10:01:00"),
172+
new Route.Schedule(6, "AF496", "07:00:00")))
173173
.distance(2881.617376098415)
174174
.build();
175175

@@ -199,29 +199,29 @@ void testDeleteRoute() throws Exception {
199199
.stops(0)
200200
.equipment("320")
201201
.schedule(Arrays.asList(
202-
new Route.Schedule(0, "10:13:00", "AF198"),
203-
new Route.Schedule(0, "19:14:00", "AF547"),
204-
new Route.Schedule(0, "01:31:00", "AF943"),
205-
new Route.Schedule(1, "12:40:00", "AF356"),
206-
new Route.Schedule(1, "08:58:00", "AF480"),
207-
new Route.Schedule(1, "12:59:00", "AF250"),
208-
new Route.Schedule(1, "04:45:00", "AF130"),
209-
new Route.Schedule(2, "00:31:00", "AF997"),
210-
new Route.Schedule(2, "19:41:00", "AF223"),
211-
new Route.Schedule(2, "15:14:00", "AF890"),
212-
new Route.Schedule(2, "00:30:00", "AF399"),
213-
new Route.Schedule(2, "16:18:00", "AF328"),
214-
new Route.Schedule(3, "23:50:00", "AF074"),
215-
new Route.Schedule(3, "11:33:00", "AF556"),
216-
new Route.Schedule(4, "13:23:00", "AF064"),
217-
new Route.Schedule(4, "12:09:00", "AF596"),
218-
new Route.Schedule(4, "08:02:00", "AF818"),
219-
new Route.Schedule(5, "11:33:00", "AF967"),
220-
new Route.Schedule(5, "19:42:00", "AF730"),
221-
new Route.Schedule(6, "17:07:00", "AF882"),
222-
new Route.Schedule(6, "17:03:00", "AF485"),
223-
new Route.Schedule(6, "10:01:00", "AF898"),
224-
new Route.Schedule(6, "07:00:00", "AF496")))
202+
new Route.Schedule(0, "AF198", "10:13:00"),
203+
new Route.Schedule(0, "AF547", "19:14:00"),
204+
new Route.Schedule(0, "AF943", "01:31:00"),
205+
new Route.Schedule(1, "AF356", "12:40:00"),
206+
new Route.Schedule(1, "AF480", "08:58:00"),
207+
new Route.Schedule(1, "AF250", "12:59:00"),
208+
new Route.Schedule(1, "AF130", "04:45:00"),
209+
new Route.Schedule(2, "AF997", "00:31:00"),
210+
new Route.Schedule(2, "AF223", "19:41:00"),
211+
new Route.Schedule(2, "AF890", "15:14:00"),
212+
new Route.Schedule(2, "AF399", "00:30:00"),
213+
new Route.Schedule(2, "AF328", "16:18:00"),
214+
new Route.Schedule(3, "AF074", "23:50:00"),
215+
new Route.Schedule(3, "AF556", "11:33:00"),
216+
new Route.Schedule(4, "AF064", "13:23:00"),
217+
new Route.Schedule(4, "AF596", "12:09:00"),
218+
new Route.Schedule(4, "AF818", "08:02:00"),
219+
new Route.Schedule(5, "AF967", "11:33:00"),
220+
new Route.Schedule(5, "AF730", "19:42:00"),
221+
new Route.Schedule(6, "AF882", "17:07:00"),
222+
new Route.Schedule(6, "AF485", "17:03:00"),
223+
new Route.Schedule(6, "AF898", "10:01:00"),
224+
new Route.Schedule(6, "AF496", "07:00:00")))
225225
.distance(2881.617376098415)
226226
.build();
227227
restTemplate.postForEntity("http://localhost:" + port + "/api/v1/route/" + route.getId(), route,

0 commit comments

Comments
 (0)