You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/04/30 17:02:56 UTC
[43/50] [abbrv] olingo-odata4 git commit: [OLINGO-564] first step for
common -> client extraction
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
index 9977b06..1047bdf 100755
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java
@@ -43,9 +43,8 @@ import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.data.Valuable;
import org.apache.olingo.commons.api.data.ValueType;
-import org.apache.olingo.commons.api.domain.ClientError;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
-import org.apache.olingo.commons.api.domain.ClientPropertyType;
+import org.apache.olingo.commons.api.domain.ODataError;
+import org.apache.olingo.commons.api.domain.ODataPropertyType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
@@ -100,11 +99,11 @@ public class JsonDeserializer implements ODataDeserializer {
JsonEntityDeserializer entityDeserializer = new JsonEntityDeserializer(serverMode);
if (inline instanceof ObjectNode) {
- link.setType(ClientLinkType.ENTITY_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_NAVIGATION_LINK_TYPE);
link.setInlineEntity(entityDeserializer.doDeserialize(inline.traverse(codec)).getPayload());
} else if (inline instanceof ArrayNode) {
- link.setType(ClientLinkType.ENTITY_SET_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_SET_NAVIGATION_LINK_TYPE);
final EntityCollection entitySet = new EntityCollection();
for (final Iterator<JsonNode> entries = inline.elements(); entries.hasNext();) {
@@ -136,7 +135,7 @@ public class JsonDeserializer implements ODataDeserializer {
if (field.getValue().isValueNode()) {
link.setHref(field.getValue().textValue());
- link.setType(ClientLinkType.ENTITY_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_NAVIGATION_LINK_TYPE);
}
linked.getNavigationLinks().add(link);
@@ -148,7 +147,7 @@ public class JsonDeserializer implements ODataDeserializer {
link.setTitle(getTitle(field));
link.setRel(Constants.NS_ASSOCIATION_LINK_REL + getTitle(field));
link.setHref(field.getValue().textValue());
- link.setType(ClientLinkType.ASSOCIATION.toString());
+ link.setType(Constants.ASSOCIATION_LINK_TYPE);
linked.getAssociationLinks().add(link);
toRemove.add(field.getKey());
@@ -168,7 +167,7 @@ public class JsonDeserializer implements ODataDeserializer {
link.setTitle(getTitle(field));
link.setRel(Constants.NS_NAVIGATION_LINK_REL + getTitle(field));
link.setHref(field.getValue().textValue());
- link.setType(ClientLinkType.ENTITY_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_NAVIGATION_LINK_TYPE);
linked.getNavigationLinks().add(link);
toRemove.add(setInline(field.getKey(), suffix, tree, codec, link));
@@ -180,7 +179,7 @@ public class JsonDeserializer implements ODataDeserializer {
link.setTitle(getTitle(field));
link.setRel(Constants.NS_NAVIGATION_LINK_REL + getTitle(field));
link.setHref(node.asText());
- link.setType(ClientLinkType.ENTITY_SET_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_SET_NAVIGATION_LINK_TYPE);
linked.getNavigationLinks().add(link);
toRemove.add(setInline(field.getKey(), Constants.JSON_BIND_LINK_SUFFIX, tree, codec, link));
}
@@ -189,32 +188,32 @@ public class JsonDeserializer implements ODataDeserializer {
}
}
- private Map.Entry<ClientPropertyType, EdmTypeInfo> guessPropertyType(final JsonNode node) {
- ClientPropertyType type;
+ private Map.Entry<ODataPropertyType, EdmTypeInfo> guessPropertyType(final JsonNode node) {
+ ODataPropertyType type;
String typeExpression = null;
if (node.isValueNode() || node.isNull()) {
- type = ClientPropertyType.PRIMITIVE;
+ type = ODataPropertyType.PRIMITIVE;
typeExpression = guessPrimitiveTypeKind(node).getFullQualifiedName().toString();
} else if (node.isArray()) {
- type = ClientPropertyType.COLLECTION;
+ type = ODataPropertyType.COLLECTION;
if (node.has(0) && node.get(0).isValueNode()) {
typeExpression = "Collection(" + guessPrimitiveTypeKind(node.get(0)) + ')';
}
} else if (node.isObject()) {
if (node.has(Constants.ATTR_TYPE)) {
- type = ClientPropertyType.PRIMITIVE;
+ type = ODataPropertyType.PRIMITIVE;
typeExpression = "Edm.Geography" + node.get(Constants.ATTR_TYPE).asText();
} else {
- type = ClientPropertyType.COMPLEX;
+ type = ODataPropertyType.COMPLEX;
}
} else {
- type = ClientPropertyType.EMPTY;
+ type = ODataPropertyType.EMPTY;
}
final EdmTypeInfo typeInfo = typeExpression == null ? null :
new EdmTypeInfo.Builder().setTypeExpression(typeExpression).build();
- return new SimpleEntry<ClientPropertyType, EdmTypeInfo>(type, typeInfo);
+ return new SimpleEntry<ODataPropertyType, EdmTypeInfo>(type, typeInfo);
}
private EdmPrimitiveTypeKind guessPrimitiveTypeKind(final JsonNode node) {
@@ -337,15 +336,15 @@ public class JsonDeserializer implements ODataDeserializer {
EdmTypeInfo typeInfo = StringUtils.isBlank(valuable.getType()) ? null
: new EdmTypeInfo.Builder().setTypeExpression(valuable.getType()).build();
- final Map.Entry<ClientPropertyType, EdmTypeInfo> guessed = guessPropertyType(node);
+ final Map.Entry<ODataPropertyType, EdmTypeInfo> guessed = guessPropertyType(node);
if (typeInfo == null) {
typeInfo = guessed.getValue();
}
- final ClientPropertyType propType = typeInfo == null ? guessed.getKey()
- : typeInfo.isCollection() ? ClientPropertyType.COLLECTION
- : typeInfo.isPrimitiveType() ? ClientPropertyType.PRIMITIVE
- : node.isValueNode() ? ClientPropertyType.ENUM : ClientPropertyType.COMPLEX;
+ final ODataPropertyType propType = typeInfo == null ? guessed.getKey()
+ : typeInfo.isCollection() ? ODataPropertyType.COLLECTION
+ : typeInfo.isPrimitiveType() ? ODataPropertyType.PRIMITIVE
+ : node.isValueNode() ? ODataPropertyType.ENUM : ODataPropertyType.COMPLEX;
switch (propType) {
case COLLECTION:
@@ -411,7 +410,7 @@ public class JsonDeserializer implements ODataDeserializer {
}
@Override
- public ClientError toError(final InputStream input) throws ODataDeserializerException {
+ public ODataError toError(final InputStream input) throws ODataDeserializerException {
try {
parser = new JsonFactory(new ObjectMapper()).createParser(input);
return new JsonODataErrorDeserializer(serverMode).doDeserialize(parser);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
index 47a2598..248f425 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
@@ -34,9 +34,8 @@ import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.Annotation;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.Link;
+import org.apache.olingo.commons.api.data.Operation;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
-import org.apache.olingo.commons.api.domain.ClientOperation;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
@@ -154,7 +153,7 @@ public class JsonEntityDeserializer extends JsonDeserializer {
link.setTitle(getTitle(field));
link.setRel(Constants.NS_MEDIA_EDIT_LINK_REL + getTitle(field));
link.setHref(field.getValue().textValue());
- link.setType(ClientLinkType.MEDIA_EDIT.toString());
+ link.setType(Constants.MEDIA_EDIT_LINK_TYPE);
entity.getMediaEditLinks().add(link);
if (tree.has(link.getTitle() + getJSONAnnotation(Constants.JSON_MEDIA_ETAG))) {
@@ -174,7 +173,7 @@ public class JsonEntityDeserializer extends JsonDeserializer {
}
toRemove.add(field.getKey());
} else if (field.getKey().charAt(0) == '#') {
- final ClientOperation operation = new ClientOperation();
+ final Operation operation = new Operation();
operation.setMetadataAnchor(field.getKey());
final ObjectNode opNode = (ObjectNode) tree.get(field.getKey());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java
index 9f58664..8a6030d 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java
@@ -25,9 +25,9 @@ import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.Annotation;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.Link;
+import org.apache.olingo.commons.api.data.Operation;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ClientOperation;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
@@ -122,7 +122,7 @@ public class JsonEntitySerializer extends JsonSerializer {
}
if (serverMode) {
- for (ClientOperation operation : entity.getOperations()) {
+ for (Operation operation : entity.getOperations()) {
jgen.writeObjectFieldStart("#" + StringUtils.substringAfterLast(operation.getMetadataAnchor(), "#"));
jgen.writeStringField(Constants.ATTR_TITLE, operation.getTitle());
jgen.writeStringField(Constants.ATTR_TARGET, operation.getTarget().toASCIIString());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java
index 9e225ad..89252dc 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java
@@ -25,8 +25,8 @@ import java.util.Iterator;
import java.util.List;
import org.apache.olingo.commons.api.Constants;
-import org.apache.olingo.commons.api.domain.ClientError;
-import org.apache.olingo.commons.api.domain.ClientErrorDetail;
+import org.apache.olingo.commons.api.domain.ODataError;
+import org.apache.olingo.commons.api.domain.ODataErrorDetail;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.JsonNode;
@@ -38,9 +38,9 @@ public class JsonODataErrorDeserializer extends JsonDeserializer {
super(serverMode);
}
- protected ClientError doDeserialize(final JsonParser parser) throws IOException {
+ protected ODataError doDeserialize(final JsonParser parser) throws IOException {
- final ClientError error = new ClientError();
+ final ODataError error = new ODataError();
final ObjectNode tree = parser.getCodec().readTree(parser);
if (tree.has(Constants.JSON_ERROR)) {
@@ -61,7 +61,7 @@ public class JsonODataErrorDeserializer extends JsonDeserializer {
error.setTarget(errorNode.get(Constants.ERROR_TARGET).textValue());
}
if (errorNode.hasNonNull(Constants.ERROR_DETAILS)) {
- List<ClientErrorDetail> details = new ArrayList<ClientErrorDetail>();
+ List<ODataErrorDetail> details = new ArrayList<ODataErrorDetail>();
JsonODataErrorDetailDeserializer detailDeserializer = new JsonODataErrorDetailDeserializer(serverMode);
for (JsonNode jsonNode : errorNode.get(Constants.ERROR_DETAILS)) {
details.add(detailDeserializer.doDeserialize(jsonNode.traverse(parser.getCodec()))
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java
index 0b5cddb..138bad3 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java
@@ -23,7 +23,7 @@ import java.net.URI;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.ResWrap;
-import org.apache.olingo.commons.api.domain.ClientErrorDetail;
+import org.apache.olingo.commons.api.domain.ODataErrorDetail;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.databind.JsonNode;
@@ -34,9 +34,9 @@ public class JsonODataErrorDetailDeserializer extends JsonDeserializer {
super(serverMode);
}
- protected ResWrap<ClientErrorDetail> doDeserialize(final JsonParser parser) throws IOException {
+ protected ResWrap<ODataErrorDetail> doDeserialize(final JsonParser parser) throws IOException {
- final ClientErrorDetail error = new ClientErrorDetail();
+ final ODataErrorDetail error = new ODataErrorDetail();
final JsonNode errorNode = parser.getCodec().readTree(parser);
if (errorNode.has(Constants.ERROR_CODE)) {
error.setCode(errorNode.get(Constants.ERROR_CODE).textValue());
@@ -53,6 +53,6 @@ public class JsonODataErrorDetailDeserializer extends JsonDeserializer {
error.setTarget(errorNode.get(Constants.ERROR_TARGET).textValue());
}
- return new ResWrap<ClientErrorDetail>((URI) null, null, error);
+ return new ResWrap<ODataErrorDetail>((URI) null, null, error);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
index 2eae519..727e03e 100755
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java
@@ -40,7 +40,6 @@ import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.data.Valuable;
import org.apache.olingo.commons.api.data.ValueType;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -157,14 +156,7 @@ public class JsonSerializer implements ODataSerializer {
valuable(jgen, annotation, link.getTitle() + "@" + annotation.getTerm());
}
- ClientLinkType type = null;
- try {
- type = ClientLinkType.fromString(link.getRel(), link.getType());
- } catch (IllegalArgumentException e) {
- // ignore
- }
-
- if (type == ClientLinkType.ENTITY_SET_NAVIGATION) {
+ if (isEntitySetNavigation(link)) {
final List<String> uris;
if (entitySetLinks.containsKey(link.getTitle())) {
uris = entitySetLinks.get(link.getTitle());
@@ -204,6 +196,10 @@ public class JsonSerializer implements ODataSerializer {
}
}
+ private boolean isEntitySetNavigation(Link link) {
+ return Constants.ENTITY_SET_NAVIGATION_LINK_TYPE.equals(link.getType());
+ }
+
protected void serverLinks(final Linked linked, final JsonGenerator jgen)
throws IOException, EdmPrimitiveTypeException {
if (linked instanceof Entity) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java
index f64f0d0..6bbde22 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java
@@ -22,13 +22,13 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
-import org.apache.olingo.commons.api.domain.ClientError;
-import org.apache.olingo.commons.api.domain.ClientErrorDetail;
+import org.apache.olingo.commons.api.domain.ODataError;
+import org.apache.olingo.commons.api.domain.ODataErrorDetail;
/**
* Server error.
*/
-public class ClientServerError extends ClientError {
+public class ClientServerError extends ODataError {
private Exception exception;
private int statusCode;
@@ -121,7 +121,7 @@ public class ClientServerError extends ClientError {
* Sets error details.
* @return this for method chaining.
*/
- public ClientServerError setDetails(List<ClientErrorDetail> details) {
+ public ClientServerError setDetails(List<ODataErrorDetail> details) {
super.setDetails(details);
return this;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ResponseUtil.java
----------------------------------------------------------------------
diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ResponseUtil.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ResponseUtil.java
index e20299a..0cc16a0 100644
--- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ResponseUtil.java
+++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/ResponseUtil.java
@@ -22,13 +22,13 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.ComplexValue;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ValueType;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
public class ResponseUtil {
public static Property createPrimitive(final String name, final String type, final Object value) {
@@ -62,7 +62,7 @@ public class ResponseUtil {
Link link = entity.getNavigationLink(navigationPropertyName);
if (link == null) {
link = new Link();
- link.setType(ClientLinkType.ENTITY_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_NAVIGATION_LINK_TYPE);
link.setTitle(navigationPropertyName);
entity.getNavigationLinks().add(link);
}
@@ -73,7 +73,7 @@ public class ResponseUtil {
Link link = entity.getNavigationLink(navigationPropertyName);
if (link == null) {
link = new Link();
- link.setType(ClientLinkType.ENTITY_SET_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_SET_NAVIGATION_LINK_TYPE);
link.setTitle(navigationPropertyName);
EntityCollection target = new EntityCollection();
target.getEntities().addAll(Arrays.asList(targets));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
index e6ab0c9..5bbbcff 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializer.java
@@ -37,7 +37,6 @@ import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Parameter;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ValueType;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
import org.apache.olingo.commons.api.edm.EdmAction;
import org.apache.olingo.commons.api.edm.EdmComplexType;
import org.apache.olingo.commons.api.edm.EdmEntityType;
@@ -358,14 +357,14 @@ public class ODataJsonDeserializer implements ODataDeserializer {
final ExpandTreeBuilder childExpandBuilder = (expandBuilder != null) ?
expandBuilder.expand(edmNavigationProperty) : null;
if (jsonNode.isArray() && edmNavigationProperty.isCollection()) {
- link.setType(ClientLinkType.ENTITY_SET_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_SET_NAVIGATION_LINK_TYPE);
EntityCollection inlineEntitySet = new EntityCollection();
inlineEntitySet.getEntities().addAll(consumeEntitySetArray(edmNavigationProperty.getType(), jsonNode,
childExpandBuilder));
link.setInlineEntitySet(inlineEntitySet);
} else if (!jsonNode.isArray() && (!jsonNode.isValueNode() || jsonNode.isNull())
&& !edmNavigationProperty.isCollection()) {
- link.setType(ClientLinkType.ENTITY_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_NAVIGATION_LINK_TYPE);
if (!jsonNode.isNull()) {
Entity inlineEntity = consumeEntityNode(edmNavigationProperty.getType(), (ObjectNode) jsonNode,
childExpandBuilder);
@@ -409,7 +408,7 @@ public class ODataJsonDeserializer implements ODataDeserializer {
}
bindingLinkStrings.add(arrayValue.asText());
}
- bindingLink.setType(ClientLinkType.ENTITY_COLLECTION_BINDING.toString());
+ bindingLink.setType(Constants.ENTITY_COLLECTION_BINDING_LINK_TYPE);
bindingLink.setBindingLinks(bindingLinkStrings);
} else {
assertIsNullNode(key, jsonNode);
@@ -418,7 +417,7 @@ public class ODataJsonDeserializer implements ODataDeserializer {
DeserializerException.MessageKeys.INVALID_ANNOTATION_TYPE, key);
}
bindingLink.setBindingLink(jsonNode.asText());
- bindingLink.setType(ClientLinkType.ENTITY_BINDING.toString());
+ bindingLink.setType(Constants.ENTITY_BINDING_LINK_TYPE);
}
return bindingLink;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java
index 354c811..14381bb 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java
@@ -21,15 +21,15 @@ package org.apache.olingo.server.core.serializer.json;
import java.io.IOException;
import org.apache.olingo.commons.api.Constants;
-import org.apache.olingo.commons.api.domain.ClientError;
-import org.apache.olingo.commons.api.domain.ClientErrorDetail;
+import org.apache.olingo.commons.api.domain.ODataError;
+import org.apache.olingo.commons.api.domain.ODataErrorDetail;
import org.apache.olingo.server.api.serializer.SerializerException;
import com.fasterxml.jackson.core.JsonGenerator;
public class ODataErrorSerializer {
- public void writeErrorDocument(JsonGenerator json, final ClientError error)
+ public void writeErrorDocument(JsonGenerator json, final ODataError error)
throws IOException, SerializerException {
if (error == null) {
throw new SerializerException("ODataError object MUST NOT be null!",
@@ -43,7 +43,7 @@ public class ODataErrorSerializer {
if (error.getDetails() != null) {
json.writeArrayFieldStart(Constants.ERROR_DETAILS);
- for (ClientErrorDetail detail : error.getDetails()) {
+ for (ODataErrorDetail detail : error.getDetails()) {
json.writeStartObject();
writeODataError(json, detail.getCode(), detail.getMessage(), detail.getTarget());
json.writeEndObject();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java
index c30a719..adf0eb4 100644
--- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java
+++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.IOUtils;
-import org.apache.olingo.commons.api.domain.ClientErrorDetail;
+import org.apache.olingo.commons.api.domain.ODataErrorDetail;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.server.api.OData;
import org.apache.olingo.server.api.ClientServerError;
@@ -83,7 +83,7 @@ public class ClientErrorSerializerTest {
@Test
public void emptyDetailsList() throws Exception {
ClientServerError error = new ClientServerError();
- error.setMessage("ErrorMessage").setDetails(new ArrayList<ClientErrorDetail>());
+ error.setMessage("ErrorMessage").setDetails(new ArrayList<ODataErrorDetail>());
InputStream stream = ser.error(error).getContent();
String jsonString = IOUtils.toString(stream);
assertEquals("{\"error\":{\"code\":null,\"message\":\"ErrorMessage\",\"details\":[]}}", jsonString);
@@ -99,8 +99,8 @@ public class ClientErrorSerializerTest {
@Test
public void singleDetailNothingSet() throws Exception {
- List<ClientErrorDetail> details = new ArrayList<ClientErrorDetail>();
- details.add(new ClientErrorDetail());
+ List<ODataErrorDetail> details = new ArrayList<ODataErrorDetail>();
+ details.add(new ODataErrorDetail());
ClientServerError error = new ClientServerError().setDetails(details);
InputStream stream = ser.error(error).getContent();
String jsonString = IOUtils.toString(stream);
@@ -110,8 +110,8 @@ public class ClientErrorSerializerTest {
@Test
public void verifiedWithJacksonParser() throws Exception {
- List<ClientErrorDetail> details = new ArrayList<ClientErrorDetail>();
- details.add(new ClientErrorDetail().setCode("detailCode").setMessage("detailMessage").setTarget("detailTarget"));
+ List<ODataErrorDetail> details = new ArrayList<ODataErrorDetail>();
+ details.add(new ODataErrorDetail().setCode("detailCode").setMessage("detailMessage").setTarget("detailTarget"));
ClientServerError error =
new ClientServerError().setCode("Code").setMessage("Message").setTarget("Target").setDetails(details);
InputStream stream = ser.error(error).getContent();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
index 452e529..db0b7ac 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataCreator.java
@@ -29,13 +29,13 @@ import java.util.Map;
import java.util.TimeZone;
import java.util.UUID;
+import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.ComplexValue;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.EntityCollection;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ValueType;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
public class DataCreator {
@@ -628,7 +628,7 @@ public class DataCreator {
Link link = entity.getNavigationLink(navigationPropertyName);
if (link == null) {
link = new Link();
- link.setType(ClientLinkType.ENTITY_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_NAVIGATION_LINK_TYPE);
link.setTitle(navigationPropertyName);
entity.getNavigationLinks().add(link);
}
@@ -639,7 +639,7 @@ public class DataCreator {
Link link = entity.getNavigationLink(navigationPropertyName);
if (link == null) {
link = new Link();
- link.setType(ClientLinkType.ENTITY_SET_NAVIGATION.toString());
+ link.setType(Constants.ENTITY_SET_NAVIGATION_LINK_TYPE);
link.setTitle(navigationPropertyName);
EntityCollection target = new EntityCollection();
target.getEntities().addAll(Arrays.asList(targets));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java
index 192f9b7..bcacb3a 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataDeserializerDeepInsertTest.java
@@ -25,9 +25,9 @@ import static org.junit.Assert.assertNull;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.Link;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ODataFormat;
@@ -46,7 +46,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe
assertNotNull(navigationLink);
assertEquals("NavPropertyETTwoPrimOne", navigationLink.getTitle());
- assertEquals(ClientLinkType.ENTITY_NAVIGATION.toString(), navigationLink.getType());
+ assertEquals(Constants.ENTITY_NAVIGATION_LINK_TYPE, navigationLink.getType());
assertNotNull(navigationLink.getInlineEntity());
assertNull(navigationLink.getInlineEntitySet());
}
@@ -68,7 +68,7 @@ public class ODataDeserializerDeepInsertTest extends AbstractODataDeserializerTe
assertNotNull(navigationLink);
assertEquals("NavPropertyETTwoPrimMany", navigationLink.getTitle());
- assertEquals(ClientLinkType.ENTITY_SET_NAVIGATION.toString(), navigationLink.getType());
+ assertEquals(Constants.ENTITY_SET_NAVIGATION_LINK_TYPE, navigationLink.getType());
assertNull(navigationLink.getInlineEntity());
assertNotNull(navigationLink.getInlineEntitySet());
assertEquals(1, navigationLink.getInlineEntitySet().getEntities().size());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/17152920/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java
index 7886fbc..cd3c710 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/deserializer/json/ODataJsonDeserializerEntityTest.java
@@ -35,12 +35,12 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
+import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.data.ComplexValue;
import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.Link;
import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ValueType;
-import org.apache.olingo.commons.api.domain.ClientLinkType;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmProperty;
@@ -474,7 +474,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
assertNotNull(bindingToOne);
assertEquals("NavPropertyETTwoPrimOne", bindingToOne.getTitle());
assertEquals("ESTwoPrim(2)", bindingToOne.getBindingLink());
- assertEquals(ClientLinkType.ENTITY_BINDING.toString(), bindingToOne.getType());
+ assertEquals(Constants.ENTITY_BINDING_LINK_TYPE, bindingToOne.getType());
assertTrue(bindingToOne.getBindingLinks().isEmpty());
assertNull(bindingToOne.getHref());
assertNull(bindingToOne.getRel());
@@ -484,7 +484,7 @@ public class ODataJsonDeserializerEntityTest extends AbstractODataDeserializerTe
assertEquals("NavPropertyETTwoPrimMany", bindingToMany.getTitle());
assertNotNull(bindingToMany.getBindingLinks());
assertEquals(2, bindingToMany.getBindingLinks().size());
- assertEquals(ClientLinkType.ENTITY_COLLECTION_BINDING.toString(), bindingToMany.getType());
+ assertEquals(Constants.ENTITY_COLLECTION_BINDING_LINK_TYPE, bindingToMany.getType());
assertNull(bindingToMany.getBindingLink());
assertNull(bindingToMany.getHref());
assertNull(bindingToMany.getRel());