You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2010/08/12 18:26:00 UTC

svn commit: r984850 - in /tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator: AddBean.java AddService.java AddServiceImpl.java CalculatorServiceImpl.java

Author: slaws
Date: Thu Aug 12 16:26:00 2010
New Revision: 984850

URL: http://svn.apache.org/viewvc?rev=984850&view=rev
Log:
Convert the add method to take a complex parameter

Added:
    tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
Modified:
    tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
    tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
    tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java

Added: tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java?rev=984850&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddBean.java Thu Aug 12 16:26:00 2010
@@ -0,0 +1,88 @@
+/*
+ * 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 calculator;
+
+public class AddBean {
+
+    protected double n1;
+    protected double n2;
+    protected double n3;
+    
+    protected Boolean b;
+    protected String s;
+    protected int x;
+    protected Integer y;
+    
+    public double getN1() {
+        return n1;
+    }
+    
+    public void setN1(double n1) {
+        this.n1 = n1;
+    }
+    
+    public double getN2() {
+        return n2;
+    }
+    
+    public void setN2(double n2) {
+        this.n2 = n2;
+    }
+    
+    public double getN3() {
+        return n3;
+    }
+    
+    public void setN3(double n3) {
+        this.n3 = n3;
+    }
+    
+    public Boolean getB() {
+        return b;
+    }
+    
+    public void setB(Boolean b) {
+        this.b = b;
+    }
+    
+    public String getS() {
+        return s;
+    }
+    
+    public void setS(String s) {
+        this.s = s;
+    }
+    
+    public int getX() {
+        return x;
+    }
+    
+    public void setX(int x) {
+        this.x = x;
+    }
+    
+    public Integer getY() {
+        return y;
+    }
+
+    public void setY(Integer y) {
+        this.y = y;
+    }
+}

Modified: tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java?rev=984850&r1=984849&r2=984850&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddService.java Thu Aug 12 16:26:00 2010
@@ -24,5 +24,6 @@ package calculator;
 public interface AddService {
 
     double add(double n1, double n2);
+    AddBean addComplexParam(AddBean aBean);
 
 }

Modified: tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java?rev=984850&r1=984849&r2=984850&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/AddServiceImpl.java Thu Aug 12 16:26:00 2010
@@ -34,5 +34,10 @@ public class AddServiceImpl implements A
         logger.log(Level.FINEST, "Adding " + n1 + " and " + n2);
         return n1 + n2;
     }
+    
+    public AddBean addComplexParam(AddBean aBean) {
+        aBean.setN3(aBean.getN1() + aBean.getN2());
+        return aBean;
+    }
 
 }

Modified: tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java?rev=984850&r1=984849&r2=984850&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/samples/binding-jsonrpc/contribution-calculator/src/main/java/calculator/CalculatorServiceImpl.java Thu Aug 12 16:26:00 2010
@@ -54,7 +54,21 @@ public class CalculatorServiceImpl imple
     }
 
     public double add(double n1, double n2) {
-        return addService.add(n1, n2);
+        AddBean aBean = new AddBean();
+        // So data to test different types
+        aBean.setB(true);
+        aBean.setS("Fred");
+        aBean.setX(27);
+        aBean.setY(58);
+        
+        // the numbers to be added
+        aBean.setN1(n1);
+        aBean.setN2(n2);
+        
+        aBean = addService.addComplexParam(aBean);
+        
+        return aBean.getN3();
+        //return addService.add(n1, n2);
     }
 
     public double subtract(double n1, double n2) {