diff --git a/tldd-hotels/.classpath b/tldd-hotels/.classpath index 4b41ad0..5c96dc8 100644 --- a/tldd-hotels/.classpath +++ b/tldd-hotels/.classpath @@ -28,11 +28,5 @@ <attribute name="maven.pomderived" value="true"/> </attributes> </classpathentry> - <classpathentry kind="lib" path="/home/dev/.p2/pool/plugins/org.apache.axis_1.4.0.v201411182030/lib/axis.jar"/> - <classpathentry kind="lib" path="/home/dev/.p2/pool/plugins/org.apache.commons.discovery_0.2.0.v201004190315/lib/commons-discovery-0.2.jar"/> - <classpathentry kind="lib" path="/home/dev/.p2/pool/plugins/javax.xml.rpc_1.1.0.v201209140446/lib/jaxrpc.jar"/> - <classpathentry kind="lib" path="/home/dev/.p2/pool/plugins/javax.xml.soap_1.2.0.v201005080501/lib/saaj.jar"/> - <classpathentry kind="lib" path="/home/dev/.p2/pool/plugins/javax.wsdl_1.6.2.v201012040545.jar"/> - <classpathentry kind="lib" path="/home/dev/.p2/pool/plugins/org.apache.commons.logging_1.2.0.v20180409-1502.jar"/> <classpathentry kind="output" path="target/classes"/> </classpath> diff --git a/tldd-hotels/pom.xml b/tldd-hotels/pom.xml index bffe47d..8b704bc 100644 --- a/tldd-hotels/pom.xml +++ b/tldd-hotels/pom.xml @@ -93,54 +93,11 @@ </dependency> - <!-- <dependency> --> - <!-- <groupId>com.fasterxml.jackson.core</groupId> --> - <!-- <artifactId>jackson-core</artifactId> --> - <!-- <version>2.9.0</version> --> - <!-- </dependency> --> - <!-- <dependency> --> - <!-- <groupId>com.fasterxml.jackson.core</groupId> --> - <!-- <artifactId>jackson-databind</artifactId> --> - <!-- <version>2.9.0</version> --> - <!-- </dependency> --> - <!-- <dependency> --> - <!-- <groupId>com.fasterxml.jackson.core</groupId> --> - <!-- <artifactId>jackson-annotations</artifactId> --> - <!-- <version>2.9.0</version> --> - <!-- </dependency> --> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-http4</artifactId> <version>${camelVersion}</version> - - </dependency> - - <!-- <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20160212</version> - </dependency> - --> - <!-- <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jetty</artifactId> - <version>${camelVersion}</version> - use the same version as your Camel core version </dependency> - --> -<!-- <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jxpath</artifactId> - <version>${camelVersion}</version> - </dependency> --> - - - <!-- <dependency> <groupId>com.github.seratch</groupId> <artifactId>java-time-backport</artifactId> - <version>1.0.0</version> </dependency> --> - - <!-- <dependency> <groupId>joda-time</groupId> <artifactId>joda-time</artifactId> - <version>2.9.9</version> </dependency> --> <!-- LOGGING --> <dependency> @@ -154,31 +111,19 @@ <version>1.6.2</version> </dependency> - - <dependency> <groupId>com.fractalite.hermes</groupId> <artifactId>hermes-model</artifactId> <version>0.0.5-SNAPSHOT</version> </dependency> - - - - <!-- <dependency> <groupId>com.fractalite</groupId> <artifactId>av-referential-api</artifactId> - <version>0.0.4-SNAPSHOT</version> </dependency> --> - + <dependency> <groupId>com.fractalite.hermes</groupId> <artifactId>hermes-stay</artifactId> <version>0.1.1-SNAPSHOT</version> - <scope>provided</scope> </dependency> - - <!-- <dependency> <groupId>com.fractalite.hermes</groupId> <artifactId>hermes-stay-tests</artifactId> - <version>0.0.1-SNAPSHOT</version> <scope>test</scope> </dependency> --> - - - <!-- THIRD PARTY --> + + <dependency> <groupId>org.apache.servicemix.bundles</groupId> <artifactId>org.apache.servicemix.bundles.commons-lang</artifactId> @@ -227,31 +172,34 @@ <artifactId>commons-net</artifactId> <version>3.4</version> </dependency> + + + <!-- https://mvnrepository.com/artifact/javax.jws/javax.jws-api --> + + - <!-- Gson google dependency used in toString implementation --> - <!--<dependency> <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> - <version>3.0.0</version> </dependency> --> + <dependency> + <groupId>org.apache.servicemix.specs</groupId> + <artifactId>org.apache.servicemix.specs.jaxws-api-2.2</artifactId> + <version>1.8.0</version> + </dependency> - <!-- <dependency> --> - <!-- <groupId>com.fasterxml.jackson.core</groupId> --> - <!-- <artifactId>jackson-databind</artifactId> --> - <!-- <version>2.9.8</version> --> - <!-- <exclusions> --> - <!-- <exclusion> --> - <!-- <groupId>com.fasterxml.jackson.core</groupId> --> - <!-- <artifactId>jackson-core</artifactId> --> - <!-- </exclusion> --> - <!-- </exclusions> --> - <!-- </dependency> --> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + <version>2.9.0</version> + </dependency> -<!-- https://mvnrepository.com/artifact/javax.xml.soap/javax.xml.soap-api --> -<dependency> - <groupId>javax.xml.soap</groupId> - <artifactId>javax.xml.soap-api</artifactId> - <version>1.4.0</version> -</dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <version>2.9.8</version> + </dependency> + + + </dependencies> <build> @@ -328,22 +276,14 @@ </build> - <scm> - <connection>scm:git:ssh://webserver:serverweb@labs.fractalite.com/var/git/bol</connection> - <url>scm:git:ssh://webserver:serverweb@labs.fractalite.com/var/git/bol</url> - <developerConnection>scm:git:ssh://webserver:serverweb@labs.fractalite.com/home/webserver/bol</developerConnection> - </scm> - - - <!-- DEPLOY --> <distributionManagement> <snapshotRepository> <id>snapshots</id> - <url>https://lib.atlasvoyages.com/repository/maven-snapshots</url> + <url>http://lib.fractalite.com/repository/maven-snapshots</url> </snapshotRepository> <repository> - <id>releases</id> - <url>https://lib.atlasvoyages.com/repository/maven-releases</url> + <id>releases</id> + <url>http://lib.fractalite.com/repository/maven-releases</url> </repository> </distributionManagement> diff --git a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.java b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.java index 31b7488..1f9377d 100644 --- a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.java +++ b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.java @@ -93,14 +93,29 @@ public class TeldarRouteBuilder extends RouteBuilder { public static final String EP_CANCEL_ORDER_ITEM = "teldar/hotel/cancelOrderItem"; public static final String EP_SEARCH_ORDER = "teldar/hotel/searchOrder"; public static final String EP_SEARCH_RESULT = "stay/searchResults"; - public static final String wsUrl = "http4://teldar.atlasvoyages.com/gekko-front/ws/v2_4/AvailabilityService"; + //public static final String wsUrl = "http4://teldar.atlasvoyages.com/gekko-front/ws/v2_4/AvailabilityService"; + public static final String wsUrl = "http4://localhost:8732/gekko-front/ws/v2_4/AvailabilityService"; public String status = ""; - public static final String clientId = "atlasvoyages/master/test"; + + ///////////// TEST ////////////////: + /*public static final String clientId = "atlasvoyages/master/test"; public static final String password = "p*TE*kH!e8$%dS"; - public static final String customerKey = "atlasvoyages/test"; + public static final String customerKey = "atlasvoyages/test";*/ + ////////////// END TEST //////////// + + /////////// TELDAR + /*public static final String clientId = "fractalite/master/tourcom9412web"; + public static final String password = "p*TE*kH!e8$%dS"; + public static final String customerKey = "fractalite/master";*/ + + + //Transco + public static final String clientId = "atlasvoyages/master/test"; + public static final String password = "p*TE*kH!e8$%dS"; + public static final String customerKey = "tourcom9412"; org.apache.camel.spi.DataFormat jaxb = new org.apache.camel.converter.jaxb.JaxbDataFormat( "com.fractalite.hermes.teldar.api"); diff --git a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.java b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.java index f16789a..ecb0621 100644 --- a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.java +++ b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.java @@ -222,11 +222,11 @@ public class ParseTeldarHotelsPriceResponse extends TeldarParsers { List<String> facilities = new ArrayList<String>(); for (Facility respFacility : respHotel.getFacilities().getFacilities()) { if (respFacility.getCode() != null && !respFacility.getCode().isEmpty()) { - com.fractalite.hermes.teldar.parsers.Facility hermesFacility = com.fractalite.hermes.teldar.parsers.Facility - .valueOf(respFacility.getCode().replace("-", "_")); - if (hermesFacility != null) { - facilities.add(hermesFacility.getValue()); - } + //com.fractalite.hermes.teldar.parsers.Facility hermesFacility = com.fractalite.hermes.teldar.parsers.Facility + // .valueOf(respFacility.getCode().replace("-", "_")); + // if (hermesFacility != null) { + facilities.add(respFacility.getValue()); + // } } } hermesHotel.setAmenities(facilities); diff --git a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.java b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.java index 2c9f504..cbfa790 100644 --- a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.java +++ b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.java @@ -148,11 +148,11 @@ public class ParserQuotesresponse extends TeldarParsers { List<String> facilities = new ArrayList<String>(); for (Facility respFacility : respHotel.getFacilities().getFacilities()) { if (respFacility.getCode() != null && !respFacility.getCode().isEmpty()) { - com.fractalite.hermes.teldar.parsers.Facility hermesFacility = com.fractalite.hermes.teldar.parsers.Facility - .valueOf(respFacility.getCode().replace("-", "_")); - if (hermesFacility != null) { - facilities.add(hermesFacility.getValue()); - } + //com.fractalite.hermes.teldar.parsers.Facility hermesFacility = com.fractalite.hermes.teldar.parsers.Facility + // .valueOf(respFacility.getCode().replace("-", "_")); + // if (hermesFacility != null) { + facilities.add(respFacility.getValue()); + // } } } hermesHotel.setAmenities(facilities); @@ -236,7 +236,12 @@ public class ParserQuotesresponse extends TeldarParsers { Money totalPrice = new Money(roomOffer.getRoomPrice().getValue(), Currency.getInstance(roomOffer.getRoomPrice().getCurrency())); roomProduct.setPrice(PriceScope.PURCHASE_UNIT, totalPrice); - +///////////////////// To be removed //////////////////// + roomProduct.setPrice(PriceScope.TOTAL, totalPrice); + + +//////////////////////////////////////////////// + quote.setTrip(quoteTemplate.getTrip()); quote.addMeta("source", ContentProvider.PROVIDER_ID); diff --git a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.java b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.java index f67912e..ebf4410 100644 --- a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.java +++ b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.java @@ -41,7 +41,7 @@ public class GetHotelDetailsRequest extends TeldarServices { customeridentification.setClientId(TeldarRouteBuilder.clientId); customeridentification.setPassword(TeldarRouteBuilder.password); - gethoteldetails.setLanguage("FR"); + gethoteldetails.setLanguage("EN"); gethoteldetails.setIdentification(customeridentification); HotelCode hotelcode = new HotelCode(); diff --git a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.java b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.java index 89718e2..77a7873 100644 --- a/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.java +++ b/tldd-hotels/src/main/java/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.java @@ -78,6 +78,7 @@ public class SearchTeldarHotelPriceRequest extends TeldarServices { // Search By hotels codes HotelCodeListDestination hotelsList = new HotelCodeListDestination(); + int i=0; for (String hotelcodes : hotelstay.getGiatacode().getGekko_teldar()) { String[] codes = hotelcodes.split("-"); String supplierCode = codes[0]; @@ -85,13 +86,18 @@ public class SearchTeldarHotelPriceRequest extends TeldarServices { HotelCodeDestination hcode = new HotelCodeDestination(); hcode.setCode(supplierCode); hotelsList.getHotel().add(hcode); + + if(i>298) + break; + i++; + } destinationcriteria.setHotels(hotelsList); avaCriteria.setDestinationCriteria(destinationcriteria); } - hotelavailability.setLanguage("EN"); + hotelavailability.setLanguage(language); avaCriteria.setCheckIn(hotelstay.getCheckin().toString()); avaCriteria.setCheckOut(hotelstay.getCheckout().toString()); diff --git a/tldd-hotels/src/main/java/com/gekko_holding/webservice/v2_4/AvailabilityWS.java b/tldd-hotels/src/main/java/com/gekko_holding/webservice/v2_4/AvailabilityWS.java index eb609c2..7c45903 100644 --- a/tldd-hotels/src/main/java/com/gekko_holding/webservice/v2_4/AvailabilityWS.java +++ b/tldd-hotels/src/main/java/com/gekko_holding/webservice/v2_4/AvailabilityWS.java @@ -1,9 +1,9 @@ package com.gekko_holding.webservice.v2_4; -import javax.jws.WebMethod; -import javax.jws.WebParam; -import javax.jws.WebResult; -import javax.jws.WebService; +//import javax.jws.WebMethod; +//import javax.jws.WebParam; +//import javax.jws.WebResult; +//import javax.jws.WebService; import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.ws.RequestWrapper; import javax.xml.ws.ResponseWrapper; @@ -14,10 +14,10 @@ import javax.xml.ws.ResponseWrapper; * Generated source version: 2.4.3 * */ -@WebService(targetNamespace = "http://webservice.gekko-holding.com/v2_4", name = "AvailabilityWS") +//@WebService(targetNamespace = "http://webservice.gekko-holding.com/v2_4", name = "AvailabilityWS") @XmlSeeAlso({ObjectFactory.class}) public interface AvailabilityWS { - +/* @WebMethod @RequestWrapper(localName = "getHotelDetails", targetNamespace = "http://webservice.gekko-holding.com/v2_4", className = "com.gekko_holding.webservice.v2_4.GetHotelDetails") @ResponseWrapper(localName = "getHotelDetailsResponse", targetNamespace = "http://webservice.gekko-holding.com/v2_4", className = "com.gekko_holding.webservice.v2_4.GetHotelDetailsResponse") @@ -137,5 +137,5 @@ public interface AvailabilityWS { com.gekko_holding.webservice.v2_4.CustomerIdentification identification, @WebParam(name = "bookRequest", targetNamespace = "") com.gekko_holding.webservice.v2_4.RequestedBookings bookRequest - ) throws TimeoutException_Exception, ServiceException; + ) throws TimeoutException_Exception, ServiceException;*/ } diff --git a/tldd-hotels/target/classes/META-INF/MANIFEST.MF b/tldd-hotels/target/classes/META-INF/MANIFEST.MF index 603cd90..f2174e0 100644 --- a/tldd-hotels/target/classes/META-INF/MANIFEST.MF +++ b/tldd-hotels/target/classes/META-INF/MANIFEST.MF @@ -1,95 +1,47 @@ Manifest-Version: 1.0 -<<<<<<< HEAD -Bnd-LastModified: 1595861104859 -Build-Jdk-Spec: 1.8 -======= -Bnd-LastModified: 1594300674429 -Build-Jdk: 1.8.0_121 -Built-By: kasmi ->>>>>>> 38409d887f3f1dc529bb01b9314fa594d8cc4402 +Bnd-LastModified: 1660828948677 +Build-Jdk-Spec: 11 Bundle-ManifestVersion: 2 Bundle-Name: tdr Bundle-SymbolicName: tldd-hotels Bundle-Version: 0.0.1.SNAPSHOT -Created-By: Apache Maven Bundle Plugin -<<<<<<< HEAD -Export-Package: com.fractalite.hermes.teldar.Marshaller;uses:="com.gekko - _holding.webservice.v2_4,org.apache.camel,org.springframework.stereotyp - e";version="0.0.1",com.fractalite.hermes.teldar.cfg;uses:="com.fractali - te.hermes.services.stay,javax.xml.parsers,org.apache.camel.builder,org. - w3c.dom,org.xml.sax";version="0.0.1",com.fractalite.hermes.teldar.parse - rs;uses:="com.fractalite.models.travel.stay,javax.xml.parsers,javax.xml - .xpath,org.apache.camel,org.slf4j,org.springframework.stereotype,org.xm - l.sax";version="0.0.1",com.fractalite.hermes.teldar.services;uses:="com - .fractalite.models.commerce,com.fractalite.models.travel.stay,com.gekko - _holding.webservice.v2_4,javax.xml.datatype,org.apache.camel,org.slf4j" - ;version="0.0.1",com.fractalite.hermes.teldar.tools;uses:="com.fractali - te.models.travel.stay,javax.xml.bind.annotation";version="0.0.1",com.ge - kko_holding.webservice.v2_4;uses:="javax.jws,javax.xml.bind,javax.xml.b - ind.annotation,javax.xml.namespace,javax.xml.ws";version="0.0.1" -Import-Package: com.fractalite.hermes.services.stay;version="[0.1,1)",co - m.fractalite.hermes.teldar.Marshaller;version="[0.0,1)",com.fractalite. - hermes.teldar.parsers;version="[0.0,1)",com.fractalite.hermes.teldar.se - rvices;version="[0.0,1)",com.fractalite.hermes.teldar.tools;version="[0 - .0,1)",com.fractalite.models.commerce;version="[0.0,1)",com.fractalite. - models.common;version="[0.0,1)",com.fractalite.models.travel;version="[ - 0.0,1)",com.fractalite.models.travel.stay;version="[0.0,1)",com.gekko_h - olding.webservice.v2_4;version="[0.0,1)",com.giata.desthotel.mapping;ve - rsion="[0.0,1)",com.google.i18n.phonenumbers,javax.jws,javax.xml.bind,j - avax.xml.bind.annotation,javax.xml.datatype,javax.xml.namespace,javax.x - ml.parsers,javax.xml.soap,javax.xml.transform,javax.xml.transform.dom,j - avax.xml.transform.stream,javax.xml.ws,javax.xml.xpath,org.apache.camel - ;version="[2.8,3)",org.apache.camel.builder;version="[2.8,3)",org.apach - e.camel.component.http4;version="[2.8,3)",org.apache.camel.converter.ja - xb;version="[2.8,3)",org.apache.camel.model;version="[2.8,3)",org.apach - e.camel.model.config;version="[2.8,3)",org.apache.camel.model.dataforma - t;version="[2.8,3)",org.apache.camel.model.language;version="[2.8,3)",o - rg.apache.camel.model.loadbalancer;version="[2.8,3)",org.apache.camel.s - pi;version="[2.8,3)",org.apache.servicemix.camel.nmr,org.apache.service - mix.nmr.api,org.codehaus.jackson.map;version="[1.8,2)",org.joda.time;ve - rsion="[1.5,2)",org.joda.time.format;version="[1.5,2)",org.slf4j;versio - n="[1.6,2)",org.springframework.beans.factory.config;version="[3.0,4)", - org.springframework.stereotype;version="[3.0,4)",org.w3c.dom,org.xml.sa - x -======= -Export-Package: com.gekko_holding.webservice.v2_4;version="0.0.1";uses:= - "javax.jws,javax.xml.bind,javax.xml.bind.annotation,javax.xml.namespace - ,javax.xml.ws",com.fractalite.hermes.teldar.parsers;version="0.0.1";use - s:="com.fractalite.models.travel.stay,javax.xml.parsers,javax.xml.xpath - ,org.apache.camel,org.slf4j,org.springframework.stereotype,org.xml.sax" - ,com.fractalite.hermes.teldar.tools;version="0.0.1";uses:="com.fractali - te.models.travel.stay,javax.xml.bind.annotation",com.fractalite.hermes. - teldar.cfg;version="0.0.1";uses:="com.fractalite.hermes.services.stay,j - avax.xml.parsers,org.apache.camel.builder,org.w3c.dom,org.xml.sax",com. - fractalite.hermes.teldar.Marshaller;version="0.0.1";uses:="com.gekko_ho - lding.webservice.v2_4,org.apache.camel,org.springframework.stereotype", - com.fractalite.hermes.teldar.services;version="0.0.1";uses:="com.fracta - lite.models.commerce,com.fractalite.models.travel.stay,com.gekko_holdin - g.webservice.v2_4,javax.xml.datatype,org.apache.camel,org.slf4j" +Created-By: Apache Maven Bundle Plugin 5.1.8 +Export-Package: com.gekko_holding.webservice.v2_4;uses:="javax.xml.bind, + javax.xml.bind.annotation,javax.xml.namespace,javax.xml.ws";version="0. + 0.1",com.fractalite.hermes.teldar.parsers;uses:="com.fractalite.models. + travel.stay,javax.xml.parsers,javax.xml.xpath,org.apache.camel,org.slf4 + j,org.springframework.stereotype,org.xml.sax";version="0.0.1",com.fract + alite.hermes.teldar.tools;uses:="com.fractalite.models.travel.stay,java + x.xml.bind.annotation";version="0.0.1",com.fractalite.hermes.teldar.cfg + ;uses:="com.fractalite.hermes.services.stay,javax.xml.parsers,org.apach + e.camel.builder,org.w3c.dom,org.xml.sax";version="0.0.1",com.fractalite + .hermes.teldar.Marshaller;uses:="com.gekko_holding.webservice.v2_4,org. + apache.camel,org.springframework.stereotype";version="0.0.1",com.fracta + lite.hermes.teldar.services;uses:="com.fractalite.models.commerce,com.f + ractalite.models.travel.stay,com.gekko_holding.webservice.v2_4,javax.xm + l.datatype,org.apache.camel,org.slf4j";version="0.0.1" Import-Package: org.apache.camel;version="[2.8,3)",org.apache.camel.mode l;version="[2.8,3)",org.apache.camel.model.language;version="[2.8,3)",o rg.slf4j;version="[1.6,2)",org.xml.sax,org.joda.time;version="[1.5,2)", - org.joda.time.format;version="[1.5,2)",javax.xml.bind,javax.xml.bind.an - notation,javax.xml.datatype,javax.xml.namespace,javax.xml.parsers,javax - .xml.soap,javax.xml.transform,javax.xml.transform.dom,javax.xml.transfo - rm.stream,javax.xml.ws,javax.xml.xpath,org.apache.camel.builder;version - ="[2.8,3)",com.fractalite.hermes.services.stay;version="[0.1,1)",com.fr - actalite.hermes.teldar.Marshaller;version="[0.0,1)",com.fractalite.herm - es.teldar.parsers;version="[0.0,1)",com.fractalite.hermes.teldar.servic - es;version="[0.0,1)",com.fractalite.hermes.teldar.tools;version="[0.0,1 - )",com.fractalite.models.commerce;version="[0.0,1)",com.fractalite.mode + org.joda.time.format;version="[1.5,2)",javax.xml.bind;version="[2.2,3)" + ,javax.xml.bind.annotation;version="[2.2,3)",javax.xml.datatype,javax.x + ml.namespace,javax.xml.parsers,javax.xml.soap;version="[1.3,2)",javax.x + ml.transform,javax.xml.transform.dom,javax.xml.transform.stream,javax.x + ml.ws;version="[2.2,3)",javax.xml.xpath,org.apache.camel.builder;versio + n="[2.8,3)",com.fractalite.hermes.services.stay;version="[0.1,1)",com.f + ractalite.hermes.teldar.Marshaller,com.fractalite.hermes.teldar.parsers + ,com.fractalite.hermes.teldar.services,com.fractalite.hermes.teldar.too + ls,com.fractalite.models.commerce;version="[0.0,1)",com.fractalite.mode ls.common;version="[0.0,1)",com.fractalite.models.travel;version="[0.0, 1)",com.fractalite.models.travel.stay;version="[0.0,1)",com.gekko_holdi - ng.webservice.v2_4;version="[0.0,1)",com.giata.desthotel.mapping;versio - n="[0.0,1)",com.google.i18n.phonenumbers,javax.jws,org.apache.camel.com - ponent.http4;version="[2.8,3)",org.apache.camel.converter.jaxb;version= - "[2.8,3)",org.apache.camel.spi;version="[2.8,3)",org.apache.servicemix. - camel.nmr,org.apache.servicemix.nmr.api,org.codehaus.jackson.map;versio - n="[1.8,2)",org.springframework.stereotype;version="[3.0,4)",org.w3c.do - m,org.apache.camel.model.config;version="[2.8,3)",org.apache.camel.mode - l.dataformat;version="[2.8,3)",org.apache.camel.model.loadbalancer;vers - ion="[2.8,3)",org.springframework.beans.factory.config;version="[3.0,4) - " ->>>>>>> 38409d887f3f1dc529bb01b9314fa594d8cc4402 + ng.webservice.v2_4,com.giata.desthotel.mapping;version="[0.0,1)",com.go + ogle.i18n.phonenumbers,org.apache.camel.component.http4;version="[2.8,3 + )",org.apache.camel.converter.jaxb;version="[2.8,3)",org.apache.camel.s + pi;version="[2.8,3)",org.apache.servicemix.camel.nmr,org.apache.service + mix.nmr.api,org.codehaus.jackson.map;version="[1.8,2)",org.springframew + ork.stereotype;version="[3.0,4)",org.w3c.dom,org.apache.camel.model.con + fig;version="[2.8,3)",org.apache.camel.model.dataformat;version="[2.8,3 + )",org.apache.camel.model.loadbalancer;version="[2.8,3)",org.springfram + ework.beans.factory.config;version="[3.0,4)" Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.6))" -Tool: Bnd-5.1.1.202006162103 +Tool: Bnd-6.3.1.202206071316 diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/MarshallingJAXB.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/MarshallingJAXB.class index ce75d58..ad6ac50 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/MarshallingJAXB.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/MarshallingJAXB.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/UnmarshallingJAXB.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/UnmarshallingJAXB.class index f1c0b0e..123745c 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/UnmarshallingJAXB.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/Marshaller/UnmarshallingJAXB.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$1.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$1.class index 84720ef..13fee57 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$1.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$1.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$10.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$10.class index bd6efa4..d231522 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$10.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$10.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$11.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$11.class index d0702e5..2504775 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$11.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$11.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$2.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$2.class index d4e761c..e9f1cf8 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$2.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$2.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$3.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$3.class index c3f1f03..9c82110 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$3.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$3.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$4.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$4.class index d35ba41..2400602 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$4.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$4.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$5.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$5.class index ce838d7..aa526e1 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$5.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$5.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$6.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$6.class index ada2e8a..e1e01fc 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$6.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$6.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$7.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$7.class index 24101b4..ce1c2f1 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$7.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$7.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$8.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$8.class index b6c1ec3..f3e6bdd 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$8.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$8.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$9.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$9.class index ef1f5e3..33198e5 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$9.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder$9.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.class index 5246ea2..d282c61 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseConfirmBookResponse.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseConfirmBookResponse.class index e2653d8..57c845f 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseConfirmBookResponse.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseConfirmBookResponse.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseHoteldetailsResponse.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseHoteldetailsResponse.class index 2fd9812..bc0413c 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseHoteldetailsResponse.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseHoteldetailsResponse.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.class index 20c3702..eb7ef0f 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParseTeldarHotelsPriceResponse.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.class index 285aabf..ba50147 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/ParserQuotesresponse.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/QuoteTeldarCancellationResponse.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/QuoteTeldarCancellationResponse.class index 4d668fd..53d3876 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/QuoteTeldarCancellationResponse.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/QuoteTeldarCancellationResponse.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/TeldarParsers.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/TeldarParsers.class index f272873..de40158 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/TeldarParsers.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/parsers/TeldarParsers.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.class index 1d5aa12..e5c56d3 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/GetHotelDetailsRequest.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.class index 93edd3d..e96cbdf 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/services/SearchTeldarHotelPriceRequest.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/IdGenerator.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/IdGenerator.class index d85c4e5..dc6923b 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/IdGenerator.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/IdGenerator.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ObjectToXml.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ObjectToXml.class index 9ae62d6..298bf74 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ObjectToXml.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ObjectToXml.class differ diff --git a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ReadWriteTextFile.class b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ReadWriteTextFile.class index 58ff7df..dbb6ace 100644 Binary files a/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ReadWriteTextFile.class and b/tldd-hotels/target/classes/com/fractalite/hermes/teldar/tools/ReadWriteTextFile.class differ diff --git a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityService.class b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityService.class index 75d6148..0137826 100644 Binary files a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityService.class and b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityService.class differ diff --git a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityWS.class b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityWS.class index a6e5fde..d1fae9d 100644 Binary files a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityWS.class and b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/AvailabilityWS.class differ diff --git a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/GetHotelDetailsResponse.class b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/GetHotelDetailsResponse.class index f65786d..6c46fa4 100644 Binary files a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/GetHotelDetailsResponse.class and b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/GetHotelDetailsResponse.class differ diff --git a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/HotelAvailabilityResponse.class b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/HotelAvailabilityResponse.class index 574d017..9173ce6 100644 Binary files a/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/HotelAvailabilityResponse.class and b/tldd-hotels/target/classes/com/gekko_holding/webservice/v2_4/HotelAvailabilityResponse.class differ diff --git a/tldd-hotels/target/tldd-hotels-0.0.1-SNAPSHOT.jar b/tldd-hotels/target/tldd-hotels-0.0.1-SNAPSHOT.jar index 3905fa1..9aa6f21 100644 Binary files a/tldd-hotels/target/tldd-hotels-0.0.1-SNAPSHOT.jar and b/tldd-hotels/target/tldd-hotels-0.0.1-SNAPSHOT.jar differ