Repository: olingo-odata4 Updated Branches: refs/heads/master e981aaad7 -> 93992f913
Misc: fixing the critical errors reported by Apache Analysis tool Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/93992f91 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/93992f91 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/93992f91 Branch: refs/heads/master Commit: 93992f9135a7ef9512869d0a38817e987bbe863f Parents: e981aaa Author: Ramesh Reddy <[email protected]> Authored: Wed Sep 9 10:08:03 2015 -0500 Committer: Ramesh Reddy <[email protected]> Committed: Wed Sep 9 10:08:03 2015 -0500 ---------------------------------------------------------------------- .../olingo/server/core/requests/DataRequest.java | 2 +- .../olingo/server/core/responses/EntityResponse.java | 15 ++++++++------- .../core/deserializer/xml/ODataXmlDeserializer.java | 6 ++---- .../core/serializer/xml/ODataXmlSerializer.java | 11 +++-------- 4 files changed, 14 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/93992f91/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java index 2966d86..da177bb 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/requests/DataRequest.java @@ -714,7 +714,7 @@ public class DataRequest extends ServiceRequest { break; } } catch (IOException e) { - new DeserializerException("Error reading raw value", + throw new DeserializerException("Error reading raw value", SerializerException.MessageKeys.IO_EXCEPTION); } } while (true); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/93992f91/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java index 2a49d92..9ac10ac 100644 --- a/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java +++ b/lib/server-core-ext/src/main/java/org/apache/olingo/server/core/responses/EntityResponse.java @@ -164,25 +164,26 @@ public class EntityResponse extends ServiceResponse { } public static String buildLocation(String baseURL, Entity entity, String enitySetName, EdmEntityType type) { - String location = baseURL + "/" + enitySetName + "("; + StringBuilder location = new StringBuilder(); + location.append(baseURL).append("/").append(enitySetName).append("("); int i = 0; boolean usename = type.getKeyPredicateNames().size() > 1; for (String key : type.getKeyPredicateNames()) { if (i > 0) { - location += ","; + location.append(","); } i++; if (usename) { - location += (key + "="); + location.append(key).append("="); } if (entity.getProperty(key).getType().equals("Edm.String")) { - location = location + "'" + entity.getProperty(key).getValue().toString() + "'"; + location.append("'").append(entity.getProperty(key).getValue().toString()).append("'"); } else { - location = location + entity.getProperty(key).getValue().toString(); + location.append(entity.getProperty(key).getValue().toString()); } } - location += ")"; - return location; + location.append(")"); + return location.toString(); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/93992f91/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializer.java index 241f32d..f8149de 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/xml/ODataXmlDeserializer.java @@ -159,9 +159,8 @@ public class ODataXmlDeserializer implements ODataDeserializer { values.add(complex(reader, event.asStartElement(), (EdmComplexType) edmType)); } else if (edmType instanceof EdmEnumType) { values.add(readEnum(reader, event.asStartElement())); - } else { - // do not add null or empty values } + // do not add null or empty values } if (event.isEndElement() && start.getName().equals(event.asEndElement().getName())) { @@ -247,9 +246,8 @@ public class ODataXmlDeserializer implements ODataDeserializer { } else if (edmType instanceof EdmEnumType) { valuable.setValue(ValueType.ENUM, readEnum(reader, start)); valuable.setType(edmType.getFullQualifiedName().getFullQualifiedNameAsString()); - } else { - // do not add null or empty values } + // do not add null or empty values } @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/93992f91/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java index 382ef6f..1ebd01a 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/ODataXmlSerializer.java @@ -588,18 +588,14 @@ public class ODataXmlSerializer extends AbstractODataSerializer { final ExpandOption innerExpand, final SelectOption innerSelect, final XMLStreamWriter writer) throws XMLStreamException, SerializerException { if (property.isCollection()) { - if (navigationLink == null || navigationLink.getInlineEntitySet() == null) { - // nothing to write. - } else { + if (navigationLink != null && navigationLink.getInlineEntitySet() != null) { writer.writeStartElement(ATOM, "feed", NS_ATOM); writeEntitySet(metadata, property.getType(), navigationLink.getInlineEntitySet(), innerExpand, innerSelect, writer); writer.writeEndElement(); } } else { - if (navigationLink == null || navigationLink.getInlineEntity() == null) { - // nothing to write - } else { + if (navigationLink != null && navigationLink.getInlineEntity() != null) { writeEntity(metadata, property.getType(), navigationLink.getInlineEntity(), null, innerExpand, innerSelect, writer, false); } @@ -756,9 +752,8 @@ public class ODataXmlSerializer extends AbstractODataSerializer { isNullable, maxLength, precision, scale, isUnicode); if (value == null) { writer.writeAttribute(DATA, NS_DATA, "null", "true"); - } else if (type == EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean)) { - writer.writeCharacters(value); } else if (type == EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte) + || type == EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean) || type == EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Decimal) || type == EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Double) || type == EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16)
