TUSCANY-3617 - Adding support for configuring wireFormat only for response to allow RPC over GET services to define the wireFormat to use for generating the response payload.

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

3 files changed, 23 insertions, 35 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
index ca5d73246a..8664162ffb 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/Echo.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 package services.echo;
 
@@ -24,7 +24,7 @@ import org.oasisopen.sca.annotation.Remotable;
 
 /**
  * Interface of our sample JSONRPC service.
- * 
+ *
  * @version $Rev$ $Date$
  */
 @Remotable
@@ -32,9 +32,7 @@ public interface Echo {
 
     String echo(@QueryParam("msg") String msg);
 
-    int echoInt(int param);
-
-    boolean echoBoolean(boolean param);
+    int echoInt(@QueryParam("param") int param);
 
     String [] echoArrayString(@QueryParam("msgArray") String[] stringArray);
 
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
index 2596637ce8..6bc22bd41a 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/echo/EchoImpl.java
@@ -6,27 +6,27 @@
  * 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.    
+ * under the License.
  */
 package services.echo;
 
 
 /**
  * A simple client component that uses a reference with an JSONRPC binding.
- * 
+ *
  * @version $Rev$ $Date$
  */
-public class EchoImpl implements Echo {    
+public class EchoImpl implements Echo {
 
-    public String echo(String msg) {        
+    public String echo(String msg) {
         return msg;
     }
 
@@ -35,11 +35,6 @@ public class EchoImpl implements Echo {
         return value;
     }
 
-    public boolean echoBoolean(boolean param) {
-        boolean value = param;
-        return value;
-    }
-
     public String[] echoArrayString(String[] stringArray) {
         return stringArray;
     }
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
index 498576117b..afe3d3863e 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java
@@ -6,15 +6,15 @@
  * 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.    
+ * under the License.
  */
 
 package services.store;
@@ -31,13 +31,13 @@ import org.oasisopen.sca.annotation.Scope;
 
 @Scope("COMPOSITE")
 public class FruitsCatalogImpl implements Catalog {
-    
+
     @Property
     public String currencyCode = "USD";
-    
+
     @Reference
     public CurrencyConverter currencyConverter;
-    
+
     private Map<String, Item> catalog = new HashMap<String, Item>();
 
     @Init
@@ -50,32 +50,27 @@ public class FruitsCatalogImpl implements Catalog {
 
     public Items getItem() {
         Items items = new Items();
-        // Add by order so that we can test in the json array
-        List<Item> list = new ArrayList<Item>();
-        list.add(catalog.get("Pear"));
-        list.add(catalog.get("Apple"));
-        list.add(catalog.get("Orange"));
-        items.setItems(list);
+        items.setItems(new ArrayList<Item>(catalog.values()));
         return items;
     }
-    
+
     public Item getItemById(String itemId) {
         return catalog.get(itemId);
     }
-    
+
     public void addItem(Item item) {
         catalog.put(item.getName(),item);
     }
-    
+
     public void updateItem(Item item) {
         if(catalog.get(item.getName()) != null) {
             catalog.put(item.getName(), item);
         }
     }
-    
+
     public void deleteItem(String itemId) {
         if(catalog.get(itemId) != null) {
             catalog.remove(itemId);
-        }        
+        }
     }
 }