You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/05/12 10:39:08 UTC
[33/50] [abbrv] git commit: Fixing timezone issues with proxy
Fixing timezone issues with proxy
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/e5cfd8eb
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/e5cfd8eb
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/e5cfd8eb
Branch: refs/heads/olingo274
Commit: e5cfd8eb13a57aa39c43337888f35ca45437c87c
Parents: bc0a8d9
Author: Francesco Chicchiriccò <--global>
Authored: Fri May 9 10:32:40 2014 +0200
Committer: Francesco Chicchiriccò <--global>
Committed: Fri May 9 10:32:40 2014 +0200
----------------------------------------------------------------------
.../olingo/ext/proxy/utils/EngineUtils.java | 49 +++++++++++++-------
.../olingo/ext/pojogen/AbstractUtility.java | 4 +-
.../src/main/resources/complexType.vm | 2 +-
.../src/main/resources/container.vm | 2 +-
.../src/main/resources/entityCollection.vm | 2 +-
.../src/main/resources/entitySet.vm | 2 +-
.../src/main/resources/entityType.vm | 2 +-
.../src/main/resources/entityTypeKey.vm | 2 +-
.../src/main/resources/singleton.vm | 2 +-
.../fit/proxy/v3/EntityRetrieveTestITCase.java | 20 ++++----
.../AllGeoCollectionTypesSet.java | 3 +-
.../astoriadefaultservice/AllGeoTypesSet.java | 3 +-
.../services/astoriadefaultservice/Car.java | 3 +-
.../astoriadefaultservice/Computer.java | 3 +-
.../astoriadefaultservice/ComputerDetail.java | 3 +-
.../astoriadefaultservice/Customer.java | 3 +-
.../astoriadefaultservice/CustomerInfo.java | 3 +-
.../astoriadefaultservice/DefaultContainer.java | 3 +-
.../services/astoriadefaultservice/Driver.java | 3 +-
.../astoriadefaultservice/LastLogin.java | 3 +-
.../services/astoriadefaultservice/License.java | 3 +-
.../services/astoriadefaultservice/Login.java | 3 +-
.../astoriadefaultservice/MappedEntityType.java | 3 +-
.../services/astoriadefaultservice/Message.java | 3 +-
.../MessageAttachment.java | 3 +-
.../services/astoriadefaultservice/Order.java | 3 +-
.../astoriadefaultservice/OrderLine.java | 3 +-
.../astoriadefaultservice/PageView.java | 3 +-
.../services/astoriadefaultservice/Person.java | 3 +-
.../astoriadefaultservice/PersonMetadata.java | 3 +-
.../services/astoriadefaultservice/Product.java | 3 +-
.../astoriadefaultservice/ProductDetail.java | 3 +-
.../astoriadefaultservice/ProductPhoto.java | 3 +-
.../astoriadefaultservice/ProductReview.java | 3 +-
.../astoriadefaultservice/RSAToken.java | 3 +-
.../astoriadefaultservice/package-info.java | 1 -
.../astoriadefaultservice/types/Aliases.java | 3 +-
.../types/AllSpatialCollectionTypes.java | 3 +-
.../AllSpatialCollectionTypesCollection.java | 3 +-
.../types/AllSpatialCollectionTypes_Simple.java | 3 +-
...SpatialCollectionTypes_SimpleCollection.java | 3 +-
.../types/AllSpatialTypes.java | 3 +-
.../types/AllSpatialTypesCollection.java | 3 +-
.../astoriadefaultservice/types/AuditInfo.java | 7 ++-
.../types/BackOrderLine.java | 3 +-
.../types/BackOrderLine2.java | 3 +-
.../types/BackOrderLine2Collection.java | 3 +-
.../types/BackOrderLineCollection.java | 3 +-
.../astoriadefaultservice/types/Car.java | 3 +-
.../types/CarCollection.java | 3 +-
.../types/ComplexToCategory.java | 3 +-
.../types/ComplexWithAllPrimitiveTypes.java | 7 ++-
.../astoriadefaultservice/types/Computer.java | 3 +-
.../types/ComputerCollection.java | 3 +-
.../types/ComputerDetail.java | 9 ++--
.../types/ComputerDetailCollection.java | 5 +-
.../types/ConcurrencyInfo.java | 7 ++-
.../types/ContactDetails.java | 3 +-
.../astoriadefaultservice/types/Contractor.java | 3 +-
.../types/ContractorCollection.java | 3 +-
.../astoriadefaultservice/types/Customer.java | 3 +-
.../types/CustomerCollection.java | 3 +-
.../types/CustomerInfo.java | 3 +-
.../types/CustomerInfoCollection.java | 3 +-
.../astoriadefaultservice/types/Dimensions.java | 3 +-
.../types/DiscontinuedProduct.java | 7 ++-
.../types/DiscontinuedProductCollection.java | 3 +-
.../astoriadefaultservice/types/Driver.java | 7 ++-
.../types/DriverCollection.java | 3 +-
.../astoriadefaultservice/types/Employee.java | 3 +-
.../types/EmployeeCollection.java | 3 +-
.../astoriadefaultservice/types/LastLogin.java | 11 ++---
.../types/LastLoginCollection.java | 3 +-
.../astoriadefaultservice/types/License.java | 7 ++-
.../types/LicenseCollection.java | 3 +-
.../astoriadefaultservice/types/Login.java | 3 +-
.../types/LoginCollection.java | 3 +-
.../types/MappedEntityType.java | 7 ++-
.../types/MappedEntityTypeCollection.java | 3 +-
.../astoriadefaultservice/types/Message.java | 7 ++-
.../types/MessageAttachment.java | 3 +-
.../types/MessageAttachmentCollection.java | 3 +-
.../types/MessageCollection.java | 3 +-
.../astoriadefaultservice/types/MessageKey.java | 3 +-
.../astoriadefaultservice/types/Order.java | 3 +-
.../types/OrderCollection.java | 3 +-
.../astoriadefaultservice/types/OrderLine.java | 3 +-
.../types/OrderLineCollection.java | 3 +-
.../types/OrderLineKey.java | 3 +-
.../astoriadefaultservice/types/PageView.java | 7 ++-
.../types/PageViewCollection.java | 3 +-
.../astoriadefaultservice/types/Person.java | 3 +-
.../types/PersonCollection.java | 3 +-
.../types/PersonMetadata.java | 3 +-
.../types/PersonMetadataCollection.java | 3 +-
.../astoriadefaultservice/types/Phone.java | 3 +-
.../astoriadefaultservice/types/Product.java | 3 +-
.../types/ProductCollection.java | 3 +-
.../types/ProductDetail.java | 3 +-
.../types/ProductDetailCollection.java | 3 +-
.../types/ProductPageView.java | 7 ++-
.../types/ProductPageViewCollection.java | 3 +-
.../types/ProductPhoto.java | 3 +-
.../types/ProductPhotoCollection.java | 3 +-
.../types/ProductPhotoKey.java | 3 +-
.../types/ProductReview.java | 3 +-
.../types/ProductReviewCollection.java | 3 +-
.../types/ProductReviewKey.java | 27 ++++++-----
.../astoriadefaultservice/types/RSAToken.java | 7 ++-
.../types/RSATokenCollection.java | 3 +-
.../types/SpecialEmployee.java | 3 +-
.../types/SpecialEmployeeCollection.java | 3 +-
.../types/package-info.java | 1 -
.../olingo/fit/proxy/v4/AbstractTest.java | 12 +----
.../fit/proxy/v4/EntityRetrieveTestITCase.java | 27 ++++++-----
.../services/odatawcfservice/Accounts.java | 3 +-
.../odata/services/odatawcfservice/Boss.java | 3 +-
.../odata/services/odatawcfservice/Company.java | 3 +-
.../services/odatawcfservice/Customers.java | 3 +-
.../odatawcfservice/DefaultStoredPI.java | 3 +-
.../services/odatawcfservice/Departments.java | 3 +-
.../services/odatawcfservice/Employees.java | 3 +-
.../odatawcfservice/InMemoryEntities.java | 3 +-
.../services/odatawcfservice/LabourUnion.java | 3 +-
.../services/odatawcfservice/OrderDetails.java | 3 +-
.../odata/services/odatawcfservice/Orders.java | 3 +-
.../odata/services/odatawcfservice/People.java | 3 +-
.../odatawcfservice/ProductDetails.java | 3 +-
.../odatawcfservice/ProductReviews.java | 3 +-
.../services/odatawcfservice/Products.java | 3 +-
.../services/odatawcfservice/PublicCompany.java | 3 +-
.../services/odatawcfservice/StoredPIs.java | 3 +-
.../odatawcfservice/SubscriptionTemplates.java | 3 +-
.../services/odatawcfservice/VipCustomer.java | 3 +-
.../services/odatawcfservice/package-info.java | 1 -
.../odatawcfservice/types/AccessLevel.java | 1 -
.../services/odatawcfservice/types/Account.java | 5 +-
.../types/AccountCollection.java | 5 +-
.../odatawcfservice/types/AccountInfo.java | 3 +-
.../services/odatawcfservice/types/Address.java | 3 +-
.../services/odatawcfservice/types/Asset.java | 3 +-
.../odatawcfservice/types/AssetCollection.java | 3 +-
.../services/odatawcfservice/types/Club.java | 3 +-
.../odatawcfservice/types/ClubCollection.java | 3 +-
.../services/odatawcfservice/types/Color.java | 1 -
.../services/odatawcfservice/types/Company.java | 3 +-
.../odatawcfservice/types/CompanyAddress.java | 3 +-
.../odatawcfservice/types/CompanyCategory.java | 1 -
.../types/CompanyCollection.java | 3 +-
.../odatawcfservice/types/CreditCardPI.java | 11 ++---
.../types/CreditCardPICollection.java | 3 +-
.../odatawcfservice/types/CreditRecord.java | 7 ++-
.../types/CreditRecordCollection.java | 3 +-
.../odatawcfservice/types/Customer.java | 7 ++-
.../types/CustomerCollection.java | 3 +-
.../odatawcfservice/types/Department.java | 3 +-
.../types/DepartmentCollection.java | 3 +-
.../odatawcfservice/types/Employee.java | 7 ++-
.../types/EmployeeCollection.java | 3 +-
.../odatawcfservice/types/GiftCard.java | 7 ++-
.../types/GiftCardCollection.java | 3 +-
.../odatawcfservice/types/HomeAddress.java | 3 +-
.../odatawcfservice/types/LabourUnion.java | 3 +-
.../types/LabourUnionCollection.java | 3 +-
.../services/odatawcfservice/types/Order.java | 7 ++-
.../odatawcfservice/types/OrderCollection.java | 3 +-
.../odatawcfservice/types/OrderDetail.java | 7 ++-
.../types/OrderDetailCollection.java | 3 +-
.../odatawcfservice/types/OrderDetailKey.java | 3 +-
.../types/PaymentInstrument.java | 7 ++-
.../types/PaymentInstrumentCollection.java | 3 +-
.../services/odatawcfservice/types/Person.java | 3 +-
.../odatawcfservice/types/PersonCollection.java | 3 +-
.../services/odatawcfservice/types/Product.java | 3 +-
.../types/ProductCollection.java | 3 +-
.../odatawcfservice/types/ProductDetail.java | 3 +-
.../types/ProductDetailCollection.java | 3 +-
.../odatawcfservice/types/ProductDetailKey.java | 27 ++++++-----
.../odatawcfservice/types/ProductReview.java | 3 +-
.../types/ProductReviewCollection.java | 3 +-
.../odatawcfservice/types/ProductReviewKey.java | 39 ++++++++--------
.../odatawcfservice/types/PublicCompany.java | 3 +-
.../types/PublicCompanyCollection.java | 3 +-
.../odatawcfservice/types/Statement.java | 3 +-
.../types/StatementCollection.java | 3 +-
.../odatawcfservice/types/StoredPI.java | 7 ++-
.../types/StoredPICollection.java | 3 +-
.../odatawcfservice/types/Subscription.java | 7 ++-
.../types/SubscriptionCollection.java | 3 +-
.../odatawcfservice/types/package-info.java | 1 -
.../client/core/v3/PrimitiveValueTest.java | 2 +-
.../core/edm/primitivetype/EdmDateTime.java | 30 +++++++-----
pom.xml | 2 +-
193 files changed, 357 insertions(+), 515 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java
----------------------------------------------------------------------
diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java
index d907afe..801250a 100644
--- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java
+++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/EngineUtils.java
@@ -24,7 +24,9 @@ import java.lang.reflect.Method;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.net.URI;
+import java.sql.Timestamp;
import java.util.ArrayList;
+import java.util.Calendar;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -36,8 +38,10 @@ import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.ODataLink;
+import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.edm.Edm;
+import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.edm.EdmType;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
@@ -169,8 +173,8 @@ public final class EngineUtils {
} else {
oprop = ((org.apache.olingo.commons.api.domain.v4.ODataObjectFactory) client.getObjectFactory()).
newEnumProperty(name,
- ((org.apache.olingo.commons.api.domain.v4.ODataValue) getODataValue(client, type, obj)).
- asEnum());
+ ((org.apache.olingo.commons.api.domain.v4.ODataValue) getODataValue(client, type, obj)).
+ asEnum());
}
} else {
throw new UnsupportedOperationException("Usupported object type " + type.getFullQualifiedName());
@@ -200,6 +204,21 @@ public final class EngineUtils {
}
}
+ private static Object primitiveValueToObject(final ODataPrimitiveValue value) {
+ Object obj;
+
+ try {
+ obj = value.toValue() instanceof Timestamp
+ ? value.toCastValue(Calendar.class)
+ : value.toValue();
+ } catch (EdmPrimitiveTypeException e) {
+ LOG.warn("Could not read temporal value as Calendar, reverting to Timestamp", e);
+ obj = value.toValue();
+ }
+
+ return obj;
+ }
+
@SuppressWarnings("unchecked")
private static void setPropertyValue(final Object bean, final Method getter, final Object value)
throws NoSuchMethodException, IllegalAccessException, IllegalArgumentException, InvocationTargetException {
@@ -211,18 +230,16 @@ public final class EngineUtils {
public static Object getKey(
final Edm metadata, final Class<?> entityTypeRef, final CommonODataEntity entity) {
- final Object res;
- if (entity.getProperties().isEmpty()) {
- res = null;
- } else {
+ Object res = null;
+
+ if (!entity.getProperties().isEmpty()) {
final Class<?> keyRef = ClassUtils.getCompoundKeyRef(entityTypeRef);
if (keyRef == null) {
final CommonODataProperty property = entity.getProperty(firstValidEntityKey(entityTypeRef));
- res = property == null || !property.hasPrimitiveValue()
- ? null
- : property.getPrimitiveValue().toValue();
-
+ if (property != null && property.hasPrimitiveValue()) {
+ res = primitiveValueToObject(property.getPrimitiveValue());
+ }
} else {
try {
res = keyRef.newInstance();
@@ -270,7 +287,7 @@ public final class EngineUtils {
setPropertyValue(bean, getter, null);
}
if (property.hasPrimitiveValue()) {
- setPropertyValue(bean, getter, property.getPrimitiveValue().toValue());
+ setPropertyValue(bean, getter, primitiveValueToObject(property.getPrimitiveValue()));
}
if (property.hasComplexValue()) {
final Object complex = getter.getReturnType().newInstance();
@@ -291,7 +308,7 @@ public final class EngineUtils {
while (collPropItor.hasNext()) {
final ODataValue value = collPropItor.next();
if (value.isPrimitive()) {
- collection.add(value.asPrimitive().toValue());
+ collection.add(primitiveValueToObject(value.asPrimitive()));
}
if (value.isComplex()) {
final Object collItem = collItemClass.newInstance();
@@ -323,7 +340,7 @@ public final class EngineUtils {
while (collPropItor.hasNext()) {
final ODataValue odataValue = collPropItor.next();
if (odataValue.isPrimitive()) {
- ((Collection) value).add(odataValue.asPrimitive().toValue());
+ ((Collection) value).add(primitiveValueToObject(odataValue.asPrimitive()));
}
if (odataValue.isComplex()) {
final Object collItem =
@@ -332,7 +349,7 @@ public final class EngineUtils {
}
}
} else if (property.hasPrimitiveValue()) {
- value = property.getPrimitiveValue().toValue();
+ value = primitiveValueToObject(property.getPrimitiveValue());
} else if (property.hasComplexValue()) {
value = buildComplexInstance(
metadata, property.getValue().asComplex().getTypeName(), property.getValue().asComplex().iterator());
@@ -378,7 +395,7 @@ public final class EngineUtils {
while (collPropItor.hasNext()) {
final ODataValue odataValue = collPropItor.next();
if (odataValue.isPrimitive()) {
- ((Collection) value).add(odataValue.asPrimitive().toValue());
+ ((Collection) value).add(primitiveValueToObject(odataValue.asPrimitive()));
}
if (odataValue.isComplex()) {
final Object collItem = collItemClass.newInstance();
@@ -387,7 +404,7 @@ public final class EngineUtils {
}
}
} else if (property.hasPrimitiveValue()) {
- value = property.getPrimitiveValue().toValue();
+ value = primitiveValueToObject(property.getPrimitiveValue());
} else {
throw new IllegalArgumentException("Invalid property " + property);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
index 4ab91fe..1a0ebf2 100644
--- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
+++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
@@ -19,9 +19,7 @@
package org.apache.olingo.ext.pojogen;
import java.io.InputStream;
-import java.sql.Timestamp;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -275,7 +273,7 @@ public abstract class AbstractUtility {
res.append(InputStream.class.getName());
} else if (edmType.isPrimitiveType()) {
final Class<?> clazz = EdmPrimitiveTypeFactory.getInstance(edmType.getPrimitiveTypeKind()).getDefaultType();
- res.append((clazz.isAssignableFrom(Calendar.class) ? Timestamp.class : clazz).getSimpleName());
+ res.append(clazz.getSimpleName());
} else if (edmType.isComplexType()) {
res.append(basePackage).append('.').
append(edmType.getFullQualifiedName().getNamespace().toLowerCase()). // namespace
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
index 683739c..05bc161 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
@@ -41,7 +41,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
#parse( "${odataVersion}/complexType.vm" )
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/resources/container.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/container.vm b/ext/pojogen-maven-plugin/src/main/resources/container.vm
index b2f2160..5a98093 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/container.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/container.vm
@@ -45,7 +45,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
@Namespace("$namespace")
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
index 4f7a6a6..b48e2de 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
@@ -42,7 +42,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface $utility.capitalize($entityType.Name)Collection extends AbstractEntityCollection<$utility.capitalize($entityType.Name)> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
index d16fcdb..378eb8f 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
@@ -41,7 +41,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
#set( $keys = $utility.getEntityKeyType($entitySet) )
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
index cdb7399..e5873a1 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
@@ -51,7 +51,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
#if( $keyRef )@KeyRef(${keyRef}.class)#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm b/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
index a4392bb..fe6b7f3 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
@@ -46,7 +46,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
@CompoundKey
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
index 7fc2bff..b6b97b7 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
@@ -42,7 +42,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
#parse( "${odataVersion}/singleton.vm" )
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
index 0dac410..9444b0e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.lang.reflect.Proxy;
-import java.sql.Timestamp;
+import java.util.Calendar;
import java.util.Collection;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -132,19 +132,23 @@ public class EntityRetrieveTestITCase extends AbstractTest {
public void navigate() {
final Order order = getContainer().getOrder().get(-9);
assertNotNull(order);
- assertEquals(Integer.valueOf(-9), order.getOrderId());
+ assertEquals(-9, order.getOrderId(), 0);
final ConcurrencyInfo concurrency = order.getConcurrency();
assertNotNull(concurrency);
- assertEquals(Timestamp.valueOf("2012-02-12 11:32:50.005072026"), concurrency.getQueriedDateTime());
- assertEquals(Integer.valueOf(78), order.getCustomerId());
+ final Calendar actual = Calendar.getInstance();
+ actual.clear();
+ actual.set(2012, 1, 12, 11, 32, 50);
+ actual.set(Calendar.MILLISECOND, 507);
+ assertEquals(actual.getTimeInMillis(), concurrency.getQueriedDateTime().getTimeInMillis());
+ assertEquals(78, order.getCustomerId(), 0);
}
@Test
public void withGeospatial() {
final AllSpatialTypes allSpatialTypes = getContainer().getAllGeoTypesSet().get(-10);
assertNotNull(allSpatialTypes);
- assertEquals(Integer.valueOf(-10), allSpatialTypes.getId());
+ assertEquals(-10, allSpatialTypes.getId(), 0);
final MultiLineString geogMultiLine = allSpatialTypes.getGeogMultiLine();
assertNotNull(geogMultiLine);
@@ -165,7 +169,7 @@ public class EntityRetrieveTestITCase extends AbstractTest {
final Customer customer = readCustomer(getContainer(), -10);
final CustomerInfo customerInfo = customer.getInfo();
assertNotNull(customerInfo);
- assertEquals(Integer.valueOf(11), customerInfo.getCustomerInfoId());
+ assertEquals(11, customerInfo.getCustomerInfoId(), 0);
}
@Test
@@ -178,12 +182,12 @@ public class EntityRetrieveTestITCase extends AbstractTest {
@Test
public void withActions() {
final ComputerDetail computerDetail = getContainer().getComputerDetail().get(-10);
- assertEquals(Integer.valueOf(-10), computerDetail.getComputerDetailId());
+ assertEquals(-10, computerDetail.getComputerDetailId(), 0);
try {
assertNotNull(
computerDetail.operations().getClass().getMethod(
- "resetComputerDetailsSpecifications", Collection.class, Timestamp.class));
+ "resetComputerDetailsSpecifications", Collection.class, Calendar.class));
} catch (Exception e) {
fail();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
index 94e7220..b7a9cc5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
index 1655db3..f812916 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
index 0be25a3..134b3c8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
index c324f98..21e7b56 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
index f9a33ae..089c62b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
index 3c08257..7a6830b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
index 6d29b9f..c9f42e9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index ff7ecfb..fcc8f50 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +42,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
index eeec482..e8ad45f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
index 556d4c6..e07e5b1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
index 5bc6ae1..c62f7cc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
index 27fe6b0..f56cfa5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
index 862d8a7..90d33dd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
index d24d96f..31a65e0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
index 2e35723..b11cf1f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
index b9c6c66..af9daf7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
index 2a712ad..a24642f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
index 9264694..4cbe005 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
index e752b57..3230522 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
index 5a1fa7d..12caafd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
index 415c21d..580d485 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
index 9117fa9..9362449 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
index 65bffd0..4832109 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
index c166c5b..8b21bc3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
index 263d170..49fdfff 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
index 09db110..132b14e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/package-info.java
@@ -16,6 +16,5 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
index f49e1ec..7417bad 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
index 03fbda6..b43f0af 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -49,7 +48,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
index b3f5deb..0f4e93b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -41,7 +40,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection<AllSpatialCollectionTypes> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index a927a03..a7d27a7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -49,7 +48,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
index 742f09f..169ed6a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -41,7 +40,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<AllSpatialCollectionTypes_Simple> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
index 7e6ebf5..f0898d5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -49,7 +48,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
index 7e98f34..48001b8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -41,7 +40,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface AllSpatialTypesCollection extends AbstractEntityCollection<AllSpatialTypes> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
index 01c192c..b4f6c39 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
@@ -50,9 +49,9 @@ public interface AuditInfo extends Serializable {
@Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
- Timestamp getModifiedDate();
+ Calendar getModifiedDate();
- void setModifiedDate(final Timestamp _modifiedDate);
+ void setModifiedDate(final Calendar _modifiedDate);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index cea7582..c19ebd4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -49,7 +48,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
@KeyRef(OrderLineKey.class)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 61f3de7..85caf19 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -49,7 +48,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
@KeyRef(OrderLineKey.class)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
index 21c9268..257723c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -41,7 +40,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface BackOrderLine2Collection extends AbstractEntityCollection<BackOrderLine2> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
index 5239676..07f93e2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -41,7 +40,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface BackOrderLineCollection extends AbstractEntityCollection<BackOrderLine> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
index 9332487..08e86f1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -49,7 +48,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
index b7932ca..0bb77fd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -41,7 +40,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface CarCollection extends AbstractEntityCollection<Car> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
index 3860fa4..5c7d216 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
index fd59d6d..4035852 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -40,7 +39,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;
@@ -71,9 +70,9 @@ public interface ComplexWithAllPrimitiveTypes extends Serializable {
@Property(name = "DateTime", type = "Edm.DateTime", nullable = false)
- Timestamp getDateTime();
+ Calendar getDateTime();
- void setDateTime(final Timestamp _dateTime);
+ void setDateTime(final Calendar _dateTime);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
index 03d8b28..28319f9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -49,7 +48,7 @@ import java.net.URI;
import java.util.UUID;
import java.io.Serializable;
import java.util.Collection;
-import java.sql.Timestamp;
+import java.util.Calendar;
import javax.xml.datatype.Duration;