Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OLINGO-853: Correcting the encoding of datetime properties correctly to be used in a URI

This commit is contained in:
Ramesh Reddy 2016-01-21 13:13:37 -06:00
parent 8537f3a512
commit 03aa1d07d9
2 changed files with 37 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java
View File

@ -24,13 +24,17 @@ import org.apache.olingo.commons.api.data.ContextURL;
import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntitySet;
import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpHeader;
import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.commons.api.http.HttpStatusCode;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
import org.apache.olingo.commons.core.edm.primitivetype.EdmString;
import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.ODataApplicationException;
import org.apache.olingo.server.api.ODataLibraryException;
import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ODataResponse;
import org.apache.olingo.server.api.ODataServerError; import org.apache.olingo.server.api.ODataServerError;
import org.apache.olingo.server.api.ODataLibraryException;
import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.ServiceMetadata;
import org.apache.olingo.server.api.serializer.EntitySerializerOptions; import org.apache.olingo.server.api.serializer.EntitySerializerOptions;
import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.ODataSerializer;
@ -99,7 +103,12 @@ public class EntityResponse extends ServiceResponse {
// exception // exception
assert (entity != null); assert (entity != null);
String locationHeader = buildLocation(this.baseURL, entity, entitySet.getName(), entitySet.getEntityType()); String locationHeader;
try {
locationHeader = buildLocation(this.baseURL, entity, entitySet.getName(), entitySet.getEntityType());
} catch (EdmPrimitiveTypeException e) {
throw new SerializerException(e.getMessage(), e, SerializerException.MessageKeys.WRONG_PRIMITIVE_VALUE);
}
// Note that if media written just like Stream, but on entity URL // Note that if media written just like Stream, but on entity URL
@ -163,12 +172,20 @@ public class EntityResponse extends ServiceResponse {
close(); close();
} }
public static String buildLocation(String baseURL, Entity entity, String enitySetName, EdmEntityType type) { public static String buildLocation(String baseURL, Entity entity, String enitySetName, EdmEntityType type)
throws EdmPrimitiveTypeException {
StringBuilder location = new StringBuilder();
location.append(baseURL).append("/").append(enitySetName);
location.append(buildKeySegmentsURI(entity, type));
return location.toString();
}
public static String buildKeySegmentsURI(Entity entity, EdmEntityType type)
throws EdmPrimitiveTypeException {
StringBuilder location = new StringBuilder(); StringBuilder location = new StringBuilder();
location.append(baseURL).append("/").append(enitySetName).append("(");
int i = 0; int i = 0;
boolean usename = type.getKeyPredicateNames().size() > 1; boolean usename = type.getKeyPredicateNames().size() > 1;
location.append("(");
for (String key : type.getKeyPredicateNames()) { for (String key : type.getKeyPredicateNames()) {
if (i > 0) { if (i > 0) {
location.append(","); location.append(",");
@ -177,11 +194,19 @@ public class EntityResponse extends ServiceResponse {
if (usename) { if (usename) {
location.append(key).append("="); location.append(key).append("=");
} }
if (entity.getProperty(key).getType().equals("Edm.String")) { String propertyType = entity.getProperty(key).getType();
location.append("'").append(entity.getProperty(key).getValue().toString()).append("'"); Object propertyValue = entity.getProperty(key).getValue();
} else {
location.append(entity.getProperty(key).getValue().toString()); if(propertyType.startsWith("Edm.")) {
propertyType = propertyType.substring(4);
} }
EdmPrimitiveTypeKind kind = EdmPrimitiveTypeKind.valueOf(propertyType);
String value = EdmPrimitiveTypeFactory.getInstance(kind).valueToString(
propertyValue, true, 4000, 0, 0, true);
if (kind == EdmPrimitiveTypeKind.String) {
value = EdmString.getInstance().toUriLiteral(value);
}
location.append(value);
} }
location.append(")"); location.append(")");
return location.toString(); return location.toString();

4
lib/server-core-ext/src/test/java/org/apache/olingo/server/example/TripPinDataModel.java
View File

@ -625,8 +625,10 @@ public class TripPinDataModel {
} catch (URISyntaxException e) { } catch (URISyntaxException e) {
throw new ODataApplicationException("Failed to create ID for entity", 500, throw new ODataApplicationException("Failed to create ID for entity", 500,
Locale.getDefault()); Locale.getDefault());
} catch (EdmPrimitiveTypeException e) {
throw new ODataApplicationException("Failed to create ID for entity", 500,
Locale.getDefault());
} }
set.getEntities().add(copy); set.getEntities().add(copy);
return copy; return copy;
} }