Skip to content

T
Teldar
Commit 38409d88 by kasmi
Options

Fix

parent 5d9f9743
Showing with 49 additions and 36 deletions
tldd-hotels/.classpath
......@@ -18,12 +18,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
<attributes>
<attribute name="test" value="true"/>
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
<attributes>
<attribute name="maven.pomderived" value="true"/>
......
tldd-hotels/src/main/java/com/fractalite/hermes/teldar/cfg/TeldarRouteBuilder.java
......@@ -56,6 +56,7 @@ import com.fractalite.hermes.teldar.services.SearchTeldarHotelPriceRequest;
import com.fractalite.models.commerce.Order;
import com.fractalite.models.commerce.QuoteTemplate;
import com.fractalite.models.commerce.RequestForQuote;
import com.fractalite.models.common.Address;
import com.fractalite.models.travel.stay.Hotel;
import com.fractalite.models.travel.stay.HotelStay;
import com.fractalite.models.travel.stay.StaySearchResults;
......@@ -203,7 +204,8 @@ public class TeldarRouteBuilder extends RouteBuilder {
.otherwise().log("teldar Giata code is NOT null")
.setHeader(Exchange.HTTP_METHOD, constant(org.apache.camel.component.http4.HttpMethods.POST))
.setHeader(Exchange.CONTENT_TYPE, constant("application/xml"))
.setHeader(Exchange.SOAP_ACTION, constant("")).process(new Processor() {
.setHeader(Exchange.SOAP_ACTION, constant(""))
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
......@@ -365,20 +367,7 @@ public class TeldarRouteBuilder extends RouteBuilder {
.bean(UnmarshallingJAXB.class, "fromPreBookingInfoResponse(${body})")
.log("ResponseUnMarshllerPreOder --------------- : \n ${body}")
.process(new ParseAddBookingTeldar())
.log("ResponseParserBook ---------- : \n ${body}")
.to(nmrOrDirect + EP_HOTEL_INFO)
.log("detailhotellllls ---------- : \n ${body}")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
Hotel hermesHotel =exchange.getIn().getMandatoryBody(Hotel.class);
Order order= exchange.getProperty("order", Order.class);
order.getTrip().getContent(HotelStay.class).get(0).setHotel(hermesHotel);
exchange.getIn().setBody(order, Order.class);
}
});
;
///////////////////EP_BOOKING_CONFIRMATION////////////////////////////
......@@ -399,7 +388,37 @@ public class TeldarRouteBuilder extends RouteBuilder {
.bean(UnmarshallingJAXB.class, "fromBookHotelResponse(${body})")
.log("ResponseUmarshledConfirm --------------- : \n ${body}")
.process(new ParseConfirmBookResponse())
.log("ResponseConfirmed ---------- : \n ${body}");
.log("ResponseConfirmed ---------- : \n ${body}")
.removeHeaders("*")
.removeHeaders("camel*")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
Order order = exchange.getIn().getMandatoryBody(Order.class);
exchange.getIn().setBody(order.getTrip().getContent(HotelStay.class).get(0).getHotel().getCode());
}
})
.log("ResponseParserBook ---------- : \n ${body}")
.to(nmrOrDirect + EP_HOTEL_INFO)
.log("detailhotellllls ---------- : \n ${body}")
.process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
Hotel hermesHotel =exchange.getIn().getMandatoryBody(Hotel.class);
Order order= exchange.getProperty("order", Order.class);
Hotel h = new Hotel(hermesHotel.getCode(), hermesHotel.getName());
log.info("From info "+hermesHotel.getCode() +" and "+ hermesHotel.getName() );
// h.setAddress(hermesHotel.getAddress());
Address adr = new Address(hermesHotel.getAddress().getStreet(), hermesHotel.getAddress().getZipcode(),null, null);
h.setAddress(adr);
order.getTrip().getContent(HotelStay.class).get(0).setHotel( h);
exchange.getIn().setBody(order, Order.class);
}
})
;
......
tldd-hotels/src/main/java/com/fractalite/hermes/teldar/parsers/ParseAddBookingTeldar.java
......@@ -38,8 +38,8 @@ public class ParseAddBookingTeldar extends TeldarParsers {
Order order = printHotelInfo(respbook.getPreBookingInfo(), oldOrder);
logger.debug("new one " + ObjectToXml.printXML(order));
exchange.setProperty("order", order);
// exchange.getIn().setBody(order);
exchange.getIn().setBody(order.getTrip().getContent(HotelStay.class).get(0).getHotel().getCode());
exchange.getIn().setBody(order);
// exchange.getIn().setBody(order.getTrip().getContent(HotelStay.class).get(0).getHotel().getCode());
logger.info("End TELDAR ParseAddBookingTeldar Processor.......");
}
......
tldd-hotels/target/classes/META-INF/MANIFEST.MF
Manifest-Version: 1.0
Bnd-LastModified: 1594295093760
Build-Jdk: 1.8.0_252
Built-By: dev
Bnd-LastModified: 1594300674429
Build-Jdk: 1.8.0_121
Built-By: kasmi
Bundle-ManifestVersion: 2
Bundle-Name: tdr
Bundle-SymbolicName: tldd-hotels
......@@ -12,15 +12,15 @@ Export-Package: com.gekko_holding.webservice.v2_4;version="0.0.1";uses:=
,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.Marshaller;version="0.0.1";uses:="com.gek
ko_holding.webservice.v2_4,org.apache.camel,org.springframework.stereot
ype",com.fractalite.hermes.teldar.tools;version="0.0.1";uses:="com.frac
talite.models.travel.stay,javax.xml.bind.annotation",com.fractalite.her
mes.teldar.services;version="0.0.1";uses:="com.fractalite.models.commer
ce,com.fractalite.models.travel.stay,com.gekko_holding.webservice.v2_4,
javax.xml.datatype,org.apache.camel,org.slf4j",com.fractalite.hermes.te
ldar.cfg;version="0.0.1";uses:="com.fractalite.hermes.services.stay,jav
ax.xml.parsers,org.apache.camel.builder,org.w3c.dom,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"
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)",
......
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