You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/05/26 16:05:16 UTC
[19/24] Some refinements arounf pojogen
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index 0bcfbf3..4d95ea8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
@@ -43,27 +48,20 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "DiscontinuedProduct",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "DiscontinuedProduct",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
public interface DiscontinuedProduct
- extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product {
- @Property(name = "Picture",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -83,10 +81,10 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
java.io.InputStream getPicture();
- void setPicture(final java.io.InputStream _picture);
+ void setPicture(java.io.InputStream _picture);
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Description",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getDescription();
+ java.lang.String getDescription();
- void setDescription(final String _description);
+ void setDescription(java.lang.String _description);
- @Property(name = "Dimensions",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
nullable = true,
defaultValue = "",
@@ -152,10 +150,10 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
- void setDimensions(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+ void setDimensions(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
- @Property(name = "BaseConcurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BaseConcurrency",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,12 +171,12 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getBaseConcurrency();
+ java.lang.String getBaseConcurrency();
- void setBaseConcurrency(final String _baseConcurrency);
+ void setBaseConcurrency(java.lang.String _baseConcurrency);
- @Property(name = "ComplexConcurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
nullable = true,
defaultValue = "",
@@ -198,10 +196,10 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
- void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+ void setComplexConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
- @Property(name = "NestedComplexConcurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
nullable = true,
defaultValue = "",
@@ -221,10 +219,10 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
- void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+ void setNestedComplexConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
- @Property(name = "Discontinued",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -242,12 +240,12 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getDiscontinued();
+ java.util.Calendar getDiscontinued();
- void setDiscontinued(final Calendar _discontinued);
+ void setDiscontinued(java.util.Calendar _discontinued);
- @Property(name = "ReplacementProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReplacementProductId",
type = "Edm.Int32",
nullable = true,
defaultValue = "",
@@ -265,12 +263,12 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getReplacementProductId();
+ java.lang.Integer getReplacementProductId();
- void setReplacementProductId(final Integer _replacementProductId);
+ void setReplacementProductId(java.lang.Integer _replacementProductId);
- @Property(name = "DiscontinuedPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
nullable = true,
defaultValue = "",
@@ -290,10 +288,10 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone();
- void setDiscontinuedPhone(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
+ void setDiscontinuedPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
- @Property(name = "ChildConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ChildConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -311,52 +309,52 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getChildConcurrencyToken();
+ java.lang.String getChildConcurrencyToken();
- void setChildConcurrencyToken(final String _childConcurrencyToken);
+ void setChildConcurrencyToken(java.lang.String _childConcurrencyToken);
- @NavigationProperty(name = "RelatedProducts",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProducts",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Product")
+ targetEntitySet = "Product",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
- void setRelatedProducts(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
-
- @NavigationProperty(name = "Detail",
+ void setRelatedProducts(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Detail",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "ProductDetail")
+ targetEntitySet = "ProductDetail",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
- void setDetail(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
-
- @NavigationProperty(name = "Reviews",
+ void setDetail(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "ProductReview")
+ targetEntitySet = "ProductReview",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
- void setReviews(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
-
- @NavigationProperty(name = "Photos",
+ void setReviews(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Photos",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "ProductPhoto")
+ targetEntitySet = "ProductPhoto",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
- void setPhotos(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
+ void setPhotos(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
+
@Override
Operations operations();
@@ -365,25 +363,92 @@ public interface DiscontinuedProduct
}
- @Override
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.ComplexFactory{
- @Property(name = "Dimensions",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
- @Property(name = "ComplexConcurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexConcurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency();
- @Property(name = "NestedComplexConcurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "NestedComplexConcurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency();
- @Property(name = "DiscontinuedPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Picture",
+ type = "Edm.Stream")
+ Annotatable getPictureAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions")
+ Annotatable getDimensionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BaseConcurrency",
+ type = "Edm.String")
+ Annotatable getBaseConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "NestedComplexConcurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getNestedComplexConcurrencyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
+ type = "Edm.DateTime")
+ Annotatable getDiscontinuedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReplacementProductId",
+ type = "Edm.Int32")
+ Annotatable getReplacementProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ Annotatable getDiscontinuedPhoneAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ChildConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getChildConcurrencyTokenAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProducts",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getRelatedProductsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Detail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductDetail")
+ Annotatable getDetailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductReview")
+ Annotatable getReviewsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Photos",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ProductPhoto")
+ Annotatable getPhotosAnnotations();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
index 800a2fb..3862b80 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@@ -43,5 +44,9 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface DiscontinuedProductCollection extends AbstractEntityCollection<DiscontinuedProduct> {
+public interface DiscontinuedProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DiscontinuedProduct> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
index 34d89a8..a1a3e9b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
@@ -43,26 +48,19 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Driver",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Driver",
openType = false,
hasStream = false,
isAbstract = false)
public interface Driver
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Driver
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @Property(name = "BirthDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BirthDate",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -103,22 +101,46 @@ public interface Driver
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getBirthDate();
+ java.util.Calendar getBirthDate();
- void setBirthDate(final Calendar _birthDate);
+ void setBirthDate(java.util.Calendar _birthDate);
- @NavigationProperty(name = "License",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "License",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "License")
+ targetEntitySet = "License",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License getLicense();
- void setLicense(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
+ void setLicense(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BirthDate",
+ type = "Edm.DateTime")
+ Annotatable getBirthDateAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "License",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.License")
+ Annotatable getLicenseAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
index 406a28d..d6d953e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@@ -43,5 +44,9 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface DriverCollection extends AbstractEntityCollection<Driver> {
+public interface DriverCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
index e9c3b05..f4bf42e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
@@ -43,27 +48,20 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Employee",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
public interface Employee
- extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person {
@Key
- @Property(name = "PersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -81,12 +79,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonId();
+ java.lang.Integer getPersonId();
- void setPersonId(final Integer _personId);
+ void setPersonId(java.lang.Integer _personId);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @Property(name = "ManagersPersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManagersPersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getManagersPersonId();
+ java.lang.Integer getManagersPersonId();
- void setManagersPersonId(final Integer _managersPersonId);
+ void setManagersPersonId(java.lang.Integer _managersPersonId);
- @Property(name = "Salary",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getSalary();
+ java.lang.Integer getSalary();
- void setSalary(final Integer _salary);
+ void setSalary(java.lang.Integer _salary);
- @Property(name = "Title",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,50 +171,90 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTitle();
+ java.lang.String getTitle();
- void setTitle(final String _title);
+ void setTitle(java.lang.String _title);
- @NavigationProperty(name = "PersonMetadata",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "PersonMetadata")
+ targetEntitySet = "PersonMetadata",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
- void setPersonMetadata(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
- @NavigationProperty(name = "Manager",
+ void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Manager",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Person")
+ targetEntitySet = "Person",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
- void setManager(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
-
+ void setManager(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
@Override
Operations operations();
interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations{
- @Operation(name = "UpdatePersonInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
type = OperationType.ACTION)
void updatePersonInfo(
);
- @Operation(name = "IncreaseEmployeeSalary",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseEmployeeSalary",
type = OperationType.ACTION,
returnType = "Edm.Boolean")
- Boolean increaseEmployeeSalary(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
+ java.lang.Boolean increaseEmployeeSalary(
+ @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
);
}
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManagersPersonId",
+ type = "Edm.Int32")
+ Annotatable getManagersPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
+ type = "Edm.Int32")
+ Annotatable getSalaryAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Manager",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
+ Annotatable getManagerAnnotations();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
index c01d2df..e328445 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface EmployeeCollection extends AbstractEntityCollection<Employee> {
+public interface EmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee> {
Operations operations();
public interface Operations {
@@ -52,8 +53,12 @@ public interface EmployeeCollection extends AbstractEntityCollection<Employee> {
@Operation(name = "IncreaseSalaries",
type = OperationType.ACTION)
void increaseSalaries(
- @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
+ @Parameter(name = "n", type = "Edm.Int32", nullable = false) java.lang.Integer n
);
}
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
index 81f8180..8eacb63 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
@@ -43,26 +48,19 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "LastLogin",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "LastLogin",
openType = false,
hasStream = false,
isAbstract = false)
public interface LastLogin
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Username",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface LastLogin
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getUsername();
+ java.lang.String getUsername();
- void setUsername(final String _username);
+ void setUsername(java.lang.String _username);
- @Property(name = "LoggedIn",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedIn",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface LastLogin
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getLoggedIn();
+ java.util.Calendar getLoggedIn();
- void setLoggedIn(final Calendar _loggedIn);
+ void setLoggedIn(java.util.Calendar _loggedIn);
- @Property(name = "LoggedOut",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LoggedOut",
type = "Edm.DateTime",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface LastLogin
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getLoggedOut();
+ java.util.Calendar getLoggedOut();
- void setLoggedOut(final Calendar _loggedOut);
+ void setLoggedOut(java.util.Calendar _loggedOut);
- @Property(name = "Duration",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Duration",
type = "Edm.Time",
nullable = false,
defaultValue = "",
@@ -149,22 +147,54 @@ public interface LastLogin
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getDuration();
+ java.math.BigDecimal getDuration();
- void setDuration(final BigDecimal _duration);
+ void setDuration(java.math.BigDecimal _duration);
- @NavigationProperty(name = "Login",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Login",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Login")
+ targetEntitySet = "Login",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
- void setLogin(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+ void setLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedIn",
+ type = "Edm.DateTime")
+ Annotatable getLoggedInAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LoggedOut",
+ type = "Edm.DateTime")
+ Annotatable getLoggedOutAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Duration",
+ type = "Edm.Time")
+ Annotatable getDurationAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
index 0b5b4f2..ee12998 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@@ -43,5 +44,9 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface LastLoginCollection extends AbstractEntityCollection<LastLogin> {
+public interface LastLoginCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
index 2292ba5..be634c1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
@@ -43,26 +48,19 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "License",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "License",
openType = false,
hasStream = false,
isAbstract = false)
public interface License
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface License
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @Property(name = "LicenseNumber",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseNumber",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface License
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getLicenseNumber();
+ java.lang.String getLicenseNumber();
- void setLicenseNumber(final String _licenseNumber);
+ void setLicenseNumber(java.lang.String _licenseNumber);
- @Property(name = "LicenseClass",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LicenseClass",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface License
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getLicenseClass();
+ java.lang.String getLicenseClass();
- void setLicenseClass(final String _licenseClass);
+ void setLicenseClass(java.lang.String _licenseClass);
- @Property(name = "Restrictions",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Restrictions",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface License
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getRestrictions();
+ java.lang.String getRestrictions();
- void setRestrictions(final String _restrictions);
+ void setRestrictions(java.lang.String _restrictions);
- @Property(name = "ExpirationDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExpirationDate",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -172,22 +170,58 @@ public interface License
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getExpirationDate();
+ java.util.Calendar getExpirationDate();
- void setExpirationDate(final Calendar _expirationDate);
+ void setExpirationDate(java.util.Calendar _expirationDate);
- @NavigationProperty(name = "Driver",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Driver",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Driver")
+ targetEntitySet = "Driver",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver getDriver();
- void setDriver(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
+ void setDriver(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseNumber",
+ type = "Edm.String")
+ Annotatable getLicenseNumberAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LicenseClass",
+ type = "Edm.String")
+ Annotatable getLicenseClassAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Restrictions",
+ type = "Edm.String")
+ Annotatable getRestrictionsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExpirationDate",
+ type = "Edm.DateTime")
+ Annotatable getExpirationDateAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Driver",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Driver")
+ Annotatable getDriverAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
index d17a561..38a0efa 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@@ -43,5 +44,9 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface LicenseCollection extends AbstractEntityCollection<License> {
+public interface LicenseCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
index a749132..4b7bb7f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
+import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Key;
import org.apache.olingo.ext.proxy.api.annotations.KeyRef;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
@@ -43,26 +48,19 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint;
import org.apache.olingo.commons.api.edm.geo.MultiPolygon;
import org.apache.olingo.commons.api.edm.geo.Point;
import org.apache.olingo.commons.api.edm.geo.Polygon;
-import java.math.BigDecimal;
-import java.net.URI;
-import java.util.UUID;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Calendar;
-import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Login",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Login",
openType = false,
hasStream = false,
isAbstract = false)
public interface Login
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Username",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Login
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getUsername();
+ java.lang.String getUsername();
- void setUsername(final String _username);
+ void setUsername(java.lang.String _username);
- @Property(name = "CustomerId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,62 +101,102 @@ public interface Login
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCustomerId();
+ java.lang.Integer getCustomerId();
- void setCustomerId(final Integer _customerId);
+ void setCustomerId(java.lang.Integer _customerId);
- @NavigationProperty(name = "Customer",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Customer",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Customer")
+ targetEntitySet = "Customer",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
- void setCustomer(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
- @NavigationProperty(name = "LastLogin",
+ void setCustomer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LastLogin",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "LastLogin")
+ targetEntitySet = "LastLogin",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin getLastLogin();
- void setLastLogin(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
-
-
- @NavigationProperty(name = "SentMessages",
+ void setLastLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "SentMessages",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Message")
+ targetEntitySet = "Message",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getSentMessages();
- void setSentMessages(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
-
-
- @NavigationProperty(name = "ReceivedMessages",
+ void setSentMessages(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ReceivedMessages",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Message")
+ targetEntitySet = "Message",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getReceivedMessages();
- void setReceivedMessages(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
-
-
- @NavigationProperty(name = "Orders",
+ void setReceivedMessages(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Order")
+ targetEntitySet = "Order",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
- void setOrders(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+ void setOrders(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getCustomerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LastLogin",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.LastLogin")
+ Annotatable getLastLoginAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "SentMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
+ Annotatable getSentMessagesAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ReceivedMessages",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Message")
+ Annotatable getReceivedMessagesAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrdersAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
index 601b11f..eed0927 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.se
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
+import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
@@ -43,5 +44,9 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface LoginCollection extends AbstractEntityCollection<Login> {
+public interface LoginCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}