Skip to content

Commit aa73c8f

Browse files
authored
Merge pull request #221 from amadeus4dev/fix-device-type
Fix device type
2 parents 240b9a5 + 98f4067 commit aa73c8f

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/main/java/com/amadeus/resources/FlightOrder.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public static class Traveler {
4040

4141
private @Getter @Setter String id;
4242
private @Getter @Setter String dateOfBirth;
43+
private @Getter @Setter String gender;
4344
private @Getter @Setter Name name;
4445
private @Getter @Setter Contact contact;
4546
private @Getter @Setter Document[] documents;
@@ -60,13 +61,6 @@ public static class Name {
6061
public static class Contact {
6162

6263
private @Getter @Setter Phone[] phones;
63-
private @Getter @Setter DeviceType deviceType;
64-
65-
public enum DeviceType {
66-
MOBILE,
67-
LANDLINE,
68-
FAX
69-
}
7064
}
7165

7266
@AllArgsConstructor
@@ -97,6 +91,13 @@ public static class Phone {
9791

9892
private @Getter @Setter String countryCallingCode;
9993
private @Getter @Setter String number;
94+
private @Getter @Setter DeviceType deviceType;
95+
96+
public enum DeviceType {
97+
MOBILE,
98+
LANDLINE,
99+
FAX
100+
}
100101
}
101102

102103
}

src/test/java/com/amadeus/booking/FlightOrdersIT.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import com.amadeus.resources.FlightOrder.Document;
1414
import com.amadeus.resources.FlightOrder.Name;
1515
import com.amadeus.resources.FlightOrder.Phone;
16+
import com.amadeus.resources.FlightOrder.Phone.DeviceType;
1617
import com.amadeus.resources.FlightOrder.Traveler;
1718
import com.amadeus.resources.FlightPrice;
1819
import com.github.tomakehurst.wiremock.WireMockServer;
@@ -113,10 +114,10 @@ private Traveler[] getTravelerData() {
113114
phone[0] = new Phone();
114115
phone[0].setCountryCallingCode("33");
115116
phone[0].setNumber("675426222");
117+
phone[0].setDeviceType(DeviceType.MOBILE);
116118

117119
Contact contact = new Contact();
118120
contact.setPhones(phone);
119-
contact.setDeviceType(Contact.DeviceType.MOBILE);
120121
traveler.setContact(contact);
121122

122123
Document[] document = new Document[1];

0 commit comments

Comments
 (0)