Repository: olingo-odata4 Updated Branches: refs/heads/master bc0a8d9d8 -> e5cfd8eb1
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java ---------------------------------------------------------------------- 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 b2b5732..d67f217 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; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java ---------------------------------------------------------------------- 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 29af89c..84e4f5b 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<Person> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java ---------------------------------------------------------------------- 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 e3d9d7f..b087931 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; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java ---------------------------------------------------------------------- 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 1790b97..60f7c89 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<Product> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java ---------------------------------------------------------------------- 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 38db34e..73183cb 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) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java ---------------------------------------------------------------------- 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 fbe1d37..7f96191 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<ProductDetail> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java ---------------------------------------------------------------------- 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 868e18b..47949e8 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; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java ---------------------------------------------------------------------- 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 45324d0..61a0cf7 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) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java ---------------------------------------------------------------------- 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 48655e8..a9d6eab 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<ProductReview> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java ---------------------------------------------------------------------- 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 6c19fec..a9790c1 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; + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java ---------------------------------------------------------------------- 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 8fcf1b9..5612e20 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; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java ---------------------------------------------------------------------- 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 4edcf30..8b6cf9d 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<PublicCompany> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java ---------------------------------------------------------------------- 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 2f1a5f9..f776e62 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; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java ---------------------------------------------------------------------- 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 5bd4f9e..4cb03c7 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<Statement> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java ---------------------------------------------------------------------- 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 0713e83..524f024 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); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java ---------------------------------------------------------------------- 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 874cc9e..171b1bf 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<StoredPI> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java ---------------------------------------------------------------------- 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 12abc95..eb4abb5 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); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java ---------------------------------------------------------------------- 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 001d6fa..fccaadc 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<Subscription> { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java ---------------------------------------------------------------------- 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 1b20c6b..4bc5702 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; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java ---------------------------------------------------------------------- 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 db0b7b7..1438a3f 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()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java ---------------------------------------------------------------------- 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 af2793b..c8c8eb5 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)) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/e5cfd8eb/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 80bf78b..761127a 100644 --- a/pom.xml +++ b/pom.xml @@ -261,7 +261,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.12</version> + <version>2.12.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
