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 2011/10/04 09:02:13 UTC
svn commit: r1178705 - in /incubator/isis/trunk/framework/viewer/json:
json-applib/src/test/java/org/apache/isis/viewer/json/applib/
json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/
json-tck/src/test/java/org/apache/isis/viewer/json...
Author: danhaywood
Date: Tue Oct 4 07:02:12 2011
New Revision: 1178705
URL: http://svn.apache.org/viewvc?rev=1178705&view=rev
Log:
ISIS-109: ReprBuilder is no more; now using ReprRenderer throughout
Added:
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkBuilder.java
- copied, changed from r1178596, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkReprBuilder.java
Removed:
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkReprBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprBuilderAbstract.java
Modified:
incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/ParserTest.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java
incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/ArgumentListTest_urlEncoding.java
incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/HomePageResourceTest.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesResourceServerside.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionSemantics.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectLinkToBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkToBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeMemberReprBuilder.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java
incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/ParserTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/ParserTest.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/ParserTest.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/ParserTest.java Tue Oct 4 07:02:12 2011
@@ -17,8 +17,6 @@ import org.hamcrest.Matcher;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Test;
-import com.google.common.collect.Iterables;
-
public class ParserTest {
@Test
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/RepresentationTypeTest_getName_lookup.java Tue Oct 4 07:02:12 2011
@@ -1,12 +1,9 @@
package org.apache.isis.viewer.json.applib;
import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
-import javax.ws.rs.core.MediaType;
-
import org.junit.Test;
public class RepresentationTypeTest_getName_lookup {
Modified: incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/ArgumentListTest_urlEncoding.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/ArgumentListTest_urlEncoding.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/ArgumentListTest_urlEncoding.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-applib/src/test/java/org/apache/isis/viewer/json/applib/blocks/ArgumentListTest_urlEncoding.java Tue Oct 4 07:02:12 2011
@@ -23,7 +23,6 @@ public class ArgumentListTest_urlEncodin
@SuppressWarnings("unused")
String decoded = URLDecoder.decode(expectedValue, Charsets.UTF_8.name());
- String x = al.toString();
assertThat(al.asUrlEncoded(), is(expectedValue));
}
}
Modified: incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/HomePageResourceTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/HomePageResourceTest.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/HomePageResourceTest.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-tck/src/test/java/org/apache/isis/viewer/json/tck/HomePageResourceTest.java Tue Oct 4 07:02:12 2011
@@ -12,7 +12,6 @@ import static org.hamcrest.CoreMatchers.
import static org.junit.Assert.assertThat;
import java.io.IOException;
-import java.util.Arrays;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family;
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/ResourceContext.java Tue Oct 4 07:02:12 2011
@@ -18,12 +18,9 @@
*/
package org.apache.isis.viewer.json.viewer;
-import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Request;
import javax.ws.rs.core.SecurityContext;
import javax.ws.rs.core.UriInfo;
Copied: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkBuilder.java (from r1178596, incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkReprBuilder.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkBuilder.java?p2=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkBuilder.java&p1=incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkReprBuilder.java&r1=1178596&r2=1178705&rev=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkReprBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/LinkBuilder.java Tue Oct 4 07:02:12 2011
@@ -22,16 +22,19 @@ import org.apache.isis.viewer.json.appli
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-public class LinkReprBuilder extends ReprBuilderAbstract<LinkReprBuilder> {
+public final class LinkBuilder {
- public static LinkReprBuilder newBuilder(ResourceContext resourceContext, String rel, RepresentationType representationType, String hrefFormat, Object... hrefArgs) {
+ public static LinkBuilder newBuilder(ResourceContext resourceContext, String rel, RepresentationType representationType, String hrefFormat, Object... hrefArgs) {
return newBuilder(resourceContext, rel, representationType.getMediaType(), hrefFormat, hrefArgs);
}
- public static LinkReprBuilder newBuilder(ResourceContext resourceContext, String rel, MediaType mediaType, String hrefFormat, Object... hrefArgs) {
- return new LinkReprBuilder(resourceContext, rel, String.format(hrefFormat, hrefArgs), mediaType);
+ public static LinkBuilder newBuilder(ResourceContext resourceContext, String rel, MediaType mediaType, String hrefFormat, Object... hrefArgs) {
+ return new LinkBuilder(resourceContext, rel, String.format(hrefFormat, hrefArgs), mediaType);
}
+ private final ResourceContext resourceContext;
+ private final JsonRepresentation representation = JsonRepresentation.newMap();
+
private final String rel;
private final String href;
private final MediaType mediaType;
@@ -40,31 +43,31 @@ public class LinkReprBuilder extends Rep
private String title;
private JsonRepresentation arguments;
private JsonRepresentation value;
-
- protected LinkReprBuilder(ResourceContext resourceContext, String rel, String href, MediaType mediaType) {
- super(resourceContext);
+
+ protected LinkBuilder(ResourceContext resourceContext, String rel, String href, MediaType mediaType) {
+ this.resourceContext = resourceContext;
this.rel = rel;
this.href = href;
this.mediaType = mediaType;
}
- public LinkReprBuilder withHttpMethod(HttpMethod method) {
+ public LinkBuilder withHttpMethod(HttpMethod method) {
this.method = method;
return this;
}
- public LinkReprBuilder withTitle(String title) {
+ public LinkBuilder withTitle(String title) {
this.title = title;
return this;
}
- public LinkReprBuilder withArguments(JsonRepresentation arguments) {
+ public LinkBuilder withArguments(JsonRepresentation arguments) {
this.arguments = arguments;
return this;
}
- public LinkReprBuilder withValue(JsonRepresentation value) {
+ public LinkBuilder withValue(JsonRepresentation value) {
this.value = value;
return this;
}
- public JsonRepresentation render() {
+ public JsonRepresentation build() {
representation.mapPut("rel", rel);
representation.mapPut("href", resourceContext.urlFor(href));
representation.mapPut("method", method);
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -1,12 +1,15 @@
package org.apache.isis.viewer.json.viewer.representations;
+import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
-public interface ReprRenderer<R extends ReprRenderer<R, T>, T> extends ReprBuilder {
+public interface ReprRenderer<R extends ReprRenderer<R, T>, T> {
RepresentationType getRepresentationType();
R with(T t);
+ public JsonRepresentation render();
+
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/representations/ReprRendererAbstract.java Tue Oct 4 07:02:12 2011
@@ -1,20 +1,39 @@
package org.apache.isis.viewer.json.viewer.representations;
+import org.apache.isis.applib.profiles.Localization;
+import org.apache.isis.core.commons.authentication.AuthenticationSession;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.runtimes.dflt.runtime.system.context.IsisContext;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.OidGenerator;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>, T> extends ReprBuilderAbstract<R> implements ReprRenderer<R, T> {
+public abstract class ReprRendererAbstract<R extends ReprRendererAbstract<R, T>, T> implements ReprRenderer<R, T> {
+ protected final ResourceContext resourceContext;
private final RepresentationType representationType;
+ protected final JsonRepresentation representation;
protected boolean includesSelf;
public ReprRendererAbstract(ResourceContext resourceContext, RepresentationType representationType, JsonRepresentation representation) {
- super(resourceContext, representation);
+ this.resourceContext = resourceContext;
this.representationType = representationType;
+ this.representation = representation;
}
-
+
+ public ResourceContext getResourceContext() {
+ return resourceContext;
+ }
+
+ @Override
+ public RepresentationType getRepresentationType() {
+ return representationType;
+ }
+
+
@SuppressWarnings("unchecked")
public R includesSelf() {
this.includesSelf = true;
@@ -23,15 +42,63 @@ public abstract class ReprRendererAbstra
public R withSelf(String href) {
if(href != null) {
- representation.mapPut("self", LinkReprBuilder.newBuilder(resourceContext, "self", representationType, href).render());
+ representation.mapPut("self", LinkBuilder.newBuilder(resourceContext, "self", representationType, href).build());
}
return cast(this);
}
- @Override
- public RepresentationType getRepresentationType() {
- return representationType;
+
+ public R withLinks() {
+ return withLinks(JsonRepresentation.newArray());
+ }
+
+ public R withLinks(JsonRepresentation links) {
+ if(!links.isArray()) {
+ throw new IllegalArgumentException("links must be a list");
+ }
+ representation.mapPut("links", links);
+ return cast(this);
+ }
+
+ public R withExtensions() {
+ return withExtensions(JsonRepresentation.newMap());
}
+ public R withExtensions(JsonRepresentation extensions) {
+ if(!extensions.isMap()) {
+ throw new IllegalArgumentException("extensions must be a map");
+ }
+ representation.mapPut("extensions", extensions);
+ return cast(this);
+ }
+
+
+ @SuppressWarnings("unchecked")
+ protected static <R extends ReprRendererAbstract<R, T>, T> R cast(ReprRendererAbstract<R,T> builder) {
+ return (R) builder;
+ }
+
+ public abstract JsonRepresentation render();
+
+
+ protected OidStringifier getOidStringifier() {
+ return getOidGenerator().getOidStringifier();
+ }
+
+ protected OidGenerator getOidGenerator() {
+ return getPersistenceSession().getOidGenerator();
+ }
+
+ protected PersistenceSession getPersistenceSession() {
+ return IsisContext.getPersistenceSession();
+ }
+
+ protected AuthenticationSession getSession() {
+ return IsisContext.getAuthenticationSession();
+ }
+
+ protected Localization getLocalization() {
+ return IsisContext.getLocalization();
+ }
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/ResourceAbstract.java Tue Oct 4 07:02:12 2011
@@ -19,7 +19,6 @@
package org.apache.isis.viewer.json.viewer.resources;
import java.io.IOException;
-import java.util.Collection;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -53,21 +52,13 @@ import org.apache.isis.viewer.json.appli
import org.apache.isis.viewer.json.applib.util.JsonMapper;
import org.apache.isis.viewer.json.viewer.JsonApplicationException;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.ReprBuilderAbstract;
-import org.apache.isis.viewer.json.viewer.representations.ReprBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
-import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainObjectReprRenderer;
import org.apache.isis.viewer.json.viewer.util.OidUtils;
import org.apache.isis.viewer.json.viewer.util.UrlDecoderUtils;
import org.codehaus.jackson.JsonGenerationException;
import org.codehaus.jackson.map.JsonMappingException;
-import com.google.common.base.Function;
-import com.google.common.base.Functions;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.Lists;
-
public abstract class ResourceAbstract {
protected final static JsonMapper jsonMapper = JsonMapper.instance();
@@ -134,24 +125,6 @@ public abstract class ResourceAbstract {
// Rendering
// //////////////////////////////////////////////////////////////
- protected String jsonFor(ReprBuilderAbstract<?> builder) {
- JsonRepresentation representation = builder.render();
- return jsonFor(representation);
- }
-
- protected String jsonFor(
- final Collection<ObjectAdapter> collectionAdapters) {
-
- return jsonFor(Lists.newArrayList(
- Collections2.transform(collectionAdapters, toObjectSelfRepresentation())));
- }
-
- protected String jsonFor(
- final ObjectAdapter objectAdapter) {
- return jsonFor(toObjectSelfRepresentation().apply(objectAdapter));
- }
-
-
protected static String jsonFor(final Object object) {
try {
return jsonMapper.write(object);
@@ -164,14 +137,6 @@ public abstract class ResourceAbstract {
}
}
- private Function<ObjectAdapter, JsonRepresentation> toObjectSelfRepresentation() {
- final ResourceContext representationContext = getResourceContext();
-
- return Functions.compose(
- DomainObjectReprRenderer.selfOf(),
- DomainObjectReprRenderer.fromAdapter(representationContext));
- }
-
// //////////////////////////////////////////////////////////////
// Isis integration
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -3,7 +3,6 @@ package org.apache.isis.viewer.json.view
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesResourceServerside.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesResourceServerside.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/capabilities/CapabilitiesResourceServerside.java Tue Oct 4 07:02:12 2011
@@ -31,10 +31,8 @@ import org.apache.isis.viewer.json.appli
import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.json.applib.capabilities.CapabilitiesResource;
import org.apache.isis.viewer.json.viewer.JsonApplicationException;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.json.viewer.resources.home.HomePageReprRenderer;
/**
* Implementation note: it seems to be necessary to annotate the implementation with {@link Path} rather than the
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/AbstractObjectMemberReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -58,7 +58,7 @@ public abstract class AbstractObjectMemb
}
public R withSelf() {
- representation.mapPut("self", linkToBuilder.linkToMember("self", memberType, objectMember).render());
+ representation.mapPut("self", linkToBuilder.linkToMember("self", memberType, objectMember).build());
return cast(this);
}
@@ -94,7 +94,7 @@ public abstract class AbstractObjectMemb
public R withDetailsLink() {
representation.mapPut(memberType.getDetailsRel(),
- linkToBuilder.linkToMember(memberType.getDetailsRel(), memberType, objectMember).render());
+ linkToBuilder.linkToMember(memberType.getDetailsRel(), memberType, objectMember).build());
return cast(this);
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionSemantics.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionSemantics.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionSemantics.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ActionSemantics.java Tue Oct 4 07:02:12 2011
@@ -5,7 +5,6 @@ import org.apache.isis.core.metamodel.fa
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.json.applib.util.Enums;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.util.StringUtil;
public enum ActionSemantics {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectLinkToBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectLinkToBuilder.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectLinkToBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectLinkToBuilder.java Tue Oct 4 07:02:12 2011
@@ -16,13 +16,11 @@
*/
package org.apache.isis.viewer.json.viewer.resources.domainobjects;
-import javax.ws.rs.core.MediaType;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
public class DomainObjectLinkToBuilder implements ObjectAdapterLinkToBuilder {
@@ -42,14 +40,14 @@ public class DomainObjectLinkToBuilder i
}
@Override
- public final LinkReprBuilder linkToAdapter() {
+ public final LinkBuilder linkToAdapter() {
StringBuilder buf = objectsBuf();
- return LinkReprBuilder.newBuilder(resourceContext, "object", RepresentationType.DOMAIN_OBJECT, buf.toString());
+ return LinkBuilder.newBuilder(resourceContext, "object", RepresentationType.DOMAIN_OBJECT, buf.toString());
}
@Override
- public final LinkReprBuilder linkToMember(String rel, MemberType memberType, ObjectMember objectMember, String... parts) {
+ public final LinkBuilder linkToMember(String rel, MemberType memberType, ObjectMember objectMember, String... parts) {
StringBuilder buf = objectsBuf();
buf.append("/").append(memberType.getUrlPart()).append(objectMember.getId());
for(String part: parts) {
@@ -59,7 +57,7 @@ public class DomainObjectLinkToBuilder i
buf.append("/").append(part);
}
String url = buf.toString();
- return LinkReprBuilder.newBuilder(resourceContext, rel, memberType.getRepresentationType(), url);
+ return LinkBuilder.newBuilder(resourceContext, rel, memberType.getRepresentationType(), url);
}
/**
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainObjectReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -18,8 +18,6 @@ package org.apache.isis.viewer.json.view
import java.util.List;
-import javax.ws.rs.core.MediaType;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.consent.Consent;
import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
@@ -35,7 +33,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
@@ -44,8 +42,6 @@ import org.apache.isis.viewer.json.viewe
import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
import org.apache.isis.viewer.json.viewer.util.OidUtils;
-import com.google.common.base.Function;
-
public class DomainObjectReprRenderer extends ReprRendererAbstract<DomainObjectReprRenderer, ObjectAdapter>{
public static class Factory extends ReprRendererFactoryAbstract {
@@ -60,10 +56,10 @@ public class DomainObjectReprRenderer ex
}
}
- public static LinkReprBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectAdapter elementAdapter) {
+ public static LinkBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectAdapter elementAdapter) {
String oidStr = resourceContext.getOidStringifier().enString(elementAdapter.getOid());
String url = "objects/" + oidStr;
- return LinkReprBuilder.newBuilder(resourceContext, rel, RepresentationType.DOMAIN_OBJECT, url);
+ return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.DOMAIN_OBJECT, url);
}
private ObjectAdapterLinkToBuilder linkToBuilder;
@@ -92,7 +88,7 @@ public class DomainObjectReprRenderer ex
// self
if(includesSelf) {
- JsonRepresentation self = linkToBuilder.with(objectAdapter).linkToAdapter().render();
+ JsonRepresentation self = linkToBuilder.with(objectAdapter).linkToAdapter().build();
representation.mapPut("self", self);
}
@@ -107,7 +103,7 @@ public class DomainObjectReprRenderer ex
// links
final JsonRepresentation links = JsonRepresentation.newArray();
links.arrayAdd(
- DomainTypeReprRenderer.newLinkToBuilder(getResourceContext(), "domainType", objectAdapter.getSpecification()).render());
+ DomainTypeReprRenderer.newLinkToBuilder(getResourceContext(), "domainType", objectAdapter.getSpecification()).build());
withLinks(links);
// extensions
@@ -191,31 +187,6 @@ public class DomainObjectReprRenderer ex
}
- /////////////////////////////////////////////////////////////////////
- //
- /////////////////////////////////////////////////////////////////////
-
- public static Function<ObjectAdapter, JsonRepresentation> fromAdapter(final ResourceContext resourceContext) {
- final RendererFactory factory = RendererFactoryRegistry.instance.find(RepresentationType.DOMAIN_OBJECT);
- return new Function<ObjectAdapter, JsonRepresentation>() {
- @Override
- public JsonRepresentation apply(ObjectAdapter adapter) {
- DomainObjectReprRenderer renderer =
- (DomainObjectReprRenderer) factory.newRenderer(resourceContext, JsonRepresentation.newMap());
- return renderer.with(adapter).render();
- }
- };
- }
-
- public static Function<JsonRepresentation, JsonRepresentation> selfOf() {
- return new Function<JsonRepresentation, JsonRepresentation>() {
- @Override
- public JsonRepresentation apply(JsonRepresentation input) {
- return input.getRepresentation("self");
- }
- };
- }
-
/////////////////////////////////////////////////////////////////////
//
@@ -230,7 +201,7 @@ public class DomainObjectReprRenderer ex
TitleFacet titleFacet = objectSpec.getFacet(TitleFacet.class);
String title = titleFacet.title(objectAdapter, resourceContext.getLocalization());
return DomainObjectReprRenderer.newLinkToBuilder(resourceContext, "object", objectAdapter)
- .withTitle(title).render();
+ .withTitle(title).build();
}
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainResourceHelper.java Tue Oct 4 07:02:12 2011
@@ -21,10 +21,6 @@ import java.io.InputStream;
import java.util.Collection;
import java.util.List;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
@@ -45,16 +41,14 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
-import org.apache.isis.viewer.json.applib.RestfulMediaType;
import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.json.applib.blocks.Link;
import org.apache.isis.viewer.json.applib.util.JsonMapper;
import org.apache.isis.viewer.json.viewer.JsonApplicationException;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
-import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract.Caching;
import org.apache.isis.viewer.json.viewer.util.OidUtils;
@@ -295,7 +289,7 @@ public class DomainResourceHelper {
String oid = OidUtils.getOidStr(resourceContext, objectAdapter);
// TODO: review; can't be more specific with the media type because we don't have a media type for action/invoke
final JsonRepresentation repBuilder =
- LinkReprBuilder.newBuilder(resourceContext, "self", MediaType.APPLICATION_JSON_TYPE, "objects/%s/actions/%s/invoke", oid, action.getId()).render();
+ LinkBuilder.newBuilder(resourceContext, "self", MediaType.APPLICATION_JSON_TYPE, "objects/%s/actions/%s/invoke", oid, action.getId()).build();
representation.mapPut("self", repBuilder);
return representation;
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/DomainServiceResourceServerside.java Tue Oct 4 07:02:12 2011
@@ -31,19 +31,13 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.applib.RestfulMediaType;
import org.apache.isis.viewer.json.applib.domainobjects.DomainServiceResource;
-import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
-import org.apache.isis.viewer.json.viewer.representations.ReprBuilderAbstract;
-import org.apache.isis.viewer.json.viewer.representations.ReprBuilder;
-import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
+import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainResourceHelper.Intent;
@Path("/services")
public class DomainServiceResourceServerside extends ResourceAbstract implements
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ListReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -55,7 +55,7 @@ public class ListReprRenderer extends Re
public ListReprRenderer with(Collection<ObjectAdapter> objectAdapters) {
JsonRepresentation list = JsonRepresentation.newArray();
for(ObjectAdapter adapter: objectAdapters) {
- JsonRepresentation linkToObject = objectAdapterLinkToBuilder.with(adapter).linkToAdapter().render();
+ JsonRepresentation linkToObject = objectAdapterLinkToBuilder.with(adapter).linkToAdapter().build();
list.arrayAdd(linkToObject);
}
representation.mapPut("values", list);
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectActionReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -101,7 +101,7 @@ public class ObjectActionReprRenderer ex
linkToBuilder.linkToMember("invoke", memberType, objectMember, mutatorSpec.suffix)
.withHttpMethod(mutatorSpec.httpMethod)
.withArguments(arguments)
- .render();
+ .build();
representation.mapPut("invoke", detailsLink);
}
@@ -132,7 +132,7 @@ public class ObjectActionReprRenderer ex
if(objectMember.isContributed()) {
ObjectActionParameter actionParameter = objectMember.getParameters().get(i);
if (actionParameter.getSpecification().isOfType(objectAdapter.getSpecification())) {
- return DomainObjectReprRenderer.newLinkToBuilder(resourceContext, "object", objectAdapter).render();
+ return DomainObjectReprRenderer.newLinkToBuilder(resourceContext, "object", objectAdapter).build();
}
}
return NullNode.instance;
@@ -206,17 +206,17 @@ public class ObjectActionReprRenderer ex
}
private void addLinksFormalDomainModel(JsonRepresentation links, ResourceContext resourceContext) {
- links.arrayAdd(TypeActionReprRenderer.newLinkToBuilder(resourceContext, "typeAction", objectAdapter.getSpecification(), objectMember).render());
+ links.arrayAdd(TypeActionReprRenderer.newLinkToBuilder(resourceContext, "typeAction", objectAdapter.getSpecification(), objectMember).build());
}
private void addLinksIsisProprietary(JsonRepresentation links, ResourceContext resourceContext) {
if(objectMember.isContributed()) {
ObjectAdapter serviceAdapter = contributingServiceAdapter();
- JsonRepresentation contributedByLink = DomainObjectReprRenderer.newLinkToBuilder(resourceContext, "contributedBy", serviceAdapter).render();
+ JsonRepresentation contributedByLink = DomainObjectReprRenderer.newLinkToBuilder(resourceContext, "contributedBy", serviceAdapter).build();
links.arrayAdd(contributedByLink);
}
- links.arrayAdd(DomainTypeReprRenderer.newLinkToBuilder(resourceContext, "domainType", objectAdapter.getSpecification()).render());
+ links.arrayAdd(DomainTypeReprRenderer.newLinkToBuilder(resourceContext, "domainType", objectAdapter.getSpecification()).build());
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkToBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkToBuilder.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkToBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectAdapterLinkToBuilder.java Tue Oct 4 07:02:12 2011
@@ -3,7 +3,7 @@ package org.apache.isis.viewer.json.view
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
public interface ObjectAdapterLinkToBuilder {
@@ -11,9 +11,9 @@ public interface ObjectAdapterLinkToBuil
ObjectAdapterLinkToBuilder with(ObjectAdapter objectAdapter);
- LinkReprBuilder linkToAdapter();
+ LinkBuilder linkToAdapter();
- LinkReprBuilder linkToMember(String rel, MemberType memberType, ObjectMember objectMember, String... parts);
+ LinkBuilder linkToMember(String rel, MemberType memberType, ObjectMember objectMember, String... parts);
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectCollectionReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
import org.apache.isis.viewer.json.viewer.resources.domaintypes.DomainTypeReprRenderer;
@@ -91,7 +91,7 @@ public class ObjectCollectionReprRendere
linkToBuilder.linkToMember(mutator, memberType, objectMember, mutatorSpec.suffix)
.withHttpMethod(mutatorSpec.httpMethod)
.withArguments(arguments)
- .render();
+ .build();
representation.mapPut(mutator, detailsLink);
}
}
@@ -122,9 +122,9 @@ public class ObjectCollectionReprRendere
List<JsonRepresentation> list = Lists.newArrayList();
for (final ObjectAdapter elementAdapter : facet.iterable(valueAdapter)) {
- LinkReprBuilder newBuilder = DomainObjectReprRenderer.newLinkToBuilder(resourceContext, "object", elementAdapter);
+ LinkBuilder newBuilder = DomainObjectReprRenderer.newLinkToBuilder(resourceContext, "object", elementAdapter);
- list.add(newBuilder.render());
+ list.add(newBuilder.build());
}
return list;
@@ -140,11 +140,11 @@ public class ObjectCollectionReprRendere
}
private void addLinksFormalDomainModel(JsonRepresentation links, ResourceContext resourceContext) {
- links.arrayAdd(TypeCollectionReprRenderer.newLinkToBuilder(resourceContext, "typeCollection", objectAdapter.getSpecification(), objectMember).render());
+ links.arrayAdd(TypeCollectionReprRenderer.newLinkToBuilder(resourceContext, "typeCollection", objectAdapter.getSpecification(), objectMember).build());
}
private void addLinksIsisProprietary(JsonRepresentation links, ResourceContext resourceContext) {
- links.arrayAdd(DomainTypeReprRenderer.newLinkToBuilder(resourceContext, "domainType", objectAdapter.getSpecification()).render());
+ links.arrayAdd(DomainTypeReprRenderer.newLinkToBuilder(resourceContext, "domainType", objectAdapter.getSpecification()).build());
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domainobjects/ObjectPropertyReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -92,7 +92,7 @@ public class ObjectPropertyReprRenderer
linkToBuilder.linkToMember(mutator, memberType, objectMember, mutatorSpec.suffix)
.withHttpMethod(mutatorSpec.httpMethod)
.withArguments(arguments)
- .render();
+ .build();
representation.mapPut(mutator, detailsLink);
}
}
@@ -156,11 +156,11 @@ public class ObjectPropertyReprRenderer
}
private void addLinksFormalDomainModel(JsonRepresentation links, ResourceContext resourceContext) {
- links.arrayAdd(TypePropertyReprRenderer.newLinkToBuilder(resourceContext, "typeProperty", objectAdapter.getSpecification(), objectMember).render());
+ links.arrayAdd(TypePropertyReprRenderer.newLinkToBuilder(resourceContext, "typeProperty", objectAdapter.getSpecification(), objectMember).build());
}
private void addLinksIsisProprietary(JsonRepresentation links, ResourceContext resourceContext) {
- links.arrayAdd(DomainTypeReprRenderer.newLinkToBuilder(resourceContext, "domainType", objectAdapter.getSpecification()).render());
+ links.arrayAdd(DomainTypeReprRenderer.newLinkToBuilder(resourceContext, "domainType", objectAdapter.getSpecification()).build());
}
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeMemberReprBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeMemberReprBuilder.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeMemberReprBuilder.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/AbstractTypeMemberReprBuilder.java Tue Oct 4 07:02:12 2011
@@ -21,7 +21,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.resources.domainobjects.MemberType;
@@ -62,8 +62,8 @@ public abstract class AbstractTypeMember
}
representation.mapPut("self",
- LinkReprBuilder.newBuilder(getResourceContext(), "self", getRepresentationType(), "domainTypes/%s/%s/%s",
- getObjectSpecification().getFullIdentifier(), getMemberType().getUrlPart(), getObjectMember().getId()).render());
+ LinkBuilder.newBuilder(getResourceContext(), "self", getRepresentationType(), "domainTypes/%s/%s/%s",
+ getObjectSpecification().getFullIdentifier(), getMemberType().getUrlPart(), getObjectMember().getId()).build());
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -20,7 +20,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -38,10 +38,10 @@ public class DomainTypeReprRenderer exte
}
}
- public static LinkReprBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpec) {
+ public static LinkBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpec) {
String typeFullName = objectSpec.getFullIdentifier();
String url = "domainTypes/" + typeFullName;
- return LinkReprBuilder.newBuilder(resourceContext, rel, RepresentationType.DOMAIN_TYPE, url);
+ return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.DOMAIN_TYPE, url);
}
private ObjectSpecification objectSpecification;
@@ -61,7 +61,7 @@ public class DomainTypeReprRenderer exte
// self
if(includesSelf) {
- representation.mapPut("self", newLinkToBuilder(getResourceContext(), "self", objectSpecification).render());
+ representation.mapPut("self", newLinkToBuilder(getResourceContext(), "self", objectSpecification).build());
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypeResourceServerside.java Tue Oct 4 07:02:12 2011
@@ -36,10 +36,9 @@ import org.apache.isis.viewer.json.appli
import org.apache.isis.viewer.json.applib.RestfulResponse.HttpStatusCode;
import org.apache.isis.viewer.json.applib.domaintypes.DomainTypeResource;
import org.apache.isis.viewer.json.viewer.JsonApplicationException;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
-import org.apache.isis.viewer.json.viewer.resources.domainobjects.DomainObjectReprRenderer;
/**
* Implementation note: it seems to be necessary to annotate the implementation with {@link Path} rather than the
@@ -125,7 +124,7 @@ public class DomainTypeResourceServersid
JsonRepresentation representation = JsonRepresentation.newMap();
representation.mapPut("self",
- LinkReprBuilder.newBuilder(getResourceContext(), "self", RepresentationType.TYPE_COLLECTION, "domainType/%s/collections/%s", domainType, collectionId).render());
+ LinkBuilder.newBuilder(getResourceContext(), "self", RepresentationType.TYPE_COLLECTION, "domainType/%s/collections/%s", domainType, collectionId).build());
return responseOfOk(RepresentationType.TYPE_COLLECTION, Caching.ONE_DAY, representation).build();
}
@@ -140,7 +139,7 @@ public class DomainTypeResourceServersid
JsonRepresentation representation = JsonRepresentation.newMap();
representation.mapPut("self",
- LinkReprBuilder.newBuilder(getResourceContext(), "self", RepresentationType.TYPE_ACTION, "domainTypes/%s/actions/%s", domainType, actionId).render());
+ LinkBuilder.newBuilder(getResourceContext(), "self", RepresentationType.TYPE_ACTION, "domainTypes/%s/actions/%s", domainType, actionId).build());
return responseOfOk(RepresentationType.TYPE_ACTION, Caching.ONE_DAY, representation).build();
}
@@ -156,7 +155,7 @@ public class DomainTypeResourceServersid
JsonRepresentation representation = JsonRepresentation.newMap();
representation.mapPut("self",
- LinkReprBuilder.newBuilder(getResourceContext(), "self", RepresentationType.TYPE_ACTION_PARAMETER, "domainTypes/%s/actions/%s/params/%s", domainType, actionId, paramName).render());
+ LinkBuilder.newBuilder(getResourceContext(), "self", RepresentationType.TYPE_ACTION_PARAMETER, "domainTypes/%s/actions/%s/params/%s", domainType, actionId, paramName).build());
return responseOfOk(RepresentationType.TYPE_COLLECTION, Caching.ONE_DAY, representation).build();
}
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/DomainTypesReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -6,7 +6,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererAbstract;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -46,9 +46,9 @@ public class DomainTypesReprRenderer ext
JsonRepresentation specList = JsonRepresentation.newArray();
for (ObjectSpecification objectSpec : specifications) {
- final LinkReprBuilder linkBuilder =
- LinkReprBuilder.newBuilder(getResourceContext(), "domainType", RepresentationType.DOMAIN_TYPE, "domainTypes/%s", objectSpec.getFullIdentifier());
- specList.arrayAdd(linkBuilder.render());
+ final LinkBuilder linkBuilder =
+ LinkBuilder.newBuilder(getResourceContext(), "domainType", RepresentationType.DOMAIN_TYPE, "domainTypes/%s", objectSpec.getFullIdentifier());
+ specList.arrayAdd(linkBuilder.build());
}
representation.mapPut("domainTypes", specList);
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeActionReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -16,13 +16,12 @@
*/
package org.apache.isis.viewer.json.viewer.resources.domaintypes;
-import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -40,11 +39,11 @@ public class TypeActionReprRenderer exte
}
}
- public static LinkReprBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpecification, ObjectAction objectAction) {
+ public static LinkBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpecification, ObjectAction objectAction) {
String typeFullName = objectSpecification.getFullIdentifier();
String actionId = objectAction.getId();
String url = "domainTypes/" + typeFullName + "/actions/" + actionId;
- return LinkReprBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_ACTION, url);
+ return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_ACTION, url);
}
public TypeActionReprRenderer(ResourceContext resourceContext, RepresentationType representationType, JsonRepresentation representation) {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypeCollectionReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -21,7 +21,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -39,11 +39,11 @@ public class TypeCollectionReprRenderer
}
}
- public static LinkReprBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpecification, OneToManyAssociation collection) {
+ public static LinkBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpecification, OneToManyAssociation collection) {
String typeFullName = objectSpecification.getFullIdentifier();
String collectionId = collection.getId();
String url = "domainTypes/" + typeFullName + "/collections/" + collectionId;
- return LinkReprBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_COLLECTION, url);
+ return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_COLLECTION, url);
}
public TypeCollectionReprRenderer(ResourceContext resourceContext, RepresentationType representationType, JsonRepresentation representation) {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/domaintypes/TypePropertyReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -21,7 +21,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
import org.apache.isis.viewer.json.viewer.representations.ReprRendererFactoryAbstract;
@@ -39,11 +39,11 @@ public class TypePropertyReprRenderer ex
}
}
- public static LinkReprBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpecification, OneToOneAssociation property) {
+ public static LinkBuilder newLinkToBuilder(ResourceContext resourceContext, String rel, ObjectSpecification objectSpecification, OneToOneAssociation property) {
String typeFullName = objectSpecification.getFullIdentifier();
String propertyId = property.getId();
String url = "domainTypes/" + typeFullName + "/properties/" + propertyId;
- return LinkReprBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_PROPERTY, url);
+ return LinkBuilder.newBuilder(resourceContext, rel, RepresentationType.TYPE_PROPERTY, url);
}
public TypePropertyReprRenderer(ResourceContext resourceContext, RepresentationType representationType, JsonRepresentation representation) {
Modified: incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java?rev=1178705&r1=1178704&r2=1178705&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java (original)
+++ incubator/isis/trunk/framework/viewer/json/json-viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/home/HomePageReprRenderer.java Tue Oct 4 07:02:12 2011
@@ -2,14 +2,12 @@ package org.apache.isis.viewer.json.view
import java.util.List;
-import javax.ws.rs.core.MediaType;
-
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.json.applib.JsonRepresentation;
import org.apache.isis.viewer.json.applib.RepresentationType;
import org.apache.isis.viewer.json.applib.RestfulRequest.QueryParameter;
import org.apache.isis.viewer.json.viewer.ResourceContext;
-import org.apache.isis.viewer.json.viewer.representations.LinkReprBuilder;
+import org.apache.isis.viewer.json.viewer.representations.LinkBuilder;
import org.apache.isis.viewer.json.viewer.representations.RendererFactory;
import org.apache.isis.viewer.json.viewer.representations.RendererFactoryRegistry;
import org.apache.isis.viewer.json.viewer.representations.ReprRenderer;
@@ -67,13 +65,13 @@ public class HomePageReprRenderer extend
private void putLinkToCapabilities(final JsonRepresentation representation) {
representation.mapPut("capabilities",
- LinkReprBuilder.newBuilder(getResourceContext(), "capabilities", RepresentationType.CAPABILITIES, "capabilities").render());
+ LinkBuilder.newBuilder(getResourceContext(), "capabilities", RepresentationType.CAPABILITIES, "capabilities").build());
}
private void putLinkToServices(JsonRepresentation representation) {
- final LinkReprBuilder servicesLinkBuilder =
- LinkReprBuilder.newBuilder(getResourceContext(), "services", RepresentationType.LIST, "services");
+ final LinkBuilder servicesLinkBuilder =
+ LinkBuilder.newBuilder(getResourceContext(), "services", RepresentationType.LIST, "services");
final List<String> followLinks = getResourceContext().getArg(QueryParameter.FOLLOW_LINKS);
if(followLinks.contains("services")) {
@@ -90,12 +88,12 @@ public class HomePageReprRenderer extend
servicesLinkBuilder.withValue(renderer.render());
}
- representation.mapPut("services", servicesLinkBuilder.render());
+ representation.mapPut("services", servicesLinkBuilder.build());
}
private void putLinkToUser(JsonRepresentation representation) {
- final LinkReprBuilder userLinkBuilder =
- LinkReprBuilder.newBuilder(getResourceContext(), "user", RepresentationType.USER, "user");
+ final LinkBuilder userLinkBuilder =
+ LinkBuilder.newBuilder(getResourceContext(), "user", RepresentationType.USER, "user");
final List<String> followLinks = getResourceContext().getArg(QueryParameter.FOLLOW_LINKS);
if(followLinks.contains("user")) {
@@ -108,7 +106,7 @@ public class HomePageReprRenderer extend
userLinkBuilder.withValue(renderer.render());
}
- representation.mapPut("user", userLinkBuilder.render());
+ representation.mapPut("user", userLinkBuilder.build());
}
}
\ No newline at end of file