bug fix: error code and message not parsed. e.g of raw response:

lib/client-api/pom.xml

@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-lib</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.8.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

lib/client-core/pom.xml

@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-lib</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.8.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ClientPrimitiveValueImpl.java

@@ -56,7 +56,8 @@ public BuilderImpl setType(final EdmType type) {
 
     @Override
     public BuilderImpl setType(final EdmPrimitiveTypeKind type) {
-      if (type == EdmPrimitiveTypeKind.Stream) {
+    	// Ilya: throwing these exceptions from here doesn't make sense
+      /*if (type == EdmPrimitiveTypeKind.Stream) {
         throw new IllegalArgumentException(String.format(
                 "Cannot build a primitive value for %s", EdmPrimitiveTypeKind.Stream.toString()));
       }
@@ -66,7 +67,7 @@ public BuilderImpl setType(final EdmPrimitiveTypeKind type) {
                         + "An entity can declare a property to be of type Geometry. "
                         + "An instance of an entity MUST NOT have a value of type Geometry. "
                         + "Each value MUST be of some subtype.");
-      }
+      }*/
 
       instance.typeKind = type == null ? EdmPrimitiveTypeKind.String : type;
       instance.type = EdmPrimitiveTypeFactory.getInstance(instance.typeKind);

lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonDeserializer.java

@@ -155,7 +155,17 @@ private void clientLinks(final Map.Entry<String, JsonNode> field, final Linked l
       final Link link = new Link();
       link.setTitle(getTitle(field));
       link.setRel(Constants.NS_ASSOCIATION_LINK_REL + getTitle(field));
-      link.setHref(field.getValue().textValue());
+      if (field.getValue() instanceof ObjectNode) {
+    	  ObjectNode values = (ObjectNode)field.getValue();
+    	  JsonNode value = values.findValue(Constants.JSON_ASSOCIATION_LINK);
+    	  if (value!=null) {
+    		  link.setHref(value.textValue());
+    	  } else {
+        	  link.setHref(field.getValue().textValue());
+    	  }
+      } else {
+    	  link.setHref(field.getValue().textValue());
+      }
       link.setType(Constants.ASSOCIATION_LINK_TYPE);
       linked.getAssociationLinks().add(link);
 

lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonEntitySetDeserializer.java

@@ -20,6 +20,9 @@
 
 import java.io.IOException;
 import java.net.URI;
+import java.net.URL;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
@@ -60,16 +63,16 @@ protected ResWrap<EntityCollection> doDeserialize(final JsonParser parser) throw
 
     URI contextURL;
     if (tree.hasNonNull(Constants.JSON_CONTEXT)) {
-      contextURL = URI.create(tree.get(Constants.JSON_CONTEXT).textValue());
+      contextURL = getUri(tree.get(Constants.JSON_CONTEXT).textValue());
       tree.remove(Constants.JSON_CONTEXT);
     } else if (tree.hasNonNull(Constants.JSON_METADATA)) {
-      contextURL = URI.create(tree.get(Constants.JSON_METADATA).textValue());
+      contextURL = getUri(tree.get(Constants.JSON_METADATA).textValue());
       tree.remove(Constants.JSON_METADATA);
     } else {
       contextURL = null;
     }
     if (contextURL != null) {
-      entitySet.setBaseURI(URI.create(StringUtils.substringBefore(contextURL.toASCIIString(), Constants.METADATA)));
+      entitySet.setBaseURI(getUri(StringUtils.substringBefore(contextURL.toASCIIString(), Constants.METADATA)));
     }
 
     final String metadataETag;
@@ -85,11 +88,11 @@ protected ResWrap<EntityCollection> doDeserialize(final JsonParser parser) throw
       tree.remove(Constants.JSON_COUNT);
     }
     if (tree.hasNonNull(Constants.JSON_NEXT_LINK)) {
-      entitySet.setNext(URI.create(tree.get(Constants.JSON_NEXT_LINK).textValue()));
+      entitySet.setNext(getUri(tree.get(Constants.JSON_NEXT_LINK).textValue()));
       tree.remove(Constants.JSON_NEXT_LINK);
     }
     if (tree.hasNonNull(Constants.JSON_DELTA_LINK)) {
-      entitySet.setDeltaLink(URI.create(tree.get(Constants.JSON_DELTA_LINK).textValue()));
+      entitySet.setDeltaLink(getUri(tree.get(Constants.JSON_DELTA_LINK).textValue()));
       tree.remove(Constants.JSON_DELTA_LINK);
     }
 
@@ -121,12 +124,68 @@ protected ResWrap<EntityCollection> doDeserialize(final JsonParser parser) throw
 
         final ObjectNode opNode = (ObjectNode) tree.get(field.getKey());
         operation.setTitle(opNode.get(Constants.ATTR_TITLE).asText());
-        operation.setTarget(URI.create(opNode.get(Constants.ATTR_TARGET).asText()));
+        operation.setTarget(getUri(opNode.get(Constants.ATTR_TARGET).asText()));
         entitySet.getOperations().add(operation);
         toRemove.add(field.getKey());
       }
     }
     tree.remove(toRemove);
     return new ResWrap<>(contextURL, metadataETag, entitySet);
   }
+
+  private URI getUri(String str) throws IOException {
+    try {
+      URL url = new URL(str);
+      String scheme = url.getProtocol();
+      String host = url.getHost();
+      int port = url.getPort();
+      String path = url.getPath();
+      String baseUrl = scheme + "://" + host + (port != -1 ? ":" + port : "") + path;
+      String query = url.getQuery();
+      String anchor = StringUtils.substringAfterLast(str, "#");
+
+      if (query == null || query.isEmpty()) {
+        return URI.create(str);
+      }
+
+      StringBuilder fixedQuery = new StringBuilder();
+      for (String param : query.split("&")) {
+        int idx = param.indexOf('=');
+        if (idx > 0) {
+          String key = param.substring(0, idx);
+          String value = param.substring(idx + 1);
+
+          key = URLDecoder.decode(key, "UTF-8");
+          value = URLDecoder.decode(value, "UTF-8");
+
+          if (!key.startsWith("$")) {
+            key = "$" + key;
+          }
+
+          String encodedKey = URLEncoder.encode(key, "UTF-8").replace("+", "%20");
+          String encodedValue = URLEncoder.encode(value, "UTF-8").replace("+", "%20");
+
+          if (fixedQuery.length() > 0) {
+            fixedQuery.append("&");
+          }
+
+          fixedQuery.append(encodedKey).append("=").append(encodedValue);
+        } else {
+          String decoded = URLDecoder.decode(param, "UTF-8");
+          fixedQuery.append(URLEncoder.encode(decoded, "UTF-8").replace("+", "%20"));
+        }
+      }
+
+      if (StringUtils.isNotBlank(anchor)) {
+        anchor = URLDecoder.decode(anchor, "UTF-8");
+        String encodedAnchor = URLEncoder.encode(anchor, "UTF-8").replace("+", "%20");
+        fixedQuery.append("#").append(encodedAnchor);
+      }
+
+      return new URI(baseUrl + "?" + fixedQuery);
+
+    } catch (Exception e) {
+      throw new IOException("Failed to normalize URI: " + str, e);
+    }
+  }
 }

lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/JsonODataErrorDeserializer.java

@@ -34,54 +34,91 @@
 
 public class JsonODataErrorDeserializer extends JsonDeserializer {
 
-  public JsonODataErrorDeserializer(final boolean serverMode) {
-    super(serverMode);
-  }
+	public JsonODataErrorDeserializer(final boolean serverMode) {
+		super(serverMode);
+	}
 
-  protected ODataError doDeserialize(final JsonParser parser) throws IOException {
+	protected ODataError doDeserialize(final JsonParser parser) throws IOException {
 
-    final ODataError error = new ODataError();
+		final ODataError error = new ODataError();
 
-    final ObjectNode tree = parser.getCodec().readTree(parser);
-    if (tree.has(Constants.JSON_ERROR)) {
-      final JsonNode errorNode = tree.get(Constants.JSON_ERROR);
+		final ObjectNode tree = parser.getCodec().readTree(parser);
+		if (tree.has(Constants.JSON_ERROR)) {
+			final JsonNode errorNode = tree.get(Constants.JSON_ERROR);
 
-      if (errorNode.has(Constants.ERROR_CODE)) {
-        error.setCode(errorNode.get(Constants.ERROR_CODE).textValue());
-      }
-      if (errorNode.has(Constants.ERROR_MESSAGE)) {
-        final JsonNode message = errorNode.get(Constants.ERROR_MESSAGE);
-        if (message.isValueNode()) {
-          error.setMessage(message.textValue());
-        } else if (message.isObject()) {
-          error.setMessage(message.get(Constants.VALUE).asText());
-        }
-      }
-      if (errorNode.has(Constants.ERROR_TARGET)) {
-        error.setTarget(errorNode.get(Constants.ERROR_TARGET).textValue());
-      }
-      if (errorNode.hasNonNull(Constants.ERROR_DETAILS)) {
-        List<ODataErrorDetail> details = new ArrayList<>();
-        JsonODataErrorDetailDeserializer detailDeserializer = new JsonODataErrorDetailDeserializer(serverMode);
-        for (JsonNode jsonNode : errorNode.get(Constants.ERROR_DETAILS)) {
-          details.add(detailDeserializer.doDeserialize(jsonNode.traverse(parser.getCodec()))
-              .getPayload());
-        }
+			if (errorNode.has(Constants.ERROR_CODE)) {
+				error.setCode(errorNode.get(Constants.ERROR_CODE).textValue());
+			}
+			if (errorNode.has(Constants.ERROR_MESSAGE)) {
+				final JsonNode message = errorNode.get(Constants.ERROR_MESSAGE);
+				if (message.isValueNode()) {
+					error.setMessage(message.textValue());
+				} else if (message.isObject()) {
+					error.setMessage(message.get(Constants.VALUE).asText());
+				}
+			}
+			if (errorNode.has(Constants.ERROR_TARGET)) {
+				error.setTarget(errorNode.get(Constants.ERROR_TARGET).textValue());
+			}
+			if (errorNode.hasNonNull(Constants.ERROR_DETAILS)) {
+				List<ODataErrorDetail> details = new ArrayList<>();
+				JsonODataErrorDetailDeserializer detailDeserializer = 
+						new JsonODataErrorDetailDeserializer(serverMode);
+				for (JsonNode jsonNode : errorNode.get(Constants.ERROR_DETAILS)) {
+					details.add(detailDeserializer.doDeserialize(
+							jsonNode.traverse(parser.getCodec())).getPayload());
+				}
 
-        error.setDetails(details);
-      }
-      if (errorNode.hasNonNull(Constants.ERROR_INNERERROR)) {
-        HashMap<String, String> innerErrorMap = new HashMap<>();
-        final JsonNode innerError = errorNode.get(Constants.ERROR_INNERERROR);
-        for (final Iterator<String> itor = innerError.fieldNames(); itor.hasNext();) {
-          final String keyTmp = itor.next();
-          final String val = innerError.get(keyTmp).toString();
-          innerErrorMap.put(keyTmp, val);
-        }
-        error.setInnerError(innerErrorMap);
-      }
-    }
+				error.setDetails(details);
+			}
+			if (errorNode.hasNonNull(Constants.ERROR_INNERERROR)) {
+				HashMap<String, String> innerErrorMap = new HashMap<>();
+				final JsonNode innerError = errorNode.get(Constants.ERROR_INNERERROR);
+				for (final Iterator<String> itor = innerError.fieldNames(); itor.hasNext();) {
+					final String keyTmp = itor.next();
+					final String val = innerError.get(keyTmp).toString();
+					innerErrorMap.put(keyTmp, val);
+				}
+				error.setInnerError(innerErrorMap);
+			}
+		} else if (tree.has(Constants.ERROR_CODE)) {
+			if (tree.has(Constants.ERROR_CODE)) {
+				error.setCode(tree.get(Constants.ERROR_CODE).textValue());
+			}
+			if (tree.has(Constants.ERROR_MESSAGE)) {
+				final JsonNode message = tree.get(Constants.ERROR_MESSAGE);
+				if (message.isValueNode()) {
+					error.setMessage(message.textValue());
+				} else if (message.isObject()) {
+					error.setMessage(message.get(Constants.VALUE).asText());
+				}
+			}
+			if (tree.has(Constants.ERROR_TARGET)) {
+				error.setTarget(tree.get(Constants.ERROR_TARGET).textValue());
+			}
+			if (tree.hasNonNull(Constants.ERROR_DETAILS)) {
+				List<ODataErrorDetail> details = new ArrayList<>();
+				JsonODataErrorDetailDeserializer detailDeserializer = 
+						new JsonODataErrorDetailDeserializer(serverMode);
+				for (JsonNode jsonNode : tree.get(Constants.ERROR_DETAILS)) {
+					details.add(detailDeserializer.doDeserialize(
+							jsonNode.traverse(parser.getCodec())).getPayload());
+				}
 
-    return error;
-  }
+				error.setDetails(details);
+			}
+			if (tree.hasNonNull(Constants.ERROR_INNERERROR)) {
+				HashMap<String, String> innerErrorMap = new HashMap<>();
+				final JsonNode innerError = tree.get(Constants.ERROR_INNERERROR);
+				for (final Iterator<String> itor = innerError.fieldNames(); itor.hasNext();) {
+					final String keyTmp = itor.next();
+					final String val = innerError.get(keyTmp).toString();
+					innerErrorMap.put(keyTmp, val);
+				}
+				error.setInnerError(innerErrorMap);
+			}
+		}
+
+		return error;
+	}
 }

lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java

@@ -442,6 +442,9 @@ protected void odataNavigationLinks(final EdmType edmType,
       final Linked linked, final ClientLinked odataLinked, final String metadataETag, final URI base) {
     for (Link link : linked.getNavigationLinks()) {
       final String href = link.getHref();
+      if (href==null) {
+    	  continue; // @odata.nextLink is missing, ignore.
+      }
       final String title = link.getTitle();
       final Entity inlineEntity = link.getInlineEntity();
       final EntityCollection inlineEntitySet = link.getInlineEntitySet();
@@ -851,8 +854,9 @@ protected ClientValue getODataValue(FullQualifiedName type,
         value.asCollection().add(getODataValue(type, fake, contextURL, metadataETag));
       }
     } else if (valuable.isEnum()) {
+      Object enumValue = valuable.asEnum();
       value = client.getObjectFactory().newEnumValue(type == null ? null : type.toString(),
-          valuable.asEnum().toString());
+          enumValue==null? null: enumValue.toString());
     } else if (valuable.isComplex()) {
       final ClientComplexValue lcValue =
           client.getObjectFactory().newComplexValue(type == null ? null : type.toString());

lib/client-core/src/test/java/org/apache/olingo/client/core/EntityTest.java

@@ -363,7 +363,7 @@ private void annotated(final ContentType contentType) throws EdmPrimitiveTypeExc
     assertEquals("com.contoso.display.styleType", annotation.getValue().getTypeName());
     assertTrue(annotation.hasComplexValue());
     assertEquals(2,
-        annotation.getValue().asComplex().get("order").getPrimitiveValue().toCastValue(Integer.class), 0);
+        annotation.getValue().asComplex().get("order").getPrimitiveValue().toCastValue(Integer.class).intValue(), 0);
 
     final ClientEntity written = client.getBinder().getODataEntity(
         new ResWrap<Entity>((URI) null, null, client.getBinder().getEntity(entity)));

lib/commons-api/pom.xml

@@ -30,7 +30,7 @@
   <parent>
     <groupId>org.apache.olingo</groupId>
     <artifactId>odata-lib</artifactId>
-    <version>4.8.0-SNAPSHOT</version>
+    <version>4.8.1-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java

@@ -206,4 +206,6 @@ List<EdmFunction> getBoundFunctionsWithBindingType(FullQualifiedName bindingPara
    * @return {@link EdmAnnotations}
    */
   EdmAnnotations getAnnotationGroup(FullQualifiedName targetName, String qualifier);
+
+  EdmEntityType getEntityType(String name);
 }

lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java

@@ -38,4 +38,6 @@ public interface EdmAnnotatable {
    * @return list of all annotations
    */
   List<EdmAnnotation> getAnnotations();
+
+  EdmAnnotation getAnnotation(String termName);
 }

lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotation.java

@@ -25,6 +25,8 @@
  */
 public interface EdmAnnotation extends EdmAnnotatable {
 
+  String getTermAsString();
+
   /**
    * @return the term of this annotation
    */
@@ -36,4 +38,6 @@ public interface EdmAnnotation extends EdmAnnotatable {
   String getQualifier();
 
   EdmExpression getExpression();
+
+  String getExpressionAsString();
 }

lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java

@@ -61,4 +61,8 @@ public interface EdmEntityType extends EdmStructuredType {
    */
   @Override
   EdmEntityType getBaseType();
+
+  String getPrimaryKey();
+
+  String getLabel();
 }

lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMember.java

@@ -27,4 +27,6 @@ public interface EdmMember extends EdmNamed, EdmAnnotatable {
    * @return value of this member as string
    */
   String getValue();
+
+  String getLabel();
 }