Author: erinnp
Date: Fri Aug 9 13:46:14 2013
New Revision: 1512304
URL: http://svn.apache.org/r1512304
Log:
Error catching
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/BadRequestExceptionMapper.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/CreatedResponseFilter.java
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/NoContentResponseFilter.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageUsersResource.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/BadRequestExceptionMapper.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/BadRequestExceptionMapper.java?rev=1512304&r1=1512303&r2=1512304&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/BadRequestExceptionMapper.java
(original)
+++
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/BadRequestExceptionMapper.java
Fri Aug 9 13:46:14 2013
@@ -20,7 +20,6 @@
package org.apache.rave.rest.filters;
import org.apache.rave.rest.exception.BadRequestException;
-import org.apache.rave.rest.exception.ResourceNotFoundException;
import org.apache.rave.rest.model.ErrorWrapperResponse;
import javax.ws.rs.Produces;
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/CreatedResponseFilter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/CreatedResponseFilter.java?rev=1512304&r1=1512303&r2=1512304&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/CreatedResponseFilter.java
(original)
+++
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/CreatedResponseFilter.java
Fri Aug 9 13:46:14 2013
@@ -38,7 +38,7 @@ public class CreatedResponseFilter imple
public void filter(ContainerRequestContext containerRequestContext,
ContainerResponseContext containerResponseContext) throws IOException {
String method = containerRequestContext.getRequest().getMethod();
- if(method.equals("POST")) {
+ if (method.equals("POST") && containerResponseContext.getStatus() ==
Response.Status.OK.getStatusCode()) {
containerResponseContext.setStatus(Response.Status.CREATED.getStatusCode());
RestEntity entity = (RestEntity)
containerResponseContext.getEntity();
String id = entity.getId();
@@ -46,6 +46,6 @@ public class CreatedResponseFilter imple
containerRequestContext.getUriInfo().getAbsolutePathBuilder().path(id).build().toString());
}
- //containerResponseContext.getHeaders().put("Location")
+ //containerResponseContext.getHeaders().put("Location")
}
}
Modified:
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/NoContentResponseFilter.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/NoContentResponseFilter.java?rev=1512304&r1=1512303&r2=1512304&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/NoContentResponseFilter.java
(original)
+++
rave/trunk/rave-components/rave-core-api/src/main/java/org/apache/rave/rest/filters/NoContentResponseFilter.java
Fri Aug 9 13:46:14 2013
@@ -37,10 +37,13 @@ public class NoContentResponseFilter imp
@Override
public void filter(ContainerRequestContext containerRequestContext,
ContainerResponseContext containerResponseContext) throws IOException {
- Object o = containerResponseContext.getEntity();
+ if (containerResponseContext.getStatus() ==
Response.Status.OK.getStatusCode()) {
- if(o == null) {
-
containerResponseContext.setStatus(Response.Status.NO_CONTENT.getStatusCode());
+ Object o = containerResponseContext.getEntity();
+
+ if (o == null) {
+
containerResponseContext.setStatus(Response.Status.NO_CONTENT.getStatusCode());
+ }
}
}
}
\ No newline at end of file
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageUsersResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageUsersResource.java?rev=1512304&r1=1512303&r2=1512304&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageUsersResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultPageUsersResource.java
Fri Aug 9 13:46:14 2013
@@ -59,7 +59,7 @@ public class DefaultPageUsersResource im
}
pageService.addMemberToPage(page.getId(), user.getPersonId());
pageService.updatePageEditingStatus(page.getId(), user.getPersonId(),
user.isEditor());
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ return user;
}
@Override
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java?rev=1512304&r1=1512303&r2=1512304&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/rest/impl/DefaultRegionWidgetsResource.java
Fri Aug 9 13:46:14 2013
@@ -21,6 +21,7 @@ package org.apache.rave.rest.impl;
import org.apache.rave.portal.service.PageService;
+import org.apache.rave.rest.exception.BadRequestException;
import org.apache.rave.rest.exception.ResourceNotFoundException;
import org.apache.rave.rest.model.Page;
import org.apache.rave.rest.model.Region;
@@ -59,6 +60,9 @@ public class DefaultRegionWidgetsResourc
@Override
public RegionWidget createPageRegionRegionWidget(RegionWidget
regionWidget) {
+ if(regionWidget.getWidgetId() == null) {
+ throw new BadRequestException("RegionWidget widgetId property must
be defined.");
+ }
org.apache.rave.model.RegionWidget fromDb =
pageService.addWidgetToPageRegion(page.getId(),
regionWidget.getWidgetId(), region.getId());
