SDK-1319 update geography api calls to the latest SDK methods (#74)

Author: dtayeh

examples/src/main/java/com/expediagroup/sdk/rapid/examples/scenarios/booking/MultiRoomHoldAndResumeBookScenario.java

@@ -39,7 +39,7 @@ public void run() {
          */
         logger.info("Getting property availability for test property: [{}]", Constants.TEST_PROPERTY_ID);
         List<String> occupancy = Arrays.asList("2", "2");
-        List<Property> propertyAvailabilityList = shopService.getMultipleRoomsPropertiesAvailability(this.rapidPartnerSalesProfile, occupancy).getBody();
+        List<Property> propertyAvailabilityList = shopService.getMultipleRoomsPropertiesAvailability(this.rapidPartnerSalesProfile, occupancy).getData();
 
         if (propertyAvailabilityList == null || propertyAvailabilityList.isEmpty()) {
             logger.error("No property availability found for the test property.");

examples/src/main/java/com/expediagroup/sdk/rapid/examples/scenarios/booking/SingleRoomBookScenario.java

@@ -33,7 +33,7 @@ public void run() {
         // Shopping for properties
         logger.info("Getting property availability for test property: {}", Constants.TEST_PROPERTY_ID);
 
-        List<Property> propertyAvailabilityList = shopService.getSingleRoomPropertiesAvailability(this.rapidPartnerSalesProfile).getBody();
+        List<Property> propertyAvailabilityList = shopService.getSingleRoomPropertiesAvailability(this.rapidPartnerSalesProfile).getData();
 
         if (propertyAvailabilityList == null || propertyAvailabilityList.isEmpty()) {
             logger.error("No property availability found for the test property.");

examples/src/main/java/com/expediagroup/sdk/rapid/examples/services/GeographyService.java

@@ -1,9 +1,13 @@
 package com.expediagroup.sdk.rapid.examples.services;
 
-import com.expediagroup.sdk.core.model.paging.Paginator;
+import com.expediagroup.sdk.core.model.paging.ResponsePaginator;
 import com.expediagroup.sdk.rapid.examples.Constants;
 import com.expediagroup.sdk.rapid.examples.salesprofiles.RapidPartnerSalesProfile;
 import com.expediagroup.sdk.rapid.models.Region;
+import com.expediagroup.sdk.rapid.operations.GetRegionOperation;
+import com.expediagroup.sdk.rapid.operations.GetRegionOperationParams;
+import com.expediagroup.sdk.rapid.operations.GetRegionsOperation;
+import com.expediagroup.sdk.rapid.operations.GetRegionsOperationParams;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -24,86 +28,69 @@ public class GeographyService extends RapidService {
 
     public List<List<Region>> getAllRegionsWithDetails(RapidPartnerSalesProfile rapidPartnerSalesProfile) {
 
-        logger.info("------------- Calling getRegionsPaginator with no ancestor ID and include=details to get all regions:");
-        Paginator<List<Region>> paginator = rapidClient.getRegionsPaginator(
-                Arrays.asList("details"),
-                "en-US",
-                Constants.CUSTOMER_SESSION_ID,
-                null,
-                null ,
-                null,
-                null,
-                null,
-                BigDecimal.valueOf(10),
-                "expedia",
-                Arrays.asList("country"),
-                rapidPartnerSalesProfile.billingTerms,
-                rapidPartnerSalesProfile.paymentTerms,
-                rapidPartnerSalesProfile.partnerPointOfSale,
-                rapidPartnerSalesProfile.platformName
-        );
+        logger.info("------------- Calling getRegions paginated results with no ancestor ID and include=details to get all regions:");
 
-        List<List<Region>> pages = new ArrayList<>();
+        GetRegionsOperationParams params = GetRegionsOperationParams.builder()
+                .include(Arrays.asList("details"))
+                .language("en-US")
+                .customerSessionId(Constants.CUSTOMER_SESSION_ID)
+                .limit(BigDecimal.valueOf(10))
+                .area("50,37.227924,-93.310036")
+                .supplySource("expedia")
+                .countryCode(Arrays.asList("US"))
+                .build();
+
+        ResponsePaginator<List<Region>> responsePaginator = rapidClient.getPaginator(new GetRegionsOperation(params));
 
-        logger.info("Paginator total results count: {}", paginator.getPaginationTotalResults());
+        List<List<Region>> pages = new ArrayList<>();
 
-        while (paginator.hasNext()) {
-            List<Region> page = paginator.next();
-            pages.add(page);
+        logger.info("Paginator total results count: {}", responsePaginator.getPaginationTotalResults());
 
-            break; // remove to iterate over all pages.
-        }
+       responsePaginator.forEachRemaining(page -> {
+               pages.add(page.getData());
+       });
 
         return pages;
     }
 
     public List<List<Region>> getRegionsByAncestor(String ancestorId, RapidPartnerSalesProfile rapidPartnerSalesProfile) {
         logger.info("------------- Calling getRegionsPaginator by ancestor ID: [{}]", ancestorId);
-        Paginator<List<Region>> paginator = rapidClient.getRegionsPaginator(
-                Arrays.asList("details"),
-                "en-US",
-                Constants.CUSTOMER_SESSION_ID,
-                ancestorId,
-                null,
-                null,
-                null,
-                null,
-                BigDecimal.valueOf(10),
-                "expedia",
-                null,
-                rapidPartnerSalesProfile.billingTerms,
-                rapidPartnerSalesProfile.paymentTerms,
-                rapidPartnerSalesProfile.partnerPointOfSale,
-                rapidPartnerSalesProfile.platformName
-        );
+
+        GetRegionsOperationParams params = GetRegionsOperationParams.builder()
+                .include(Arrays.asList("details"))
+                .language("en-US")
+                .customerSessionId(Constants.CUSTOMER_SESSION_ID)
+                .limit(BigDecimal.valueOf(10))
+                .supplySource("expedia")
+                .countryCode(Arrays.asList("US"))
+                .ancestorId(ancestorId)
+                .build();
+
+        ResponsePaginator<List<Region>> responsePaginator = rapidClient.getPaginator(new GetRegionsOperation(params));
 
         List<List<Region>> pages = new ArrayList<>();
 
-        while (paginator.hasNext()) {
-            List<Region> page = paginator.next();
-            pages.add(page);
+        logger.info("Paginator total results count: {}", responsePaginator.getPaginationTotalResults());
 
-            break; // remove to iterate over all pages.
-        }
+        responsePaginator.forEachRemaining(page -> {
+            pages.add(page.getData());
+        });
 
         return pages;
     }
 
     public Region getRegionDetailsAndPropertyIds(String regionId, String language, RapidPartnerSalesProfile rapidPartnerSalesProfile) {
         logger.info("------------- Calling GetRegion:");
-        Region region = rapidClient.getRegion(
-                regionId,
-                language,
-                Arrays.asList("details","property_ids"),
-                Constants.CUSTOMER_SESSION_ID,
-                rapidPartnerSalesProfile.billingTerms,
-                rapidPartnerSalesProfile.paymentTerms,
-                rapidPartnerSalesProfile.partnerPointOfSale,
-                rapidPartnerSalesProfile.platformName,
-                "expedia"
-        );
-
-        return region;
+
+        GetRegionOperationParams params = GetRegionOperationParams.builder()
+                .include(Arrays.asList("details", "property_ids"))
+                .language(language)
+                .regionId(regionId)
+                .customerSessionId(Constants.CUSTOMER_SESSION_ID)
+                .supplySource("expedia")
+                .build();
+
+        return rapidClient.execute(new GetRegionOperation(params)).getData();
     }
 
 }