[OLINGO-200] Fixing minor quirk in V4 APIs
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/a5b7b257 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/a5b7b257 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/a5b7b257 Branch: refs/heads/olingo-206-validator Commit: a5b7b2577d264efcac7af85a0c63c3d6ea56d728 Parents: 850d44e Author: Francesco Chicchiriccò <[email protected]> Authored: Tue Apr 1 14:10:29 2014 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Tue Apr 1 14:10:29 2014 +0200 ---------------------------------------------------------------------- .../client/core/it/v4/EntityCreateTestITCase.java | 12 +++++------- .../olingo/commons/api/domain/ODataCollectionValue.java | 2 +- .../core/domain/AbstractODataCollectionValue.java | 5 +++-- 3 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a5b7b257/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityCreateTestITCase.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityCreateTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityCreateTestITCase.java index 0044e73..962542c 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityCreateTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v4/EntityCreateTestITCase.java @@ -25,10 +25,9 @@ import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateR import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataProperty; -import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.v4.ODataValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.format.ODataPubFormat; -import org.apache.olingo.commons.core.domain.v3.ODataCollectionValueImpl; import org.apache.olingo.commons.core.domain.v4.ODataEntityImpl; import org.junit.Test; @@ -52,15 +51,14 @@ public class EntityCreateTestITCase extends AbstractTestITCase { setType(EdmPrimitiveTypeKind.Duration).setText("PT0.0000001S").build()); order.getProperties().add(shelfLife); - // TODO: this should be possible via getClient().getObjectFactory().newCollectionValue() - final ODataCollectionValue<ODataValue> orderShelfLifesValue = - new ODataCollectionValueImpl("Collection(Duration)"); + final ODataCollectionValue<ODataValue> orderShelfLifesValue = getClient().getObjectFactory(). + newCollectionValue("Collection(Duration)"); orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder(). setType(EdmPrimitiveTypeKind.Duration).setText("PT0.0000001S").build()); orderShelfLifesValue.add(getClient().getObjectFactory().newPrimitiveValueBuilder(). setType(EdmPrimitiveTypeKind.Duration).setText("PT0.0000002S").build()); - final ODataProperty orderShelfLifes = getClient().getObjectFactory().newCollectionProperty("OrderShelfLifes", - orderShelfLifesValue); + final ODataProperty orderShelfLifes = getClient().getObjectFactory(). + newCollectionProperty("OrderShelfLifes", orderShelfLifesValue); order.getProperties().add(orderShelfLifes); final ODataEntityCreateRequest<ODataEntity> req = getClient().getCUDRequestFactory().getEntityCreateRequest( http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a5b7b257/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java index 29eedab..088bbc0 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java @@ -30,7 +30,7 @@ public interface ODataCollectionValue<OV extends ODataValue> extends ODataValue, * * @param value value to be added. */ - void add(OV value); + void add(ODataValue value); /** * Checks if collection is empty. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/a5b7b257/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java index 181f2da..2f8236b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java @@ -55,8 +55,9 @@ public abstract class AbstractODataCollectionValue<OV extends ODataValue> * @param value value to be added. */ @Override - public void add(final OV value) { - values.add(value); + @SuppressWarnings("unchecked") + public void add(final ODataValue value) { + values.add((OV) value); } /**
