1: add transfer orders IT, 2: fix transfer orders model, 3: update wording

tsolakoua · tsolakoua · commit 5a02bc5637bf · 2023-06-16T13:36:21.000+02:00
diff --git a/src/main/java/com/amadeus/Ordering.java b/src/main/java/com/amadeus/Ordering.java
@@ -28,7 +28,7 @@ public class Ordering {
    *   <code>/v1/ordering/transfer-orders</code> endpoints.
    * </p>
    */
-  public TransferOrders tranferOrders;
+  public TransferOrders transferOrders;
 
   /**
    * <p>
@@ -45,7 +45,7 @@ public TransferOrder transferOrder(String orderId) {
    * @hide
    */
   public Ordering(Amadeus client) {
-    this.tranferOrders = new TransferOrders(client);
+    this.transferOrders = new TransferOrders(client);
     this.client = client;
   }
 }
diff --git a/src/main/java/com/amadeus/referenceData/locations/pointsOfInterest/BySquare.java b/src/main/java/com/amadeus/referenceData/locations/pointsOfInterest/BySquare.java
@@ -6,7 +6,6 @@
 import com.amadeus.exceptions.ResponseException;
 import com.amadeus.resources.PointOfInterest;
 import com.amadeus.resources.Resource;
-import com.google.gson.Gson;
 
 /**
  * <p>
diff --git a/src/main/java/com/amadeus/resources/TransferOffersPost.java b/src/main/java/com/amadeus/resources/TransferOffersPost.java
@@ -133,7 +133,7 @@ protected Quotation() {}
 
   @ToString
   public class PartnerInfo {
-    private @Getter String serviceProvider;
+    private @Getter ServiceProvider serviceProvider;
 
     protected PartnerInfo() {}
 
diff --git a/src/main/java/com/amadeus/resources/TransferOrder.java b/src/main/java/com/amadeus/resources/TransferOrder.java
@@ -36,6 +36,7 @@ public class TransferReservation {
     private @Getter TransferOffersPost.Vehicle vehicle;
     private @Getter TransferOffersPost.ServiceProvider serviceProvider;
     private @Getter TransferOffersPost.PartnerInfo partnerInfo;
+    
     private @Getter TransferOffersPost.Quotation quotation;
     private @Getter TransferOffersPost.Quotation converted;
     private @Getter TransferOffersPost.ExtraService[] extraServices;
@@ -77,7 +78,7 @@ protected Contact() {}
 
   @ToString
   public class Agency {
-    private @Getter Email contacts;
+    private @Getter Email[] contacts;
 
     protected Agency() {}
 
diff --git a/src/test/java/com/amadeus/HTTPClientThreadSafeIT.java b/src/test/java/com/amadeus/HTTPClientThreadSafeIT.java
@@ -39,7 +39,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/NamespaceTest.java b/src/test/java/com/amadeus/NamespaceTest.java
@@ -114,7 +114,7 @@ public class NamespaceTest {
     assertNotNull(client.referenceData.locations.hotels.byGeocode);
     assertNotNull(client.referenceData.locations.cities);
     assertNotNull(client.airline.destinations);
-    assertNotNull(client.ordering.tranferOrders);
+    assertNotNull(client.ordering.transferOrders);
     assertNotNull(client.ordering.transferOrder("XXX"));
   }
 
diff --git a/src/test/java/com/amadeus/airline/DestinationsIT.java b/src/test/java/com/amadeus/airline/DestinationsIT.java
@@ -33,7 +33,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/booking/FlightOrdersIT.java b/src/test/java/com/amadeus/booking/FlightOrdersIT.java
@@ -41,7 +41,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/dutyOfCare/diseases/Covid19ReportIT.java b/src/test/java/com/amadeus/dutyOfCare/diseases/Covid19ReportIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/ordering/TransferOrdersIT.java b/src/test/java/com/amadeus/ordering/TransferOrdersIT.java
@@ -0,0 +1,91 @@
+package com.amadeus.ordering;
+
+import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
+import static com.github.tomakehurst.wiremock.client.WireMock.post;
+import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import com.amadeus.Amadeus;
+import com.amadeus.Params;
+import com.amadeus.exceptions.ResponseException;
+import com.amadeus.resources.TransferOrder;
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+// https://developers.amadeus.com/self-service/category/cars-and-transfers/api-doc/transfer-booking
+public class TransferOrdersIT {
+
+  WireMockServer wireMockServer;
+
+  private Amadeus amadeus;
+
+  /**
+   * Authentication is conducted for each test.
+   */
+  @BeforeEach
+  public void setup() {
+    wireMockServer = new WireMockServer(8080);
+    wireMockServer.start();
+
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    String address = "/v1/security/oauth2/token"
+        + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
+    wireMockServer.stubFor(post(urlEqualTo(address))
+        .willReturn(aResponse().withHeader("Content-Type", "application/json")
+        .withStatus(200)
+        .withBodyFile("auth_ok.json")));
+
+    amadeus = Amadeus
+      .builder("DEMO", "DEMO")
+      .setHost("localhost")
+      .setPort(8080)
+      .setSsl(false)
+      .setLogLevel("debug")
+      .build();
+  }
+
+  @AfterEach
+  public void teardown() {
+    wireMockServer.stop();
+  }
+
+  @Test
+  public void givenClientWhenCallTransferOrdersWithParamsThenOK()
+      throws ResponseException, IOException {
+
+    //Given
+    String address = "/v1/ordering/transfer-orders" + "?offerId=123456";
+    wireMockServer.stubFor(post(urlEqualTo(address))
+        .willReturn(aResponse().withHeader("Content-Type", "application/json")
+        .withStatus(200)
+        .withBodyFile("transfer_orders_response_ok.json")));
+
+    JsonObject request = getRequestFromResources("transfer_orders_request_ok.json");
+    Params params = Params.with("offerId", "123456");
+
+    //When
+    TransferOrder result = amadeus.ordering.transferOrders.post(request, params);
+
+    //Then
+    assertNotNull(result);
+  }
+
+  private JsonObject getRequestFromResources(String jsonFile) throws IOException {
+
+    final String folder = "__files/";
+
+    ClassLoader classLoader = getClass().getClassLoader();
+    File file = new File(classLoader.getResource(folder + jsonFile).getFile());
+    String jsonString = new String(Files.readAllBytes(file.toPath()));
+
+    return new JsonParser().parse(jsonString).getAsJsonObject();
+  }
+
+}
diff --git a/src/test/java/com/amadeus/referenceData/locations/CitiesIT.java b/src/test/java/com/amadeus/referenceData/locations/CitiesIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/referenceData/locations/HotelIT.java b/src/test/java/com/amadeus/referenceData/locations/HotelIT.java
@@ -39,7 +39,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/referenceData/locations/PointOfInterestIT.java b/src/test/java/com/amadeus/referenceData/locations/PointOfInterestIT.java
@@ -29,7 +29,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/referenceData/locations/hotels/ByCityIT.java b/src/test/java/com/amadeus/referenceData/locations/hotels/ByCityIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/referenceData/locations/hotels/ByGeocodeIT.java b/src/test/java/com/amadeus/referenceData/locations/hotels/ByGeocodeIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/referenceData/locations/hotels/ByHotelsIT.java b/src/test/java/com/amadeus/referenceData/locations/hotels/ByHotelsIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/referenceData/locations/pointsOfInterest/BySquareIT.java b/src/test/java/com/amadeus/referenceData/locations/pointsOfInterest/BySquareIT.java
@@ -33,7 +33,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/safety/SafetyIT.java b/src/test/java/com/amadeus/safety/SafetyIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/ActivityIT.java b/src/test/java/com/amadeus/shopping/ActivityIT.java
@@ -30,7 +30,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/FlightOfferSearchIT.java b/src/test/java/com/amadeus/shopping/FlightOfferSearchIT.java
@@ -37,7 +37,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/HotelOfferSearchIT.java b/src/test/java/com/amadeus/shopping/HotelOfferSearchIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/HotelOffersSearchIT.java b/src/test/java/com/amadeus/shopping/HotelOffersSearchIT.java
@@ -32,7 +32,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/SeatMapsIT.java b/src/test/java/com/amadeus/shopping/SeatMapsIT.java
@@ -37,7 +37,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/TransferOffersIT.java b/src/test/java/com/amadeus/shopping/TransferOffersIT.java
@@ -1,4 +1,4 @@
-package com.amadeus.shopping.availability;
+package com.amadeus.shopping;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
@@ -33,7 +33,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/activities/BySquareIT.java b/src/test/java/com/amadeus/shopping/activities/BySquareIT.java
@@ -33,7 +33,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/availability/FlightAvailabilitiesIT.java b/src/test/java/com/amadeus/shopping/availability/FlightAvailabilitiesIT.java
@@ -33,7 +33,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/flightOffers/PredictionIT.java b/src/test/java/com/amadeus/shopping/flightOffers/PredictionIT.java
@@ -34,7 +34,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/flightOffers/PricingIT.java b/src/test/java/com/amadeus/shopping/flightOffers/PricingIT.java
@@ -38,7 +38,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/shopping/flightOffers/UpsellingIT.java b/src/test/java/com/amadeus/shopping/flightOffers/UpsellingIT.java
@@ -33,7 +33,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/travel/TripParserIT.java b/src/test/java/com/amadeus/travel/TripParserIT.java
@@ -33,7 +33,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))
diff --git a/src/test/java/com/amadeus/travel/TripPurposeIT.java b/src/test/java/com/amadeus/travel/TripPurposeIT.java
@@ -30,7 +30,7 @@ public void setup() {
     wireMockServer = new WireMockServer(8080);
     wireMockServer.start();
 
-    //https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
+    // https://developers.amadeus.com/self-service/apis-docs/guides/authorization-262
     String address = "/v1/security/oauth2/token"
         + "?grant_type=client_credentials&client_secret=DEMO&client_id=DEMO";
     wireMockServer.stubFor(post(urlEqualTo(address))

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public class NamespaceTest {`
`114`	`114`	`assertNotNull(client.referenceData.locations.hotels.byGeocode);`
`115`	`115`	`assertNotNull(client.referenceData.locations.cities);`
`116`	`116`	`assertNotNull(client.airline.destinations);`
`117`		`- assertNotNull(client.ordering.tranferOrders);`
	`117`	`+ assertNotNull(client.ordering.transferOrders);`
`118`	`118`	`assertNotNull(client.ordering.transferOrder("XXX"));`
`119`	`119`	`}`
`120`	`120`