Add customer registry into the spring component

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@824091 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 317 insertions, 27 deletions

diff --git a/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/Customer.java b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/Customer.java
new file mode 100644
index 0000000000..3b72f81b33
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/Customer.java
@@ -0,0 +1,70 @@
+/*
+ * 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 com.tuscanyscatours.customer;
+
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+
+/**
+ * Customer data
+ */
+public class Customer {
+    private String id;
+    private String email;
+    private String name;
+
+    private CreditCardDetailsType creditCard;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public CreditCardDetailsType getCreditCard() {
+        return creditCard;
+    }
+
+    public void setCreditCard(CreditCardDetailsType creditCard) {
+        this.creditCard = creditCard;
+    }
+
+    public String toString() {
+        return "id: " + id + " name: " + name + " e-mail: " + email;
+    }
+
+}
diff --git a/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
new file mode 100644
index 0000000000..fdced0d659
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerNotFoundException.java
@@ -0,0 +1,58 @@
+/*
+ * 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 com.tuscanyscatours.customer;
+
+
+public class CustomerNotFoundException extends Exception {
+    private static final long serialVersionUID = -129752837478357452L;
+
+    /**
+     * 
+     */
+    public CustomerNotFoundException() {
+
+    }
+
+    /**
+     * @param message
+     */
+    public CustomerNotFoundException(String message) {
+        super(message);
+
+    }
+
+    /**
+     * @param cause
+     */
+    public CustomerNotFoundException(Throwable cause) {
+        super(cause);
+
+    }
+
+    /**
+     * @param message
+     * @param cause
+     */
+    public CustomerNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+
+    }
+
+}
diff --git a/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
new file mode 100644
index 0000000000..706167d567
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/CustomerRegistry.java
@@ -0,0 +1,39 @@
+/*
+ * 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 com.tuscanyscatours.customer;
+
+import java.util.Collection;
+
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+
+/**
+ * Customer registry interface
+ */
+public interface CustomerRegistry {
+    Customer createCustomer(String name, String email, CreditCardDetailsType creditCard);
+
+    boolean updateCustomer(Customer customer);
+
+    Customer getCustomer(String id) throws CustomerNotFoundException;
+
+    Collection<Customer> getAllCustomers();
+
+    boolean deleteCustomer(String id);
+}
diff --git a/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
new file mode 100644
index 0000000000..6364701b9c
--- /dev/null
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/customer/impl/CustomerRegistryImpl.java
@@ -0,0 +1,115 @@
+/*
+ * 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 com.tuscanyscatours.customer.impl;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.osoa.sca.annotations.Destroy;
+import org.osoa.sca.annotations.EagerInit;
+import org.osoa.sca.annotations.Init;
+import org.osoa.sca.annotations.Requires;
+import org.osoa.sca.annotations.Scope;
+import org.osoa.sca.annotations.Service;
+
+import com.tuscanyscatours.customer.Customer;
+import com.tuscanyscatours.customer.CustomerNotFoundException;
+import com.tuscanyscatours.customer.CustomerRegistry;
+import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
+import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
+import com.tuscanyscatours.payment.creditcard.ObjectFactory;
+import com.tuscanyscatours.payment.creditcard.PayerType;
+
+/**
+ * An in-memory customer registry implementation
+ */
+@Service(CustomerRegistry.class)
+@Scope("COMPOSITE")
+@EagerInit
+@Requires("{http://www.osoa.org/xmlns/sca/1.0}managedTransaction.global")
+public class CustomerRegistryImpl implements CustomerRegistry {
+    private volatile static int idGenerator = 0;
+    private Map<String, Customer> customers = new HashMap<String, Customer>();
+
+    @Init
+    public void init() {
+        // Load the customers
+        ObjectFactory factory = new ObjectFactory();
+        CreditCardDetailsType cc = factory.createCreditCardDetailsType();
+        PayerType john = factory.createPayerType();
+        john.setName("John Smith");
+        cc.setCardOwner(john);
+        cc.setCreditCardNumber("1111-2222-3333-4444");
+        cc.setCreditCardType(CreditCardTypeType.VISA);
+        cc.setCVV2("1234");
+        cc.setExpMonth(1);
+        cc.setExpYear(2012);
+        createCustomer("John Smith", "john@xyz.com", cc);
+    }
+    
+    @Destroy
+    public void destroy() {
+        // Save the customers
+    }
+    
+    public Customer createCustomer(String name, String email, CreditCardDetailsType creditCard) {
+        Customer customer = new Customer();
+        customer.setId("c-" + idGenerator++);
+        customer.setName(name);
+        customer.setEmail(email);
+        customer.setCreditCard(creditCard);
+        customers.put(customer.getId(), customer);
+        return customer;
+    }
+
+    public boolean deleteCustomer(String id) {
+        return customers.remove(id) != null;
+    }
+
+    public Collection<Customer> getAllCustomers() {
+        return customers.values();
+    }
+
+    public Customer getCustomer(String id) throws CustomerNotFoundException {
+        Customer customer = customers.get(id);
+        
+        if (customer == null){
+            throw new CustomerNotFoundException("Customer " + id + " not found");
+        }
+        
+        return customer;
+    }
+
+    public boolean updateCustomer(Customer customer) {
+        Customer current = null;
+        try {
+            current = getCustomer(customer.getId());
+        } catch (Exception ex) {
+            return false;
+        }
+
+        current.setEmail(customer.getEmail());
+        current.setName(customer.getName());
+        current.setCreditCard(customer.getCreditCard());
+        return true;
+    }
+
+}
diff --git a/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
index 1e7050edbe..8dfe4b2b40 100644
--- a/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/java/com/tuscanyscatours/payment/impl/PaymentImpl.java
@@ -19,18 +19,18 @@
 
 package com.tuscanyscatours.payment.impl;
 
+import com.tuscanyscatours.customer.Customer;
+import com.tuscanyscatours.customer.CustomerNotFoundException;
+import com.tuscanyscatours.customer.CustomerRegistry;
 import com.tuscanyscatours.emailgateway.EmailGateway;
 import com.tuscanyscatours.emailgateway.EmailType;
 import com.tuscanyscatours.payment.Payment;
-import com.tuscanyscatours.payment.creditcard.CreditCardDetailsType;
 import com.tuscanyscatours.payment.creditcard.CreditCardPayment;
-import com.tuscanyscatours.payment.creditcard.CreditCardTypeType;
-import com.tuscanyscatours.payment.creditcard.ObjectFactory;
-import com.tuscanyscatours.payment.creditcard.PayerType;
 
 public class PaymentImpl implements Payment {
 
     private CreditCardPayment creditCardPayment;
+    private CustomerRegistry customerRegistry;
     private EmailGateway emailGateway;
     private float transactionFee;
     
@@ -38,6 +38,10 @@ public class PaymentImpl implements Payment {
         this.creditCardPayment = creditCardPayment;
     }
     
+    public void setCustomerRegistry(CustomerRegistry customerRegistry) {
+        this.customerRegistry = customerRegistry;
+    }    
+    
     public void setEmailGateway(EmailGateway emailGateway) {
         this.emailGateway = emailGateway;
     }
@@ -47,27 +51,27 @@ public class PaymentImpl implements Payment {
     }
     
     public String makePaymentMember(String customerId, float amount) {
-        
-        ObjectFactory objectFactory = new ObjectFactory();
-        CreditCardDetailsType ccDetails = objectFactory.createCreditCardDetailsType();
-        ccDetails.setCreditCardType(CreditCardTypeType.fromValue("Visa"));
-        PayerType ccOwner = objectFactory.createPayerType();
-        ccOwner.setName(customerId);
-        ccDetails.setCardOwner(ccOwner);
-        
-        amount += transactionFee;
-        
-        String status = creditCardPayment.authorize(ccDetails, amount);
-        
-        com.tuscanyscatours.emailgateway.ObjectFactory emailFactory
-            = new com.tuscanyscatours.emailgateway.ObjectFactory();
-        EmailType email = emailFactory.createEmailType();
-        email.setTitle("Payment Received");
-        email.setTo(customerId);
-        
-        emailGateway.sendEmail(email);
-        
-        return status;
+        try {
+            Customer customer = customerRegistry.getCustomer(customerId);
+            
+            amount += transactionFee;
+            
+            String status = creditCardPayment.authorize(customer.getCreditCard(), amount);
+            
+            com.tuscanyscatours.emailgateway.ObjectFactory emailFactory
+                = new com.tuscanyscatours.emailgateway.ObjectFactory();
+            EmailType email = emailFactory.createEmailType();
+            email.setTitle("Payment Received");
+            email.setTo(customerId);
+            
+            emailGateway.sendEmail(email);
+            
+            return status;
+        } catch (CustomerNotFoundException ex) {
+            return "Payment failed due to " + ex.getMessage();
+        } catch (Throwable t) {
+            return "Payment failed due to system error " + t.getMessage();
+        }         
     }
 
 }
diff --git a/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml b/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml
index c79abdb6ba..f27280bf2f 100644
--- a/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml
+++ b/sandbox/travelsample/contributions/payment-spring/src/main/resources/Payment-context.xml
@@ -26,10 +26,14 @@
     <bean id="Payment" class="com.tuscanyscatours.payment.impl.PaymentImpl">
         <property name="creditCardPayment" ref="creditCardPaymentReference"/>
         <property name="emailGateway" ref="EmailGateway"/>
+        <property name="customerRegistry" ref="CustomerRegistry"/>
         <property name="transactionFee" value="0.5f"/>
     </bean>
 
-    <bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
+    <bean id="CustomerRegistry" class="com.tuscanyscatours.customer.impl.CustomerRegistryImpl">
     </bean>
+    
+    <bean id="EmailGateway" class="com.tuscanyscatours.emailgateway.impl.EmailGatewayImpl">
+    </bean>    
   
 </beans>
diff --git a/sandbox/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java b/sandbox/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
index 41a5d05294..23c60e5d35 100644
--- a/sandbox/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
+++ b/sandbox/travelsample/contributions/payment-spring/src/test/java/scatours/payment/PaymentTestCase.java
@@ -53,7 +53,7 @@ public class PaymentTestCase {
     public void testPayment() {
         SCAClient client = (SCAClient) paymentNode;
         Payment payment = client.getService(Payment.class, "PaymentClient");
-        System.out.println("Result = " + payment.makePaymentMember("Fred", 100.00f));
+        System.out.println("Result = " + payment.makePaymentMember("c-0", 100.00f));
     }
 
     @AfterClass