Repository: isis Updated Branches: refs/heads/master 46e8aef81 -> 430a836ab
ISIS-421: Delete on object is 405 Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/86dd97c4 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/86dd97c4 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/86dd97c4 Branch: refs/heads/master Commit: 86dd97c4229b41c0b35efaed5f130b111146cada Parents: 46e8aef Author: Dan Haywood <[email protected]> Authored: Fri Mar 28 10:28:27 2014 +0000 Committer: Dan Haywood <[email protected]> Committed: Fri Mar 28 10:28:27 2014 +0000 ---------------------------------------------------------------------- .../applib/client/RestfulResponse.java | 2 +- .../domainobjects/DomainObjectResource.java | 5 ++ .../DomainObjectResourceServerside.java | 5 ++ .../oid/Delete_thenResponseCode_405_bad.java | 68 ++++++++++++++++++++ .../Delete_thenResponseCode_405_bad_TODO.java | 23 ------- 5 files changed, 79 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/86dd97c4/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java index 4c02e2e..aadef4d 100644 --- a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java +++ b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/client/RestfulResponse.java @@ -263,7 +263,7 @@ public class RestfulResponse<T> { } public X parse(final String value) { - return parser.valueOf(value); + return value != null? parser.valueOf(value): null; } public String render(X message) { http://git-wip-us.apache.org/repos/asf/isis/blob/86dd97c4/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java index e597e08..9800fb7 100644 --- a/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java +++ b/component/viewer/restfulobjects/applib/src/main/java/org/apache/isis/viewer/restfulobjects/applib/domainobjects/DomainObjectResource.java @@ -62,6 +62,11 @@ public interface DomainObjectResource { @ClientResponseType(entityType = String.class) public Response object(@PathParam("domainType") String domainType, @PathParam("instanceId") final String instanceId, final InputStream arguments); + @DELETE + @Path("/{domainType}/{instanceId}") + public Response deleteMethodNotSupported(@PathParam("domainType") String domainType, @PathParam("instanceId") final String instanceId); + + // ////////////////////////////////////////////////////////// // domain object property // ////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/86dd97c4/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java b/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java index 16cecf4..f99299e 100644 --- a/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java +++ b/component/viewer/restfulobjects/server/src/main/java/org/apache/isis/viewer/restfulobjects/server/resources/DomainObjectResourceServerside.java @@ -142,6 +142,11 @@ public class DomainObjectResourceServerside extends ResourceAbstract implements return helper.objectRepresentation(); } + @Override + public Response deleteMethodNotSupported(@PathParam("domainType") String domainType, @PathParam("instanceId") String instanceId) { + throw RestfulObjectsApplicationException.createWithMessage(HttpStatusCode.METHOD_NOT_ALLOWED, "Deleting objects is not supported."); + } + // ////////////////////////////////////////////////////////// // domain object property // ////////////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/isis/blob/86dd97c4/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad.java new file mode 100644 index 0000000..2b8d7b3 --- /dev/null +++ b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad.java @@ -0,0 +1,68 @@ +/* + * 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.restfulobjects.tck.domainobject.oid; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.apache.isis.core.commons.matchers.IsisMatchers; +import org.apache.isis.core.webserver.WebServer; +import org.apache.isis.viewer.restfulobjects.applib.*; +import org.apache.isis.viewer.restfulobjects.applib.client.RestfulClient; +import org.apache.isis.viewer.restfulobjects.applib.client.RestfulResponse; +import org.apache.isis.viewer.restfulobjects.applib.domainobjects.DomainObjectRepresentation; +import org.apache.isis.viewer.restfulobjects.applib.errors.ErrorRepresentation; +import org.apache.isis.viewer.restfulobjects.tck.IsisWebServerRule; +import org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers; +import org.apache.isis.viewer.restfulobjects.tck.Util; + +import static org.apache.isis.core.commons.matchers.IsisMatchers.matches; +import static org.apache.isis.viewer.restfulobjects.tck.RestfulMatchers.isLink; +import static org.hamcrest.CoreMatchers.*; +import static org.junit.Assert.assertThat; + +public class Delete_thenResponseCode_405_bad { + + @Rule + public IsisWebServerRule webServerRule = new IsisWebServerRule(); + + protected RestfulClient client; + + private ErrorRepresentation errorRepresentation; + + @Before + public void setUp() throws Exception { + final WebServer webServer = webServerRule.getWebServer(); + client = new RestfulClient(webServer.getBase()); + } + + @Test + public void followLink() throws Exception { + + // when + final LinkRepresentation link = Util.domainObjectLink(client, "PrimitiveValuedEntities"); + final LinkRepresentation deleteLink = link.withMethod(RestfulHttpMethod.DELETE); + final RestfulResponse<JsonRepresentation> restfulResponse = client.follow(deleteLink); + + assertThat(restfulResponse.getStatus(), is(RestfulResponse.HttpStatusCode.METHOD_NOT_ALLOWED)); + assertThat(restfulResponse.getHeader(RestfulResponse.Header.WARNING), is("Deleting objects is not supported.")); + + } + +} http://git-wip-us.apache.org/repos/asf/isis/blob/86dd97c4/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad_TODO.java ---------------------------------------------------------------------- diff --git a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad_TODO.java b/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad_TODO.java deleted file mode 100644 index 17ffea5..0000000 --- a/component/viewer/restfulobjects/tck/src/test/java/org/apache/isis/viewer/restfulobjects/tck/domainobject/oid/Delete_thenResponseCode_405_bad_TODO.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * 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.restfulobjects.tck.domainobject.oid; - -public class Delete_thenResponseCode_405_bad_TODO { - -}
