summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk/modules/binding-rest-runtime/src/test')
-rw-r--r--sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java1
-rw-r--r--sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java5
-rw-r--r--sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/FruitsCatalogImpl.java4
3 files changed, 7 insertions, 3 deletions
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
index 2aa59af508..b3cf3f1975 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/org/apache/tuscany/sca/binding/rest/wireformat/json/CatalogServiceTestCase.java
@@ -56,6 +56,7 @@ public class CatalogServiceTestCase {
String contribution = ContributionLocationHelper.getContributionLocation(CatalogServiceTestCase.class);
node = NodeFactory.newInstance().createNode("store.composite", new Contribution("catalog", contribution));
node.start();
+ System.out.println();
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java
index 7e579c6aba..5fb29782f2 100644
--- a/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java
+++ b/sca-java-2.x/trunk/modules/binding-rest-runtime/src/test/java/services/store/Catalog.java
@@ -19,8 +19,11 @@
package services.store;
+import java.util.Date;
+
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
+import javax.ws.rs.HeaderParam;
import javax.ws.rs.POST;
import javax.ws.rs.PUT;
import javax.ws.rs.Path;
@@ -37,7 +40,7 @@ public interface Catalog {
@GET
@Path("{id}")
- Item getItemById(@PathParam("id") String itemId);
+ Item getItemById(@PathParam("id") String itemId, @HeaderParam("If-Modified-Since") Date date);
@POST
void addItem(Item item);
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 afe3d3863e..447e983aa7 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
@@ -20,8 +20,8 @@
package services.store;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
import org.oasisopen.sca.annotation.Init;
@@ -54,7 +54,7 @@ public class FruitsCatalogImpl implements Catalog {
return items;
}
- public Item getItemById(String itemId) {
+ public Item getItemById(String itemId, Date date) {
return catalog.get(itemId);
}