You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/10/07 16:25:26 UTC
git commit: use processor exceptions in technical service
Repository: olingo-odata4
Updated Branches:
refs/heads/master 03475605e -> e7bcaf068
use processor exceptions in technical service
Change-Id: I8dc53d6450d24bfde8198d46e6bf18964926f1fe
Signed-off-by: Christian Amend <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e7bcaf06
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e7bcaf06
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e7bcaf06
Branch: refs/heads/master
Commit: e7bcaf0687a7cc727d29a51436c87b52a84967f9
Parents: 0347560
Author: Klaus Straubinger <kl...@sap.com>
Authored: Tue Oct 7 16:20:10 2014 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Oct 7 16:25:15 2014 +0200
----------------------------------------------------------------------
.../olingo/server/tecsvc/data/DataProvider.java | 14 +-
.../tecsvc/processor/TechnicalProcessor.java | 314 ++++++++-----------
2 files changed, 135 insertions(+), 193 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e7bcaf06/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
index 820994b..f4120db 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java
@@ -24,11 +24,11 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
+import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import java.util.UUID;
-import org.apache.olingo.commons.api.ODataException;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntitySet;
import org.apache.olingo.commons.api.data.Link;
@@ -40,11 +40,13 @@ import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmProperty;
+import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.commons.core.data.EntityImpl;
import org.apache.olingo.commons.core.data.EntitySetImpl;
import org.apache.olingo.commons.core.data.LinkImpl;
import org.apache.olingo.commons.core.data.LinkedComplexValueImpl;
import org.apache.olingo.commons.core.data.PropertyImpl;
+import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.uri.UriParameter;
public class DataProvider {
@@ -104,15 +106,15 @@ public class DataProvider {
}
}
- public static class DataProviderException extends ODataException {
+ public static class DataProviderException extends ODataApplicationException {
private static final long serialVersionUID = 5098059649321796156L;
- public DataProviderException(String message, Throwable throwable) {
- super(message, throwable);
+ public DataProviderException(final String message, final Throwable throwable) {
+ super(message, HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), Locale.ROOT, throwable);
}
- public DataProviderException(String message) {
- super(message);
+ public DataProviderException(final String message) {
+ super(message, HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), Locale.ROOT);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e7bcaf06/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
index 65ae74c..17ae201 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java
@@ -30,6 +30,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmProperty;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.format.ODataFormat;
+import org.apache.olingo.commons.api.http.HttpContentType;
import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.server.api.OData;
@@ -40,8 +41,8 @@ import org.apache.olingo.server.api.processor.EntitySetProcessor;
import org.apache.olingo.server.api.processor.EntityProcessor;
import org.apache.olingo.server.api.processor.PropertyProcessor;
import org.apache.olingo.server.api.serializer.ODataSerializer;
-import org.apache.olingo.server.api.serializer.SerializerException;
import org.apache.olingo.server.api.serializer.ODataSerializerOptions;
+import org.apache.olingo.server.api.serializer.SerializerException;
import org.apache.olingo.server.api.uri.UriInfo;
import org.apache.olingo.server.api.uri.UriInfoResource;
import org.apache.olingo.server.api.uri.UriResource;
@@ -50,7 +51,6 @@ import org.apache.olingo.server.api.uri.UriResourceKind;
import org.apache.olingo.server.api.uri.UriResourceProperty;
import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind;
import org.apache.olingo.server.tecsvc.data.DataProvider;
import java.io.ByteArrayInputStream;
@@ -59,7 +59,7 @@ import java.util.List;
import java.util.Locale;
/**
- * Technical Processor which provides current implemented processor functionality.
+ * Technical Processor which provides currently implemented processor functionality.
*/
public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor, PropertyProcessor {
@@ -77,124 +77,80 @@ public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor,
@Override
public void readEntitySet(final ODataRequest request, ODataResponse response, final UriInfo uriInfo,
- final ContentType requestedContentType) {
- if (!validateOptions(uriInfo.asUriInfoResource())) {
- response.setStatusCode(HttpStatusCode.NOT_IMPLEMENTED.getStatusCode());
- return;
- }
- try {
- final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
- final EntitySet entitySet = readEntitySetInternal(edmEntitySet);
- if (entitySet == null) {
- response.setStatusCode(HttpStatusCode.NOT_FOUND.getStatusCode());
- } else {
- final ODataFormat format = ODataFormat.fromContentType(requestedContentType);
- ODataSerializer serializer = odata.createSerializer(format);
- final ExpandOption expand = uriInfo.getExpandOption();
- final SelectOption select = uriInfo.getSelectOption();
- response.setContent(serializer.entitySet(edmEntitySet, entitySet,
- ODataSerializerOptions.with()
- .contextURL(format == ODataFormat.JSON_NO_METADATA ? null :
- getContextUrl(serializer, edmEntitySet, false, expand, select, null))
- .count(uriInfo.getCountOption())
- .expand(expand).select(select)
- .build()));
- response.setStatusCode(HttpStatusCode.OK.getStatusCode());
- response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString());
- }
- } catch (final DataProvider.DataProviderException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final SerializerException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final ODataApplicationException e) {
- response.setStatusCode(e.getStatusCode());
- }
- }
+ final ContentType requestedContentType) throws ODataApplicationException, SerializerException {
+ validateOptions(uriInfo.asUriInfoResource());
- @Override
- public void readEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo,
- final ContentType requestedContentType) {
- if (!validateOptions(uriInfo.asUriInfoResource())) {
- response.setStatusCode(HttpStatusCode.NOT_IMPLEMENTED.getStatusCode());
- return;
- }
- try {
- final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
- final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
- if (entity == null) {
- response.setStatusCode(HttpStatusCode.NOT_FOUND.getStatusCode());
- } else {
- final ODataFormat format = ODataFormat.fromContentType(requestedContentType);
- ODataSerializer serializer = odata.createSerializer(format);
- final ExpandOption expand = uriInfo.getExpandOption();
- final SelectOption select = uriInfo.getSelectOption();
- response.setContent(serializer.entity(edmEntitySet, entity,
- ODataSerializerOptions.with()
- .contextURL(format == ODataFormat.JSON_NO_METADATA ? null :
- getContextUrl(serializer, edmEntitySet, true, expand, select, null))
- .count(uriInfo.getCountOption())
- .expand(expand).select(select)
- .build()));
- response.setStatusCode(HttpStatusCode.OK.getStatusCode());
- response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString());
- }
- } catch (final DataProvider.DataProviderException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final SerializerException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final ODataApplicationException e) {
- response.setStatusCode(e.getStatusCode());
+ final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
+ final EntitySet entitySet = readEntitySetInternal(edmEntitySet,
+ uriInfo.getCountOption() != null && uriInfo.getCountOption().getValue());
+ if (entitySet == null) {
+ throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT);
+ } else {
+ final ODataFormat format = ODataFormat.fromContentType(requestedContentType);
+ ODataSerializer serializer = odata.createSerializer(format);
+ final ExpandOption expand = uriInfo.getExpandOption();
+ final SelectOption select = uriInfo.getSelectOption();
+ response.setContent(serializer.entitySet(edmEntitySet, entitySet,
+ ODataSerializerOptions.with()
+ .contextURL(format == ODataFormat.JSON_NO_METADATA ? null :
+ getContextUrl(serializer, edmEntitySet, false, expand, select, null))
+ .count(uriInfo.getCountOption())
+ .expand(expand).select(select)
+ .build()));
+ response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+ response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString());
}
}
@Override
- public void countEntitySet(ODataRequest request, ODataResponse response, UriInfo uriInfo) {
- try {
- EntitySet entitySet = null;
- final UriInfoResource uriResource = uriInfo.asUriInfoResource();
- final List<UriResource> resourceParts = uriResource.getUriResourceParts();
- if (isCount(resourceParts)) {
- int pos = resourceParts.size() - 2;
- if (pos >= 0) {
- final UriResourceEntitySet ur =
- (UriResourceEntitySet) uriResource.getUriResourceParts().get(pos);
- entitySet = readEntitySetInternal(ur.getEntitySet(), true);
- }
- }
+ public void readEntity(final ODataRequest request, ODataResponse response, final UriInfo uriInfo,
+ final ContentType requestedContentType) throws ODataApplicationException, SerializerException {
+ validateOptions(uriInfo.asUriInfoResource());
- if (entitySet == null) {
- response.setStatusCode(HttpStatusCode.NOT_FOUND.getStatusCode());
- } else {
- Integer count = entitySet.getCount();
- response.setContent(new ByteArrayInputStream(count.toString().getBytes()));
- response.setStatusCode(HttpStatusCode.OK.getStatusCode());
- response.setHeader(HttpHeader.CONTENT_TYPE, "text/plain");
- }
- } catch (final DataProvider.DataProviderException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
+ final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
+ final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
+ if (entity == null) {
+ throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT);
+ } else {
+ final ODataFormat format = ODataFormat.fromContentType(requestedContentType);
+ ODataSerializer serializer = odata.createSerializer(format);
+ final ExpandOption expand = uriInfo.getExpandOption();
+ final SelectOption select = uriInfo.getSelectOption();
+ response.setContent(serializer.entity(edmEntitySet, entity,
+ ODataSerializerOptions.with()
+ .contextURL(format == ODataFormat.JSON_NO_METADATA ? null :
+ getContextUrl(serializer, edmEntitySet, true, expand, select, null))
+ .count(uriInfo.getCountOption())
+ .expand(expand).select(select)
+ .build()));
+ response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+ response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString());
}
}
- private boolean isCount(List<UriResource> resourceParts) {
- if (resourceParts.isEmpty()) {
- return false;
+ @Override
+ public void countEntitySet(final ODataRequest request, ODataResponse response, final UriInfo uriInfo)
+ throws ODataApplicationException, SerializerException {
+ final List<UriResource> resourceParts = uriInfo.asUriInfoResource().getUriResourceParts();
+ final int pos = resourceParts.size() - 2;
+ final EntitySet entitySet =
+ readEntitySetInternal(((UriResourceEntitySet) resourceParts.get(pos)).getEntitySet(), true);
+ if (entitySet == null) {
+ throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT);
+ } else {
+ response.setContent(new ByteArrayInputStream(entitySet.getCount().toString().getBytes()));
+ response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+ response.setHeader(HttpHeader.CONTENT_TYPE, HttpContentType.TEXT_PLAIN);
}
- UriResource part = resourceParts.get(resourceParts.size() - 1);
- return SystemQueryOptionKind.COUNT.toString().equals(part.toString());
- }
-
- private EntitySet readEntitySetInternal(final EdmEntitySet edmEntitySet) throws DataProvider.DataProviderException {
- return readEntitySetInternal(edmEntitySet, false);
}
private EntitySet readEntitySetInternal(final EdmEntitySet edmEntitySet,
- boolean withCount) throws DataProvider.DataProviderException {
+ final boolean withCount) throws DataProvider.DataProviderException {
EntitySet entitySet = dataProvider.readAll(edmEntitySet);
// TODO: set count (correctly) and next link
if (withCount && entitySet.getCount() == null) {
entitySet.setCount(entitySet.getEntities().size());
}
- //
return entitySet;
}
@@ -204,16 +160,19 @@ public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor,
return dataProvider.read(entitySet, resourceEntitySet.getKeyPredicates());
}
- private boolean validateOptions(final UriInfoResource uriInfo) {
- return uriInfo.getCountOption() == null
- && uriInfo.getCustomQueryOptions().isEmpty()
- && uriInfo.getFilterOption() == null
- && uriInfo.getIdOption() == null
- && uriInfo.getOrderByOption() == null
- && uriInfo.getSearchOption() == null
- && uriInfo.getSkipOption() == null
- && uriInfo.getSkipTokenOption() == null
- && uriInfo.getTopOption() == null;
+ private void validateOptions(final UriInfoResource uriInfo) throws ODataApplicationException {
+ if (uriInfo.getCountOption() != null
+ || !uriInfo.getCustomQueryOptions().isEmpty()
+ || uriInfo.getFilterOption() != null
+ || uriInfo.getIdOption() != null
+ || uriInfo.getOrderByOption() != null
+ || uriInfo.getSearchOption() != null
+ || uriInfo.getSkipOption() != null
+ || uriInfo.getSkipTokenOption() != null
+ || uriInfo.getTopOption() != null) {
+ throw new ODataApplicationException("Not all of the specified options are supported.",
+ HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT);
+ }
}
private EdmEntitySet getEdmEntitySet(final UriInfoResource uriInfo) throws ODataApplicationException {
@@ -223,7 +182,6 @@ public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor,
throw new ODataApplicationException("Invalid resource type.",
HttpStatusCode.NOT_IMPLEMENTED.getStatusCode(), Locale.ROOT);
}
-
List<UriResource> subResPaths = resourcePaths.subList(1, resourcePaths.size());
for (UriResource subResPath : subResPaths) {
UriResourceKind kind = subResPath.getKind();
@@ -236,7 +194,6 @@ public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor,
}
}
- //
final UriResourceEntitySet uriResource = (UriResourceEntitySet) resourcePaths.get(0);
if (uriResource.getTypeFilterOnCollection() != null || uriResource.getTypeFilterOnEntry() != null) {
throw new ODataApplicationException("Type filters are not supported.",
@@ -246,100 +203,83 @@ public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor,
}
private ContextURL getContextUrl(final ODataSerializer serializer,
- final EdmEntitySet entitySet, final boolean isSingleEntity,
- final ExpandOption expand, final SelectOption select, final String navOrPropertyPath)
- throws SerializerException {
-
+ final EdmEntitySet entitySet, final boolean isSingleEntity,
+ final ExpandOption expand, final SelectOption select, final String propertyPath)
+ throws SerializerException {
return ContextURL.with().entitySet(entitySet)
.selectList(serializer.buildContextURLSelectList(entitySet, expand, select))
- .suffix(isSingleEntity ? Suffix.ENTITY : null)
- .navOrPropertyPath(navOrPropertyPath)
+ .suffix(isSingleEntity && propertyPath == null ? Suffix.ENTITY : null)
+ .navOrPropertyPath(propertyPath)
.build();
}
@Override
- public void readProperty(ODataRequest request,
- ODataResponse response, UriInfo uriInfo, ContentType contentType) {
+ public void readProperty(final ODataRequest request, ODataResponse response, final UriInfo uriInfo,
+ final ContentType contentType) throws ODataApplicationException, SerializerException {
+ validateOptions(uriInfo.asUriInfoResource());
- if (!validateOptions(uriInfo.asUriInfoResource())) {
- response.setStatusCode(HttpStatusCode.NOT_IMPLEMENTED.getStatusCode());
- return;
- }
- try {
- final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
- final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
- if (entity == null) {
+ final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
+ final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
+ if (entity == null) {
+ throw new ODataApplicationException("Nothing found.", HttpStatusCode.NOT_FOUND.getStatusCode(), Locale.ROOT);
+ } else {
+ final UriResourceProperty uriProperty = (UriResourceProperty) uriInfo
+ .getUriResourceParts().get(uriInfo.getUriResourceParts().size() - 1);
+ final EdmProperty edmProperty = uriProperty.getProperty();
+ final Property property = entity.getProperty(edmProperty.getName());
+ if (property == null) {
response.setStatusCode(HttpStatusCode.NOT_FOUND.getStatusCode());
} else {
- UriResourceProperty uriProperty = (UriResourceProperty) uriInfo
- .getUriResourceParts().get(uriInfo.getUriResourceParts().size() - 1);
- EdmProperty edmProperty = uriProperty.getProperty();
- Property property = entity.getProperty(edmProperty.getName());
- if (property == null) {
- response.setStatusCode(HttpStatusCode.NOT_FOUND.getStatusCode());
+ if (property.getValue() == null) {
+ response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
} else {
- if (property.getValue() == null) {
- response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
- } else {
- final ODataFormat format = ODataFormat.fromContentType(contentType);
- ODataSerializer serializer = odata.createSerializer(format);
- response.setContent(serializer.entityProperty(edmProperty, property,
- ODataSerializerOptions.with()
- .contextURL(format == ODataFormat.JSON_NO_METADATA ? null :
- getContextUrl(serializer, edmEntitySet, true, null, null, edmProperty.getName()))
- .build()));
- response.setStatusCode(HttpStatusCode.OK.getStatusCode());
- response.setHeader(HttpHeader.CONTENT_TYPE, contentType.toContentTypeString());
- }
+ final ODataFormat format = ODataFormat.fromContentType(contentType);
+ ODataSerializer serializer = odata.createSerializer(format);
+ response.setContent(serializer.entityProperty(edmProperty, property,
+ ODataSerializerOptions.with()
+ .contextURL(format == ODataFormat.JSON_NO_METADATA ? null :
+ getContextUrl(serializer, edmEntitySet, true, null, null, edmProperty.getName()))
+ .build()));
+ response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+ response.setHeader(HttpHeader.CONTENT_TYPE, contentType.toContentTypeString());
}
}
- } catch (final DataProvider.DataProviderException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final SerializerException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final ODataApplicationException e) {
- response.setStatusCode(e.getStatusCode());
}
}
@Override
- public void readPropertyValue(ODataRequest request, ODataResponse response,
- UriInfo uriInfo, ContentType contentType) {
+ public void readPropertyValue(final ODataRequest request, ODataResponse response, final UriInfo uriInfo,
+ final ContentType contentType) throws ODataApplicationException, SerializerException {
+ validateOptions(uriInfo.asUriInfoResource());
- if (!validateOptions(uriInfo.asUriInfoResource())) {
- response.setStatusCode(HttpStatusCode.NOT_IMPLEMENTED.getStatusCode());
- return;
- }
- try {
- final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
- final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
- if (entity == null) {
- response.setStatusCode(HttpStatusCode.NOT_FOUND.getStatusCode());
+ final EdmEntitySet edmEntitySet = getEdmEntitySet(uriInfo.asUriInfoResource());
+ final Entity entity = readEntityInternal(uriInfo.asUriInfoResource(), edmEntitySet);
+ if (entity == null) {
+ response.setStatusCode(HttpStatusCode.NOT_FOUND.getStatusCode());
+ } else {
+ final UriResourceProperty uriProperty =
+ (UriResourceProperty) uriInfo.getUriResourceParts().get(uriInfo.getUriResourceParts().size() - 2);
+ final EdmProperty edmProperty = uriProperty.getProperty();
+ final Property property = entity.getProperty(edmProperty.getName());
+ if (property == null || property.getValue() == null) {
+ response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
} else {
- UriResourceProperty uriProperty = (UriResourceProperty) uriInfo
- .getUriResourceParts().get(uriInfo.getUriResourceParts().size() - 2);
- EdmProperty edmProperty = uriProperty.getProperty();
- Property property = entity.getProperty(edmProperty.getName());
- if (property == null || property.getValue() == null) {
- response.setStatusCode(HttpStatusCode.NO_CONTENT.getStatusCode());
- } else {
- final EdmPrimitiveType type = (EdmPrimitiveType) edmProperty.getType();
+ final EdmPrimitiveType type = (EdmPrimitiveType) edmProperty.getType();
+ try {
final String value = type.valueToString(property.getValue(),
- edmProperty.isNullable(), edmProperty.getMaxLength(),
- edmProperty.getPrecision(), edmProperty.getScale(), edmProperty.isUnicode());
+ edmProperty.isNullable(), edmProperty.getMaxLength(),
+ edmProperty.getPrecision(), edmProperty.getScale(), edmProperty.isUnicode());
response.setContent(new ByteArrayInputStream(value.getBytes("UTF-8")));
- response.setStatusCode(HttpStatusCode.OK.getStatusCode());
- response.setHeader(HttpHeader.CONTENT_TYPE, ContentType.TEXT_PLAIN.toContentTypeString());
+ } catch (final EdmPrimitiveTypeException e) {
+ throw new ODataApplicationException("Error in value formatting.",
+ HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), Locale.ROOT, e);
+ } catch (final UnsupportedEncodingException e) {
+ throw new ODataApplicationException("Encoding exception.",
+ HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode(), Locale.ROOT, e);
}
+ response.setStatusCode(HttpStatusCode.OK.getStatusCode());
+ response.setHeader(HttpHeader.CONTENT_TYPE, ContentType.TEXT_PLAIN.toContentTypeString());
}
- } catch (final DataProvider.DataProviderException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final EdmPrimitiveTypeException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final UnsupportedEncodingException e) {
- response.setStatusCode(HttpStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
- } catch (final ODataApplicationException e) {
- response.setStatusCode(e.getStatusCode());
}
}
}