From 569c99b45bb0b3e6408c3af066110f4212da0688 Mon Sep 17 00:00:00 2001 From: slaws Date: Sun, 10 Aug 2008 15:15:28 +0000 Subject: Separate the search into a travel component so that it is independent of the trip booking git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@684518 13f79535-47bb-0310-9956-ffa450edef68 --- .../META-INF/sca-contribution.xml | 25 ++++ sandbox/travelsample/travel-contribution/pom.xml | 88 ++++++++++++ .../src/scatours/travel/TravelBooking.java | 36 +++++ .../src/scatours/travel/TravelImpl.java | 151 +++++++++++++++++++++ .../src/scatours/travel/TravelSearch.java | 32 +++++ 5 files changed, 332 insertions(+) create mode 100644 sandbox/travelsample/travel-contribution/META-INF/sca-contribution.xml create mode 100644 sandbox/travelsample/travel-contribution/pom.xml create mode 100644 sandbox/travelsample/travel-contribution/src/scatours/travel/TravelBooking.java create mode 100644 sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java create mode 100644 sandbox/travelsample/travel-contribution/src/scatours/travel/TravelSearch.java (limited to 'sandbox/travelsample/travel-contribution') diff --git a/sandbox/travelsample/travel-contribution/META-INF/sca-contribution.xml b/sandbox/travelsample/travel-contribution/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..687c894496 --- /dev/null +++ b/sandbox/travelsample/travel-contribution/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ + + + + + + + + \ No newline at end of file diff --git a/sandbox/travelsample/travel-contribution/pom.xml b/sandbox/travelsample/travel-contribution/pom.xml new file mode 100644 index 0000000000..4ae7890544 --- /dev/null +++ b/sandbox/travelsample/travel-contribution/pom.xml @@ -0,0 +1,88 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-sca + 1.4-SNAPSHOT + + + scatours-travel-contribution + Apache Tuscany SCA Tours Travel Contribution + + + + org.apache.tuscany.sca + tuscany-sca-api + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-data-api + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + scatours-common-contribution + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + scatours-currency-contribution + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + scatours-trip-contribution + 1.4-SNAPSHOT + + + + junit + junit + 4.2 + test + + + + + + ${artifactId} + ${basedir}/src + + + ${basedir} + + **/*.java + **/.*/** + pom.xml + build.xml + target/** + src/** + + + + + diff --git a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelBooking.java b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelBooking.java new file mode 100644 index 0000000000..5aa3ef94f5 --- /dev/null +++ b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelBooking.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package scatours.travel; + + +import org.osoa.sca.annotations.Remotable; + +import scatours.common.TripItem; + +/** + * The TravelBooking service interface + */ +@Remotable +public interface TravelBooking { + + void addTripItem(String id); + void removeTripItem(String id); + double getTotalPrice(); + void purchaseTrip(); +} diff --git a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java new file mode 100644 index 0000000000..9d3b9b94e9 --- /dev/null +++ b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelImpl.java @@ -0,0 +1,151 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package scatours.travel; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import org.apache.tuscany.sca.data.collection.Entry; +import org.apache.tuscany.sca.data.collection.NotFoundException; +import org.osoa.sca.ComponentContext; +import org.osoa.sca.ServiceReference; +import org.osoa.sca.annotations.Context; +import org.osoa.sca.annotations.Property; +import org.osoa.sca.annotations.Reference; +import org.osoa.sca.annotations.Scope; +import org.osoa.sca.annotations.Service; + +import scatours.common.Search; +import scatours.common.SearchCallback; +import scatours.common.TripItem; +import scatours.common.TripLeg; +import scatours.currencyconverter.CurrencyConverter; +import scatours.trip.Trip; + +/** + * An implementation of the Trip service + */ +@Scope("COMPOSITE") +@Service(interfaces={TravelSearch.class, TravelBooking.class}) +public class TravelImpl implements TravelSearch, SearchCallback, TravelBooking{ + + @Reference + protected CurrencyConverter currencyConverter; + + @Reference + protected Search hotelSearch; + + @Reference + protected Search flightSearch; + + @Reference + protected Search carSearch; + + @Reference + protected Trip trip; + + @Property + public String quoteCurrencyCode = "USD"; + + @Context + protected ComponentContext componentContext; + + private int responsesReceived = 0; + + private List searchResults = new ArrayList(); + private Map> trips = new HashMap>(); + + // TravelSearch methods + + public TripItem[] search(TripLeg tripLeg) { + + searchResults.clear(); + responsesReceived = 0; + + hotelSearch.searchAsynch(tripLeg); + flightSearch.searchAsynch(tripLeg); + carSearch.searchAsynch(tripLeg); + + while (responsesReceived < 3){ + try { + this.wait(); + } catch (InterruptedException ex){ + // do nothing + } + } + + for (TripItem tripItem : searchResults){ + tripItem.setId(UUID.randomUUID().toString()); + tripItem.setPrice(currencyConverter.convert(tripItem.getCurrency(), + quoteCurrencyCode, + tripItem.getPrice())); + tripItem.setCurrency(quoteCurrencyCode); + } + + return searchResults.toArray(new TripItem[searchResults.size()]); + } + + // SearchCallback methods + + public void searchResults(TripItem[] items){ + for(int i = 0; i < items.length; i++ ){ + searchResults.add(items[i]); + } + + responsesReceived++; + try { + this.notifyAll(); + } catch (Exception ex) { + } + } + + // TravelBooking methods + + public String newTrip(){ + String tripId = UUID.randomUUID().toString(); + ServiceReference tripReference = componentContext.getServiceReference(Trip.class, + "trip"); + //tripReference.setConversationID(tripId); + trips.put(tripId, tripReference); + return tripId; + } + + public void addTripItem(String id){ + for (TripItem tripItem : searchResults) { + if (tripItem.getId().equals(id)){ + trip.addTripItem(tripItem); + } + } + } + + public void removeTripItem(String id){ + trip.removeTripItem(id); + } + + public double getTotalPrice(){ + return trip.getTripPrice(); + } + + public void purchaseTrip() { + trip.purchaseTrip(); + } +} diff --git a/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelSearch.java b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelSearch.java new file mode 100644 index 0000000000..d1aeed2906 --- /dev/null +++ b/sandbox/travelsample/travel-contribution/src/scatours/travel/TravelSearch.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package scatours.travel; + +import org.osoa.sca.annotations.Remotable; + +import scatours.common.TripItem; +import scatours.common.TripLeg; + +/** + * The Trip service interface + */ +@Remotable +public interface TravelSearch { + TripItem[] search(TripLeg tripLeg); +} -- cgit v1.2.3