Commit 4655fc60 by kasmi

Fix

parent 1c4106fb
......@@ -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>
......@@ -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>
......@@ -228,28 +173,31 @@
<version>3.4</version>
</dependency>
<!-- 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>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> -->
<!-- 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>
<!-- https://mvnrepository.com/artifact/javax.jws/javax.jws-api -->
<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.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
<version>2.9.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.9.8</version>
</dependency>
</dependencies>
......@@ -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>
<url>http://lib.fractalite.com/repository/maven-releases</url>
</repository>
</distributionManagement>
......
......@@ -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";*/
////////////// 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 = "atlasvoyages/test";
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");
......
......@@ -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);
......
......@@ -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,6 +236,11 @@ 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);
......
......@@ -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();
......
......@@ -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());
......
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;*/
}
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment