[OLINGO-1176]OData V2.0: Improve Code Style
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
index 22a6434..5129e2e 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
@@ -39,7 +39,8 @@
PRECONDITION_FAILED(412, "Precondition Failed"), REQUEST_ENTITY_TOO_LARGE(413, "Request Entity Too Large"),
REQUEST_URI_TOO_LONG(414, "Request-URI Too Long"), UNSUPPORTED_MEDIA_TYPE(415, "Unsupported Media Type"),
REQUESTED_RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"),
- EXPECTATION_FAILED(417, "Expectation Failed"), UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"), PRECONDITION_REQUIRED(428, "Precondition Required"),
+ EXPECTATION_FAILED(417, "Expectation Failed"), UNPROCESSABLE_ENTITY(422, "Unprocessable Entity"),
+ PRECONDITION_REQUIRED(428, "Precondition Required"),
METHOD_FAILED(420, "Method Failed"),
INTERNAL_SERVER_ERROR(500, "Internal Server Error"), NOT_IMPLEMENTED(501, "Not Implemented"), BAD_GATEWAY(502,
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
index 8c5a240..0b31cfd 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
@@ -31,6 +31,7 @@
import org.apache.olingo.odata2.api.edm.Edm;
import org.apache.olingo.odata2.api.edm.EdmEntitySet;
import org.apache.olingo.odata2.api.edm.EdmException;
+import org.apache.olingo.odata2.api.edm.EdmFacets;
import org.apache.olingo.odata2.api.edm.EdmLiteralKind;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
@@ -170,9 +171,11 @@
final EntityPropertyInfo propertyInfo = getValidatedPropertyInfo(eia, tagName);
final Class<?> typeMapping = typeMappings.getMappingClass(propertyInfo.getName());
final EdmSimpleType type = (EdmSimpleType) propertyInfo.getType();
+ final Class<?> typeMappingClass = typeMapping == null ? type.getDefaultType() : (Class<?>) typeMapping;
+ final EdmFacets facets = readProperties == null || readProperties.isValidatingFacets() ?
+ propertyInfo.getFacets() : null;
final Object value = type.valueOfString(text, EdmLiteralKind.DEFAULT,
- readProperties == null || readProperties.isValidatingFacets() ? propertyInfo.getFacets() : null,
- typeMapping == null ? type.getDefaultType() : typeMapping);
+ facets, typeMappingClass);
properties.put(tagName, value);
}
}
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
index 557191c..d9f1c32 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
@@ -203,8 +203,10 @@
private Object convert(final EntityPropertyInfo property, final String value, final Class<?> typeMapping,
final EntityProviderReadProperties readProperties) throws EdmSimpleTypeException {
final EdmSimpleType type = (EdmSimpleType) property.getType();
- return type.valueOfString(value, EdmLiteralKind.DEFAULT,
- readProperties == null || readProperties.isValidatingFacets() ? property.getFacets() : null,
- typeMapping == null ? type.getDefaultType() : typeMapping);
+ final Class<?> typeMappingClass = typeMapping == null ? type.getDefaultType() : (Class<?>) typeMapping;
+ final EdmFacets facets = readProperties == null || readProperties.isValidatingFacets() ?
+ property.getFacets() : null;
+ return type.valueOfString(value, EdmLiteralKind.DEFAULT,
+ facets, typeMappingClass);
}
}
