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/06/26 13:51:10 UTC
svn commit: r1139763 [4/10] - in /incubator/isis/trunk/viewer: json/
json/applib2/ json/applib2/src/ json/applib2/src/main/
json/applib2/src/main/java/ json/applib2/src/main/java/META-INF/
json/applib2/src/main/java/org/ json/applib2/src/main/java/org/...
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectRepBuilder.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,153 @@
+/**
+ * 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.viewer.restful.viewer2.resources.objects;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.core.metamodel.consent.Consent;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.viewer.restful.viewer2.RepContext;
+import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
+import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.restful.viewer2.representations.RepresentationBuilder;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Maps;
+
+public class DomainObjectRepBuilder extends RepresentationBuilder {
+
+ public static DomainObjectRepBuilder newBuilder(RepContext representationContext, ObjectAdapter objectAdapter) {
+ return new DomainObjectRepBuilder(representationContext, objectAdapter);
+ }
+
+ private final ObjectAdapter objectAdapter;
+ private final Map<String, Representation> members = Maps.newLinkedHashMap();
+
+ public DomainObjectRepBuilder(RepContext repContext, ObjectAdapter objectAdapter) {
+ super(repContext);
+ this.objectAdapter = objectAdapter;
+ }
+
+ public Representation build() {
+ RepContext repContext = this.repContext.underAttribute("_self");
+ Representation selfLink = LinkRepBuilder.newBuilder(repContext, "link", url()).build();
+ Representation selfType = LinkRepBuilder.newTypeBuilder(repContext, "type", objectAdapter.getSpecification()).build();
+ String title = objectAdapter.titleString();
+ Representation iconLink = LinkRepBuilder.newBuilder(repContext, "icon", icon()).build();
+ Representation self = new Representation();
+ self.put("link", selfLink);
+ self.put("type", selfType);
+ self.put("title", title);
+ self.put("icon", iconLink);
+ representation.put("_self", self);
+ withAllMembers(objectAdapter);
+ if(!members.isEmpty()) {
+ for(Map.Entry<String, Representation> entry: members.entrySet()) {
+ String memberId = entry.getKey();
+ Representation memberRep = entry.getValue();
+ representation.put(memberId, memberRep);
+ }
+ }
+ return representation;
+ }
+
+ private String icon() {
+ String iconName = objectAdapter.getIconName();
+ return "images/" + iconName + ".png";
+ }
+
+ private String url() {
+ OidStringifier oidStringifier = getOidStringifier();
+ return urlFor(objectAdapter, oidStringifier);
+ }
+
+ private void withAllMembers(final ObjectAdapter objectAdapter) {
+ List<ObjectAssociation> associations = objectAdapter.getSpecification().getAssociations();
+ for (ObjectAssociation assoc : associations) {
+ Consent visibility = assoc.isVisible(getSession(), objectAdapter);
+ if(!visibility.isAllowed()) {
+ continue;
+ }
+ String id = assoc.getId();
+ if(assoc instanceof OneToOneAssociation) {
+ OneToOneAssociation property = (OneToOneAssociation)assoc;
+ Representation propertyRep = PropertyRepBuilder.newBuilder(repContext.underAttribute(id), objectAdapter, property).build();
+ withMember(id, propertyRep);
+ }
+ if(assoc instanceof OneToManyAssociation) {
+ OneToManyAssociation collection = (OneToManyAssociation) assoc;
+ Representation collectionRep = CollectionRepBuilder.newBuilder(repContext.underAttribute(id), objectAdapter, collection).build();
+ withMember(id, collectionRep);
+ }
+ }
+
+ List<ObjectAction> actions = objectAdapter.getSpecification().getObjectActionsAll();
+ for (ObjectAction action : actions) {
+ Consent visibility = action.isVisible(getSession(), objectAdapter);
+ if(!visibility.isAllowed()) {
+ continue;
+ }
+ String id = action.getId();
+ Representation actionRep = ActionRepBuilder.newBuilder(repContext.underAttribute(id), objectAdapter, action).build();
+ withMember(id, actionRep);
+ }
+ }
+
+ private void withMember(String id, Representation propertyRep) {
+ members.put(id, propertyRep);
+ }
+
+
+ /////////////////////////////////////////////////////////////////////
+ //
+ /////////////////////////////////////////////////////////////////////
+
+ public static String urlFor(ObjectAdapter objectAdapter, OidStringifier oidStringifier) {
+ String oidStr = oidStringifier.enString(objectAdapter.getOid());
+ return "objects/" + oidStr;
+ }
+
+
+ /////////////////////////////////////////////////////////////////////
+ //
+ /////////////////////////////////////////////////////////////////////
+
+ public static Function<ObjectAdapter, Representation> fromAdapter(final RepContext repContext) {
+ return new Function<ObjectAdapter, Representation>() {
+ @Override
+ public Representation apply(ObjectAdapter input) {
+ return newBuilder(repContext, input).build();
+ }
+ };
+ }
+
+ public static Function<Representation, Representation> selfOf() {
+ return new Function<Representation, Representation>() {
+ @Override
+ public Representation apply(Representation input) {
+ return (Representation) input.get("_self");
+ }
+ };
+ }
+
+}
\ No newline at end of file
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/DomainObjectResourceImpl.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,222 @@
+/**
+ * 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.viewer.restful.viewer2.resources.objects;
+
+import java.io.InputStream;
+import java.util.List;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response.Status;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAssociationFilters;
+import org.apache.isis.core.metamodel.spec.feature.OneToManyAssociation;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.viewer.restful.applib2.resources.DomainObjectResource;
+import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.restful.viewer2.representations.RepresentationBuilder;
+import org.apache.isis.viewer.restful.viewer2.resources.ResourceAbstract;
+import org.apache.isis.viewer.restful.viewer2.util.UrlDecoderUtils;
+
+@Path("/objects")
+public class DomainObjectResourceImpl extends ResourceAbstract implements DomainObjectResource {
+
+ @GET
+ @Path("/{oid}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String object(@PathParam("oid") final String oidStr) {
+ init();
+ final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
+
+ DomainObjectRepBuilder builder = DomainObjectRepBuilder.newBuilder(getResourceContext().repContext(), objectAdapter);
+ return jsonRepresentionFrom(builder);
+ }
+
+ @GET
+ @Path("/{oid}/properties/{propertyId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String propertyDetails(
+ @PathParam("oid") final String oidStr,
+ @PathParam("propertyId") final String propertyId) {
+
+ init();
+ final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
+ ObjectAssociation association = objectAdapter.getSpecification().getAssociation(propertyId);
+ if(association == null || !association.isOneToOneAssociation()) {
+ throwPropertyNotFoundException(propertyId);
+ }
+ OneToOneAssociation property = (OneToOneAssociation) association;
+ PropertyRepBuilder builder = PropertyRepBuilder.newBuilder(getResourceContext().repContext(), objectAdapter, property);
+ if(!builder.isMemberVisible()) {
+ throwPropertyNotFoundException(propertyId);
+ }
+
+ return jsonRepresentionFrom(builder);
+ }
+
+ @PUT
+ @Path("/{oid}/properties/{propertyId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String modifyProperty(
+ @PathParam("oid") final String oidEncodedStr,
+ @PathParam("propertyId") final String propertyId,
+ @FormParam("proposedValue") final String proposedValue) {
+
+ init();
+ final String oidStr = UrlDecoderUtils.urlDecode(oidEncodedStr);
+
+ return null;
+ }
+
+ @DELETE
+ @Path("/{oid}/properties/{propertyId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String clearProperty(
+ @PathParam("oid") final String oidStr,
+ @PathParam("propertyId") final String propertyId){
+
+ return null;
+ }
+
+ @GET
+ @Path("/{oid}/collections/{collectionId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String accessCollection(
+ @PathParam("oid") final String oidStr,
+ @PathParam("collectionId") final String collectionId){
+
+ init();
+ final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
+ ObjectAssociation association = objectAdapter.getSpecification().getAssociation(collectionId);
+ if(association == null || !association.isOneToManyAssociation()) {
+ throwCollectionNotFoundException(collectionId);
+ }
+ OneToManyAssociation collection = (OneToManyAssociation) association;
+ CollectionRepBuilder builder = CollectionRepBuilder.newBuilder(getResourceContext().repContext(), objectAdapter, collection);
+ if(!builder.isMemberVisible()) {
+ throwCollectionNotFoundException(collectionId);
+ }
+
+ return jsonRepresentionFrom(builder);
+ }
+
+ @PUT
+ @Path("/{oid}/collections/{collectionId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String addToCollection(
+ @PathParam("oid") final String oidStr,
+ @PathParam("collectionId") final String collectionId,
+ @FormParam("proposedValue") final String proposedValueOidStr){
+
+ return null;
+ }
+
+ @DELETE
+ @Path("/{oid}/collections/{collectionId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String removeFromCollection(
+ @PathParam("oid") final String oidStr,
+ @PathParam("collectionId") final String collectionId,
+ @FormParam("proposedValue") final String proposedValueOidStr){
+
+ return null;
+ }
+
+ @GET
+ @Path("/{oid}/actions/{actionId}")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String actionPrompt(
+ @PathParam("oid") final String oidStr,
+ @PathParam("actionId") final String actionId) {
+
+ init();
+ final ObjectAdapter objectAdapter = getObjectAdapter(oidStr);
+ ObjectAction action = objectAdapter.getSpecification().getObjectAction(actionId);
+ if(action == null) {
+ throwActionNotFoundException(actionId);
+ }
+ ActionRepBuilder builder = ActionRepBuilder.newBuilder(getResourceContext().repContext(), objectAdapter, action);
+ if(!builder.isMemberVisible()) {
+ throwActionNotFoundException(actionId);
+ }
+
+ return jsonRepresentionFrom(builder);
+ }
+
+ @POST
+ @Path("/{oid}/actions/{actionId}/invoke")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String invokeAction(
+ @PathParam("oid") final String oidStr,
+ @PathParam("actionId") final String actionId,
+ final InputStream body){
+
+ return null;
+ }
+
+
+ @GET
+ @Path("/{oid}/actions/{actionId}/invoke")
+ @Produces({ MediaType.APPLICATION_JSON })
+ public String invokeActionIdempotent(
+ @PathParam("oid") String oidStr,
+ @PathParam("actionId") String actionId,
+ @QueryParam("argument") List<String> arguments) {
+
+ return null;
+ }
+
+
+
+ /////////////////////////////////////////////////////////////////////
+
+ private void throwPropertyNotFoundException(final String propertyId) {
+ throwNotFoundException(propertyId, MemberType.PROPERTY);
+ }
+
+ private void throwCollectionNotFoundException(final String collectionId) {
+ throwNotFoundException(collectionId, MemberType.COLLECTION);
+ }
+
+ private void throwActionNotFoundException(final String actionId) {
+ throwNotFoundException(actionId, MemberType.ACTION);
+ }
+
+
+ private void throwNotFoundException(final String propertyId, MemberType memberType) {
+ String memberTypeStr = memberType.name().toLowerCase();
+ throw new WebApplicationException(responseOfNotFound("No such " +
+ memberTypeStr +
+ "/" +
+ memberTypeStr +
+ " not visible: '" + propertyId + "'"));
+ }
+
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberRepType.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,61 @@
+/**
+ * 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.viewer.restful.viewer2.resources.objects;
+
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.applib2.resources.DomainObjectResource;
+
+/**
+ * Whether the representation of an {@link ObjectMember} (as generated by
+ * the subclasses of {@link AbstractMemberRepBuilder}) is to be a {@link #STANDALONE} (eg
+ * for {@link DomainObjectResource#propertyDetails(String, String)},
+ * {@link DomainObjectResource#accessCollection(String, String)}, or
+ * {@link DomainObjectResource#actionPrompt(String, String)}), or is
+ * {@link #INLINE} within the representation of the {@link DomainObjectResource#object(String)}).
+ *
+ * <p>
+ * {@link #STANDALONE Standalone} representations are more detailed (eg contain links to
+ * describe how to modify the member), while {@link #INLINE inlined} representations
+ * contain links to the {@link #STANDALONE} representation.
+ */
+public enum MemberRepType {
+
+ STANDALONE,
+ INLINE;
+
+ public boolean hasSelf() {
+ return this == STANDALONE;
+ }
+
+ public boolean hasMutators() {
+ return this == STANDALONE;
+ }
+
+ public boolean hasLinkToDetails() {
+ return this == INLINE;
+ }
+
+ public boolean hasValue(MemberType memberType) {
+ return memberType.isProperty() || memberType.isCollection() && isStandalone();
+ }
+
+ private boolean isStandalone() {
+ return this == STANDALONE;
+ }
+
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberSelfRepBuilder.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,60 @@
+/**
+ * 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.viewer.restful.viewer2.resources.objects;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.stringable.OidStringifier;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.viewer.restful.viewer2.RepContext;
+import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
+import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.restful.viewer2.representations.RepresentationBuilder;
+
+public class MemberSelfRepBuilder extends RepresentationBuilder {
+
+ public static MemberSelfRepBuilder newBuilder(RepContext repContext, ObjectAdapter objectAdapter, MemberType memberType, ObjectMember objectMember) {
+ return new MemberSelfRepBuilder(repContext, objectAdapter, memberType, objectMember);
+ }
+
+ private final ObjectAdapter objectAdapter;
+ private final MemberType memberType;
+ private final ObjectMember objectMember;
+
+ public MemberSelfRepBuilder(RepContext repContext, ObjectAdapter objectAdapter, MemberType memberType, ObjectMember objectMember) {
+ super(repContext);
+ this.objectAdapter = objectAdapter;
+ this.memberType = memberType;
+ this.objectMember = objectMember;
+ }
+
+ public Representation build() {
+ representation.put("link", memberLinkRep());
+ representation.put("object", domainObjectLinkRep());
+ return representation;
+ }
+
+ private Representation memberLinkRep() {
+ String url = AbstractMemberRepBuilder.urlForMember(objectAdapter, memberType, objectMember, getOidStringifier());
+ return LinkRepBuilder.newBuilder(repContext, "link", url).build();
+ }
+
+ private Representation domainObjectLinkRep() {
+ String url = DomainObjectRepBuilder.urlFor(objectAdapter, getOidStringifier());
+ return LinkRepBuilder.newBuilder(repContext, "object", url).build();
+ }
+
+}
\ No newline at end of file
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MemberType.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,97 @@
+/**
+ * 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.viewer.restful.viewer2.resources.objects;
+
+import java.util.Map;
+
+import org.apache.isis.core.metamodel.facets.actions.invoke.ActionInvocationFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionAddToFacet;
+import org.apache.isis.core.metamodel.facets.collections.modify.CollectionRemoveFromFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.spec.ObjectSpecification;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import org.apache.isis.core.metamodel.spec.feature.ObjectMember;
+import org.apache.isis.core.progmodel.facets.actions.validate.ActionValidationFacet;
+import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateAddToFacet;
+import org.apache.isis.core.progmodel.facets.collections.validate.CollectionValidateRemoveFromFacet;
+import org.apache.isis.core.progmodel.facets.properties.validate.PropertyValidateFacet;
+import org.apache.isis.viewer.restful.viewer2.representations.HttpMethod;
+
+import com.google.common.collect.ImmutableMap;
+
+public enum MemberType {
+
+ PROPERTY("properties/", ImmutableMap.of(
+ "modify", MutatorSpec.of(PropertyValidateFacet.class, PropertySetterFacet.class, HttpMethod.PUT, BodyArgs.ONE),
+ "clear", MutatorSpec.of(PropertyValidateFacet.class, PropertyClearFacet.class, HttpMethod.DELETE, BodyArgs.NONE)
+ )) {
+ @Override
+ public ObjectSpecification specFor(ObjectMember objectMember) {
+ return objectMember.getSpecification();
+ }
+ },
+ COLLECTION("collections/", ImmutableMap.of(
+ "addTo", MutatorSpec.of(CollectionValidateAddToFacet.class, CollectionAddToFacet.class, HttpMethod.PUT, BodyArgs.ONE),
+ "removeFrom", MutatorSpec.of(CollectionValidateRemoveFromFacet.class, CollectionRemoveFromFacet.class, HttpMethod.DELETE, BodyArgs.ONE)
+ )) {
+ @Override
+ public ObjectSpecification specFor(ObjectMember objectMember) {
+ return objectMember.getSpecification();
+ }
+ },
+ ACTION("actions/", ImmutableMap.of(
+ "invoke", MutatorSpec.of(ActionValidationFacet.class, ActionInvocationFacet.class, HttpMethod.PUT, BodyArgs.MANY, "invoke")
+ )) {
+ @Override
+ public ObjectSpecification specFor(ObjectMember objectMember) {
+ ObjectAction objectAction = (ObjectAction) objectMember;
+ return objectAction.getReturnType();
+ }
+ };
+
+ private final Map<String, MutatorSpec> mutators;
+
+ private final String urlPart;
+ private MemberType(String urlPart, Map<String, MutatorSpec> mutators) {
+ this.urlPart = urlPart;
+ this.mutators = mutators;
+ }
+
+ public String urlPart() {
+ return urlPart;
+ }
+
+ public Map<String, MutatorSpec> getMutators() {
+ return mutators;
+ }
+
+ public abstract ObjectSpecification specFor(ObjectMember objectMember);
+
+ public boolean isProperty() {
+ return this == MemberType.PROPERTY;
+ }
+
+ public boolean isCollection() {
+ return this == MemberType.COLLECTION;
+ }
+
+ public boolean isAction() {
+ return this == MemberType.ACTION;
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/MutatorSpec.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,47 @@
+/**
+ * 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.viewer.restful.viewer2.resources.objects;
+
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.viewer.restful.viewer2.representations.HttpMethod;
+
+public class MutatorSpec {
+
+
+ public static MutatorSpec of(Class<? extends Facet> validationFacetType, Class<? extends Facet> mutatorFacetType, HttpMethod httpMethod, BodyArgs argSpec) {
+ return of(validationFacetType, mutatorFacetType, httpMethod, argSpec, null);
+ }
+
+ public static MutatorSpec of(Class<? extends Facet> validationFacetType, Class<? extends Facet> mutatorFacetType, HttpMethod httpMethod, BodyArgs argSpec, String suffix) {
+ return new MutatorSpec(validationFacetType, mutatorFacetType, httpMethod, argSpec, suffix);
+ }
+
+ public final Class<? extends Facet> validationFacetType;
+ public final Class<? extends Facet> mutatorFacetType;
+ public final HttpMethod httpMethod;
+ public final String suffix;
+ public final BodyArgs argSpec;
+
+ private MutatorSpec(Class<? extends Facet> validationFacetType, Class<? extends Facet> mutatorFacetType, HttpMethod httpMethod, BodyArgs argSpec, String suffix) {
+ this.validationFacetType = validationFacetType;
+ this.mutatorFacetType = mutatorFacetType;
+ this.httpMethod = httpMethod;
+ this.argSpec = argSpec;
+ this.suffix = suffix;
+ }
+
+}
\ No newline at end of file
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/objects/PropertyRepBuilder.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,74 @@
+/**
+ * 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.viewer.restful.viewer2.resources.objects;
+
+import java.util.List;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facetapi.Facet;
+import org.apache.isis.core.metamodel.facets.object.encodeable.EncodableFacet;
+import org.apache.isis.core.metamodel.facets.object.title.TitleFacet;
+import org.apache.isis.core.metamodel.facets.object.value.ValueFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertyClearFacet;
+import org.apache.isis.core.metamodel.facets.properties.modify.PropertySetterFacet;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
+import org.apache.isis.viewer.restful.viewer2.RepContext;
+import org.apache.isis.viewer.restful.viewer2.representations.LinkRepBuilder;
+import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+
+import com.google.common.collect.BiMap;
+import com.google.common.collect.Lists;
+
+public class PropertyRepBuilder extends AbstractMemberRepBuilder<OneToOneAssociation> {
+
+ public static PropertyRepBuilder newBuilder(RepContext repContext, ObjectAdapter objectAdapter, OneToOneAssociation otoa) {
+ return new PropertyRepBuilder(repContext, objectAdapter, otoa);
+ }
+
+ public PropertyRepBuilder(RepContext repContext, ObjectAdapter objectAdapter, OneToOneAssociation otoa) {
+ super(repContext, objectAdapter, MemberType.PROPERTY, otoa);
+ }
+
+ public Representation build() {
+ putSelfIfRequired();
+ putTypeRep();
+ putMemberTypeRep();
+ putValueIfRequired();
+ putDisabledReason();
+ putMutatorsIfRequired();
+ putDetailsIfRequired();
+ return representation;
+ }
+
+
+ @Override
+ protected Object valueRep() {
+ ObjectAdapter valueAdapter = objectMember.get(objectAdapter);
+ if(valueAdapter == null) {
+ return null;
+ }
+ ValueFacet valueFacet = getMemberSpecFacet(ValueFacet.class);
+ if(valueFacet != null) {
+ EncodableFacet encodableFacet = getMemberSpecFacet(EncodableFacet.class);
+ return encodableFacet.toEncodedString(valueAdapter);
+ }
+ TitleFacet titleFacet = getMemberSpecFacet(TitleFacet.class);
+ String title = titleFacet.title(valueAdapter, getLocalization());
+ return LinkRepBuilder.newBuilder(repContext, "value", urlForObject()).withTitle(title).build();
+ }
+
+}
\ No newline at end of file
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,65 @@
+/*
+ * 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.viewer.restful.viewer2.resources.services;
+
+import java.util.List;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.viewer.restful.applib2.resources.ServicesResource;
+import org.apache.isis.viewer.restful.viewer2.RepContext;
+import org.apache.isis.viewer.restful.viewer2.representations.Representation;
+import org.apache.isis.viewer.restful.viewer2.resources.ResourceAbstract;
+import org.apache.isis.viewer.restful.viewer2.resources.objects.DomainObjectRepBuilder;
+
+import com.google.common.base.Function;
+import com.google.common.base.Functions;
+import com.google.common.collect.Collections2;
+import com.google.common.collect.Lists;
+
+/**
+ * Implementation note: it seems to be necessary to annotate the implementation with {@link Path} rather than the
+ * interface (at least under RestEasy 1.0.2 and 1.1-RC2).
+ */
+@Path("/services")
+public class ServicesResourceImpl extends ResourceAbstract implements ServicesResource {
+
+ @Override
+ @Produces({ "application/json" })
+ public String services() {
+ init();
+
+ return asJson(serviceSelfRepresentations());
+ }
+
+ protected List<Representation> serviceSelfRepresentations() {
+ final List<ObjectAdapter> serviceAdapters = getPersistenceSession().getServices();
+ RepContext representationContext = getResourceContext().repContext();
+
+ Function<ObjectAdapter, Representation> objectSelfRepresentation =
+ Functions.compose(
+ DomainObjectRepBuilder.selfOf(),
+ DomainObjectRepBuilder.fromAdapter(representationContext));
+ return Lists.newArrayList(
+ Collections2.transform(serviceAdapters, objectSelfRepresentation));
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,50 @@
+/*
+ * 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.viewer.restful.viewer2.util;
+
+import java.util.List;
+
+import org.apache.isis.core.metamodel.spec.ActionType;
+import org.apache.isis.core.metamodel.spec.ObjectActionSet;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+
+import com.google.inject.internal.Lists;
+
+public final class ActionUtils {
+
+ private ActionUtils() {
+ }
+
+ public static List<ObjectAction> flattened(final List<ObjectAction> objectActions) {
+ final List<ObjectAction> actions = Lists.newArrayList();
+ for (final ObjectAction action : objectActions) {
+ if (action.getType() == ActionType.SET) {
+ final ObjectActionSet actionSet = (ObjectActionSet) action;
+ final List<ObjectAction> subActions = actionSet.getActions();
+ for (final ObjectAction subAction : subActions) {
+ actions.add(subAction);
+ }
+ } else {
+ actions.add(action);
+ }
+ }
+ return actions;
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,64 @@
+/*
+ * 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.viewer.restful.viewer2.util;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public final class InputStreamUtil {
+
+ private InputStreamUtil() {
+ }
+
+ public static List<String> getArgs(final InputStream body) {
+ // will be sorted by arg
+ final Map<String, String> args = new TreeMap<String, String>();
+ if (body == null) {
+ return listOfValues(args);
+ }
+ try {
+ final InputStreamReader inputStreamReader = new InputStreamReader(body);
+ final BufferedReader bufferedReader = new BufferedReader(inputStreamReader);
+ String readLine = bufferedReader.readLine();
+ while (readLine != null) {
+ final String[] keyValuePairs = readLine.split("&");
+ for (final String keyValuePair : keyValuePairs) {
+ final String[] keyThenValue = keyValuePair.split("=");
+ args.put(keyThenValue[0], keyThenValue[1]);
+ }
+ readLine = bufferedReader.readLine();
+ }
+ return listOfValues(args);
+ } catch (final IOException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ private static ArrayList<String> listOfValues(final Map<String, String> args) {
+ // returns the values in the order of the keys
+ return new ArrayList<String>(args.values());
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,38 @@
+/*
+ * 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.viewer.restful.viewer2.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class ListUtils {
+
+ private ListUtils() {
+ }
+
+ @SuppressWarnings("unchecked")
+ public static <T> List<T> toList(final Object[] objects) {
+ final List<T> list = new ArrayList<T>();
+ for (final Object o : objects) {
+ list.add((T) o);
+ }
+ return list;
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,56 @@
+/*
+ * 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.viewer.restful.viewer2.util;
+
+import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.adapter.oid.Oid;
+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.AdapterManager;
+import org.apache.isis.runtimes.dflt.runtime.system.persistence.PersistenceSession;
+
+public final class OidUtils {
+
+ private OidUtils() {
+ }
+
+ public static ObjectAdapter getObjectAdapter(final String oidEncodedStr, final OidStringifier oidStringifier) {
+ final String oidStr = UrlDecoderUtils.urlDecode(oidEncodedStr);
+ final Oid oid = oidStringifier.deString(oidStr);
+ return getAdapterManager().getAdapterFor(oid);
+ }
+
+ public static String getOidStr(final ObjectAdapter objectAdapter, final OidStringifier oidStringifier) {
+ final Oid oid = objectAdapter.getOid();
+ return oid != null ? oidStringifier.enString(oid) : null;
+ }
+
+ // //////////////////////////////////////////////////////////////
+ // Dependencies (from singletons)
+ // //////////////////////////////////////////////////////////////
+
+ public static AdapterManager getAdapterManager() {
+ return getPersistenceSession().getAdapterManager();
+ }
+
+ protected static PersistenceSession getPersistenceSession() {
+ return IsisContext.getPersistenceSession();
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,39 @@
+/*
+ * 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.viewer.restful.viewer2.util;
+
+import javax.servlet.http.HttpServletRequest;
+
+public final class PathUtils {
+
+ private PathUtils() {
+ }
+
+ public static String combine(final HttpServletRequest request, final String... pathElements) {
+ final StringBuilder buf = new StringBuilder(request.getContextPath());
+ for (final String pathElement : pathElements) {
+ if (!pathElement.startsWith("/")) {
+ buf.append("/");
+ }
+ buf.append(pathElement);
+ }
+ return buf.toString();
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,38 @@
+/*
+ * 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.viewer.restful.viewer2.util;
+
+public final class StringUtil {
+
+ private StringUtil() {
+ }
+
+ public static String concat(final String... lines) {
+ final StringBuilder buf = new StringBuilder();
+ for (final String line : lines) {
+ buf.append(line);
+ }
+ return buf.toString();
+ }
+
+ public static String quote(final String val) {
+ return "\"" + val + "\"";
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,41 @@
+/*
+ * 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.viewer.restful.viewer2.util;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
+import javax.ws.rs.WebApplicationException;
+
+import org.apache.isis.viewer.restful.viewer2.Constants;
+
+public final class UrlDecoderUtils {
+
+ private UrlDecoderUtils() {
+ }
+
+ public static String urlDecode(final String oidStr) {
+ try {
+ return URLDecoder.decode(oidStr, Constants.URL_ENCODING_CHAR_SET);
+ } catch (final UnsupportedEncodingException e) {
+ throw new WebApplicationException(e);
+ }
+ }
+
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/resources/index.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/resources/index.html?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/resources/index.html (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/resources/index.html Sun Jun 26 11:51:01 2011
@@ -0,0 +1,38 @@
+<html>
+ <head>
+ <title>Restful Objects</title>
+ <script type="text/javascript" src="/jquery-1.6.1.js"></script>
+ <script type="text/javascript" src="/isis-json-support.js"></script>
+ </head>
+ <body>
+ <div id="services">
+ <p>Services</p>
+ <ul></ul>
+ </div>
+ <div id="breadcrumbs">
+ <ul></ul>
+ </div>
+ <div id="current">
+ <div id="object">
+ <div id="summary">
+ <ul></ul>
+ </div>
+ <div id="properties">
+ <ul></ul>
+ </div>
+ <div id="collections">
+ <ul></ul>
+ </div>
+ </div>
+ <div id="collection">
+ <ul></ul>
+ </div>
+ </div>
+ <div id="actions">
+ <ul></ul>
+ </div>
+ <script>
+ bootstrap_app();
+ </script>
+ </body>
+</html>
\ No newline at end of file
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-json-support.js
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-json-support.js?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-json-support.js (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-json-support.js Sun Jun 26 11:51:01 2011
@@ -0,0 +1,48 @@
+function add_links(ul, linkable) {
+ var el = $("<a>", {
+ href: linkable.link.url,
+ text: linkable.title
+ });
+ ul.append(
+ $("<li/>").append(el)
+ );
+ $.data(el, "isis", linkable);
+}
+
+function bootstrap_app() {
+ $.getJSON('/index',
+ undefined,
+ function load_services (data) {
+ $.getJSON(data.services.url,
+ undefined,
+ function(data) {
+ for(var i=0; i<data.length; i++) {
+ add_links($("#services > ul"), data[i]);
+ //var x = $.data(el, "isis");
+ //var jsonString= JSON.stringify(x, null, " ");
+ //alert(jsonString);
+ }
+ });
+ });
+}
+
+
+
+
+
+/*
+ * 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.
+ */
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-rest-support.js
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-rest-support.js?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-rest-support.js (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/resources/isis-rest-support.js Sun Jun 26 11:51:01 2011
@@ -0,0 +1,101 @@
+/*
+ * 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.
+ */
+
+/**
+ * Sends a PUT to /objects/oid/property/propertyId?proposedValue=valueOrOid
+ */
+function modifyProperty(objectUri, propertyId, proposedValue) {
+ modifyAssociation("PUT", objectUri, "property", propertyId, proposedValue);
+}
+
+/**
+ * Sends a DELETE to /objects/oid/property/propertyId
+ */
+function clearProperty(objectUri, propertyId, proposedValue) {
+ modifyAssociation("DELETE", objectUri, "property", propertyId, null);
+}
+
+/**
+ * Sends a PUT to /objects/oid/collection/collectionId?proposedValue=oidToAdd
+ */
+function addToCollection(objectUri, collectionId, proposedValue) {
+ modifyAssociation("PUT", objectUri, "collection", collectionId, proposedValue);
+}
+
+/**
+ * Sends a DELETE to /objects/oid/collection/collectionId?proposedValue=oidToRemove
+ */
+function removeFromCollection(objectUri, collectionId, proposedValue) {
+ modifyAssociation("DELETE", objectUri, "collection", collectionId, proposedValue);
+}
+
+/**
+ * Helper that factors out common functionality in the four functions that modify
+ * either properties or collections.
+ */
+function modifyAssociation(verb, objectUri, associationType, associationId, proposedValue) {
+ var uri = uriOnSuccess(objectUri, associationType, associationId);
+ if (proposedValue) {
+ uri += "?" + "proposedValue=" + proposedValue;
+ }
+ var reasonInvalidDomId = reasonInvalidDomIdOnFailure(associationType, associationId);
+ invokeUri(verb, uri, objectUri, reasonInvalidDomId);
+}
+
+
+
+function uriOnSuccess(objectUri, memberType, memberId) {
+ return objectUri + "/" + memberType + "/" + memberId;
+}
+
+function reasonInvalidDomIdOnFailure(memberType, memberId) {
+ return memberType + "-invalid-" + memberId;
+}
+
+/**
+ * Helper function that does the heavily lifting.
+ *
+ * <p>
+ * Makes the request, and redirects to the objectUri if successful, or updates the
+ * DOM element with id <tt>association-invalid-xxx</tt> otherwise.
+ */
+function invokeUri(verb, uri, uriOnSuccess, reasonInvalidDomIdOnFailure) {
+ //debugger;
+ var xhr = jQuery.ajax( {
+ url: uri,
+ type: verb,
+ dataType: 'xml',
+ success: function(data, textStatus, jqXHR) {
+ window.location = uriOnSuccess;
+ },
+ error: function(jqXHR, textStatus, errorThrown) {
+ if (jqXHR.status >= 400 && jqXHR.status < 500) {
+ reason = jqXHR.getResponseHeader("isis-reason");
+ if (!reason) {
+ reason = "invalid (unable to determine reason)";
+ }
+ reasonInvalidPara = document.getElementById(reasonInvalidDomIdOnFailure);
+ if (reasonInvalidPara) {
+ reasonInvalidPara.innerHTML = reason;
+ }
+ } else {
+ alert(jqXHR.status)
+ }
+ }
+ }
+ );
+}
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/resources/json-20110223.js
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/resources/json-20110223.js?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/resources/json-20110223.js (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/resources/json-20110223.js Sun Jun 26 11:51:01 2011
@@ -0,0 +1,530 @@
+/*
+ json.js
+ 2011-02-23
+
+ Public Domain
+
+ No warranty expressed or implied. Use at your own risk.
+
+ This file has been superceded by http://www.JSON.org/json2.js
+
+ See http://www.JSON.org/js.html
+
+ This code should be minified before deployment.
+ See http://javascript.crockford.com/jsmin.html
+
+ USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
+ NOT CONTROL.
+
+ This file adds these methods to JavaScript:
+
+ object.toJSONString(whitelist)
+ This method produce a JSON text from a JavaScript value.
+ It must not contain any cyclical references. Illegal values
+ will be excluded.
+
+ The default conversion for dates is to an ISO string. You can
+ add a toJSONString method to any date object to get a different
+ representation.
+
+ The object and array methods can take an optional whitelist
+ argument. A whitelist is an array of strings. If it is provided,
+ keys in objects not found in the whitelist are excluded.
+
+ string.parseJSON(filter)
+ This method parses a JSON text to produce an object or
+ array. It can throw a SyntaxError exception.
+
+ The optional filter parameter is a function which can filter and
+ transform the results. It receives each of the keys and values, and
+ its return value is used instead of the original value. If it
+ returns what it received, then structure is not modified. If it
+ returns undefined then the member is deleted.
+
+ Example:
+
+ // Parse the text. If a key contains the string 'date' then
+ // convert the value to a date.
+
+ myData = text.parseJSON(function (key, value) {
+ return key.indexOf('date') >= 0 ? new Date(value) : value;
+ });
+
+ This file will break programs with improper for..in loops. See
+ http://yuiblog.com/blog/2006/09/26/for-in-intrigue/
+
+ This file creates a global JSON object containing two methods: stringify
+ and parse.
+
+ JSON.stringify(value, replacer, space)
+ value any JavaScript value, usually an object or array.
+
+ replacer an optional parameter that determines how object
+ values are stringified for objects. It can be a
+ function or an array of strings.
+
+ space an optional parameter that specifies the indentation
+ of nested structures. If it is omitted, the text will
+ be packed without extra whitespace. If it is a number,
+ it will specify the number of spaces to indent at each
+ level. If it is a string (such as '\t' or ' '),
+ it contains the characters used to indent at each level.
+
+ This method produces a JSON text from a JavaScript value.
+
+ When an object value is found, if the object contains a toJSON
+ method, its toJSON method will be called and the result will be
+ stringified. A toJSON method does not serialize: it returns the
+ value represented by the name/value pair that should be serialized,
+ or undefined if nothing should be serialized. The toJSON method
+ will be passed the key associated with the value, and this will be
+ bound to the object holding the key.
+
+ For example, this would serialize Dates as ISO strings.
+
+ Date.prototype.toJSON = function (key) {
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ return this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z';
+ };
+
+ You can provide an optional replacer method. It will be passed the
+ key and value of each member, with this bound to the containing
+ object. The value that is returned from your method will be
+ serialized. If your method returns undefined, then the member will
+ be excluded from the serialization.
+
+ If the replacer parameter is an array of strings, then it will be
+ used to select the members to be serialized. It filters the results
+ such that only members with keys listed in the replacer array are
+ stringified.
+
+ Values that do not have JSON representations, such as undefined or
+ functions, will not be serialized. Such values in objects will be
+ dropped; in arrays they will be replaced with null. You can use
+ a replacer function to replace those with JSON values.
+ JSON.stringify(undefined) returns undefined.
+
+ The optional space parameter produces a stringification of the
+ value that is filled with line breaks and indentation to make it
+ easier to read.
+
+ If the space parameter is a non-empty string, then that string will
+ be used for indentation. If the space parameter is a number, then
+ the indentation will be that many spaces.
+
+ Example:
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}]);
+ // text is '["e",{"pluribus":"unum"}]'
+
+
+ text = JSON.stringify(['e', {pluribus: 'unum'}], null, '\t');
+ // text is '[\n\t"e",\n\t{\n\t\t"pluribus": "unum"\n\t}\n]'
+
+ text = JSON.stringify([new Date()], function (key, value) {
+ return this[key] instanceof Date ?
+ 'Date(' + this[key] + ')' : value;
+ });
+ // text is '["Date(---current time---)"]'
+
+
+ JSON.parse(text, reviver)
+ This method parses a JSON text to produce an object or array.
+ It can throw a SyntaxError exception.
+
+ The optional reviver parameter is a function that can filter and
+ transform the results. It receives each of the keys and values,
+ and its return value is used instead of the original value.
+ If it returns what it received, then the structure is not modified.
+ If it returns undefined then the member is deleted.
+
+ Example:
+
+ // Parse the text. Values that look like ISO date strings will
+ // be converted to Date objects.
+
+ myData = JSON.parse(text, function (key, value) {
+ var a;
+ if (typeof value === 'string') {
+ a =
+/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
+ if (a) {
+ return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
+ +a[5], +a[6]));
+ }
+ }
+ return value;
+ });
+
+ myData = JSON.parse('["Date(09/09/2001)"]', function (key, value) {
+ var d;
+ if (typeof value === 'string' &&
+ value.slice(0, 5) === 'Date(' &&
+ value.slice(-1) === ')') {
+ d = new Date(value.slice(5, -1));
+ if (d) {
+ return d;
+ }
+ }
+ return value;
+ });
+
+
+ This is a reference implementation. You are free to copy, modify, or
+ redistribute.
+*/
+
+/*jslint evil: true, regexp: false */
+
+/*members "", "\b", "\t", "\n", "\f", "\r", "\"", JSON, "\\", apply,
+ call, charCodeAt, getUTCDate, getUTCFullYear, getUTCHours,
+ getUTCMinutes, getUTCMonth, getUTCSeconds, hasOwnProperty, join,
+ lastIndex, length, parse, parseJSON, prototype, push, replace, slice,
+ stringify, test, toJSON, toJSONString, toString, valueOf
+*/
+
+
+// Create a JSON object only if one does not already exist. We create the
+// methods in a closure to avoid creating global variables.
+
+var JSON;
+if (!JSON) {
+ JSON = {};
+}
+
+(function () {
+ "use strict";
+
+ function f(n) {
+ // Format integers to have at least two digits.
+ return n < 10 ? '0' + n : n;
+ }
+
+ if (typeof Date.prototype.toJSON !== 'function') {
+
+ Date.prototype.toJSON = function (key) {
+
+ return isFinite(this.valueOf()) ?
+ this.getUTCFullYear() + '-' +
+ f(this.getUTCMonth() + 1) + '-' +
+ f(this.getUTCDate()) + 'T' +
+ f(this.getUTCHours()) + ':' +
+ f(this.getUTCMinutes()) + ':' +
+ f(this.getUTCSeconds()) + 'Z' : null;
+ };
+
+ String.prototype.toJSON =
+ Number.prototype.toJSON =
+ Boolean.prototype.toJSON = function (key) {
+ return this.valueOf();
+ };
+ }
+
+ var cx = /[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+ gap,
+ indent,
+ meta = { // table of character substitutions
+ '\b': '\\b',
+ '\t': '\\t',
+ '\n': '\\n',
+ '\f': '\\f',
+ '\r': '\\r',
+ '"' : '\\"',
+ '\\': '\\\\'
+ },
+ rep;
+
+
+ function quote(string) {
+
+// If the string contains no control characters, no quote characters, and no
+// backslash characters, then we can safely slap some quotes around it.
+// Otherwise we must also replace the offending characters with safe escape
+// sequences.
+
+ escapable.lastIndex = 0;
+ return escapable.test(string) ? '"' + string.replace(escapable, function (a) {
+ var c = meta[a];
+ return typeof c === 'string' ? c :
+ '\\u' + ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ }) + '"' : '"' + string + '"';
+ }
+
+
+ function str(key, holder) {
+
+// Produce a string from holder[key].
+
+ var i, // The loop counter.
+ k, // The member key.
+ v, // The member value.
+ length,
+ mind = gap,
+ partial,
+ value = holder[key];
+
+// If the value has a toJSON method, call it to obtain a replacement value.
+
+ if (value && typeof value === 'object' &&
+ typeof value.toJSON === 'function') {
+ value = value.toJSON(key);
+ }
+
+// If we were called with a replacer function, then call the replacer to
+// obtain a replacement value.
+
+ if (typeof rep === 'function') {
+ value = rep.call(holder, key, value);
+ }
+
+// What happens next depends on the value's type.
+
+ switch (typeof value) {
+ case 'string':
+ return quote(value);
+
+ case 'number':
+
+// JSON numbers must be finite. Encode non-finite numbers as null.
+
+ return isFinite(value) ? String(value) : 'null';
+
+ case 'boolean':
+ case 'null':
+
+// If the value is a boolean or null, convert it to a string. Note:
+// typeof null does not produce 'null'. The case is included here in
+// the remote chance that this gets fixed someday.
+
+ return String(value);
+
+// If the type is 'object', we might be dealing with an object or an array or
+// null.
+
+ case 'object':
+
+// Due to a specification blunder in ECMAScript, typeof null is 'object',
+// so watch out for that case.
+
+ if (!value) {
+ return 'null';
+ }
+
+// Make an array to hold the partial results of stringifying this object value.
+
+ gap += indent;
+ partial = [];
+
+// Is the value an array?
+
+ if (Object.prototype.toString.apply(value) === '[object Array]') {
+
+// The value is an array. Stringify every element. Use null as a placeholder
+// for non-JSON values.
+
+ length = value.length;
+ for (i = 0; i < length; i += 1) {
+ partial[i] = str(i, value) || 'null';
+ }
+
+// Join all of the elements together, separated with commas, and wrap them in
+// brackets.
+
+ v = partial.length === 0 ? '[]' : gap ?
+ '[\n' + gap + partial.join(',\n' + gap) + '\n' + mind + ']' :
+ '[' + partial.join(',') + ']';
+ gap = mind;
+ return v;
+ }
+
+// If the replacer is an array, use it to select the members to be stringified.
+
+ if (rep && typeof rep === 'object') {
+ length = rep.length;
+ for (i = 0; i < length; i += 1) {
+ k = rep[i];
+ if (typeof k === 'string') {
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ } else {
+
+// Otherwise, iterate through all of the keys in the object.
+
+ for (k in value) {
+ if (Object.prototype.hasOwnProperty.call(value, k)) {
+ v = str(k, value);
+ if (v) {
+ partial.push(quote(k) + (gap ? ': ' : ':') + v);
+ }
+ }
+ }
+ }
+
+// Join all of the member texts together, separated with commas,
+// and wrap them in braces.
+
+ v = partial.length === 0 ? '{}' : gap ?
+ '{\n' + gap + partial.join(',\n' + gap) + '\n' + mind + '}' :
+ '{' + partial.join(',') + '}';
+ gap = mind;
+ return v;
+ }
+ }
+
+// If the JSON object does not yet have a stringify method, give it one.
+
+ if (typeof JSON.stringify !== 'function') {
+ JSON.stringify = function (value, replacer, space) {
+
+// The stringify method takes a value and an optional replacer, and an optional
+// space parameter, and returns a JSON text. The replacer can be a function
+// that can replace values, or an array of strings that will select the keys.
+// A default replacer method can be provided. Use of the space parameter can
+// produce text that is more easily readable.
+
+ var i;
+ gap = '';
+ indent = '';
+
+// If the space parameter is a number, make an indent string containing that
+// many spaces.
+
+ if (typeof space === 'number') {
+ for (i = 0; i < space; i += 1) {
+ indent += ' ';
+ }
+
+// If the space parameter is a string, it will be used as the indent string.
+
+ } else if (typeof space === 'string') {
+ indent = space;
+ }
+
+// If there is a replacer, it must be a function or an array.
+// Otherwise, throw an error.
+
+ rep = replacer;
+ if (replacer && typeof replacer !== 'function' &&
+ (typeof replacer !== 'object' ||
+ typeof replacer.length !== 'number')) {
+ throw new Error('JSON.stringify');
+ }
+
+// Make a fake root object containing our value under the key of ''.
+// Return the result of stringifying the value.
+
+ return str('', {'': value});
+ };
+ }
+
+
+// If the JSON object does not yet have a parse method, give it one.
+
+ if (typeof JSON.parse !== 'function') {
+ JSON.parse = function (text, reviver) {
+
+// The parse method takes a text and an optional reviver function, and returns
+// a JavaScript value if the text is a valid JSON text.
+
+ var j;
+
+ function walk(holder, key) {
+
+// The walk method is used to recursively walk the resulting structure so
+// that modifications can be made.
+
+ var k, v, value = holder[key];
+ if (value && typeof value === 'object') {
+ for (k in value) {
+ if (Object.prototype.hasOwnProperty.call(value, k)) {
+ v = walk(value, k);
+ if (v !== undefined) {
+ value[k] = v;
+ } else {
+ delete value[k];
+ }
+ }
+ }
+ }
+ return reviver.call(holder, key, value);
+ }
+
+
+// Parsing happens in four stages. In the first stage, we replace certain
+// Unicode characters with escape sequences. JavaScript handles many characters
+// incorrectly, either silently deleting them, or treating them as line endings.
+
+ text = String(text);
+ cx.lastIndex = 0;
+ if (cx.test(text)) {
+ text = text.replace(cx, function (a) {
+ return '\\u' +
+ ('0000' + a.charCodeAt(0).toString(16)).slice(-4);
+ });
+ }
+
+// In the second stage, we run the text against regular expressions that look
+// for non-JSON patterns. We are especially concerned with '()' and 'new'
+// because they can cause invocation, and '=' because it can cause mutation.
+// But just to be safe, we want to reject all unexpected forms.
+
+// We split the second stage into 4 regexp operations in order to work around
+// crippling inefficiencies in IE's and Safari's regexp engines. First we
+// replace the JSON backslash pairs with '@' (a non-JSON character). Second, we
+// replace all simple value tokens with ']' characters. Third, we delete all
+// open brackets that follow a colon or comma or that begin the text. Finally,
+// we look to see that the remaining characters are only whitespace or ']' or
+// ',' or ':' or '{' or '}'. If that is so, then the text is safe for eval.
+
+ if (/^[\],:{}\s]*$/
+ .test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@')
+ .replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']')
+ .replace(/(?:^|:|,)(?:\s*\[)+/g, ''))) {
+
+// In the third stage we use the eval function to compile the text into a
+// JavaScript structure. The '{' operator is subject to a syntactic ambiguity
+// in JavaScript: it can begin a block or an object literal. We wrap the text
+// in parens to eliminate the ambiguity.
+
+ j = eval('(' + text + ')');
+
+// In the optional fourth stage, we recursively walk the new structure, passing
+// each name/value pair to a reviver function for possible transformation.
+
+ return typeof reviver === 'function' ?
+ walk({'': j}, '') : j;
+ }
+
+// If the text is not JSON parseable, then a SyntaxError is thrown.
+
+ throw new SyntaxError('JSON.parse');
+ };
+ }
+
+// Augment the basic prototypes if they have not already been augmented.
+// These forms are obsolete. It is recommended that JSON.stringify and
+// JSON.parse be used instead.
+
+ if (!Object.prototype.toJSONString) {
+ Object.prototype.toJSONString = function (filter) {
+ return JSON.stringify(this, filter);
+ };
+ Object.prototype.parseJSON = function (filter) {
+ return JSON.parse(this, filter);
+ };
+ }
+}());
\ No newline at end of file
Added: incubator/isis/trunk/viewer/json/viewer2/src/main/test/net/sf/restfulobjects/viewer/util/StringUtilTest.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer2/src/main/test/net/sf/restfulobjects/viewer/util/StringUtilTest.java?rev=1139763&view=auto
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer2/src/main/test/net/sf/restfulobjects/viewer/util/StringUtilTest.java (added)
+++ incubator/isis/trunk/viewer/json/viewer2/src/main/test/net/sf/restfulobjects/viewer/util/StringUtilTest.java Sun Jun 26 11:51:01 2011
@@ -0,0 +1,71 @@
+/*
+ * 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 net.sf.restfulobjects.viewer.util;
+
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
+import java.io.ByteArrayInputStream;
+import java.util.List;
+
+import org.junit.Test;
+
+
+public class StringUtilTest {
+
+ @Test
+ public void shouldReturnEmptyArrayWhenNull() {
+ final List<String> args = StringUtil.getArgs(null);
+ assertThat(args.size(), is(equalTo(0)));
+ }
+
+ @Test
+ public void shouldReturnEmptyArrayWhenEmptyString() {
+ final List<String> args = StringUtil.getArgs(newInputStream(""));
+ assertThat(args.size(), is(equalTo(0)));
+ }
+
+ @Test
+ public void shouldReturnArrayOfCorrectSizeWhenTwoArgs() {
+ final List<String> args = StringUtil.getArgs(newInputStream("arg0=foo&arg1=bar"));
+ assertThat(args.size(), is(equalTo(2)));
+ }
+
+ private ByteArrayInputStream newInputStream(final String string) {
+ ByteArrayInputStream bais;
+ bais = new ByteArrayInputStream(string.getBytes());
+ return bais;
+ }
+
+ @Test
+ public void shouldReturnFirstArg() {
+ final ByteArrayInputStream bais = new ByteArrayInputStream("arg0=foo&arg1=bar".getBytes());
+ final List<String> args = StringUtil.getArgs(bais);
+ assertThat(args.get(0), is(equalTo("foo")));
+ }
+
+ @Test
+ public void shouldReturnSecondArg() {
+ final ByteArrayInputStream bais = new ByteArrayInputStream("arg0=foo&arg1=bar".getBytes());
+ final List<String> args = StringUtil.getArgs(bais);
+ assertThat(args.get(1), is(equalTo("bar")));
+ }
+
+}