Repository: olingo-odata4 Updated Branches: refs/heads/master 0e6c9a118 -> 8955af75c
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java index d71e835..cdc0012 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java @@ -27,7 +27,7 @@ import java.net.URI; */ public class ODataInlineEntitySet extends ODataLink { - private CommonODataEntitySet entitySet; + private ODataEntitySet entitySet; /** * Constructor. @@ -39,7 +39,7 @@ public class ODataInlineEntitySet extends ODataLink { * @param entitySet entity set. */ public ODataInlineEntitySet(final ODataServiceVersion version, final URI uri, final ODataLinkType type, - final String title, final CommonODataEntitySet entitySet) { + final String title, final ODataEntitySet entitySet) { super(version, uri, type, title); this.entitySet = entitySet; @@ -56,7 +56,7 @@ public class ODataInlineEntitySet extends ODataLink { * @param entitySet entity set. */ public ODataInlineEntitySet(final ODataServiceVersion version, final URI baseURI, final String href, - final ODataLinkType type, final String title, final CommonODataEntitySet entitySet) { + final ODataLinkType type, final String title, final ODataEntitySet entitySet) { super(version, baseURI, href, type, title); this.entitySet = entitySet; @@ -67,7 +67,7 @@ public class ODataInlineEntitySet extends ODataLink { * * @return wrapped entity set. */ - public CommonODataEntitySet getEntitySet() { + public ODataEntitySet getEntitySet() { return entitySet; } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java index 7363675..6441944 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java @@ -21,8 +21,8 @@ package org.apache.olingo.commons.api.domain; /** * Marker interface for any OData domain object that can be returned by an operation invocation. * - * @see CommonODataEntitySet - * @see CommonODataEntity - * @see CommonODataProperty + * @see ODataEntitySet + * @see ODataEntity + * @see ODataProperty */ public interface ODataInvokeResult {} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java index 08b8534..589b249 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java @@ -50,28 +50,28 @@ public abstract class ODataItem { /** * Constructor. * - * @param name ODataItem name (it's entity type for {@link CommonODataEntity}). + * @param name ODataItem name (it's entity type for {@link ODataEntity}). */ public ODataItem(final String name) { this.name = name; } /** - * @return ODataItem name (it's entity type for {@link CommonODataEntity}). + * @return ODataItem name (it's entity type for {@link ODataEntity}). */ public String getName() { return name; } /** - * @return ODataItem link (it's edit link for {@link CommonODataEntity}). + * @return ODataItem link (it's edit link for {@link ODataEntity}). */ public URI getLink() { return link; } /** - * Sets ODataItem link (it's edit link for {@link CommonODataEntity}). + * Sets ODataItem link (it's edit link for {@link ODataEntity}). * * @param link link. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java index 52b49e6..90d6ed6 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java @@ -22,58 +22,149 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import java.net.URI; -public interface ODataObjectFactory extends CommonODataObjectFactory { +/** + * Entry point for generating OData domain objects. + */ +public interface ODataObjectFactory { - @Override + /** + * Instantiates a new entity set. + * + * @return entity set. + */ ODataEntitySet newEntitySet(); - @Override + /** + * Instantiates a new entity set. + * + * @param next next link. + * @return entity set. + */ ODataEntitySet newEntitySet(URI next); - @Override + /** + * Instantiates a new entity. + * + * @param typeName OData entity type name. + * @return entity. + */ ODataEntity newEntity(FullQualifiedName typeName); - @Override + /** + * Instantiates a new entity. + * + * @param typeName OData entity type name. + * @param link self link. + * @return entity. + */ ODataEntity newEntity(FullQualifiedName typeName, URI link); - ODataSingleton newSingleton(FullQualifiedName typeName); - - @Override + /** + * Instantiates a new entity set (for deep insert). + * + * @param name name. + * @param entitySet entity set. + * @return in-line entity set. + */ + ODataInlineEntitySet newDeepInsertEntitySet(String name, ODataEntitySet entitySet); + + /** + * Instantiates a new entity (for deep insert). + * + * @param name name. + * @param entity entity. + * @return in-line entity. + */ + ODataInlineEntity newDeepInsertEntity(String name, ODataEntity entity); + + /** + * Instantiates a new entity set navigation link. + * + * @param name name. + * @param link link. + * @return entity set navigation link. + */ ODataLink newEntitySetNavigationLink(String name, URI link); - @Override + /** + * Instantiates a new singleton entity. + * + * @param typeName OData singleton entity type name. + * @return new singleton entity. + */ + ODataSingleton newSingleton(FullQualifiedName typeName); + + /** + * Instantiates a new entity navigation link. + * + * @param name name. + * @param link link. + * @return entity navigation link. + */ ODataLink newEntityNavigationLink(String name, URI link); - @Override ODataLink newAssociationLink(String name, URI link); - @Override ODataLink newMediaEditLink(String name, URI link); + ODataPrimitiveValue.Builder newPrimitiveValueBuilder(); + ODataEnumValue newEnumValue(String typeName, String value); - @Override ODataComplexValue<ODataProperty> newComplexValue(String typeName); ODataLinkedComplexValue newLinkedComplexValue(String typeName); - @Override ODataCollectionValue<ODataValue> newCollectionValue(String typeName); - @Override + /** + * Instantiates a new primitive property. + * + * @param name name. + * @param value primitive value. + * @return primitive property. + */ ODataProperty newPrimitiveProperty(String name, ODataPrimitiveValue value); + /** + * Instantiates a new complex property. + * + * @param name name. + * @param value value. + * @return complex property. + */ + ODataProperty newComplexProperty(String name, ODataComplexValue<? extends ODataProperty> value); + + /** + * Instantiates a new collection property. + * + * @param name name. + * @param value value. + * @return collection property. + */ + ODataProperty newCollectionProperty(String name, ODataCollectionValue<? extends ODataValue> value); + + /** + * Instantiates a new enum property. + * + * @param name name. + * @param value value. + * @return new enum property. + */ ODataProperty newEnumProperty(String name, ODataEnumValue value); - @Override - ODataProperty newComplexProperty(String name, ODataComplexValue<? extends CommonODataProperty> value); - - @Override - ODataProperty newCollectionProperty(String name, - ODataCollectionValue<? extends org.apache.olingo.commons.api.domain.ODataValue> value); - + /** + * Instantiates a new delta property. + * + * @return new delta property. + */ ODataDelta newDelta(); + /** + * Instantiates a new delta property. + * + * @param next next link for delta property + * @return new delta property. + */ ODataDelta newDelta(URI next); - } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java index 533d318..f8b91b1 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java @@ -1,23 +1,75 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.commons.api.domain; +/** + * OData entity property. + */ +public interface ODataProperty extends ODataInvokeResult, ODataAnnotatable, ODataValuable { + + /** + * Returns property name. + * + * @return property name. + */ + String getName(); + + /** + * Returns property value. + * + * @return property value. + */ + ODataValue getValue(); + + /** + * Checks if has null value. + * + * @return 'TRUE' if has null value; 'FALSE' otherwise. + */ + boolean hasNullValue(); + + /** + * Checks if has primitive value. + * + * @return 'TRUE' if has primitive value; 'FALSE' otherwise. + */ + boolean hasPrimitiveValue(); + + /** + * Gets primitive value. + * + * @return primitive value if exists; null otherwise. + */ + ODataPrimitiveValue getPrimitiveValue(); + + /** + * Checks if has collection value. + * + * @return 'TRUE' if has collection value; 'FALSE' otherwise. + */ + boolean hasCollectionValue(); + + /** + * Checks if has complex value. + * + * @return 'TRUE' if has complex value; 'FALSE' otherwise. + */ + boolean hasComplexValue(); -public interface ODataProperty extends CommonODataProperty, ODataAnnotatable, ODataValuable { } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java index d0c69ad..aabc836 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java @@ -73,7 +73,7 @@ public interface ODataValue { * @param <OP> The actual ODataProperty interface. * @return complex value. */ - <OP extends CommonODataProperty> ODataComplexValue<OP> asComplex(); + <OP extends ODataProperty> ODataComplexValue<OP> asComplex(); /** * Check is is a linked complex value. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java index c27013a..71dc49f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java @@ -19,7 +19,7 @@ package org.apache.olingo.commons.core.domain; import org.apache.olingo.commons.api.domain.AbstractODataValue; -import org.apache.olingo.commons.api.domain.CommonODataProperty; +import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataComplexValue; import java.util.Iterator; @@ -31,7 +31,7 @@ import java.util.Map; * * @param <OP> The actual ODataProperty interface. */ -public abstract class AbstractODataComplexValue<OP extends CommonODataProperty> +public abstract class AbstractODataComplexValue<OP extends ODataProperty> extends AbstractODataValue implements ODataComplexValue<OP> { /** @@ -57,7 +57,7 @@ public abstract class AbstractODataComplexValue<OP extends CommonODataProperty> */ @Override @SuppressWarnings("unchecked") - public ODataComplexValue<OP> add(final CommonODataProperty field) { + public ODataComplexValue<OP> add(final ODataProperty field) { fields.put(field.getName(), (OP) field); return getThis(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java index b4bcdab..e7cebbb 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java @@ -20,8 +20,8 @@ package org.apache.olingo.commons.core.domain; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.domain.AbstractODataPayload; -import org.apache.olingo.commons.api.domain.CommonODataEntity; -import org.apache.olingo.commons.api.domain.CommonODataProperty; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -33,7 +33,7 @@ import java.util.List; /** * OData entity. */ -public abstract class AbstractODataEntity extends AbstractODataPayload implements CommonODataEntity { +public abstract class AbstractODataEntity extends AbstractODataPayload implements ODataEntity { private final FullQualifiedName typeName; @@ -130,11 +130,11 @@ public abstract class AbstractODataEntity extends AbstractODataPayload implement } @Override - public CommonODataProperty getProperty(final String name) { - CommonODataProperty result = null; + public ODataProperty getProperty(final String name) { + ODataProperty result = null; if (StringUtils.isNotBlank(name)) { - for (CommonODataProperty property : getProperties()) { + for (ODataProperty property : getProperties()) { if (name.equals(property.getName())) { result = property; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java index 2e8218c..f8535b0 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java @@ -19,11 +19,11 @@ package org.apache.olingo.commons.core.domain; import org.apache.olingo.commons.api.domain.AbstractODataPayload; -import org.apache.olingo.commons.api.domain.CommonODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import java.net.URI; -public abstract class AbstractODataEntitySet extends AbstractODataPayload implements CommonODataEntitySet { +public abstract class AbstractODataEntitySet extends AbstractODataPayload implements ODataEntitySet { /** * Link to the next page. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataObjectFactory.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataObjectFactory.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataObjectFactory.java index a017cb3..f54f957 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataObjectFactory.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataObjectFactory.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.domain; -import org.apache.olingo.commons.api.domain.CommonODataEntity; -import org.apache.olingo.commons.api.domain.CommonODataEntitySet; -import org.apache.olingo.commons.api.domain.CommonODataObjectFactory; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataObjectFactory; import org.apache.olingo.commons.api.domain.ODataInlineEntity; import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; import org.apache.olingo.commons.api.domain.ODataLinkType; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -public abstract class AbstractODataObjectFactory implements CommonODataObjectFactory { +public abstract class AbstractODataObjectFactory implements ODataObjectFactory { protected final ODataServiceVersion version; @@ -35,12 +35,12 @@ public abstract class AbstractODataObjectFactory implements CommonODataObjectFac } @Override - public ODataInlineEntitySet newDeepInsertEntitySet(final String name, final CommonODataEntitySet entitySet) { + public ODataInlineEntitySet newDeepInsertEntitySet(final String name, final ODataEntitySet entitySet) { return new ODataInlineEntitySet(version, null, ODataLinkType.ENTITY_SET_NAVIGATION, name, entitySet); } @Override - public ODataInlineEntity newDeepInsertEntity(final String name, final CommonODataEntity entity) { + public ODataInlineEntity newDeepInsertEntity(final String name, final ODataEntity entity) { return new ODataInlineEntity(version, null, ODataLinkType.ENTITY_NAVIGATION, name, entity); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataProperty.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataProperty.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataProperty.java index 243726b..71274cf 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataProperty.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataProperty.java @@ -22,11 +22,11 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.olingo.commons.api.domain.CommonODataProperty; +import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.ODataValue; -public abstract class AbstractODataProperty implements CommonODataProperty { +public abstract class AbstractODataProperty implements ODataProperty { /** * Property name. http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataObjectFactoryImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataObjectFactoryImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataObjectFactoryImpl.java index 7f7a81c..629b05d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataObjectFactoryImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataObjectFactoryImpl.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.commons.core.domain; -import org.apache.olingo.commons.api.domain.CommonODataProperty; +import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.ODataDelta; @@ -30,7 +30,6 @@ import org.apache.olingo.commons.api.domain.ODataLinkType; import org.apache.olingo.commons.api.domain.ODataLinkedComplexValue; import org.apache.olingo.commons.api.domain.ODataObjectFactory; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; -import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataSingleton; import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -127,7 +126,7 @@ public class ODataObjectFactoryImpl extends AbstractODataObjectFactory implement @Override public ODataProperty newComplexProperty(final String name, - final ODataComplexValue<? extends CommonODataProperty> value) { + final ODataComplexValue<? extends ODataProperty> value) { return new ODataPropertyImpl(name, value); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/8955af75/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataPropertyImpl.java index e1560b3..d383af4 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/ODataPropertyImpl.java @@ -18,19 +18,20 @@ */ package org.apache.olingo.commons.core.domain; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataAnnotatable; import org.apache.olingo.commons.api.domain.ODataAnnotation; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.ODataEnumValue; import org.apache.olingo.commons.api.domain.ODataLinkedComplexValue; -import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.domain.ODataValuable; import org.apache.olingo.commons.api.domain.ODataValue; import java.util.ArrayList; import java.util.List; -public class ODataPropertyImpl extends AbstractODataProperty implements ODataProperty { +public class ODataPropertyImpl extends AbstractODataProperty implements ODataProperty, ODataAnnotatable, ODataValuable { private final ODataValuable valuable;
