You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/07/09 06:59:38 UTC
[3/8] ISIS-831: use of @InteractionWith{Action|Property|Collection}
and {Action|Property|Collection}InteractionEvents
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
index 3643a8e..32b2bde 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Put_whenArgsValid_thenMultiplePropertyUpdate.java
@@ -76,7 +76,7 @@ public class Put_whenArgsValid_thenMultiplePropertyUpdate {
@Test
public void primitivePropertiesUpdated() throws Exception {
- final DomainObjectRepresentation domainObjectRepr = getObjectRepr("PRMV", "31");
+ final DomainObjectRepresentation domainObjectRepr = getObjectRepr("PRMV", "40");
final LinkRepresentation updateLink = domainObjectRepr.getLinkWithRel(Rel.UPDATE);
@@ -115,7 +115,7 @@ public class Put_whenArgsValid_thenMultiplePropertyUpdate {
@Test
public void jdkPropertiesUpdated() throws Exception {
- final DomainObjectRepresentation domainObjectRepr = getObjectRepr("JDKV", "29");
+ final DomainObjectRepresentation domainObjectRepr = getObjectRepr("JDKV", "38");
final LinkRepresentation updateLink = domainObjectRepr.getLinkWithRel(Rel.UPDATE);
final JsonRepresentation argRepr = updateLink.getArguments();
@@ -156,7 +156,7 @@ public class Put_whenArgsValid_thenMultiplePropertyUpdate {
@Test
public void jodaPropertiesUpdated() throws Exception {
- final DomainObjectRepresentation domainObjectRepr = getObjectRepr("JODA", "73");
+ final DomainObjectRepresentation domainObjectRepr = getObjectRepr("JODA", "82");
final LinkRepresentation updateLink = domainObjectRepr.getLinkWithRel(Rel.UPDATE);
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenRepresentation_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenRepresentation_ok.java
index 6f155ee..3b235ec 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenRepresentation_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenRepresentation_ok.java
@@ -58,7 +58,7 @@ public class Get_thenRepresentation_ok {
public void representation() throws Exception {
// when
- final Response collectionResp = domainObjectResource.accessCollection("BSRL", "64", "visibleAndEditableCollection");
+ final Response collectionResp = domainObjectResource.accessCollection("BSRL", "73", "visibleAndEditableCollection");
final RestfulResponse<ObjectCollectionRepresentation> collectionJsonResp = RestfulResponse.ofT(collectionResp);
assertThat(collectionJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -71,7 +71,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation selfLink = collectionRepr.getLinkWithRel(Rel.SELF);
assertThat(selfLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/BSRL/64/collections/visibleAndEditableCollection"))
+ .href(endsWith("/objects/BSRL/73/collections/visibleAndEditableCollection"))
.returning(HttpStatusCode.OK)
.build());
@@ -79,7 +79,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation upLink = collectionRepr.getLinkWithRel(Rel.UP);
assertThat(upLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("http://localhost:39393/objects/BSRL/64"))
+ .href(endsWith("http://localhost:39393/objects/BSRL/73"))
.returning(HttpStatusCode.OK)
.type(RepresentationType.DOMAIN_OBJECT.getMediaType())
.title("Untitled Bus Rules Entity")
@@ -90,7 +90,7 @@ public class Get_thenRepresentation_ok {
assertThat(addtoLink, isLink(client)
.httpMethod(RestfulHttpMethod.POST)
.type(RepresentationType.OBJECT_COLLECTION.getMediaType())
- .href(endsWith("/objects/BSRL/64/collections/visibleAndEditableCollection"))
+ .href(endsWith("/objects/BSRL/73/collections/visibleAndEditableCollection"))
.build());
assertThat(addtoLink.getArguments(), is(not(nullValue())));
@@ -102,7 +102,7 @@ public class Get_thenRepresentation_ok {
assertThat(removeFromLink, isLink(client)
.httpMethod(RestfulHttpMethod.DELETE)
.type(RepresentationType.OBJECT_COLLECTION.getMediaType())
- .href(endsWith("/objects/BSRL/64/collections/visibleAndEditableCollection"))
+ .href(endsWith("/objects/BSRL/73/collections/visibleAndEditableCollection"))
.build());
assertThat(removeFromLink.getArguments(), is(not(nullValue())));
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenResponseHeaders_ContentLength_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenResponseHeaders_ContentLength_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenResponseHeaders_ContentLength_ok.java
index ad91a20..d43dcb4 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenResponseHeaders_ContentLength_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_thenResponseHeaders_ContentLength_ok.java
@@ -18,11 +18,10 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.collection;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import javax.ws.rs.core.Response;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
@@ -31,9 +30,9 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.Heade
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectPropertyRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_thenResponseHeaders_ContentLength_ok {
@@ -55,7 +54,7 @@ public class Get_thenResponseHeaders_ContentLength_ok {
public void collectionDetails() throws Exception {
// when
- final Response collectionResp = domainObjectResource.accessCollection("BSRL", "64", "visibleAndEditableCollection");
+ final Response collectionResp = domainObjectResource.accessCollection("BSRL", "73", "visibleAndEditableCollection");
final RestfulResponse<ObjectPropertyRepresentation> collectionJsonResp = RestfulResponse.ofT(collectionResp);
assertThat(collectionJsonResp.getHeader(Header.CONTENT_LENGTH), is(IsisMatchers.greaterThan(1000)));
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_then_200_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_then_200_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_then_200_ok.java
index 4b2cb8e..b56ee79 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_then_200_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_then_200_ok.java
@@ -18,11 +18,10 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.collection;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import javax.ws.rs.core.Response;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
@@ -30,9 +29,9 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpS
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectPropertyRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_then_200_ok {
@Rule
@@ -53,7 +52,7 @@ public class Get_then_200_ok {
public void collectionDetails() throws Exception {
// when
- final Response collectionResp = domainObjectResource.accessCollection("BSRL", "64", "visibleAndEditableCollection");
+ final Response collectionResp = domainObjectResource.accessCollection("BSRL", "73", "visibleAndEditableCollection");
final RestfulResponse<ObjectPropertyRepresentation> collectionJsonResp = RestfulResponse.ofT(collectionResp);
assertThat(collectionJsonResp.getStatus(), is(HttpStatusCode.OK));
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenDoesntExistOid_then_404.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenDoesntExistOid_then_404.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenDoesntExistOid_then_404.java
index f698310..986c431 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenDoesntExistOid_then_404.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenDoesntExistOid_then_404.java
@@ -47,7 +47,7 @@ public class Get_whenDoesntExistOid_then_404 {
@Test
public void returns404() throws Exception {
- givenWhenThen("64", RestfulResponse.HttpStatusCode.OK);
+ givenWhenThen("73", RestfulResponse.HttpStatusCode.OK);
givenWhenThen("nonExistentOid", RestfulResponse.HttpStatusCode.NOT_FOUND);
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenQueryArg_xRoDomainModel_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenQueryArg_xRoDomainModel_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenQueryArg_xRoDomainModel_ok.java
index 9162699..2d12768 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenQueryArg_xRoDomainModel_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenQueryArg_xRoDomainModel_ok.java
@@ -18,21 +18,21 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.collection;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectCollectionRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_whenQueryArg_xRoDomainModel_ok {
@Rule
@@ -45,7 +45,7 @@ public class Get_whenQueryArg_xRoDomainModel_ok {
public void setUp() throws Exception {
final WebServer webServer = webServerRule.getWebServer();
client = new RestfulClient(webServer.getBase());
- request = client.createRequest(RestfulHttpMethod.GET, "/objects/BSRL/64/collections/visibleAndEditableCollection");
+ request = client.createRequest(RestfulHttpMethod.GET, "/objects/BSRL/73/collections/visibleAndEditableCollection");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenRequestHeaders_Accept_ok_TODO.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenRequestHeaders_Accept_ok_TODO.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenRequestHeaders_Accept_ok_TODO.java
index b8c9669..a55e08d 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenRequestHeaders_Accept_ok_TODO.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/collection/Get_whenRequestHeaders_Accept_ok_TODO.java
@@ -45,7 +45,7 @@ public class Get_whenRequestHeaders_Accept_ok_TODO {
@Before
public void setUp() throws Exception {
client = webServerRule.getClient();
- request = client.createRequest(RestfulHttpMethod.GET, "objects/BSRL/64/collections/visibleAndEditableCollection");
+ request = client.createRequest(RestfulHttpMethod.GET, "objects/BSRL/73/collections/visibleAndEditableCollection");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
index 8505a69..f0a302c 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenRepresentation_ok.java
@@ -60,7 +60,7 @@ public class Get_thenRepresentation_ok {
public void representation() throws Exception {
// when
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","58", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
assertThat(idPropertyJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -73,7 +73,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation selfLink = propertyRepr.getLinkWithRel(Rel.SELF);
assertThat(selfLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/58/properties/anInt"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt"))
.returning(HttpStatusCode.OK)
.build());
@@ -81,7 +81,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation upLink = propertyRepr.getLinkWithRel(Rel.UP);
assertThat(upLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/58"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67"))
.returning(HttpStatusCode.OK)
.type(RepresentationType.DOMAIN_OBJECT.getMediaType())
.title("default-name")
@@ -92,7 +92,7 @@ public class Get_thenRepresentation_ok {
assertThat(modifyLink, isLink(client)
.httpMethod(RestfulHttpMethod.PUT)
.type(RepresentationType.OBJECT_PROPERTY.getMediaType())
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/58/properties/anInt"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt"))
.build());
assertThat(modifyLink.getArguments(), is(not(nullValue())));
@@ -104,7 +104,7 @@ public class Get_thenRepresentation_ok {
assertThat(clearLink, isLink(client)
.httpMethod(RestfulHttpMethod.DELETE)
.type(RepresentationType.OBJECT_PROPERTY.getMediaType())
- .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/58/properties/anInt"))
+ .href(endsWith("/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt"))
.build());
// described by link
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
index f096dc4..d201d23 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_thenResponseHeaders_ContentLength_ok.java
@@ -18,11 +18,10 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.property;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import javax.ws.rs.core.Response;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
@@ -31,9 +30,9 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.Heade
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectPropertyRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_thenResponseHeaders_ContentLength_ok {
@@ -55,7 +54,7 @@ public class Get_thenResponseHeaders_ContentLength_ok {
public void propertyDetails() throws Exception {
// when
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","58", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
//given
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
//then
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
index 4d8aeb5..9f6e1ad 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_then_200_ok.java
@@ -19,11 +19,10 @@
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.property;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import javax.ws.rs.core.Response;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
@@ -31,9 +30,9 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpS
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectPropertyRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_then_200_ok {
@@ -55,7 +54,7 @@ public class Get_then_200_ok {
public void propertyDetails() throws Exception {
// when
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","58", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
assertThat(idPropertyJsonResp.getStatus(), is(HttpStatusCode.OK));
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
index 7e2a529..59e5486 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenQueryArg_xRoDomainModel_ok.java
@@ -18,21 +18,21 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobject.oid.property;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectPropertyRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_whenQueryArg_xRoDomainModel_ok {
@Rule
@@ -45,7 +45,7 @@ public class Get_whenQueryArg_xRoDomainModel_ok {
public void setUp() throws Exception {
final WebServer webServer = webServerRule.getWebServer();
client = new RestfulClient(webServer.getBase());
- request = client.createRequest(RestfulHttpMethod.GET, "/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/58/properties/anInt");
+ request = client.createRequest(RestfulHttpMethod.GET, "/objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/67/properties/anInt");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenRequestHeaders_Accept_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenRequestHeaders_Accept_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenRequestHeaders_Accept_ok.java
index 80d4ad9..7b6bd70 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenRequestHeaders_Accept_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Get_whenRequestHeaders_Accept_ok.java
@@ -45,7 +45,7 @@ public class Get_whenRequestHeaders_Accept_ok {
@Before
public void setUp() throws Exception {
client = webServerRule.getClient();
- request = client.createRequest(RestfulHttpMethod.GET, "objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/55/properties/anInt");
+ request = client.createRequest(RestfulHttpMethod.GET, "objects/org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity/68/properties/anInt");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
index 4ba29d0..5e09219 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Post_then_405_bad.java
@@ -23,18 +23,16 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
-import org.apache.isis.viewer.restfulobjects.applib.*;
+import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
+import org.apache.isis.viewer.restfulobjects.applib.Rel;
+import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectPropertyRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isMap;
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.CoreMatchers.endsWith;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
@@ -58,7 +56,7 @@ public class Post_then_405_bad {
public void representation() throws Exception {
// given
- final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","58", "anInt");
+ final Response idPropertyResp = domainObjectResource.propertyDetails("org.apache.isis.core.tck.dom.defaults.WithDefaultsEntity","67", "anInt");
final RestfulResponse<ObjectPropertyRepresentation> idPropertyJsonResp = RestfulResponse.ofT(idPropertyResp);
final ObjectPropertyRepresentation propertyRepr = idPropertyJsonResp.getEntity();
final LinkRepresentation selfLink = propertyRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPropertyUpdated_ok_TODO.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPropertyUpdated_ok_TODO.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPropertyUpdated_ok_TODO.java
index 6feb0ff..191269d 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPropertyUpdated_ok_TODO.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/property/Put_whenArgValid_thenPropertyUpdated_ok_TODO.java
@@ -84,49 +84,49 @@ public class Put_whenArgValid_thenPropertyUpdated_ok_TODO {
// byte
final byte b = (byte)99;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "byteProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "byteProperty");
argRepr = modifyLink.getArguments().mapPut("value", b);
assertThat(followedRepr(modifyLink,argRepr).getByte("value"), is(b));
// char
final char c = 'b';
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "charProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "charProperty");
argRepr = modifyLink.getArguments().mapPut("value", c);
assertThat(followedRepr(modifyLink,argRepr).getChar("value"), is(c));
// double
final double d = 12345.678;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "doubleProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "doubleProperty");
argRepr = modifyLink.getArguments().mapPut("value", d);
assertThat(followedRepr(modifyLink,argRepr).getDouble("value"), is(d));
// float
final float f = 54321.123F;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "floatProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "floatProperty");
argRepr = modifyLink.getArguments().mapPut("value", f);
assertThat(followedRepr(modifyLink,argRepr).getFloat("value"), is(f));
// int
final int i = 999999;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "intProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "intProperty");
argRepr = modifyLink.getArguments().mapPut("value", i);
assertThat(followedRepr(modifyLink,argRepr).getInt("value"), is(i));
// long
final long l = 99999999999L;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "longProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "longProperty");
argRepr = modifyLink.getArguments().mapPut("value", l);
assertThat(followedRepr(modifyLink,argRepr).getLong("value"), is(l));
// short
final short s = (short)999;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "shortProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "shortProperty");
argRepr = modifyLink.getArguments().mapPut("value", s);
assertThat(followedRepr(modifyLink,argRepr).getShort("value"), is(s));
// boolean
final boolean z = false;
- modifyLink = getObjectPropertyReprModifyLink("PRMV", "31", "booleanProperty");
+ modifyLink = getObjectPropertyReprModifyLink("PRMV", "40", "booleanProperty");
argRepr = modifyLink.getArguments().mapPut("value", z);
assertThat(followedRepr(modifyLink,argRepr).getBoolean("value"), is(z));
@@ -137,49 +137,49 @@ public class Put_whenArgValid_thenPropertyUpdated_ok_TODO {
// big decimal
final BigDecimal bd = new BigDecimal("12345678901234567.789");
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "bigDecimalProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "bigDecimalProperty");
argRepr = modifyLink.getArguments().mapPut("value", bd);
assertThat(followedRepr(modifyLink,argRepr).getBigDecimal("value"), is(new BigDecimal("12345678901234567.7890000000"))); // big-decimal(30,10)
// big integer
final BigInteger bi = new BigInteger("123456789012345678");
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "bigIntegerProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "bigIntegerProperty");
argRepr = modifyLink.getArguments().mapPut("value", bi);
assertThat(followedRepr(modifyLink,argRepr).getBigInteger("value"), is(bi));
// java.sql.Date
final java.sql.Date sqld = new java.sql.Date(new DateTime(2014,5,1, 0,0, DateTimeZone.UTC).getMillis());
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "javaSqlDateProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "javaSqlDateProperty");
argRepr = modifyLink.getArguments().mapPut("value", asIsoNoT(sqld));
assertThat(followedRepr(modifyLink,argRepr).getDate("value"), is((java.util.Date)sqld));
// java.sql.Time
final java.sql.Time sqlt = new java.sql.Time(13,0,0);
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "javaSqlTimeProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "javaSqlTimeProperty");
argRepr = modifyLink.getArguments().mapPut("value", asIsoOnlyT(sqlt));
assertThat(followedRepr(modifyLink,argRepr).getTime("value"), is((java.util.Date)sqlt));
// java.sql.Timestamp
final java.sql.Timestamp sqlts = new java.sql.Timestamp(114,4,1,13,0,0,0);
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "javaSqlTimestampProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "javaSqlTimestampProperty");
argRepr = modifyLink.getArguments().mapPut("value", sqlts.getTime());
assertThat(followedRepr(modifyLink,argRepr).getLong("value"), is(sqlts.getTime()));
// java.util.Date
final java.util.Date d = new java.util.Date(114,4,1,13,0,0);
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "javaUtilDateProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "javaUtilDateProperty");
argRepr = modifyLink.getArguments().mapPut("value", asIso(d));
assertThat(followedRepr(modifyLink,argRepr).getDateTime("value"), is(d));
// enum
final String e = "ORANGE";
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "myEnum");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "myEnum");
argRepr = modifyLink.getArguments().mapPut("value", e);
assertThat(followedRepr(modifyLink,argRepr).getString("value"), is(e));
// String
final String s = "Tangerine";
- modifyLink = getObjectPropertyReprModifyLink("JDKV", "29", "stringProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JDKV", "38", "stringProperty");
argRepr = modifyLink.getArguments().mapPut("value", s);
assertThat(followedRepr(modifyLink,argRepr).getString("value"), is(s));
@@ -192,25 +192,25 @@ public class Put_whenArgValid_thenPropertyUpdated_ok_TODO {
// LocalDate
final LocalDate ld = new LocalDate(2013,5,1);
- modifyLink = getObjectPropertyReprModifyLink("JODA", "73", "localDateProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JODA", "82", "localDateProperty");
argRepr = modifyLink.getArguments().mapPut("value", "2013-05-01");
assertThat(followedRepr(modifyLink,argRepr).getString("value"), is("2013-05-01")); // hacky
// LocalDateTime
final LocalDateTime ldt = new LocalDateTime(2013,2,1,14,15,0);
- modifyLink = getObjectPropertyReprModifyLink("JODA", "73", "localDateTimeProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JODA", "82", "localDateTimeProperty");
argRepr = modifyLink.getArguments().mapPut("value", asIso(ldt.toDate()));
assertThat(followedRepr(modifyLink,argRepr).getDateTime("value"), is(ldt.toDate()));
// DateTime
final DateTime dt = new DateTime(2013,2,1,14,15,0);
- modifyLink = getObjectPropertyReprModifyLink("JODA", "73", "dateTimeProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JODA", "82", "dateTimeProperty");
argRepr = modifyLink.getArguments().mapPut("value", asIso(dt.toDate()));
assertThat(followedRepr(modifyLink,argRepr).getDateTime("value"), is(dt.toDate()));
// String
final String s = "New string";
- modifyLink = getObjectPropertyReprModifyLink("JODA", "73", "stringProperty");
+ modifyLink = getObjectPropertyReprModifyLink("JODA", "82", "stringProperty");
argRepr = modifyLink.getArguments().mapPut("value", s);
assertThat(followedRepr(modifyLink,argRepr).getString("value"), is(s));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
index a4621d1..58c4dda 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Delete_givenObjectResource_then_405_bad.java
@@ -55,7 +55,7 @@ public class Delete_givenObjectResource_then_405_bad {
public void representation() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "67", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "76", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
final ObjectActionRepresentation actionPromptRepr = actionPromptJsonResp.getEntity();
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
index 96b997d..cd46282 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenRepresentation_ok.java
@@ -59,7 +59,7 @@ public class Get_thenRepresentation_ok {
public void representation() throws Exception {
// when
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "67", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "76", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
assertThat(actionPromptJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
@@ -72,14 +72,14 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
assertThat(selfLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/RTNE/67/actions/contains"))
+ .href(endsWith("/objects/RTNE/76/actions/contains"))
.returning(HttpStatusCode.OK));
// up link
final LinkRepresentation upLink = actionPromptRepr.getLinkWithRel(Rel.UP);
assertThat(upLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/RTNE/67"))
+ .href(endsWith("/objects/RTNE/76"))
.returning(HttpStatusCode.OK)
.type(RepresentationType.DOMAIN_OBJECT.getMediaType())
.title("Untitled Actions Entity"));
@@ -88,7 +88,7 @@ public class Get_thenRepresentation_ok {
final LinkRepresentation invokeLink = actionPromptRepr.getLinkWithRel(Rel.INVOKE);
assertThat(invokeLink, isLink(client)
.httpMethod(RestfulHttpMethod.GET)
- .href(endsWith("/objects/RTNE/67/actions/contains/invoke")));
+ .href(endsWith("/objects/RTNE/76/actions/contains/invoke")));
assertThat(invokeLink.getArguments(), is(not(nullValue())));
assertThat(invokeLink.getArguments().isArray(), is(false));
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
index ee212af..c2983b7 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseCode_200_ok.java
@@ -18,15 +18,10 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import javax.ws.rs.core.Response;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
@@ -35,6 +30,9 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectRe
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
public class Get_thenResponseCode_200_ok {
@Rule
@@ -54,7 +52,7 @@ public class Get_thenResponseCode_200_ok {
public void actionPrompt() throws Exception {
// when
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "67", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "76", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
assertThat(actionPromptJsonResp.getStatus(), is(HttpStatusCode.OK));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
index 76df246..190d245 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_thenResponseHeaders_ContentLength_ok.java
@@ -18,11 +18,10 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import javax.ws.rs.core.Response;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
@@ -31,9 +30,9 @@ import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.Heade
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectResource;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_thenResponseHeaders_ContentLength_ok {
@@ -53,7 +52,7 @@ public class Get_thenResponseHeaders_ContentLength_ok {
@Test
public void ok() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "67", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "76", "contains");
// when
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
index c48e8be..932890c 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Get_whenQueryArg_xRoDomainModel_ok.java
@@ -18,21 +18,21 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest;
-import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulRequest.RequestParameter;
+import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
public class Get_whenQueryArg_xRoDomainModel_ok {
@@ -46,7 +46,7 @@ public class Get_whenQueryArg_xRoDomainModel_ok {
public void setUp() throws Exception {
final WebServer webServer = webServerRule.getWebServer();
client = new RestfulClient(webServer.getBase());
- request = client.createRequest(RestfulHttpMethod.GET, "/objects/RTNE/67/actions/contains");
+ request = client.createRequest(RestfulHttpMethod.GET, "/objects/RTNE/76/actions/contains");
}
@Test
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
index 0114fdc..005802e 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Post_givenObjectResource_then_405_bad.java
@@ -55,7 +55,7 @@ public class Post_givenObjectResource_then_405_bad {
public void representation() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "67", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "76", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
final ObjectActionRepresentation actionPromptRepr = actionPromptJsonResp.getEntity();
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
index 22fd03d..a9d9274 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/Put_givenObjectResource_then_405_bad.java
@@ -55,7 +55,7 @@ public class Put_givenObjectResource_then_405_bad {
public void representation() throws Exception {
// given
- final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "67", "contains");
+ final Response actionPromptResp = domainObjectResource.actionPrompt("RTNE", "76", "contains");
final RestfulResponse<ObjectActionRepresentation> actionPromptJsonResp = RestfulResponse.ofT(actionPromptResp);
final ObjectActionRepresentation actionPromptRepr = actionPromptJsonResp.getEntity();
final LinkRepresentation selfLink = actionPromptRepr.getLinkWithRel(Rel.SELF);
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenList_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenList_thenRepresentation_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenList_thenRepresentation_ok.java
index b3aa64b..ba3c693 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenList_thenRepresentation_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Get_whenList_thenRepresentation_ok.java
@@ -18,24 +18,11 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.apache.isis.core.commons.matchers.IsisMatchers.matches;
-import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.junit.Assert.assertThat;
-
import javax.ws.rs.core.Response;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
-import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
-import org.apache.isis.viewer.restfulobjects.applib.Rel;
-import org.apache.isis.viewer.restfulobjects.applib.RepresentationType;
-import org.apache.isis.viewer.restfulobjects.applib.RestfulHttpMethod;
+import org.apache.isis.viewer.restfulobjects.applib.*;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse;
import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse.HttpStatusCode;
@@ -45,6 +32,11 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainServiceR
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ListRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import static org.apache.isis.core.commons.matchers.IsisMatchers.matches;
+import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink;
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertThat;
+
public class Get_whenList_thenRepresentation_ok {
@Rule
@@ -87,7 +79,7 @@ public class Get_whenList_thenRepresentation_ok {
.rel(Rel.ELEMENT)
.title("Untitled Actions Entity")
.httpMethod(RestfulHttpMethod.GET)
- .href(matches("http://localhost:\\d+/objects/RTNE/67"))
+ .href(matches("http://localhost:\\d+/objects/RTNE/75"))
.type(RepresentationType.DOMAIN_OBJECT.getMediaType())
.arguments(JsonRepresentation.newMap())
.build());
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
index 5e9d2d8..5c95999 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobjectorservice/id/action/invoke/Post_whenInvokeArgWithObjectReference_thenOK.java
@@ -18,18 +18,13 @@
*/
package org.apache.isis.viewer.restfulobjects.tck.domainobjectorservice.id.action.invoke;
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
-
import org.jboss.resteasy.client.core.executors.URLConnectionClientExecutor;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
-
import org.apache.isis.core.commons.matchers.IsisMatchers;
import org.apache.isis.core.tck.dom.refs.ParentEntity;
-import org.apache.isis.core.webserver.WebServer;
import org.apache.isis.viewer.restfulobjects.applib.JsonRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.LinkRepresentation;
import org.apache.isis.viewer.restfulobjects.applib.Rel;
@@ -41,6 +36,9 @@ import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectActionRe
import org.apache.isis.viewer.restfulobjects.applib.domainobjects.ObjectCollectionRepresentation;
import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
/**
* This test calls {@link ParentEntity#getChildren()} to retrieve the list of children,
* then invokes {@link ParentEntity#removeChild(org.apache.isis.core.tck.dom.refs.ChildEntity)} to remove
@@ -75,7 +73,7 @@ public class Post_whenInvokeArgWithObjectReference_thenOK {
// given
RestfulResponse<ObjectCollectionRepresentation> childrenRestfulResponse =
- RestfulResponse.ofT(objectResource.accessCollection("PRNT", "43", "children"));
+ RestfulResponse.ofT(objectResource.accessCollection("PRNT", "50", "children"));
ObjectCollectionRepresentation childrenRepr = childrenRestfulResponse.getEntity();
JsonRepresentation collValue = childrenRepr.getValue();
@@ -87,7 +85,7 @@ public class Post_whenInvokeArgWithObjectReference_thenOK {
// when
final RestfulResponse<ObjectActionRepresentation> removeChildRestfulResponse =
- RestfulResponse.ofT(objectResource.actionPrompt("PRNT", "43", "removeChild"));
+ RestfulResponse.ofT(objectResource.actionPrompt("PRNT", "50", "removeChild"));
final ObjectActionRepresentation removeChildRepr = removeChildRestfulResponse.getEntity();
LinkRepresentation invokeLinkRepr = removeChildRepr.getLinkWithRel(Rel.INVOKE);
@@ -102,7 +100,7 @@ public class Post_whenInvokeArgWithObjectReference_thenOK {
// then
childrenRestfulResponse =
- RestfulResponse.ofT(objectResource.accessCollection("PRNT", "43", "children"));
+ RestfulResponse.ofT(objectResource.accessCollection("PRNT", "50", "children"));
childrenRepr = childrenRestfulResponse.getEntity();
collValue = childrenRepr.getValue();
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_thenRepresentation_ok.java
----------------------------------------------------------------------
diff --git a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_thenRepresentation_ok.java b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_thenRepresentation_ok.java
index 53bf28f..fd1b175 100644
--- a/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_thenRepresentation_ok.java
+++ b/core/viewer-restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainservice/serviceId/Get_thenRepresentation_ok.java
@@ -115,7 +115,7 @@ public class Get_thenRepresentation_ok {
assertThat(repr.getLinkWithRel(Rel.DELETE), is(nullValue()));
assertThat(repr.getExtensions(), isMap());
- assertThat(repr.getOid(), matches("JdkValuedEntities:16"));
+ assertThat(repr.getOid(), matches("JdkValuedEntities:26"));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/core/webserver/src/main/java/org/apache/isis/Dummy.java
----------------------------------------------------------------------
diff --git a/core/webserver/src/main/java/org/apache/isis/Dummy.java b/core/webserver/src/main/java/org/apache/isis/Dummy.java
new file mode 100644
index 0000000..1e0e48a
--- /dev/null
+++ b/core/webserver/src/main/java/org/apache/isis/Dummy.java
@@ -0,0 +1,32 @@
+/*
+ * 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 org.apache.isis;
+
+/**
+ * This is a dummy 'main' class that does nothing. It is provided simply as a target for IntelliJ users
+ * using the "before launch" feature as a means to perform JDO enhancement by way of a Maven goal.
+ */
+public class Dummy {
+
+ public static void main(final String[] args) {
+ System.out.println("Hi there!");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
index cfb6749..1aab97f 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItem.java
@@ -42,7 +42,7 @@ import org.apache.isis.applib.annotation.Optional;
import org.apache.isis.applib.services.background.BackgroundService;
import org.apache.isis.applib.services.clock.ClockService;
import org.apache.isis.applib.services.command.CommandContext;
-import org.apache.isis.applib.services.eventbus.ActionInvokedEvent;
+import org.apache.isis.applib.services.eventbus.ActionInteractionEvent;
import org.apache.isis.applib.services.eventbus.EventBusService;
import org.apache.isis.applib.services.scratchpad.Scratchpad;
import org.apache.isis.applib.services.wrapper.WrapperFactory;
@@ -133,7 +133,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
private String description;
@javax.jdo.annotations.Column(allowsNull="false", length=100)
- @PostsPropertyChangedEvent()
+ @InteractionWithProperty()
@RegEx(validation = "\\w[@&:\\-\\,\\.\\+ \\w]*")
public String getDescription() {
return description;
@@ -284,7 +284,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
this.complete = complete;
}
- @PostsActionInvokedEvent(CompletedEvent.class)
+ @InteractionWithAction(CompletedEvent.class)
@Command
@PublishedAction
@Bulk
@@ -312,7 +312,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
return isComplete() ? "Already completed" : null;
}
- @PostsActionInvokedEvent(NoLongerCompletedEvent.class)
+ @InteractionWithAction(NoLongerCompletedEvent.class)
@Command
@PublishedAction
@Bulk
@@ -469,8 +469,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@javax.jdo.annotations.Element(column="dependentId")
private SortedSet<ToDoItem> dependencies = new TreeSet<ToDoItem>();
- @PostsCollectionAddedToEvent
- @PostsCollectionRemovedFromEvent
+ @InteractionWithCollection
@SortedBy(DependenciesComparator.class)
public SortedSet<ToDoItem> getDependencies() {
return dependencies;
@@ -492,7 +491,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@TypicalLength(20)
final ToDoItem toDoItem) {
// By wrapping the call, Isis will detect that the collection is modified
- // and it will automatically send a CollectionAddedToEvent to the Event Bus.
+ // and it will automatically send a CollectionInteractionEvent to the Event Bus.
// ToDoItemSubscriptions is a demo subscriber to this event
wrapperFactory.wrapSkipRules(this).addToDependencies(toDoItem);
return this;
@@ -525,7 +524,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
@TypicalLength(20)
final ToDoItem toDoItem) {
// By wrapping the call, Isis will detect that the collection is modified
- // and it will automatically send a CollectionRemovedFromEvent to the Event Bus.
+ // and it will automatically send a CollectionInteractionEvent to the Event Bus.
// ToDoItemSubscriptions is a demo subscriber to this event
wrapperFactory.wrapSkipRules(this).removeFromDependencies(toDoItem);
return this;
@@ -589,7 +588,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
//endregion
//region > delete (action)
- @PostsActionInvokedEvent(DeletedEvent.class)
+ @InteractionWithAction(DeletedEvent.class)
@Bulk
public List<ToDoItem> delete() {
@@ -699,13 +698,13 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
//region > events
- public static abstract class AbstractActionInvokedEvent extends ActionInvokedEvent<ToDoItem> {
+ public static abstract class AbstractActionInteractionEvent extends ActionInteractionEvent<ToDoItem> {
private static final long serialVersionUID = 1L;
private final String description;
- public AbstractActionInvokedEvent(
- final String description,
- final ToDoItem source,
- final Identifier identifier,
+ public AbstractActionInteractionEvent(
+ final String description,
+ final ToDoItem source,
+ final Identifier identifier,
final Object... arguments) {
super(source, identifier, arguments);
this.description = description;
@@ -715,7 +714,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
}
- public static class CompletedEvent extends AbstractActionInvokedEvent {
+ public static class CompletedEvent extends AbstractActionInteractionEvent {
private static final long serialVersionUID = 1L;
public CompletedEvent(
final ToDoItem source,
@@ -725,7 +724,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
}
- public static class NoLongerCompletedEvent extends AbstractActionInvokedEvent {
+ public static class NoLongerCompletedEvent extends AbstractActionInteractionEvent {
private static final long serialVersionUID = 1L;
public NoLongerCompletedEvent(
final ToDoItem source,
@@ -735,7 +734,7 @@ public class ToDoItem implements Categorized, Comparable<ToDoItem> {
}
}
- public static class DeletedEvent extends AbstractActionInvokedEvent {
+ public static class DeletedEvent extends AbstractActionInteractionEvent {
private static final long serialVersionUID = 1L;
public DeletedEvent(
final ToDoItem source,
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
index 9677c7f..be34ffb 100644
--- a/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
+++ b/example/application/quickstart_wicket_restful_jdo/dom/src/main/java/dom/todo/ToDoItemSubscriptions.java
@@ -26,10 +26,7 @@ import org.apache.isis.applib.DomainObjectContainer;
import org.apache.isis.applib.NonRecoverableException;
import org.apache.isis.applib.RecoverableException;
import org.apache.isis.applib.annotation.*;
-import org.apache.isis.applib.services.eventbus.CollectionAddedToEvent;
-import org.apache.isis.applib.services.eventbus.CollectionRemovedFromEvent;
-import org.apache.isis.applib.services.eventbus.EventBusService;
-import org.apache.isis.applib.services.eventbus.PropertyChangedEvent;
+import org.apache.isis.applib.services.eventbus.*;
@DomainService
public class ToDoItemSubscriptions {
@@ -82,7 +79,7 @@ public class ToDoItemSubscriptions {
//region > on(Event)...
@Programmatic
@Subscribe
- public void on(ToDoItem.AbstractActionInvokedEvent ev) {
+ public void on(ToDoItem.AbstractActionInteractionEvent ev) {
rejectIfRequired();
recordEvent(ev);
LOG.info(ev.getEventDescription() + ": " + container.titleOf(ev.getSource()));
@@ -90,7 +87,15 @@ public class ToDoItemSubscriptions {
@Programmatic
@Subscribe
- public void on(PropertyChangedEvent<?,?> ev) {
+ public void on(ActionInteractionEvent<?> ev) {
+ rejectIfRequired();
+ recordEvent(ev);
+ LOG.info(ev.getIdentifier().getMemberName() + ": " + container.titleOf(ev.getSource()));
+ }
+
+ @Programmatic
+ @Subscribe
+ public void on(PropertyInteractionEvent<?,?> ev) {
rejectIfRequired();
recordEvent(ev);
if(ev.getIdentifier().getMemberName().contains("description")) {
@@ -104,18 +109,14 @@ public class ToDoItemSubscriptions {
@Programmatic
@Subscribe
- public void on(CollectionAddedToEvent<?,?> ev) {
+ public void on(CollectionInteractionEvent<?,?> ev) {
rejectIfRequired();
recordEvent(ev);
- LOG.info(container.titleOf(ev.getSource()) + ", added to " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
- }
-
- @Programmatic
- @Subscribe
- public void on(CollectionRemovedFromEvent<?,?> ev) {
- rejectIfRequired();
- recordEvent(ev);
- LOG.info(container.titleOf(ev.getSource()) + ", removed from " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
+ if(ev.getOf() == CollectionInteractionEvent.Of.ADD_TO) {
+ LOG.info(container.titleOf(ev.getSource()) + ", added to " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
+ } else {
+ LOG.info(container.titleOf(ev.getSource()) + ", removed from " + ev.getIdentifier().getMemberName() + " : " + ev.getValue());
+ }
}
//endregion
http://git-wip-us.apache.org/repos/asf/isis/blob/9dd104af/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
----------------------------------------------------------------------
diff --git a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
index de9a780..afb58ff 100644
--- a/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
+++ b/example/application/quickstart_wicket_restful_jdo/integtests/src/test/java/integration/tests/ToDoItemContributionsIntegTest.java
@@ -55,7 +55,7 @@ public abstract class ToDoItemContributionsIntegTest extends AbstractToDoIntegTe
toDoItemContributionsWrapped = wrap(toDoItemContributions);
}
- public static class Collections {
+ public static class Actions {
public static class UpdateCategory extends ToDoItemContributionsIntegTest {
@Test