From e5cfd8eb13a57aa39c43337888f35ca45437c87c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <--global> Date: Fri, 9 May 2014 10:32:40 +0200 Subject: [PATCH] Fixing timezone issues with proxy --- .../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 +- .../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 +- .../DefaultContainer.java | 3 +- .../astoriadefaultservice/Driver.java | 3 +- .../astoriadefaultservice/LastLogin.java | 3 +- .../astoriadefaultservice/License.java | 3 +- .../services/astoriadefaultservice/Login.java | 3 +- .../MappedEntityType.java | 3 +- .../astoriadefaultservice/Message.java | 3 +- .../MessageAttachment.java | 3 +- .../services/astoriadefaultservice/Order.java | 3 +- .../astoriadefaultservice/OrderLine.java | 3 +- .../astoriadefaultservice/PageView.java | 3 +- .../astoriadefaultservice/Person.java | 3 +- .../astoriadefaultservice/PersonMetadata.java | 3 +- .../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 +- .../AllSpatialCollectionTypes_Simple.java | 3 +- ...atialCollectionTypes_SimpleCollection.java | 3 +- .../types/AllSpatialTypes.java | 3 +- .../types/AllSpatialTypesCollection.java | 3 +- .../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 +- .../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 +- .../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 +- .../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 +- .../types/MessageKey.java | 3 +- .../astoriadefaultservice/types/Order.java | 3 +- .../types/OrderCollection.java | 3 +- .../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 +---- .../proxy/v4/EntityRetrieveTestITCase.java | 27 +++++----- .../services/odatawcfservice/Accounts.java | 3 +- .../odata/services/odatawcfservice/Boss.java | 3 +- .../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 +- .../odatawcfservice/OrderDetails.java | 3 +- .../services/odatawcfservice/Orders.java | 3 +- .../services/odatawcfservice/People.java | 3 +- .../odatawcfservice/ProductDetails.java | 3 +- .../odatawcfservice/ProductReviews.java | 3 +- .../services/odatawcfservice/Products.java | 3 +- .../odatawcfservice/PublicCompany.java | 3 +- .../services/odatawcfservice/StoredPIs.java | 3 +- .../SubscriptionTemplates.java | 3 +- .../services/odatawcfservice/VipCustomer.java | 3 +- .../odatawcfservice/package-info.java | 1 - .../odatawcfservice/types/AccessLevel.java | 1 - .../odatawcfservice/types/Account.java | 5 +- .../types/AccountCollection.java | 5 +- .../odatawcfservice/types/AccountInfo.java | 3 +- .../odatawcfservice/types/Address.java | 3 +- .../services/odatawcfservice/types/Asset.java | 3 +- .../types/AssetCollection.java | 3 +- .../services/odatawcfservice/types/Club.java | 3 +- .../odatawcfservice/types/ClubCollection.java | 3 +- .../services/odatawcfservice/types/Color.java | 1 - .../odatawcfservice/types/Company.java | 3 +- .../odatawcfservice/types/CompanyAddress.java | 3 +- .../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 ++- .../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 +- .../odatawcfservice/types/Person.java | 3 +- .../types/PersonCollection.java | 3 +- .../odatawcfservice/types/Product.java | 3 +- .../types/ProductCollection.java | 3 +- .../odatawcfservice/types/ProductDetail.java | 3 +- .../types/ProductDetailCollection.java | 3 +- .../types/ProductDetailKey.java | 27 +++++----- .../odatawcfservice/types/ProductReview.java | 3 +- .../types/ProductReviewCollection.java | 3 +- .../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(-) 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 d907afe1d..801250a46 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); } 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 4ab91fec7..1a0ebf20d 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 diff --git a/ext/pojogen-maven-plugin/src/main/resources/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/complexType.vm index 683739cc9..05bc161d8 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" ) diff --git a/ext/pojogen-maven-plugin/src/main/resources/container.vm b/ext/pojogen-maven-plugin/src/main/resources/container.vm index b2f21607b..5a98093e8 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") diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm index 4f7a6a6a5..b48e2de3a 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)> { diff --git a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm index d16fcdb41..378eb8f6b 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) ) diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm index cdb739969..e5873a185 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 diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm b/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm index a4392bb69..fe6b7f382 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 diff --git a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm index 7fc2bffca..b6b97b731 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" ) 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 0dac4106a..9444b0ea5 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(); } 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 94e7220e5..b7a9cc5f8 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; 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 1655db3a3..f812916ee 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; 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 0be25a3ab..134b3c81c 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; 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 c324f984d..21e7b56f0 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; 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 f9a33ae1e..089c62bb6 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; 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 3c08257f2..7a6830b26 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; 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 6d29b9fa0..c9f42e997 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; 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 ff7ecfb20..fcc8f5044 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") 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 eeec4827b..e8ad45ff5 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; 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 556d4c6ff..e07e5b188 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; 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 5bc6ae1f7..c62f7ccc9 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; 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 27fe6b0ce..f56cfa51b 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; 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 862d8a710..90d33dd55 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; 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 d24d96fc3..31a65e0c7 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; 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 2e357238d..b11cf1f0e 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; 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 b9c6c66bb..af9daf716 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; 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 2a712ad55..a24642f73 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; 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 926469411..4cbe005c4 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; 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 e752b5769..3230522f0 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; 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 5a1fa7da5..12caafdc0 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; 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 415c21dbd..580d4854c 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; 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 9117fa954..9362449ac 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; 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 65bffd0dc..48321091b 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; 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 c166c5bb6..8b21bc32b 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; 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 263d17061..49fdfff04 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; 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 09db11037..132b14ec6 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; 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 f49e1ec58..7417badad 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; 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 03fbda647..b43f0aff6 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; 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 b3f5deb15..0f4e93beb 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 { 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 a927a0356..a7d27a77b 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; 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 742f09f45..169ed6a3c 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 { 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 7e6ebf50a..f0898d52a 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; 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 7e98f34df..48001b851 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 { 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 01c192cbd..b4f6c39d2 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); 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 cea7582e2..c19ebd4ea 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) 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 61f3de7f3..85caf1900 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) 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 21c92681a..257723ca4 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 { 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 52396762d..07f93e2db 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 { 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 9332487dc..08e86f192 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; 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 b7932ca6a..0bb77fd08 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 { 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 3860fa4cd..5c7d2163b 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; 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 fd59d6d10..403585220 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); 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 03d8b286c..28319f937 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java index 0e2bdf52f..f7acf0f1e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.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 ComputerCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java index f030e678a..57f83824d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; @@ -196,9 +195,9 @@ public interface ComputerDetail fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getPurchaseDate(); + Calendar getPurchaseDate(); - void setPurchaseDate(final Timestamp _purchaseDate); + void setPurchaseDate(final Calendar _purchaseDate); @Property(name = "Dimensions", @@ -245,7 +244,7 @@ public interface ComputerDetail isComposable = false) void resetComputerDetailsSpecifications( @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection specifications, - @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Timestamp purchaseTime + @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Calendar purchaseTime ); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java index 563dc82f2..eca299dc3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.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 ComputerDetailCollection extends AbstractEntityCollection { @@ -54,7 +53,7 @@ public interface ComputerDetailCollection extends AbstractEntityCollection specifications, - @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Timestamp purchaseTime + @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Calendar purchaseTime ); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java index 5361edb98..8426bfa82 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.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; @@ -57,9 +56,9 @@ public interface ConcurrencyInfo extends Serializable { @Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true) - Timestamp getQueriedDateTime(); + Calendar getQueriedDateTime(); - void setQueriedDateTime(final Timestamp _queriedDateTime); + void setQueriedDateTime(final Calendar _queriedDateTime); } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java index dc1ba5d8b..4b618f3c5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java index ce980c3b5..a020012e0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java index 744d4deaa..79b8e04cd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.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 ContractorCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java index 6bf2bd46a..9bd8f4d8e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java index 461c7cf55..719b88964 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.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 CustomerCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java index bb3c30bed..0c5a7ad0b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java index 2af4f70a8..5f1d74799 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.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 CustomerInfoCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java index 40cf671c6..5c9d8293b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java index f331d4d42..f5e6a949d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.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; @@ -246,9 +245,9 @@ public interface DiscontinuedProduct fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getDiscontinued(); + Calendar getDiscontinued(); - void setDiscontinued(final Timestamp _discontinued); + void setDiscontinued(final Calendar _discontinued); @Property(name = "ReplacementProductId", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java index af83076f5..5f51306af 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.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 DiscontinuedProductCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java index 21d3300dc..a4e755a50 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; @@ -104,9 +103,9 @@ public interface Driver fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getBirthDate(); + Calendar getBirthDate(); - void setBirthDate(final Timestamp _birthDate); + void setBirthDate(final Calendar _birthDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java index 2818ea7c7..896323efa 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.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 DriverCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java index 0b4662ff6..935119fcd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java index 3f6b3b70b..e239f17f4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.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 EmployeeCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java index 95c484fb6..d7f5bda24 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; @@ -104,9 +103,9 @@ public interface LastLogin fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getLoggedIn(); + Calendar getLoggedIn(); - void setLoggedIn(final Timestamp _loggedIn); + void setLoggedIn(final Calendar _loggedIn); @Property(name = "LoggedOut", @@ -127,9 +126,9 @@ public interface LastLogin fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getLoggedOut(); + Calendar getLoggedOut(); - void setLoggedOut(final Timestamp _loggedOut); + void setLoggedOut(final Calendar _loggedOut); @Property(name = "Duration", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java index bbfb83f45..f4e0b6265 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.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 LastLoginCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java index c93b48ba8..e6318f442 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; @@ -173,9 +172,9 @@ public interface License fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getExpirationDate(); + Calendar getExpirationDate(); - void setExpirationDate(final Timestamp _expirationDate); + void setExpirationDate(final Calendar _expirationDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java index e518060d4..4ae6c8df1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.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 LicenseCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java index 8afb793c7..f08e828d3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java index 08748828f..3b1df7479 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.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 LoginCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java index a495830f8..2c4a98c13 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; @@ -449,9 +448,9 @@ public interface MappedEntityType fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Collection getBagOfDateTime(); + Collection getBagOfDateTime(); - void setBagOfDateTime(final Collection _bagOfDateTime); + void setBagOfDateTime(final Collection _bagOfDateTime); @Property(name = "BagOfComplexToCategories", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java index 1ab83a45c..363af239e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.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 MappedEntityTypeCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java index 9339135f9..86ec54e66 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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(MessageKey.class) @@ -150,9 +149,9 @@ public interface Message fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getSent(); + Calendar getSent(); - void setSent(final Timestamp _sent); + void setSent(final Calendar _sent); @Property(name = "Subject", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java index 10831afd4..7c974ed7e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java index daf58355b..f00466f30 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.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 MessageAttachmentCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java index 761cefc47..517e125ed 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.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 MessageCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java index 2d920a84e..883f91247 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.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.EntityType; @@ -45,7 +44,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 diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java index b133017cf..46d76250e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java index 166db3c7e..085d6f1ce 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.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 OrderCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java index ec7cadbfe..456317835 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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) diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java index 32b63d5ac..dbd605697 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.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 OrderLineCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java index b36c35371..10b249ede 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.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.EntityType; @@ -45,7 +44,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 diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java index 7f474185c..8a2e6bced 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; @@ -127,9 +126,9 @@ public interface PageView fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getViewed(); + Calendar getViewed(); - void setViewed(final Timestamp _viewed); + void setViewed(final Calendar _viewed); @Property(name = "TimeSpentOnPage", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java index 741c55c6c..b81523c2c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.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 PageViewCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java index a2d007ac4..883ecd69e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java index 03f43ebe3..9efd3c1e1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.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 PersonCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java index 7621144d0..cfe280b9e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java index 8cd7ad4ca..bef279ec5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.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 PersonMetadataCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java index b5c4949f6..d0e7844b3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java index eacc9618a..0db55f356 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java index 37c24646a..d90d95c6b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.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 ProductCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java index 98a5cbb74..5b75d44be 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java index 75d3347f6..1ae704f56 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.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 ProductDetailCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java index d0f2e9a2f..2d0fd74d8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.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; @@ -128,9 +127,9 @@ public interface ProductPageView fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getViewed(); + Calendar getViewed(); - void setViewed(final Timestamp _viewed); + void setViewed(final Calendar _viewed); @Property(name = "TimeSpentOnPage", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java index 1360b8a56..379799b63 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.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 ProductPageViewCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java index c1310eeec..9ce636d27 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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(ProductPhotoKey.class) diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java index 34da74995..84fb108a0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.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 ProductPhotoCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java index f2c0e09e7..fb84c2574 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.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.EntityType; @@ -45,7 +44,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 diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java index 33b5888cc..8dbd1b283 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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(ProductReviewKey.class) diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java index 2f2f50900..8670cdf27 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.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 ProductReviewCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java index 9df0a33ae..cfcaa95cc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.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.EntityType; @@ -45,21 +44,21 @@ 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 public class ProductReviewKey extends AbstractEntityKey { - private String _revisionId; + private Integer _productId; - @CompoundKeyElement(name = "RevisionId", position = 0) - public String getRevisionId() { - return _revisionId; + @CompoundKeyElement(name = "ProductId", position = 0) + public Integer getProductId() { + return _productId; } - public void setRevisionId(final String _revisionId) { - this._revisionId = _revisionId; + public void setProductId(final Integer _productId) { + this._productId = _productId; } private Integer _reviewId; @@ -73,14 +72,14 @@ public class ProductReviewKey extends AbstractEntityKey { this._reviewId = _reviewId; } - private Integer _productId; + private String _revisionId; - @CompoundKeyElement(name = "ProductId", position = 2) - public Integer getProductId() { - return _productId; + @CompoundKeyElement(name = "RevisionId", position = 2) + public String getRevisionId() { + return _revisionId; } - public void setProductId(final Integer _productId) { - this._productId = _productId; + public void setRevisionId(final String _revisionId) { + this._revisionId = _revisionId; } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java index 9adde5d15..40405b077 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.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; @@ -104,9 +103,9 @@ public interface RSAToken fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getIssued(); + Calendar getIssued(); - void setIssued(final Timestamp _issued); + void setIssued(final Calendar _issued); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java index 42b51b7f2..e0b510661 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.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 RSATokenCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java index 005c1b3f2..467ca473c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java index 681034992..a37f415f1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.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 SpecialEmployeeCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java index c6af5350f..ba1c67687 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/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.types; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTest.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTest.java index 49fea0c6d..416ed0495 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTest.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTest.java @@ -22,12 +22,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; import java.io.IOException; -import java.util.Locale; import org.apache.olingo.ext.proxy.EntityContainerFactory; import org.apache.olingo.ext.proxy.context.EntityContext; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; - import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -59,14 +57,6 @@ public abstract class AbstractTest { protected static InMemoryEntities container; - /** - * This is needed for correct number handling (Double, for example). - */ - @BeforeClass - public static void setEnglishLocale() { - Locale.setDefault(Locale.ENGLISH); - } - @BeforeClass public static void setUpODataServiceRoot() throws IOException { testStaticServiceRootURL = "http://localhost:9080/stub/StaticService/V40/Static.svc"; @@ -84,7 +74,7 @@ public abstract class AbstractTest { protected Customer readCustomer(final InMemoryEntities container, int id) { final Customer customer = container.getCustomers().get(id); assertNotNull(customer); - assertEquals(Integer.valueOf(id), customer.getPersonID()); + assertEquals(id, customer.getPersonID(), 0); return customer; } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java index f3b3f6802..3f4517fa3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java @@ -25,7 +25,8 @@ 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.TimeZone; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.ext.proxy.commons.EntityTypeInvocationHandler; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; @@ -98,15 +99,18 @@ public class EntityRetrieveTestITCase extends AbstractTest { public void navigate() { final Order order = getContainer().getOrders().get(8); assertNotNull(order); - assertEquals(8, order.getOrderID().intValue()); + assertEquals(8, order.getOrderID(), 0); - final Timestamp date = order.getOrderDate(); + final Calendar date = order.getOrderDate(); assertNotNull(date); - assertEquals(Timestamp.valueOf("2011-03-04 17:03:57.0"), date); + final Calendar actual = Calendar.getInstance(TimeZone.getTimeZone("GMT")); + actual.clear(); + actual.set(2011, 2, 4, 16, 3, 57); + assertEquals(actual.getTimeInMillis(), date.getTimeInMillis()); final Customer customer = getContainer().getCustomers().get(1); assertNotNull(customer); - assertEquals(1, customer.getPersonID().intValue()); + assertEquals(1, customer.getPersonID(), 0); final Address address = customer.getHomeAddress(); assertNotNull(address); assertEquals("98052", address.getPostalCode()); @@ -116,7 +120,7 @@ public class EntityRetrieveTestITCase extends AbstractTest { public void withInlineEntry() { final Customer customer = readCustomer(getContainer(), 1); final Company company = customer.getCompany(); - assertEquals(0, company.getCompanyID().intValue()); + assertEquals(0, company.getCompanyID(), 0); } @Test @@ -124,13 +128,13 @@ public class EntityRetrieveTestITCase extends AbstractTest { final Customer customer = readCustomer(getContainer(), 1); final OrderCollection orders = customer.getOrders(); assertEquals(1, orders.size()); - assertEquals(8, orders.iterator().next().getOrderID().intValue()); + assertEquals(8, orders.iterator().next().getOrderID(), 0); } @Test public void withActions() { final Product product = getContainer().getProducts().get(5); - assertEquals(5, product.getProductID().intValue()); + assertEquals(5, product.getProductID(), 0); try { assertNotNull(product.operations().getClass().getMethod("addAccessRight", AccessLevel.class)); @@ -147,14 +151,13 @@ public class EntityRetrieveTestITCase extends AbstractTest { final OrderDetail orderDetail = getContainer().getOrderDetails().get(orderDetailKey); assertNotNull(orderDetail); - assertEquals(7, orderDetail.getOrderID().intValue()); - assertEquals(5, orderDetail.getProductID().intValue()); + assertEquals(7, orderDetail.getOrderID(), 0); + assertEquals(5, orderDetail.getProductID(), 0); } @Test public void checkForETag() { final Order order = getContainer().getOrders().get(8); - assertTrue(StringUtils.isNotBlank( - ((EntityTypeInvocationHandler) Proxy.getInvocationHandler(order)).getETag())); + assertTrue(StringUtils.isNotBlank(((EntityTypeInvocationHandler) Proxy.getInvocationHandler(order)).getETag())); } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java index 9814f30a6..57520570b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java index d3cba48cb..596b5f5f3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java index fbf502003..24763a9da 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java index 1fa962a4e..429f6d96a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java index 73fc41563..f5b25c0af 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java index 5c7296899..f6e135f1f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java index 78d0a0fd0..bd41f3fa7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java index 4c1093458..0d95ca70b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java index 0d7cc2a17..1d6539015 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java index d08283ac8..fc166181f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java index 58c4e1a66..a395b2288 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java index 557d35dcf..3bcadf3cc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java index c7f52e6c2..245bd5c8e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java index 8d7e24a4a..fc77e7401 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java index 2563d6b4b..123919a4e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java index 873648844..b50871755 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java index 3f4113b58..49c7118c1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java index 67394b413..e9d66d809 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; 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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java index db5383727..726648085 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java index abf2d52f1..e7fb1fc79 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java @@ -16,6 +16,5 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java index 4b3c72384..5055bde31 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java index 0aaa24237..0392aabde 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -197,7 +196,7 @@ public interface Account type = OperationType.ACTION, returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument") org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument refreshDefaultPI( - @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) Timestamp newDate + @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) Calendar newDate ); } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java index bf0d8ad89..facd06658 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 AccountCollection extends AbstractEntityCollection { @@ -68,7 +67,7 @@ public interface AccountCollection extends AbstractEntityCollection { type = OperationType.ACTION, returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument") org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument refreshDefaultPI( - @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) Timestamp newDate + @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) Calendar newDate ); } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java index ff7cdf1e9..4624e0bd2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java index 515b45ee0..acfce4d18 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java index 0864b9045..cd00e934f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java index d2ca070b4..be390b220 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 AssetCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java index 078e83a60..223820605 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java index 0059b3398..022a161a8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 ClubCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java index 5432f9efe..17a0a7d67 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java index fd979e46e..ff78a0e8b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java index 8d181feb3..8b44c961d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java index 361f9128a..47aa8eb6c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.Namespace; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java index e7ca666cd..b9d3c09e2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 CompanyCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java index 2dd87d5d9..c9e034461 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -128,9 +127,9 @@ public interface CreditCardPI fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getCreatedDate(); + Calendar getCreatedDate(); - void setCreatedDate(final Timestamp _createdDate); + void setCreatedDate(final Calendar _createdDate); @Property(name = "CardNumber", @@ -243,9 +242,9 @@ public interface CreditCardPI fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getExperationDate(); + Calendar getExperationDate(); - void setExperationDate(final Timestamp _experationDate); + void setExperationDate(final Calendar _experationDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java index 10de63123..91be35853 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 CreditCardPICollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java index 62c733368..16b8a0754 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -150,9 +149,9 @@ public interface CreditRecord fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getCreatedDate(); + Calendar getCreatedDate(); - void setCreatedDate(final Timestamp _createdDate); + void setCreatedDate(final Calendar _createdDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java index df59d25a9..6c891092d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 CreditRecordCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java index 4efc6e2d3..863a6d319 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -290,9 +289,9 @@ public interface Customer fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getBirthday(); + Calendar getBirthday(); - void setBirthday(final Timestamp _birthday); + void setBirthday(final Calendar _birthday); @Property(name = "TimeBetweenLastTwoOrders", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java index 2bdad08e3..3eb054828 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 CustomerCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java index 9fe354360..f2dc969d9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java index 69ad3307d..5b78d8de8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 DepartmentCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java index 5f11a3e84..6a8e3998c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -267,9 +266,9 @@ public interface Employee fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getDateHired(); + Calendar getDateHired(); - void setDateHired(final Timestamp _dateHired); + void setDateHired(final Calendar _dateHired); @Property(name = "Office", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java index 4ae457082..d7886a214 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 EmployeeCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java index 2fabd6036..2b92fccbe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -150,9 +149,9 @@ public interface GiftCard fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getExperationDate(); + Calendar getExperationDate(); - void setExperationDate(final Timestamp _experationDate); + void setExperationDate(final Calendar _experationDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java index 375a5ea8b..177906e7e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 GiftCardCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java index 98d6a1f2c..cdeea546b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java index 0204f1fa8..575bc7869 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java index 52f789315..67a2b94ea 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 LabourUnionCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java index a08ae95e9..f3405ac23 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -104,9 +103,9 @@ public interface Order fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getOrderDate(); + Calendar getOrderDate(); - void setOrderDate(final Timestamp _orderDate); + void setOrderDate(final Calendar _orderDate); @Property(name = "ShelfLife", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java index 567604fc4..e8b5eb616 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 OrderCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java index 444854d9e..15b643908 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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(OrderDetailKey.class) @@ -127,9 +126,9 @@ public interface OrderDetail fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getOrderPlaced(); + Calendar getOrderPlaced(); - void setOrderPlaced(final Timestamp _orderPlaced); + void setOrderPlaced(final Calendar _orderPlaced); @Property(name = "Quantity", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java index dd465abdc..3a8dde771 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 OrderDetailCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java index a4818ec9d..868e74b79 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; @@ -45,7 +44,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 diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java index e1d6b6944..69dc4bfc6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -127,9 +126,9 @@ public interface PaymentInstrument fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getCreatedDate(); + Calendar getCreatedDate(); - void setCreatedDate(final Timestamp _createdDate); + void setCreatedDate(final Calendar _createdDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java index 01046c9bd..aa3578032 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 PaymentInstrumentCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java index b2b5732a6..d67f21744 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java index 29af89c8d..84e4f5b45 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 PersonCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java index e3d9d7f06..b087931ea 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java index 1790b97ea..60f7c89f8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 ProductCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java index 38db34ef3..73183cb7b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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(ProductDetailKey.class) diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java index fbe1d3799..7f961916d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 ProductDetailCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java index 868e18b9a..47949e878 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; @@ -45,26 +44,15 @@ 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 public class ProductDetailKey extends AbstractEntityKey { - private Integer _productDetailID; - - @CompoundKeyElement(name = "ProductDetailID", position = 0) - public Integer getProductDetailID() { - return _productDetailID; - } - - public void setProductDetailID(final Integer _productDetailID) { - this._productDetailID = _productDetailID; - } - private Integer _productID; - @CompoundKeyElement(name = "ProductID", position = 1) + @CompoundKeyElement(name = "ProductID", position = 0) public Integer getProductID() { return _productID; } @@ -72,4 +60,15 @@ public class ProductDetailKey extends AbstractEntityKey { public void setProductID(final Integer _productID) { this._productID = _productID; } + + private Integer _productDetailID; + + @CompoundKeyElement(name = "ProductDetailID", position = 1) + public Integer getProductDetailID() { + return _productDetailID; + } + + public void setProductDetailID(final Integer _productDetailID) { + this._productDetailID = _productDetailID; + } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java index 45324d08b..61a0cf778 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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(ProductReviewKey.class) diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java index 48655e85f..a9d6eab96 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 ProductReviewCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java index 6c19fecc1..a9790c103 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; import org.apache.olingo.ext.proxy.api.annotations.EntityType; @@ -45,21 +44,21 @@ 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 public class ProductReviewKey extends AbstractEntityKey { - private Integer _revisionID; + private Integer _productID; - @CompoundKeyElement(name = "RevisionID", position = 0) - public Integer getRevisionID() { - return _revisionID; + @CompoundKeyElement(name = "ProductID", position = 0) + public Integer getProductID() { + return _productID; } - public void setRevisionID(final Integer _revisionID) { - this._revisionID = _revisionID; + public void setProductID(final Integer _productID) { + this._productID = _productID; } private Integer _productDetailID; @@ -73,20 +72,9 @@ public class ProductReviewKey extends AbstractEntityKey { this._productDetailID = _productDetailID; } - private Integer _productID; - - @CompoundKeyElement(name = "ProductID", position = 2) - public Integer getProductID() { - return _productID; - } - - public void setProductID(final Integer _productID) { - this._productID = _productID; - } - private String _reviewTitle; - @CompoundKeyElement(name = "ReviewTitle", position = 3) + @CompoundKeyElement(name = "ReviewTitle", position = 2) public String getReviewTitle() { return _reviewTitle; } @@ -94,4 +82,15 @@ public class ProductReviewKey extends AbstractEntityKey { public void setReviewTitle(final String _reviewTitle) { this._reviewTitle = _reviewTitle; } + + private Integer _revisionID; + + @CompoundKeyElement(name = "RevisionID", position = 3) + public Integer getRevisionID() { + return _revisionID; + } + + public void setRevisionID(final Integer _revisionID) { + this._revisionID = _revisionID; + } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java index 8fcf1b90e..5612e2052 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java index 4edcf30a2..8b6cf9dce 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 PublicCompanyCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java index 2f1a5f953..f776e6270 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java index 5bd4f9eaf..4cb03c7e7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 StatementCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java index 0713e8360..524f02428 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -150,9 +149,9 @@ public interface StoredPI fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getCreatedDate(); + Calendar getCreatedDate(); - void setCreatedDate(final Timestamp _createdDate); + void setCreatedDate(final Calendar _createdDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java index 874cc9e6a..171b1bffd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 StoredPICollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java index 12abc9534..eb4abb5f4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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; @@ -173,9 +172,9 @@ public interface Subscription fcNSPrefix = "", fcNSURI = "", fcKeepInContent = false) - Timestamp getCreatedDate(); + Calendar getCreatedDate(); - void setCreatedDate(final Timestamp _createdDate); + void setCreatedDate(final Calendar _createdDate); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java index 001d6fabf..fccaadc34 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.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 SubscriptionCollection extends AbstractEntityCollection { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java index 1b20c6bcd..4bc5702f9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java @@ -16,6 +16,5 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java index db0b7b750..1438a3f1c 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java @@ -114,7 +114,7 @@ public class PrimitiveValueTest extends AbstractTest { // Timestamp final Timestamp timestamp = value.asPrimitive().toCastValue(Timestamp.class); - assertEquals(expected.get(Calendar.MILLISECOND), timestamp.getNanos()); + assertEquals(expected.get(Calendar.MILLISECOND), timestamp.getNanos() / 1000000); assertEquals("2013-01-10T02:27:47.673", value.asPrimitive().toString()); } diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java index af2793b93..c8c8eb532 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java @@ -64,31 +64,39 @@ public final class EdmDateTime extends SingletonPrimitiveType { } TimeZone timezone = null; - Integer fractionalSecs = null; + String decimals = null; if (dateParts.length > 1) { int idx = dateParts[1].indexOf('+'); if (idx == -1) { idx = dateParts[1].indexOf('-'); } if (idx == -1) { - fractionalSecs = Integer.parseInt(dateParts[1]); + decimals = dateParts[1]; } else { timezone = TimeZone.getTimeZone(dateParts[1].substring(idx)); - fractionalSecs = Integer.parseInt(dateParts[1].substring(0, idx)); + decimals = dateParts[1].substring(0, idx); } } - if (fractionalSecs != null && String.valueOf(fractionalSecs).length() > (precision == null ? 0 : precision)) { - throw new EdmPrimitiveTypeException( - "EdmPrimitiveTypeException.LITERAL_FACETS_NOT_MATCHED.addContent(value, facets)"); - } - final Calendar calendar = timezone == null ? Calendar.getInstance() : Calendar.getInstance(timezone); calendar.setTime(date); final Timestamp timestamp = new Timestamp(date.getTime()); - if (fractionalSecs != null) { - calendar.set(Calendar.MILLISECOND, fractionalSecs); - timestamp.setNanos(fractionalSecs); + + if (decimals != null) { + if (decimals.length() > (precision == null ? 0 : precision)) { + throw new EdmPrimitiveTypeException( + "EdmPrimitiveTypeException.LITERAL_FACETS_NOT_MATCHED.addContent(value, facets)"); + } + final String milliSeconds = decimals.length() > 3 + ? decimals.substring(0, 3) + : decimals + "000".substring(decimals.length()); + calendar.set(Calendar.MILLISECOND, Short.parseShort(milliSeconds)); + + if (!decimals.isEmpty()) { + final int fractionalSecs = calendar.get(Calendar.MILLISECOND); + // if fractional are just milliseconds, convert to nanoseconds + timestamp.setNanos(fractionalSecs < 1000 ? fractionalSecs * 1000000 : fractionalSecs); + } } if (returnType.isAssignableFrom(Calendar.class)) { diff --git a/pom.xml b/pom.xml index 80bf78b6a..761127a74 100644 --- a/pom.xml +++ b/pom.xml @@ -261,7 +261,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 2.12 + 2.12.1 org.apache.maven.plugins