1 files changed, 32 insertions, 140 deletions

diff --git a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java b/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
index 30d87a283e..3f42edd587 100644
--- a/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
+++ b/sandbox/travelsample/trip-contribution/src/scatours/trip/TripImpl.java
@@ -18,169 +18,59 @@
  */
 package scatours.trip;
 
-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.annotations.Property;
-import org.osoa.sca.annotations.Reference;
+
+import org.osoa.sca.annotations.ConversationID;
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.Init;
+
 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;
 
 /**
  * An implementation of the Trip service
  */
-@Scope("COMPOSITE")
-@Service(interfaces={TripSearch.class, TripContents.class})
-public class TripImpl implements TripSearch, SearchCallback, TripContents{
-    
-    @Reference
-    protected CurrencyConverter currencyConverter;
-    
-    @Reference 
-    protected Search hotelSearch;
-    
-    @Reference 
-    protected Search flightSearch;
-    
-    @Reference 
-    protected Search carSearch;
-        
-    @Property
-    public String quoteCurrencyCode = "USD";
-    
-    private int responsesReceived = 0;
+@Scope("CONVERSATION")
+@Service(interfaces={Trip.class})
+public class TripImpl implements Trip{
+
+    @ConversationID
+    protected String conversationId;
     
-    private List<TripItem> searchResults = new ArrayList<TripItem>();
     private Map<String, TripItem> tripItems = new HashMap<String, TripItem>();
+     
+    // Trip methods
     
-    // TripSearch methods
+    @Init
+    public void initTrip() {
+        //TODO
+        System.out.println("Trip init");
+    }
     
-    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()]);
+    @Destroy
+    public void destroyTrip() {
+        //TODO
+        System.out.println("Trip destroy");
     }
     
-    // SearchCallback methods
+    public void startTrip(String id){
+        tripItems.clear();
+    }
     
-    public void searchResults(TripItem[] items){
-        for(int i = 0; i < items.length; i++ ){
-            searchResults.add(items[i]);
-        }
-        
-        responsesReceived++;
-        try {
-            this.notifyAll();
-        } catch (Exception ex) {
-        }
-    }    
-
-    // TripContents methods
-    public void addTripItem(String id){
-        for (TripItem tripItem : searchResults) {
-            if (tripItem.getId().equals(id)){
-                tripItems.put(id, tripItem);
-            }
-        }
+    public void addTripItem(TripItem tripItem){
+        tripItems.put(tripItem.getId(), tripItem);
     }
     
     public void removeTripItem(String id){
         tripItems.remove(id);
     }     
     
-    // Not using the DataCollection iface yet as it seems like a 
-    // likely attach vector to be passing complete tripItem records in
-    // really need to look up the cached item based on id    
-    public Entry<String, TripItem>[] getAll() {
-        Entry<String, TripItem>[] entries = new Entry[tripItems.size()];
-        int i = 0;
-        for (Map.Entry<String, TripItem> e: tripItems.entrySet()) {
-            entries[i++] = new Entry<String, TripItem>(e.getKey(), e.getValue());
-        }
-        return entries;
-    }
-    
-    public TripItem get(String key) throws NotFoundException {
-        TripItem item = tripItems.get(key);
-        if (item == null) {
-            throw new NotFoundException(key);
-        } else {
-            return item;
-        }
-    }
-
-    public String post(String key, TripItem item) {
-        tripItems.put(key, item);
-        return key;
-    }
-
-    public void put(String key, TripItem item) throws NotFoundException {
-        if (!tripItems.containsKey(key)) {
-            throw new NotFoundException(key);
-        }
-        tripItems.put(key, item);
-    }
-    
-    public void delete(String key) throws NotFoundException {
-        if (key == null || key.equals("")) {
-            tripItems.clear();
-        } else {
-            TripItem item = tripItems.remove(key);
-            if (item == null)
-                throw new NotFoundException(key);
-        }
-    }
-
-    public Entry<String, TripItem>[] query(String queryString) {
-        List<Entry<String, TripItem>> entries = new ArrayList<Entry<String,TripItem>>();
-        if (queryString.startsWith("name=")) {
-            String name = queryString.substring(5);
-            for (Map.Entry<String, TripItem> e: tripItems.entrySet()) {
-                TripItem item = e.getValue();
-                if (item.getName().equals(name)) {
-                    entries.add(new Entry<String, TripItem>(e.getKey(), e.getValue()));
-                }
-            }
-        }
-        return entries.toArray(new Entry[entries.size()]);
-    }
-   
-    // TripTotal methods
-    
-    public double getTotalPrice(){ 
+    public double getTripPrice(){ 
         double totalPrice = 0.0;
         
         for (TripItem tripItem : tripItems.values()){
@@ -190,5 +80,7 @@ public class TripImpl implements TripSearch, SearchCallback, TripContents{
         return totalPrice;
     }
     
-
+    public void purchaseTrip() {
+        // TODO
+    }
 }