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 2012/07/12 17:08:55 UTC
svn commit: r1360714 - in /incubator/isis/trunk/framework:
tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/
viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/domainobjects/
viewer/restfulobjects/...
Author: danhaywood
Date: Thu Jul 12 15:08:55 2012
New Revision: 1360714
URL: http://svn.apache.org/viewvc?rev=1360714&view=rev
Log:
ISIS-233: Hiding @Hidden classes from list representations.
Added:
incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/HiddenRepository.java
Modified:
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/domainobjects/ListRepresentation.java
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/isis.properties
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ListReprRenderer.java
Added: incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/HiddenRepository.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/HiddenRepository.java?rev=1360714&view=auto
==============================================================================
--- incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/HiddenRepository.java (added)
+++ incubator/isis/trunk/framework/tck/tck-dom/src/main/java/org/apache/isis/tck/dom/defaults/HiddenRepository.java Thu Jul 12 15:08:55 2012
@@ -0,0 +1,11 @@
+package org.apache.isis.tck.dom.defaults;
+
+import org.apache.isis.applib.annotation.Hidden;
+
+@Hidden
+public class HiddenRepository {
+
+ public String someAction() {
+ return null;
+ }
+}
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/domainobjects/ListRepresentation.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/domainobjects/ListRepresentation.java?rev=1360714&r1=1360713&r2=1360714&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/domainobjects/ListRepresentation.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-applib/src/main/java/org/apache/isis/viewer/restfulobjects/domainobjects/ListRepresentation.java Thu Jul 12 15:08:55 2012
@@ -29,7 +29,7 @@ public class ListRepresentation extends
}
public JsonRepresentation getValues() {
- return getArray("values").ensureArray();
+ return getArray("value").ensureArray();
}
}
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/isis.properties
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/isis.properties?rev=1360714&r1=1360713&r2=1360714&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/isis.properties (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/main/webapp/WEB-INF/isis.properties Thu Jul 12 15:08:55 2012
@@ -21,7 +21,8 @@ isis.services =\
scalars.PrimitiveValuedEntityRepository,\
scalars.WrapperValuedEntityRepository, \
refs.AssociatedEntitiesRepository,\
- defaults.WithDefaultsEntityRepository
+ defaults.WithDefaultsEntityRepository,\
+ defaults.HiddenRepository
isis.fixtures.prefix= org.apache.isis.tck.fixture
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java?rev=1360714&r1=1360713&r2=1360714&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/resources/service/services/DomainServiceResourceTest_services_representationAndHeaders.java Thu Jul 12 15:08:55 2012
@@ -109,6 +109,8 @@ public class DomainServiceResourceTest_s
// then
for (final LinkRepresentation link : values.arrayIterable(LinkRepresentation.class)) {
+ assertThat("HiddenRepository should not show up in services list", false, is(link.getHref().endsWith("HiddenRepository")));
+
final RestfulResponse<JsonRepresentation> followJsonResp = client.follow(link);
assertThat(followJsonResp.getStatus().getFamily(), is(Family.SUCCESSFUL));
Modified: incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ListReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ListReprRenderer.java?rev=1360714&r1=1360713&r2=1360714&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ListReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/restfulobjects/restfulobjects-viewer/src/main/java/org/apache/isis/viewer/restfulobjects/viewer/resources/domainobjects/ListReprRenderer.java Thu Jul 12 15:08:55 2012
@@ -96,6 +96,9 @@ public class ListReprRenderer extends Re
final LinkFollower linkFollower = getLinkFollower().follow("value");
for (final ObjectAdapter adapter : objectAdapters) {
+ if (adapter.getSpecification().isHidden()) {
+ continue;
+ }
final JsonRepresentation linkToObject = linkTo.with(adapter).builder().build();
values.arrayAdd(linkToObject);