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:04:58 UTC
[01/24] Some refinements arounf pojogen
Repository: olingo-odata4
Updated Branches:
refs/heads/master b91371775 -> b0a0c20eb
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
index fcee35c..e97ecc7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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;
@KeyRef(ProductReviewKey.class)
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@EntityType(name = "ProductReview",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductReview",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductReview
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductID();
+ java.lang.Integer getProductID();
- void setProductID(Integer _productID);
+ void setProductID(java.lang.Integer _productID);
@Key
- @Property(name = "ProductDetailID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductDetailID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductDetailID();
+ java.lang.Integer getProductDetailID();
- void setProductDetailID(Integer _productDetailID);
+ void setProductDetailID(java.lang.Integer _productDetailID);
@Key
- @Property(name = "ReviewTitle",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewTitle",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getReviewTitle();
+ java.lang.String getReviewTitle();
- void setReviewTitle(String _reviewTitle);
+ void setReviewTitle(java.lang.String _reviewTitle);
@Key
- @Property(name = "RevisionID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -151,12 +147,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getRevisionID();
+ java.lang.Integer getRevisionID();
- void setRevisionID(Integer _revisionID);
+ void setRevisionID(java.lang.Integer _revisionID);
- @Property(name = "Comment",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Comment",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -174,12 +170,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getComment();
+ java.lang.String getComment();
- void setComment(String _comment);
+ void setComment(java.lang.String _comment);
- @Property(name = "Author",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Author",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -197,43 +193,48 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getAuthor();
+ java.lang.String getAuthor();
- void setAuthor(String _author);
+ void setAuthor(java.lang.String _author);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
type = "Edm.Int32")
Annotatable getProductIDAnnotations();
- @AnnotationsForProperty(name = "ProductDetailID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductDetailID",
type = "Edm.Int32")
Annotatable getProductDetailIDAnnotations();
- @AnnotationsForProperty(name = "ReviewTitle",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewTitle",
type = "Edm.String")
Annotatable getReviewTitleAnnotations();
- @AnnotationsForProperty(name = "RevisionID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionID",
type = "Edm.Int32")
Annotatable getRevisionIDAnnotations();
- @AnnotationsForProperty(name = "Comment",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Comment",
type = "Edm.String")
Annotatable getCommentAnnotations();
- @AnnotationsForProperty(name = "Author",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Author",
type = "Edm.String")
Annotatable getAuthorAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
index 1c98796..28e9234 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface ProductReviewCollection extends AbstractEntityCollection<ProductReview> {
+public interface ProductReviewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
index 500624e..6b1fed3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
@@ -46,50 +47,50 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductReviewKey extends AbstractEntityKey {
- private Integer _productID;
+ private java.lang.Integer _productID;
@CompoundKeyElement(name = "ProductID", position = 0)
- public Integer getProductID() {
+ public java.lang.Integer getProductID() {
return _productID;
}
- public void setProductID(Integer _productID) {
+ public void setProductID(java.lang.Integer _productID) {
this._productID = _productID;
}
- private Integer _productDetailID;
+ private java.lang.Integer _productDetailID;
@CompoundKeyElement(name = "ProductDetailID", position = 1)
- public Integer getProductDetailID() {
+ public java.lang.Integer getProductDetailID() {
return _productDetailID;
}
- public void setProductDetailID(Integer _productDetailID) {
+ public void setProductDetailID(java.lang.Integer _productDetailID) {
this._productDetailID = _productDetailID;
}
- private String _reviewTitle;
+ private java.lang.String _reviewTitle;
@CompoundKeyElement(name = "ReviewTitle", position = 2)
- public String getReviewTitle() {
+ public java.lang.String getReviewTitle() {
return _reviewTitle;
}
- public void setReviewTitle(String _reviewTitle) {
+ public void setReviewTitle(java.lang.String _reviewTitle) {
this._reviewTitle = _reviewTitle;
}
- private Integer _revisionID;
+ private java.lang.Integer _revisionID;
@CompoundKeyElement(name = "RevisionID", position = 3)
- public Integer getRevisionID() {
+ public java.lang.Integer getRevisionID() {
return _revisionID;
}
- public void setRevisionID(Integer _revisionID) {
+ public void setRevisionID(java.lang.Integer _revisionID) {
this._revisionID = _revisionID;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
index d856468..0abf5a9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,17 +48,10 @@ 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.ODataWCFService")
-@EntityType(name = "PublicCompany",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PublicCompany",
openType = true,
hasStream = false,
isAbstract = false,
@@ -65,7 +61,7 @@ public interface PublicCompany
@Key
- @Property(name = "CompanyID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -83,12 +79,12 @@ public interface PublicCompany
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCompanyID();
+ java.lang.Integer getCompanyID();
- void setCompanyID(Integer _companyID);
+ void setCompanyID(java.lang.Integer _companyID);
- @Property(name = "CompanyCategory",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyCategory",
type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
nullable = true,
defaultValue = "",
@@ -111,7 +107,7 @@ public interface PublicCompany
void setCompanyCategory(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
- @Property(name = "Revenue",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue",
type = "Edm.Int64",
nullable = false,
defaultValue = "",
@@ -129,12 +125,12 @@ public interface PublicCompany
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Long getRevenue();
+ java.lang.Long getRevenue();
- void setRevenue(Long _revenue);
+ void setRevenue(java.lang.Long _revenue);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -152,12 +148,12 @@ public interface PublicCompany
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(String _name);
+ void setName(java.lang.String _name);
- @Property(name = "Address",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
nullable = true,
defaultValue = "",
@@ -180,7 +176,7 @@ public interface PublicCompany
void setAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address);
- @Property(name = "StockExchange",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StockExchange",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -198,13 +194,13 @@ public interface PublicCompany
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getStockExchange();
+ java.lang.String getStockExchange();
- void setStockExchange(String _stockExchange);
+ void setStockExchange(java.lang.String _stockExchange);
- @NavigationProperty(name = "Employees",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees",
type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -214,7 +210,7 @@ public interface PublicCompany
void setEmployees(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees);
- @NavigationProperty(name = "VipCustomer",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer",
type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -224,7 +220,7 @@ public interface PublicCompany
void setVipCustomer(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer);
- @NavigationProperty(name = "Departments",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -234,7 +230,7 @@ public interface PublicCompany
void setDepartments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments);
- @NavigationProperty(name = "CoreDepartment",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -244,17 +240,8 @@ public interface PublicCompany
void setCoreDepartment(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment);
- @NavigationProperty(name = "Assets",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Asset",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.Assets getAssets();
-
- void setAssets(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.Assets _assets);
-
- @NavigationProperty(name = "Club",
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Club",
type = "Microsoft.Test.OData.Services.ODataWCFService.Club",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "",
@@ -264,7 +251,7 @@ public interface PublicCompany
void setClub(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club _club);
- @NavigationProperty(name = "LabourUnion",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LabourUnion",
type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -282,73 +269,90 @@ public interface PublicCompany
}
- @Override
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.ComplexFactory{
- @Property(name = "Address",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress();
- }
+ }
- @Override
- Annotations annotations();
+ Annotations annotations();
interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.Annotations{
- @AnnotationsForProperty(name = "CompanyID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyID",
type = "Edm.Int32")
Annotatable getCompanyIDAnnotations();
- @AnnotationsForProperty(name = "CompanyCategory",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyCategory",
type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory")
Annotatable getCompanyCategoryAnnotations();
- @AnnotationsForProperty(name = "Revenue",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Revenue",
type = "Edm.Int64")
Annotatable getRevenueAnnotations();
- @AnnotationsForProperty(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
type = "Edm.String")
Annotatable getNameAnnotations();
- @AnnotationsForProperty(name = "Address",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
Annotatable getAddressAnnotations();
- @AnnotationsForProperty(name = "StockExchange",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StockExchange",
type = "Edm.String")
Annotatable getStockExchangeAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "Employees",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Employees",
type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
Annotatable getEmployeesAnnotations();
-
- @AnnotationsForNavigationProperty(name = "VipCustomer",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "VipCustomer",
type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
Annotatable getVipCustomerAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Departments",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Departments",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
Annotatable getDepartmentsAnnotations();
-
- @AnnotationsForNavigationProperty(name = "CoreDepartment",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CoreDepartment",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
Annotatable getCoreDepartmentAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Assets",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Assets",
type = "Microsoft.Test.OData.Services.ODataWCFService.Asset")
Annotatable getAssetsAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Club",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Club",
type = "Microsoft.Test.OData.Services.ODataWCFService.Club")
Annotatable getClubAnnotations();
-
- @AnnotationsForNavigationProperty(name = "LabourUnion",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LabourUnion",
type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion")
Annotatable getLabourUnionAnnotations();
+ }
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Assets",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "LabourUnion",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets getAssets();
+ void setAssets(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets _assets);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Assets", contained = true)
+ interface Assets
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset newAsset();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection newAssetCollection();
}
-}
+
+ }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
index 2257e2b..8ebe7ef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface PublicCompanyCollection extends AbstractEntityCollection<PublicCompany> {
+public interface PublicCompanyCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
index fb86a38..fdc4156 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Statement",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Statement",
openType = false,
hasStream = false,
isAbstract = false)
public interface Statement
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "StatementID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StatementID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Statement
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getStatementID();
+ java.lang.Integer getStatementID();
- void setStatementID(Integer _statementID);
+ void setStatementID(java.lang.Integer _statementID);
- @Property(name = "TransactionType",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionType",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Statement
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTransactionType();
+ java.lang.String getTransactionType();
- void setTransactionType(String _transactionType);
+ void setTransactionType(java.lang.String _transactionType);
- @Property(name = "TransactionDescription",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TransactionDescription",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface Statement
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTransactionDescription();
+ java.lang.String getTransactionDescription();
- void setTransactionDescription(String _transactionDescription);
+ void setTransactionDescription(java.lang.String _transactionDescription);
- @Property(name = "Amount",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
type = "Edm.Double",
nullable = false,
defaultValue = "",
@@ -151,35 +147,40 @@ public interface Statement
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Double getAmount();
+ java.lang.Double getAmount();
- void setAmount(Double _amount);
+ void setAmount(java.lang.Double _amount);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "StatementID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StatementID",
type = "Edm.Int32")
Annotatable getStatementIDAnnotations();
- @AnnotationsForProperty(name = "TransactionType",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TransactionType",
type = "Edm.String")
Annotatable getTransactionTypeAnnotations();
- @AnnotationsForProperty(name = "TransactionDescription",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TransactionDescription",
type = "Edm.String")
Annotatable getTransactionDescriptionAnnotations();
- @AnnotationsForProperty(name = "Amount",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Amount",
type = "Edm.Double")
Annotatable getAmountAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
index 6f325a7..fb9b0a9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface StatementCollection extends AbstractEntityCollection<Statement> {
+public interface StatementCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
index bad03e4..699bf10 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "StoredPI",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "StoredPI",
openType = false,
hasStream = false,
isAbstract = false)
public interface StoredPI
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "StoredPIID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StoredPIID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface StoredPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getStoredPIID();
+ java.lang.Integer getStoredPIID();
- void setStoredPIID(Integer _storedPIID);
+ void setStoredPIID(java.lang.Integer _storedPIID);
- @Property(name = "PIName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface StoredPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPIName();
+ java.lang.String getPIName();
- void setPIName(String _pIName);
+ void setPIName(java.lang.String _pIName);
- @Property(name = "PIType",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PIType",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface StoredPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPIType();
+ java.lang.String getPIType();
- void setPIType(String _pIType);
+ void setPIType(java.lang.String _pIType);
- @Property(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -151,35 +147,40 @@ public interface StoredPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getCreatedDate();
+ java.util.Calendar getCreatedDate();
- void setCreatedDate(Calendar _createdDate);
+ void setCreatedDate(java.util.Calendar _createdDate);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "StoredPIID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "StoredPIID",
type = "Edm.Int32")
Annotatable getStoredPIIDAnnotations();
- @AnnotationsForProperty(name = "PIName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PIName",
type = "Edm.String")
Annotatable getPINameAnnotations();
- @AnnotationsForProperty(name = "PIType",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PIType",
type = "Edm.String")
Annotatable getPITypeAnnotations();
- @AnnotationsForProperty(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
type = "Edm.DateTimeOffset")
Annotatable getCreatedDateAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
index d4d34fe..e4d71dc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface StoredPICollection extends AbstractEntityCollection<StoredPI> {
+public interface StoredPICollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
index e72bdfd..a5dd8cf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Subscription",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Subscription",
openType = false,
hasStream = false,
isAbstract = false)
public interface Subscription
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "SubscriptionID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SubscriptionID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Subscription
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getSubscriptionID();
+ java.lang.Integer getSubscriptionID();
- void setSubscriptionID(Integer _subscriptionID);
+ void setSubscriptionID(java.lang.Integer _subscriptionID);
- @Property(name = "TemplateGuid",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TemplateGuid",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Subscription
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTemplateGuid();
+ java.lang.String getTemplateGuid();
- void setTemplateGuid(String _templateGuid);
+ void setTemplateGuid(java.lang.String _templateGuid);
- @Property(name = "Title",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface Subscription
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTitle();
+ java.lang.String getTitle();
- void setTitle(String _title);
+ void setTitle(java.lang.String _title);
- @Property(name = "Category",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Category",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -151,12 +147,12 @@ public interface Subscription
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getCategory();
+ java.lang.String getCategory();
- void setCategory(String _category);
+ void setCategory(java.lang.String _category);
- @Property(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -174,39 +170,44 @@ public interface Subscription
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getCreatedDate();
+ java.util.Calendar getCreatedDate();
- void setCreatedDate(Calendar _createdDate);
+ void setCreatedDate(java.util.Calendar _createdDate);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "SubscriptionID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SubscriptionID",
type = "Edm.Int32")
Annotatable getSubscriptionIDAnnotations();
- @AnnotationsForProperty(name = "TemplateGuid",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TemplateGuid",
type = "Edm.String")
Annotatable getTemplateGuidAnnotations();
- @AnnotationsForProperty(name = "Title",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
type = "Edm.String")
Annotatable getTitleAnnotations();
- @AnnotationsForProperty(name = "Category",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Category",
type = "Edm.String")
Annotatable getCategoryAnnotations();
- @AnnotationsForProperty(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
type = "Edm.DateTimeOffset")
Annotatable getCreatedDateAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
index 5e8083b..41bfc0b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface SubscriptionCollection extends AbstractEntityCollection<Subscription> {
+public interface SubscriptionCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
index 4bc5702..1b20c6b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java
@@ -16,5 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
index a48bb49..7805691 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java
@@ -24,10 +24,8 @@ import static org.junit.Assert.fail;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
-import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.commons.api.domain.ODataError;
import org.apache.olingo.commons.api.domain.ODataErrorDetail;
-import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.format.ODataPubFormat;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
index 70009a5..27c0ccf 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
@@ -84,13 +84,17 @@ public class EdmSchemaImpl extends AbstractEdmSchema {
if (schema instanceof org.apache.olingo.client.api.edm.xml.v4.Schema) {
entityContainers = super.getEntityContainers();
- entityContainerByName.put(getEntityContainer().getFullQualifiedName(), getEntityContainer());
+ if (getEntityContainer() != null) {
+ entityContainerByName.put(getEntityContainer().getFullQualifiedName(), getEntityContainer());
+ }
} else {
entityContainers = new ArrayList<EdmEntityContainer>(schema.getEntityContainers().size());
for (EntityContainer entityContainer : schema.getEntityContainers()) {
final EdmEntityContainer edmContainer = createEntityContainer(entityContainer.getName());
- entityContainers.add(edmContainer);
- entityContainerByName.put(edmContainer.getFullQualifiedName(), edmContainer);
+ if (edmContainer != null) {
+ entityContainers.add(edmContainer);
+ entityContainerByName.put(edmContainer.getFullQualifiedName(), edmContainer);
+ }
}
}
}
@@ -291,5 +295,4 @@ public class EdmSchemaImpl extends AbstractEdmSchema {
return result;
}
-
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java
index d1c8e2d..7d34816 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java
@@ -167,7 +167,11 @@ public abstract class AbstractEdmSchema implements EdmSchema {
@Override
public List<EdmEntityContainer> getEntityContainers() {
- return Collections.singletonList(getEntityContainer());
+ if (getEntityContainer() == null) {
+ return Collections.<EdmEntityContainer>emptyList();
+ } else {
+ return Collections.singletonList(getEntityContainer());
+ }
}
@Override
[04/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyGiftCard.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyGiftCard.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyGiftCard.java
deleted file mode 100644
index 2557126..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyGiftCard.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "MyGiftCard", contained = true)
-public interface MyGiftCard
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCardCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard newGiftCard();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCardCollection newGiftCardCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyPaymentInstruments.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyPaymentInstruments.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyPaymentInstruments.java
deleted file mode 100644
index 3043b90..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/MyPaymentInstruments.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "MyPaymentInstruments", contained = true)
-public interface MyPaymentInstruments
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument newPaymentInstrument();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection newPaymentInstrumentCollection();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI newCreditCardPI();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection newCreditCardPICollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
index bbbec65..f4d92d1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,7 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "OrderDetails")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderDetails")
public interface OrderDetails
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail, OrderDetailKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
index 0c64602..6324951 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "Orders")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Orders")
public interface Orders
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order newOrder();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection newOrderCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
index 04e5dc2..0da37d6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "People")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "People")
public interface People
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person newPerson();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection newPersonCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
index d9acf1b..e0c6ce4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,7 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "ProductDetails")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails")
public interface ProductDetails
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail, ProductDetailKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
index 2cb2010..3441421 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,7 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "ProductReviews")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReviews")
public interface ProductReviews
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
index d9e66fa..48c3040 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "Products")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products")
public interface Products
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product newProduct();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection newProductCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
index e44d0e5..b2bc233 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -43,6 +44,6 @@ import java.util.Calendar;
-@Singleton(name = "PublicCompany")
-public interface PublicCompany extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {
+@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "PublicCompany")
+public interface PublicCompany extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
index ab6cbc4..12e8461 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "StoredPIs")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "StoredPIs")
public interface StoredPIs
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI newStoredPI();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection newStoredPICollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
index 7ddb271..fe6a468 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "SubscriptionTemplates")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "SubscriptionTemplates")
public interface SubscriptionTemplates
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription newSubscription();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection newSubscriptionCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
index ddee96b..07b886a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -43,6 +44,6 @@ import java.util.Calendar;
-@Singleton(name = "VipCustomer")
-public interface VipCustomer extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
+@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "VipCustomer")
+public interface VipCustomer extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
index e7fb1fc..abf2d52 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java
@@ -16,5 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
index 5055bde..f03c8d2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -23,8 +24,8 @@ import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@EnumType(name = "AccessLevel",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "AccessLevel",
underlyingType = EdmPrimitiveTypeKind.Int32,
isFlags = true)
public enum AccessLevel {
@@ -34,13 +35,13 @@ public enum AccessLevel {
Execute(4),
ReadWrite(3);
- private Integer value;
+ private java.lang.Integer value;
- public Integer getValue(){
+ public java.lang.Integer getValue(){
return this.value;
}
- private AccessLevel(final Integer value){
+ private AccessLevel(final java.lang.Integer value){
this.value=value;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
index 12402e3..7fe3774 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Account",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Account",
openType = false,
hasStream = false,
isAbstract = false)
public interface Account
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "AccountID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Account
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getAccountID();
+ java.lang.Integer getAccountID();
- void setAccountID(Integer _accountID);
+ void setAccountID(java.lang.Integer _accountID);
- @Property(name = "Country",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Account
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getCountry();
+ java.lang.String getCountry();
- void setCountry(String _country);
+ void setCountry(java.lang.String _country);
- @Property(name = "AccountInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo",
nullable = true,
defaultValue = "",
@@ -134,7 +130,7 @@ public interface Account
- @NavigationProperty(name = "MyGiftCard",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyGiftCard",
type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "",
@@ -144,27 +140,9 @@ public interface Account
void setMyGiftCard(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard _myGiftCard);
- @NavigationProperty(name = "MyPaymentInstruments",
- type = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.MyPaymentInstruments getMyPaymentInstruments();
-
- void setMyPaymentInstruments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.MyPaymentInstruments _myPaymentInstruments);
-
- @NavigationProperty(name = "ActiveSubscriptions",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.ActiveSubscriptions getActiveSubscriptions();
-
- void setActiveSubscriptions(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.ActiveSubscriptions _activeSubscriptions);
-
- @NavigationProperty(name = "AvailableSubscriptionTemplatess",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AvailableSubscriptionTemplatess",
type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -178,14 +156,14 @@ public interface Account
Operations operations();
interface Operations {
- @Operation(name = "GetDefaultPI",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetDefaultPI",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument getDefaultPI(
);
- @Operation(name = "GetAccountInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetAccountInfo",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
@@ -193,56 +171,95 @@ public interface Account
);
- @Operation(name = "RefreshDefaultPI",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RefreshDefaultPI",
type = OperationType.ACTION,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument refreshDefaultPI(
- @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) Calendar newDate
+ @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) java.util.Calendar newDate
);
}
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "AccountInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo newAccountInfo();
- }
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "AccountID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AccountID",
type = "Edm.Int32")
Annotatable getAccountIDAnnotations();
- @AnnotationsForProperty(name = "Country",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country",
type = "Edm.String")
Annotatable getCountryAnnotations();
- @AnnotationsForProperty(name = "AccountInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AccountInfo",
type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
Annotatable getAccountInfoAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "MyGiftCard",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "MyGiftCard",
type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard")
Annotatable getMyGiftCardAnnotations();
-
- @AnnotationsForNavigationProperty(name = "MyPaymentInstruments",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "MyPaymentInstruments",
type = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument")
Annotatable getMyPaymentInstrumentsAnnotations();
-
- @AnnotationsForNavigationProperty(name = "ActiveSubscriptions",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ActiveSubscriptions",
type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
Annotatable getActiveSubscriptionsAnnotations();
-
- @AnnotationsForNavigationProperty(name = "AvailableSubscriptionTemplatess",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "AvailableSubscriptionTemplatess",
type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription")
Annotatable getAvailableSubscriptionTemplatessAnnotations();
+ }
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyPaymentInstruments",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "SubscriptionTemplates",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments getMyPaymentInstruments();
+ void setMyPaymentInstruments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments _myPaymentInstruments);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MyPaymentInstruments", contained = true)
+ interface MyPaymentInstruments
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument newPaymentInstrument();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection newPaymentInstrumentCollection();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI newCreditCardPI();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection newCreditCardPICollection();
}
-}
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ActiveSubscriptions",
+ type = "java.lang.Integer",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "SubscriptionTemplates",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions getActiveSubscriptions();
+ void setActiveSubscriptions(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions _activeSubscriptions);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ActiveSubscriptions", contained = true)
+ interface ActiveSubscriptions
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription newSubscription();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection newSubscriptionCollection();
+ }
+
+ }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
index b4f069a..a78767b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface AccountCollection extends AbstractEntityCollection<Account> {
+public interface AccountCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
index da20faa..c3022a6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java
@@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
@@ -40,21 +43,20 @@ 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.ODataWCFService")
-@ComplexType(name = "AccountInfo",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AccountInfo",
isOpenType = true,
isAbstract = false)
public interface AccountInfo
- extends AbstractOpenType,Serializable {
+ extends AbstractOpenType,java.io.Serializable {
- @Property(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -65,13 +67,13 @@ public interface AccountInfo
unicode = true,
collation = "",
srid = "")
- String getFirstName();
+ java.lang.String getFirstName();
- void setFirstName(String _firstName);
+ void setFirstName(java.lang.String _firstName);
- @Property(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -82,26 +84,32 @@ public interface AccountInfo
unicode = true,
collation = "",
srid = "")
- String getLastName();
+ java.lang.String getLastName();
- void setLastName(String _lastName);
+ void setLastName(java.lang.String _lastName);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
type = "Edm.String")
Annotatable getFirstNameAnnotations();
- @AnnotationsForProperty(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
type = "Edm.String")
Annotatable getLastNameAnnotations();
-
- }
+
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
index 40ce1f2..a28baa4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java
@@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
@@ -40,21 +43,20 @@ 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.ODataWCFService")
-@ComplexType(name = "Address",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Address",
isOpenType = false,
isAbstract = false)
public interface Address
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Street",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -65,13 +67,13 @@ public interface Address
unicode = true,
collation = "",
srid = "")
- String getStreet();
+ java.lang.String getStreet();
- void setStreet(String _street);
+ void setStreet(java.lang.String _street);
- @Property(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -82,13 +84,13 @@ public interface Address
unicode = true,
collation = "",
srid = "")
- String getCity();
+ java.lang.String getCity();
- void setCity(String _city);
+ void setCity(java.lang.String _city);
- @Property(name = "PostalCode",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -99,30 +101,36 @@ public interface Address
unicode = true,
collation = "",
srid = "")
- String getPostalCode();
+ java.lang.String getPostalCode();
- void setPostalCode(String _postalCode);
+ void setPostalCode(java.lang.String _postalCode);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "Street",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
type = "Edm.String")
Annotatable getStreetAnnotations();
- @AnnotationsForProperty(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
type = "Edm.String")
Annotatable getCityAnnotations();
- @AnnotationsForProperty(name = "PostalCode",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
type = "Edm.String")
Annotatable getPostalCodeAnnotations();
-
- }
+
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
index aad3273..4c41e70 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Asset",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Asset",
openType = false,
hasStream = false,
isAbstract = false)
public interface Asset
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "AssetID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AssetID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Asset
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getAssetID();
+ java.lang.Integer getAssetID();
- void setAssetID(Integer _assetID);
+ void setAssetID(java.lang.Integer _assetID);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Asset
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(String _name);
+ void setName(java.lang.String _name);
- @Property(name = "Number",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Number",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -128,31 +124,36 @@ public interface Asset
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getNumber();
+ java.lang.Integer getNumber();
- void setNumber(Integer _number);
+ void setNumber(java.lang.Integer _number);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "AssetID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AssetID",
type = "Edm.Int32")
Annotatable getAssetIDAnnotations();
- @AnnotationsForProperty(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
type = "Edm.String")
Annotatable getNameAnnotations();
- @AnnotationsForProperty(name = "Number",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Number",
type = "Edm.Int32")
Annotatable getNumberAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
index acc55d1..5a48400 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface AssetCollection extends AbstractEntityCollection<Asset> {
+public interface AssetCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
index 79d5c41..36ab4dd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Club",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Club",
openType = false,
hasStream = false,
isAbstract = false)
public interface Club
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ClubID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ClubID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Club
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getClubID();
+ java.lang.Integer getClubID();
- void setClubID(Integer _clubID);
+ void setClubID(java.lang.Integer _clubID);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -105,27 +101,32 @@ public interface Club
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(String _name);
+ void setName(java.lang.String _name);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "ClubID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ClubID",
type = "Edm.Int32")
Annotatable getClubIDAnnotations();
- @AnnotationsForProperty(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
type = "Edm.String")
Annotatable getNameAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
index e04aa4a..61b6e82 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface ClubCollection extends AbstractEntityCollection<Club> {
+public interface ClubCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
index 17a0a7d..84c3835 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -23,8 +24,8 @@ import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@EnumType(name = "Color",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "Color",
underlyingType = EdmPrimitiveTypeKind.Int32,
isFlags = false)
public enum Color {
@@ -32,13 +33,13 @@ public enum Color {
Green(2),
Blue(4);
- private Integer value;
+ private java.lang.Integer value;
- public Integer getValue(){
+ public java.lang.Integer getValue(){
return this.value;
}
- private Color(final Integer value){
+ private Color(final java.lang.Integer value){
this.value=value;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
index cc27967..a9b4ead 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,17 +48,10 @@ 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.ODataWCFService")
-@EntityType(name = "Company",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Company",
openType = true,
hasStream = false,
isAbstract = false)
@@ -64,7 +60,7 @@ public interface Company
@Key
- @Property(name = "CompanyID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Company
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCompanyID();
+ java.lang.Integer getCompanyID();
- void setCompanyID(Integer _companyID);
+ void setCompanyID(java.lang.Integer _companyID);
- @Property(name = "CompanyCategory",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyCategory",
type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory",
nullable = true,
defaultValue = "",
@@ -110,7 +106,7 @@ public interface Company
void setCompanyCategory(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
- @Property(name = "Revenue",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue",
type = "Edm.Int64",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface Company
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Long getRevenue();
+ java.lang.Long getRevenue();
- void setRevenue(Long _revenue);
+ void setRevenue(java.lang.Long _revenue);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -151,12 +147,12 @@ public interface Company
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(String _name);
+ void setName(java.lang.String _name);
- @Property(name = "Address",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
nullable = true,
defaultValue = "",
@@ -180,7 +176,7 @@ public interface Company
- @NavigationProperty(name = "Employees",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees",
type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -190,7 +186,7 @@ public interface Company
void setEmployees(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees);
- @NavigationProperty(name = "VipCustomer",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer",
type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -200,7 +196,7 @@ public interface Company
void setVipCustomer(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer);
- @NavigationProperty(name = "Departments",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -210,7 +206,7 @@ public interface Company
void setDepartments(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments);
- @NavigationProperty(name = "CoreDepartment",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -224,72 +220,73 @@ public interface Company
Operations operations();
interface Operations {
- @Operation(name = "GetEmployeesCount",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetEmployeesCount",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Edm.Int32")
- Integer getEmployeesCount(
+ java.lang.Integer getEmployeesCount(
);
- @Operation(name = "IncreaseRevenue",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseRevenue",
type = OperationType.ACTION,
returnType = "Edm.Int64")
- Long increaseRevenue(
- @Parameter(name = "IncreaseValue", type = "Edm.Int64", nullable = true) Long increaseValue
+ java.lang.Long increaseRevenue(
+ @Parameter(name = "IncreaseValue", type = "Edm.Int64", nullable = true) java.lang.Long increaseValue
);
}
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "Address",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress();
- }
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "CompanyID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyID",
type = "Edm.Int32")
Annotatable getCompanyIDAnnotations();
- @AnnotationsForProperty(name = "CompanyCategory",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyCategory",
type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory")
Annotatable getCompanyCategoryAnnotations();
- @AnnotationsForProperty(name = "Revenue",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Revenue",
type = "Edm.Int64")
Annotatable getRevenueAnnotations();
- @AnnotationsForProperty(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
type = "Edm.String")
Annotatable getNameAnnotations();
- @AnnotationsForProperty(name = "Address",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
Annotatable getAddressAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "Employees",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Employees",
type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
Annotatable getEmployeesAnnotations();
-
- @AnnotationsForNavigationProperty(name = "VipCustomer",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "VipCustomer",
type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
Annotatable getVipCustomerAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Departments",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Departments",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
Annotatable getDepartmentsAnnotations();
-
- @AnnotationsForNavigationProperty(name = "CoreDepartment",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CoreDepartment",
type = "Microsoft.Test.OData.Services.ODataWCFService.Department")
Annotatable getCoreDepartmentAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
index d4916dd..071eae6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java
@@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
@@ -40,22 +43,21 @@ 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.ODataWCFService")
-@ComplexType(name = "CompanyAddress",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "CompanyAddress",
isOpenType = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
public interface CompanyAddress
- extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,Serializable {
+ extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,java.io.Serializable {
- @Property(name = "Street",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -66,13 +68,13 @@ public interface CompanyAddress
unicode = true,
collation = "",
srid = "")
- String getStreet();
+ java.lang.String getStreet();
- void setStreet(String _street);
+ void setStreet(java.lang.String _street);
- @Property(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -83,13 +85,13 @@ public interface CompanyAddress
unicode = true,
collation = "",
srid = "")
- String getCity();
+ java.lang.String getCity();
- void setCity(String _city);
+ void setCity(java.lang.String _city);
- @Property(name = "PostalCode",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -100,13 +102,13 @@ public interface CompanyAddress
unicode = true,
collation = "",
srid = "")
- String getPostalCode();
+ java.lang.String getPostalCode();
- void setPostalCode(String _postalCode);
+ void setPostalCode(java.lang.String _postalCode);
- @Property(name = "CompanyName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -117,35 +119,40 @@ public interface CompanyAddress
unicode = true,
collation = "",
srid = "")
- String getCompanyName();
+ java.lang.String getCompanyName();
- void setCompanyName(String _companyName);
+ void setCompanyName(java.lang.String _companyName);
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.ComplexFactory{
+ }
- @Override
- Annotations annotations();
+ Annotations annotations();
interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations{
- @AnnotationsForProperty(name = "Street",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
type = "Edm.String")
Annotatable getStreetAnnotations();
- @AnnotationsForProperty(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
type = "Edm.String")
Annotatable getCityAnnotations();
- @AnnotationsForProperty(name = "PostalCode",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
type = "Edm.String")
Annotatable getPostalCodeAnnotations();
- @AnnotationsForProperty(name = "CompanyName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyName",
type = "Edm.String")
Annotatable getCompanyNameAnnotations();
-
- }
+
+ }
+
+
}
[05/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/SupplierCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/SupplierCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/SupplierCollection.java
new file mode 100644
index 0000000..47792b9
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/SupplierCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface SupplierCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier> {
+
+ 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/v4/demo/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/package-info.java
new file mode 100644
index 0000000..9c9e0b7
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
index 574d5b4..a391c3e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
@@ -20,8 +20,6 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4;
import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
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.annotations.Property;
@@ -46,8 +44,8 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
-@EntityContainer(name = "DefaultContainer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
@@ -66,11 +64,11 @@ public interface DefaultContainer extends PersistenceManager {
ComplexFactory complexFactory();
interface ComplexFactory {
- @Property(name = "ContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.ContactDetails")
org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.ContactDetails newContactDetails();
- @Property(name = "AccountInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.AccountInfo")
org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.AccountInfo newAccountInfo();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
index 80a73a9..db95749 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java
@@ -43,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "Row")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row")
public interface Row
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row, UUID, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row, java.util.UUID, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection> {
org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row newRow();
org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowCollection newRowCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
index 97ee5f9..535ec88 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java
@@ -43,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "RowIndex")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RowIndex")
public interface RowIndex
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex, Integer, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex, java.lang.Integer, org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection> {
org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex newRowIndex();
org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndexCollection newRowIndexCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
index 651a65a..dc11e74 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java
@@ -19,11 +19,16 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
@@ -38,21 +43,20 @@ 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.OpenTypesServiceV4")
-@ComplexType(name = "AccountInfo",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AccountInfo",
isOpenType = true,
isAbstract = false)
public interface AccountInfo
- extends AbstractOpenType,Serializable {
+ extends AbstractOpenType,java.io.Serializable {
- @Property(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -63,13 +67,13 @@ public interface AccountInfo
unicode = true,
collation = "",
srid = "")
- String getFirstName();
+ java.lang.String getFirstName();
- void setFirstName(String _firstName);
+ void setFirstName(java.lang.String _firstName);
- @Property(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,11 +84,32 @@ public interface AccountInfo
unicode = true,
collation = "",
srid = "")
- String getLastName();
+ java.lang.String getLastName();
- void setLastName(String _lastName);
+ void setLastName(java.lang.String _lastName);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
+ type = "Edm.String")
+ Annotatable getFirstNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
+ type = "Edm.String")
+ Annotatable getLastNameAnnotations();
+
+
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
index f47d023..535c552 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java
@@ -24,8 +24,8 @@ import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-@Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
-@EnumType(name = "Color",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
+@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "Color",
underlyingType = EdmPrimitiveTypeKind.Int32,
isFlags = false)
public enum Color {
@@ -33,13 +33,13 @@ public enum Color {
Green(2),
Blue(4);
- private Integer value;
+ private java.lang.Integer value;
- public Integer getValue(){
+ public java.lang.Integer getValue(){
return this.value;
}
- private Color(final Integer value){
+ private Color(final java.lang.Integer value){
this.value=value;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
index 4eae254..5801de5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java
@@ -19,11 +19,16 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*;
@@ -38,21 +43,20 @@ 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.OpenTypesServiceV4")
-@ComplexType(name = "ContactDetails",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails",
isOpenType = false,
isAbstract = false)
public interface ContactDetails
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "FirstContacted",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstContacted",
type = "Edm.Binary",
nullable = true,
defaultValue = "",
@@ -69,7 +73,7 @@ public interface ContactDetails
- @Property(name = "LastContacted",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -80,13 +84,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Calendar getLastContacted();
+ java.util.Calendar getLastContacted();
- void setLastContacted(Calendar _lastContacted);
+ void setLastContacted(java.util.Calendar _lastContacted);
- @Property(name = "Contacted",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted",
type = "Edm.Date",
nullable = false,
defaultValue = "",
@@ -97,13 +101,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Calendar getContacted();
+ java.util.Calendar getContacted();
- void setContacted(Calendar _contacted);
+ void setContacted(java.util.Calendar _contacted);
- @Property(name = "GUID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -114,13 +118,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- UUID getGUID();
+ java.util.UUID getGUID();
- void setGUID(UUID _gUID);
+ void setGUID(java.util.UUID _gUID);
- @Property(name = "PreferedContactTime",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PreferedContactTime",
type = "Edm.TimeOfDay",
nullable = false,
defaultValue = "",
@@ -131,13 +135,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Calendar getPreferedContactTime();
+ java.util.Calendar getPreferedContactTime();
- void setPreferedContactTime(Calendar _preferedContactTime);
+ void setPreferedContactTime(java.util.Calendar _preferedContactTime);
- @Property(name = "Byte",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte",
type = "Edm.Byte",
nullable = false,
defaultValue = "",
@@ -148,13 +152,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Short getByte();
+ java.lang.Short getByte();
- void setByte(Short _byte);
+ void setByte(java.lang.Short _byte);
- @Property(name = "SignedByte",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte",
type = "Edm.SByte",
nullable = false,
defaultValue = "",
@@ -165,13 +169,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Byte getSignedByte();
+ java.lang.Byte getSignedByte();
- void setSignedByte(Byte _signedByte);
+ void setSignedByte(java.lang.Byte _signedByte);
- @Property(name = "Double",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double",
type = "Edm.Double",
nullable = false,
defaultValue = "",
@@ -182,13 +186,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Double getDouble();
+ java.lang.Double getDouble();
- void setDouble(Double _double);
+ void setDouble(java.lang.Double _double);
- @Property(name = "Single",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single",
type = "Edm.Single",
nullable = false,
defaultValue = "",
@@ -199,13 +203,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Float getSingle();
+ java.lang.Float getSingle();
- void setSingle(Float _single);
+ void setSingle(java.lang.Float _single);
- @Property(name = "Short",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short",
type = "Edm.Int16",
nullable = false,
defaultValue = "",
@@ -216,13 +220,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Short getShort();
+ java.lang.Short getShort();
- void setShort(Short _short);
+ void setShort(java.lang.Short _short);
- @Property(name = "Int",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -233,13 +237,13 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Integer getInt();
+ java.lang.Integer getInt();
- void setInt(Integer _int);
+ void setInt(java.lang.Integer _int);
- @Property(name = "Long",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long",
type = "Edm.Int64",
nullable = false,
defaultValue = "",
@@ -250,11 +254,72 @@ public interface ContactDetails
unicode = true,
collation = "",
srid = "")
- Long getLong();
+ java.lang.Long getLong();
- void setLong(Long _long);
+ void setLong(java.lang.Long _long);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstContacted",
+ type = "Edm.Binary")
+ Annotatable getFirstContactedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastContacted",
+ type = "Edm.DateTimeOffset")
+ Annotatable getLastContactedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Contacted",
+ type = "Edm.Date")
+ Annotatable getContactedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GUID",
+ type = "Edm.Guid")
+ Annotatable getGUIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PreferedContactTime",
+ type = "Edm.TimeOfDay")
+ Annotatable getPreferedContactTimeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Byte",
+ type = "Edm.Byte")
+ Annotatable getByteAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SignedByte",
+ type = "Edm.SByte")
+ Annotatable getSignedByteAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Double",
+ type = "Edm.Double")
+ Annotatable getDoubleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Single",
+ type = "Edm.Single")
+ Annotatable getSingleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Short",
+ type = "Edm.Int16")
+ Annotatable getShortAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Int",
+ type = "Edm.Int32")
+ Annotatable getIntAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Long",
+ type = "Edm.Int64")
+ Annotatable getLongAnnotations();
+
+
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
index e7ec3e6..7dd0848 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java
@@ -20,8 +20,11 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.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;
@@ -31,6 +34,7 @@ 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
@@ -44,17 +48,10 @@ 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.OpenTypesServiceV4")
-@EntityType(name = "IndexedRow",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "IndexedRow",
openType = true,
hasStream = false,
isAbstract = false,
@@ -64,7 +61,7 @@ public interface IndexedRow
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -82,12 +79,28 @@ public interface IndexedRow
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- UUID getId();
+ java.util.UUID getId();
- void setId(UUID _id);
+ void setId(java.util.UUID _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
index a4496e5..36382b5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java
@@ -44,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface IndexedRowCollection extends AbstractEntityCollection<IndexedRow> {
+public interface IndexedRowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
index d655cee..7bb0dad 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java
@@ -20,8 +20,11 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.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;
@@ -31,6 +34,7 @@ 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
@@ -44,17 +48,10 @@ 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.OpenTypesServiceV4")
-@EntityType(name = "Row",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Row",
openType = true,
hasStream = false,
isAbstract = false)
@@ -63,7 +60,7 @@ public interface Row
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -81,12 +78,28 @@ public interface Row
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- UUID getId();
+ java.util.UUID getId();
- void setId(UUID _id);
+ void setId(java.util.UUID _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
index 0872073..aa4f641 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java
@@ -44,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface RowCollection extends AbstractEntityCollection<Row> {
+public interface RowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
index 213bcc7..545214c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java
@@ -20,8 +20,11 @@
package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.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;
@@ -31,6 +34,7 @@ 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.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*;
@@ -44,17 +48,10 @@ 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.OpenTypesServiceV4")
-@EntityType(name = "RowIndex",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RowIndex",
openType = true,
hasStream = false,
isAbstract = false)
@@ -63,7 +60,7 @@ public interface RowIndex
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -81,13 +78,13 @@ public interface RowIndex
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(Integer _id);
+ void setId(java.lang.Integer _id);
- @NavigationProperty(name = "Rows",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Rows",
type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row",
targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
targetContainer = "DefaultContainer",
@@ -99,4 +96,24 @@ public interface RowIndex
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Rows",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row")
+ Annotatable getRowsAnnotations();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
index eeeb329..08c3be0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java
@@ -44,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface RowIndexCollection extends AbstractEntityCollection<RowIndex> {
+public interface RowIndexCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
index 8628426..c571081 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "Accounts")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Accounts")
public interface Accounts
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account newAccount();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection newAccountCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ActiveSubscriptions.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ActiveSubscriptions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ActiveSubscriptions.java
deleted file mode 100644
index 83746b9..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ActiveSubscriptions.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "ActiveSubscriptions", contained = true)
-public interface ActiveSubscriptions
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription newSubscription();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection newSubscriptionCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Assets.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Assets.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Assets.java
deleted file mode 100644
index f2d4f71..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Assets.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "Assets", contained = true)
-public interface Assets
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset newAsset();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AssetCollection newAssetCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/BillingStatements.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/BillingStatements.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/BillingStatements.java
deleted file mode 100644
index 5c8cac9..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/BillingStatements.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "BillingStatements", contained = true)
-public interface BillingStatements
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement newStatement();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection newStatementCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
index 70c41be..b644b9c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -43,6 +44,6 @@ import java.util.Calendar;
-@Singleton(name = "Boss")
-public interface Boss extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
+@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "Boss")
+public interface Boss extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Club.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Club.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Club.java
deleted file mode 100644
index b7f874a..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Club.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "Club", contained = true)
-public interface Club
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ClubCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club newClub();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ClubCollection newClubCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
index 4ed2761..8810011 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -43,6 +44,6 @@ import java.util.Calendar;
-@Singleton(name = "Company")
-public interface Company extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {
+@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "Company")
+public interface Company extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/CreditRecords.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/CreditRecords.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/CreditRecords.java
deleted file mode 100644
index 62eaa94..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/CreditRecords.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
-import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "CreditRecords", contained = true)
-public interface CreditRecords
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection> {
-
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord newCreditRecord();
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection newCreditRecordCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
index 575cf0d..74964cf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "Customers")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customers")
public interface Customers
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer newCustomer();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection newCustomerCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
index 9d50353..d85dc02 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -43,6 +44,6 @@ import java.util.Calendar;
-@Singleton(name = "DefaultStoredPI")
-public interface DefaultStoredPI extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
+@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "DefaultStoredPI")
+public interface DefaultStoredPI extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
index 27f5708..800d234 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "Departments")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Departments")
public interface Departments
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department newDepartment();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection newDepartmentCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
index 005c65b..ae7eb7c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
@@ -42,9 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-@EntitySet(name = "Employees")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Employees")
public interface Employees
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection> {
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee newEmployee();
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection newEmployeeCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
index 5ce328d..dad0585 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java
@@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
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.annotations.Property;
@@ -45,8 +44,8 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@EntityContainer(name = "InMemoryEntities",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "InMemoryEntities",
namespace = "Microsoft.Test.OData.Services.ODataWCFService",
isDefaultEntityContainer = true)
public interface InMemoryEntities extends PersistenceManager {
@@ -81,47 +80,47 @@ public interface InMemoryEntities extends PersistenceManager {
Operations operations();
public interface Operations {
- @Operation(name = "GetBossEmails",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetBossEmails",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Collection(Edm.String)")
- Collection<String> getBossEmails(
- @Parameter(name = "start", type = "Edm.Int32", nullable = false) Integer start,
- @Parameter(name = "count", type = "Edm.Int32", nullable = false) Integer count
+ java.util.Collection<java.lang.String> getBossEmails(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "start", type = "Edm.Int32", nullable = false) java.lang.Integer start,
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "count", type = "Edm.Int32", nullable = false) java.lang.Integer count
);
- @Operation(name = "GetPerson2",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPerson2",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getPerson2(
- @Parameter(name = "city", type = "Edm.String", nullable = false) String city
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "city", type = "Edm.String", nullable = false) java.lang.String city
);
- @Operation(name = "GetDefaultColor",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetDefaultColor",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.Color")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getDefaultColor(
);
- @Operation(name = "GetPerson",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPerson",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getPerson(
- @Parameter(name = "address", type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address", type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
);
- @Operation(name = "GetProductsByAccessLevel",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetProductsByAccessLevel",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Collection(Edm.String)")
- Collection<String> getProductsByAccessLevel(
- @Parameter(name = "accessLevel", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessLevel
+ java.util.Collection<java.lang.String> getProductsByAccessLevel(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "accessLevel", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessLevel
);
- @Operation(name = "GetAllProducts",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetAllProducts",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
@@ -129,29 +128,29 @@ public interface InMemoryEntities extends PersistenceManager {
);
- @Operation(name = "ResetBossAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetBossAddress",
type = OperationType.ACTION,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address resetBossAddress(
- @Parameter(name = "address", type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address", type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address
);
- @Operation(name = "ResetDataSource",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetDataSource",
type = OperationType.ACTION)
void resetDataSource(
);
- @Operation(name = "Discount",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
type = OperationType.ACTION)
void discount(
- @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) Integer percentage
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage
);
- @Operation(name = "ResetBossEmail",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetBossEmail",
type = OperationType.ACTION,
returnType = "Collection(Edm.String)")
- Collection<String> resetBossEmail(
- @Parameter(name = "emails", type = "Collection(Edm.String)", nullable = false) Collection<String> emails
+ java.util.Collection<java.lang.String> resetBossEmail(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "emails", type = "Collection(Edm.String)", nullable = false) java.util.Collection<java.lang.String> emails
);
}
@@ -159,19 +158,19 @@ public interface InMemoryEntities extends PersistenceManager {
ComplexFactory complexFactory();
interface ComplexFactory {
- @Property(name = "Address",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress();
- @Property(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress newHomeAddress();
- @Property(name = "CompanyAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CompanyAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress newCompanyAddress();
- @Property(name = "AccountInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AccountInfo",
type = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo newAccountInfo();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
index 3aa2ddf..85682f3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
import org.apache.olingo.ext.proxy.api.AbstractSingleton;
@@ -43,6 +44,6 @@ import java.util.Calendar;
-@Singleton(name = "LabourUnion")
-public interface LabourUnion extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion, Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection> {
+@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "LabourUnion")
+public interface LabourUnion extends AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnionCollection> {
}
[22/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
index ebbeb53..c395f03 100644
--- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
+++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java
@@ -167,8 +167,21 @@ public abstract class AbstractUtility {
}
}
+ public boolean isNavigationAlreadyDeclared(final EdmStructuredType type, final EdmNavigationProperty property) {
+ EdmStructuredType basetype = type.getBaseType();
+ while (basetype != null) {
+ if (basetype.getNavigationProperty(property.getName()) != null) {
+ return true;
+ } else {
+ basetype = basetype.getBaseType();
+ }
+ }
+ return false;
+ }
+
public String getContainedEntitySet(final EdmNavigationProperty navProp) {
- return new StringBuilder().append(basePackage).append('.').
+ return (StringUtils.isBlank(basePackage)
+ ? new StringBuilder() : new StringBuilder().append(basePackage).append('.')).
append(navProp.getType().getFullQualifiedName().getNamespace().toLowerCase()). // namespace
append('.').append(capitalize(navProp.getName())).toString();
}
@@ -289,26 +302,32 @@ public abstract class AbstractUtility {
final EdmTypeInfo edmType = getEdmTypeInfo(typeExpression);
if ((forceCollection || edmType.isCollection()) && !edmType.isEntityType()) {
- res.append("Collection<");
+ res.append("java.util.Collection<");
}
+ final String basepkg = StringUtils.isBlank(basePackage) ? "" : basePackage + ".";
+
if ("Edm.Stream".equals(typeExpression)) {
res.append(InputStream.class.getName());
} else if (edmType.isPrimitiveType()) {
final Class<?> clazz = EdmPrimitiveTypeFactory.getInstance(edmType.getPrimitiveTypeKind()).getDefaultType();
- res.append(clazz.getSimpleName());
+ if (clazz.isArray()) {
+ res.append(clazz.getComponentType().getName()).append("[]");
+ } else {
+ res.append(clazz.getName());
+ }
} else if (edmType.isComplexType()) {
- res.append(basePackage).append('.').
+ res.append(basepkg).
append(edmType.getFullQualifiedName().getNamespace().toLowerCase()). // namespace
append('.').append(TYPE_SUB_PKG).append('.').
append(capitalize(edmType.getComplexType().getName())); // ComplexType capitalized name
} else if (edmType.isEntityType()) {
- res.append(basePackage).append('.').
+ res.append(basepkg).
append(edmType.getFullQualifiedName().getNamespace().toLowerCase()). // namespace
append('.').append(TYPE_SUB_PKG).append('.').
append(capitalize(edmType.getEntityType().getName())); // EntityType capitalized name
} else if (edmType.isEnumType()) {
- res.append(basePackage).append('.').
+ res.append(basepkg).
append(edmType.getFullQualifiedName().getNamespace().toLowerCase()). // namespace
append('.').append(TYPE_SUB_PKG).append('.').
append(capitalize(edmType.getEnumType().getName()));
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
index d7acbff..ee7c28d 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/complexType.vm
@@ -22,13 +22,15 @@ 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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -39,13 +41,6 @@ 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;
#parse( "${odataVersion}/complexType.vm" )
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/containedEntitySet.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/containedEntitySet.vm b/ext/pojogen-maven-plugin/src/main/resources/containedEntitySet.vm
deleted file mode 100644
index 6433d47..0000000
--- a/ext/pojogen-maven-plugin/src/main/resources/containedEntitySet.vm
+++ /dev/null
@@ -1,65 +0,0 @@
-#*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- *#
-package ${package};
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
-#end
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-#set( $keys = $utility.getEntityKeyType($navProp) )
-#if( $keys.size() > 1 )
- #set( $type = $utility.getEdmType($navProp).EntityType.Name + "Key" )
-#elseif( $keys.size() == 1 )
- #set( $type = $keys.values().iterator().next() )
-#else
- #set( $type = "" )
-#end
-
-@EntitySet(name = "$navProp.Name", contained = true)
-public interface $utility.capitalize($navProp.Name)
- extends AbstractEntitySet<$utility.getJavaType($navProp.Type), $type, $utility.getJavaType($navProp.Type)Collection> {
-
-#foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($navProp)) )
- #set( $djt = $utility.getJavaType($dos) )
- #set( $sIdx = $djt.lastIndexOf('.') + 1 )
- $djt new$djt.substring($sIdx)();
- ${djt}Collection new$djt.substring($sIdx)Collection();
-#end
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/container.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/container.vm b/ext/pojogen-maven-plugin/src/main/resources/container.vm
index d31024b..9225537 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/container.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/container.vm
@@ -20,16 +20,14 @@
package ${package};
import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
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.annotations.Property;
import org.apache.olingo.ext.proxy.api.PersistenceManager;
import org.apache.olingo.ext.proxy.api.OperationType;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -48,8 +46,8 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@Namespace("$namespace")
-@EntityContainer(name = "$container.Name",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("$namespace")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "$container.Name",
namespace = "$namespace",
isDefaultEntityContainer = $container.Default)
public interface $utility.capitalize($container.Name) extends PersistenceManager {
@@ -65,7 +63,7 @@ public interface $utility.capitalize($container.Name) extends PersistenceManager
public interface Operations {
#foreach($operation in $container.FunctionImports)
#foreach($function in $operation.UnboundFunctions)
- @Operation(name = "$function.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "$function.Name",
type = OperationType.FUNCTION,
isComposable = $function.Composable#if($function.ReturnType),
returnType = "#if( $function.ReturnType.Collection )Collection(#end$function.ReturnType.Type.FullQualifiedName.toString()#if( $function.ReturnType.Collection ))#end"#end)
@@ -75,7 +73,7 @@ public interface $utility.capitalize($container.Name) extends PersistenceManager
*##foreach($paramName in $function.ParameterNames)#*
*##set( $count = $count - 1 )#*
*##set( $param = $function.getParameter($paramName) )#*
- *# @Parameter(name = "$param.Name", type = "#if( $param.Collection )Collection(#end$param.Type.FullQualifiedName.toString()#if( $param.Collection ))#end", nullable = $param.Nullable) $utility.getJavaType($param.Type, $param.Collection) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
+ *# @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "$param.Name", type = "#if( $param.Collection )Collection(#end$param.Type.FullQualifiedName.toString()#if( $param.Collection ))#end", nullable = $param.Nullable) $utility.getJavaType($param.Type, $param.Collection) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
#end#*
*##end);
@@ -86,7 +84,7 @@ public interface $utility.capitalize($container.Name) extends PersistenceManager
#foreach($operation in $container.ActionImports)
#set( $action = $operation.UnboundAction )
#if($action)
- @Operation(name = "$action.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "$action.Name",
type = OperationType.ACTION#if($action.ReturnType),
returnType = "#if( $action.ReturnType.Collection )Collection(#end$action.ReturnType.Type.FullQualifiedName.toString()#if( $action.ReturnType.Collection ))#end"#end)
#if($action.ReturnType)$utility.getJavaType($action.ReturnType.Type, $action.ReturnType.Collection)#{else}void#end $utility.uncapitalize($action.Name)(
@@ -95,7 +93,7 @@ public interface $utility.capitalize($container.Name) extends PersistenceManager
*##foreach($paramName in $action.ParameterNames)#*
*##set( $count = $count - 1 )#*
*##set( $param = $action.getParameter($paramName) )#*
- *# @Parameter(name = "$param.Name", type = "#if( $param.Collection )Collection(#end$param.Type.FullQualifiedName.toString()#if( $param.Collection ))#end", nullable = $param.Nullable) $utility.getJavaType($param.Type, $param.Collection) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
+ *# @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "$param.Name", type = "#if( $param.Collection )Collection(#end$param.Type.FullQualifiedName.toString()#if( $param.Collection ))#end", nullable = $param.Nullable) $utility.getJavaType($param.Type, $param.Collection) $utility.uncapitalize($param.Name)#if( $count > 0 ), #end
#end#*
*##end);
@@ -111,7 +109,7 @@ public interface $utility.capitalize($container.Name) extends PersistenceManager
interface ComplexFactory {
#foreach($complex in $complexes)
#set( $type = "${namespace}.${complex.Name}" )
- @Property(name = "$complex.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "$complex.Name",
type = "$type")
$utility.getJavaType($type) new$utility.capitalize($complex.Name)();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
index 8df366f..987b0a7 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityCollection.vm
@@ -25,8 +25,8 @@ 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;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -45,7 +45,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface $utility.capitalize($entityType.Name)Collection extends AbstractEntityCollection<$utility.capitalize($entityType.Name)> {
+public interface $utility.capitalize($entityType.Name)Collection extends AbstractEntityCollection<$utility.getJavaType($entityType)> {
#set( $functions = $utility.getFunctionsBoundTo($entityType.Name, true) )
#set( $actions = $utility.getActionsBoundTo($entityType.Name, true) )
#if( $functions.size() > 0 || $actions.size() > 0 )
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
index 8ba5ce6..825ebd2 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entitySet.vm
@@ -23,8 +23,8 @@ import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -52,7 +52,7 @@ import javax.xml.datatype.Duration;
#set( $type = "" )
#end
-@EntitySet(name = "$entitySet.Name")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "$entitySet.Name")
public interface $utility.capitalize($entitySet.Name)
extends AbstractEntitySet<$utility.getJavaType($entitySet.EntityType), $type, $utility.getJavaType($entitySet.EntityType)Collection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
index 5c54e5f..9cb2b52 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityType.vm
@@ -24,6 +24,7 @@ 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;
@@ -33,11 +34,12 @@ 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;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -48,24 +50,17 @@ 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;
#if( $keyRef )@KeyRef(${keyRef}.class)#end
-@Namespace("$namespace")
-@EntityType(name = "$entityType.Name",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("$namespace")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "$entityType.Name",
openType = $entityType.isOpenType(),
hasStream = $entityType.hasStream(),
isAbstract = $entityType.Abstract#if($entityType.getBaseType()),
baseType = "$entityType.getBaseType().getFullQualifiedName().toString()"#end)
public interface $utility.capitalize($entityType.Name)
- extends Annotatable,#if( $entityType.getBaseType() )$utility.getJavaType($entityType.getBaseType())#{elseif}( $entityType.isOpenType() )AbstractOpenType#{else}Serializable#end {
+ extends Annotatable,#if( $entityType.getBaseType() )$utility.getJavaType($entityType.getBaseType())#{elseif}( $entityType.isOpenType() )AbstractOpenType#{else}java.io.Serializable#end {
#set( $keys = [] )
#foreach($key in $entityType.KeyPropertyRefs)
@@ -73,12 +68,13 @@ public interface $utility.capitalize($entityType.Name)
#end
#set( $complexProps = [] )
+#set( $contained = [] )
#foreach($propertyName in $entityType.PropertyNames)
#set($property = $entityType.getProperty($propertyName))
#set($fcprops = $utility.getFcProperties($property) )
#if($keys.contains($property.Name))@Key#end
- @Property(name = "$property.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "$property.Name",
type = "$property.Type.FullQualifiedName.toString()",
nullable = $property.Nullable,
defaultValue = "#if($property.getDefaultValue())$property.getDefaultValue()#end",
@@ -110,18 +106,16 @@ public interface $utility.capitalize($entityType.Name)
#set($type = $utility.getNavigationType($property))
#set($binding = $utility.getNavigationBindingDetails($entityType, $property))
- @NavigationProperty(name = "$property.Name",
+ #if($property.containsTarget() && $property.Collection)#*
+ *##set( $contains = $contained.add($property) )
+ #else#*
+ *#@org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "$property.Name",
type = "$type",
targetSchema = "$binding.Schema.Namespace",
targetContainer = "#if($binding.Container)$binding.Container.Name#end",
targetEntitySet = "#if($binding.EntitySet)$binding.EntitySet.Name#end",
containsTarget = $property.containsTarget())
- #if($property.containsTarget() && $property.Collection)#*
- *#$utility.getContainedEntitySet($property) get$utility.capitalize($property.Name)();
-
- void set$utility.capitalize($property.Name)($utility.getContainedEntitySet($property) _$utility.uncapitalize($property.Name));
- #else#*
- *#$utility.getJavaType($type, $property.Collection) get$utility.capitalize($property.Name)();
+ $utility.getJavaType($type, $property.Collection) get$utility.capitalize($property.Name)();
void set$utility.capitalize($property.Name)($utility.getJavaType($type, $property.Collection) _$utility.uncapitalize($property.Name));
#end
@@ -145,7 +139,7 @@ public interface $utility.capitalize($entityType.Name)
interface Operations #if($inherited.size() > 0)
extends ${utility.getJavaType($entityType.getBaseType())}.Operations#end{
#foreach($operation in $functions)
- @Operation(name = "$operation.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "$operation.Name",
type = OperationType.FUNCTION,
isComposable = $operation.Composable#if($operation.ReturnType),
returnType = "#if( $operation.ReturnType.Collection )Collection(#end$operation.ReturnType.Type.FullQualifiedName.toString()#if( $operation.ReturnType.Collection ))#end"#end)
@@ -165,7 +159,7 @@ public interface $utility.capitalize($entityType.Name)
#end
#foreach($operation in $actions)
- @Operation(name = "$operation.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "$operation.Name",
type = OperationType.ACTION#if($operation.ReturnType),
returnType = "#if( $operation.ReturnType.Collection )Collection(#end$operation.ReturnType.Type.FullQualifiedName.toString()#if( $operation.ReturnType.Collection ))#end"#end)
#if($operation.ReturnType)$utility.getJavaType($operation.ReturnType.Type, $operation.ReturnType.Collection)#{else}void#end $utility.uncapitalize($operation.Name)(
@@ -185,46 +179,74 @@ public interface $utility.capitalize($entityType.Name)
}
#end
-#if( $complexProps.size() > 0 )
- #if( $entityType.baseType )
- @Override
- #end
ComplexFactory factory();
interface ComplexFactory #if( $entityType.baseType )
extends ${utility.getJavaType($entityType.getBaseType())}.ComplexFactory#end{
- #foreach($property in $complexProps)
- @Property(name = "$property.Name",
+#foreach($property in $complexProps)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "$property.Name",
type = "$property.Type.FullQualifiedName.toString()")
$utility.getJavaType($property.Type) new$utility.capitalize($property.Name)();
- #end
- }
#end
+ }
- #if( $entityType.baseType )
- @Override
- #end
Annotations annotations();
interface Annotations #if( $entityType.baseType )
extends ${utility.getJavaType($entityType.getBaseType())}.Annotations#end{
- #foreach($propertyName in $entityType.PropertyNames)
+#foreach($propertyName in $entityType.PropertyNames)
#set($property = $entityType.getProperty($propertyName))
- @AnnotationsForProperty(name = "$property.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "$property.Name",
type = "$property.Type.FullQualifiedName.toString()")
Annotatable get$utility.capitalize($property.Name)Annotations();
- #end
+#end
- #foreach($propertyName in $entityType.NavigationPropertyNames)
+#foreach($propertyName in $entityType.NavigationPropertyNames)
#set($property = $entityType.getNavigationProperty($propertyName))
#set($type = $utility.getNavigationType($property))
- @AnnotationsForNavigationProperty(name = "$property.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "$property.Name",
type = "$type")
Annotatable get$utility.capitalize($property.Name)Annotations();
+#end
+ }
+
+#foreach($property in $contained)
+ #if( !$entityType.BaseType.getNavigationProperty($property.Name))
+ #set( $pkgname = "${package}.${utility.capitalize($entityType.Name)}.$utility.capitalize($property.Name)" )
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "$property.Name",
+ type = "$type",
+ targetSchema = "$binding.Schema.Namespace",
+ targetContainer = "#if($binding.Container)$binding.Container.Name#end",
+ targetEntitySet = "#if($binding.EntitySet)$binding.EntitySet.Name#end",
+ containsTarget = $property.containsTarget())
+ $pkgname get$utility.capitalize($property.Name)();
+ void set$utility.capitalize($property.Name)($pkgname _$utility.uncapitalize($property.Name));
+
+ #set( $keys = $utility.getEntityKeyType($property) )
+ #if( $keys.size() > 1 )
+ #set( $type = $utility.getEdmType($property).EntityType.Name + "Key" )
+ #elseif( $keys.size() == 1 )
+ #set( $type = $keys.values().iterator().next() )
+ #else
+ #set( $type = "" )
+ #end
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "$property.Name", contained = true)
+ interface $utility.capitalize($property.Name)
+ extends AbstractEntitySet<$utility.getJavaType($property.Type), $type, $utility.getJavaType($property.Type)Collection> {
+
+ #foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($property)) )
+ #set( $djt = $utility.getJavaType($dos) )
+ #set( $sIdx = $djt.lastIndexOf('.') + 1 )
+ $djt new$djt.substring($sIdx)();
+ ${djt}Collection new$djt.substring($sIdx)Collection();
#end
}
+
+ #end
+#end
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm b/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
index 423b0e1..2c53164 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/entityTypeKey.vm
@@ -28,8 +28,8 @@ import org.apache.olingo.ext.proxy.api.AbstractEntityKey;
import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
import org.apache.olingo.client.api.edm.ConcurrencyMode;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
import org.apache.olingo.commons.api.edm.geo.Geospatial;
@@ -48,7 +48,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class $keyRef extends AbstractEntityKey {
#set ( $count = 0 )
#foreach ($entry in $keys.entrySet())
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/enumType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/enumType.vm b/ext/pojogen-maven-plugin/src/main/resources/enumType.vm
index 5467613..9e64b93 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/enumType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/enumType.vm
@@ -30,8 +30,8 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
#set( $javatype = $utility.getJavaType("Edm.Int32") )
#end
-@Namespace("$namespace")
-@EnumType(name = "$enumType.Name",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("$namespace")
+@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "$enumType.Name",
#if( $enumType.UnderlyingType )underlyingType = EdmPrimitiveTypeKind.${utility.getEdmTypeInfo($enumType.UnderlyingType).PrimitiveTypeKind.name()},
#{end}isFlags = $enumType.Flags)
public enum $enumName {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
index 5724c73..a84de50 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/singleton.vm
@@ -24,8 +24,8 @@ import org.apache.olingo.ext.proxy.api.annotations.Singleton;
import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
import org.apache.olingo.commons.api.edm.geo.Geospatial;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/term.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/term.vm b/ext/pojogen-maven-plugin/src/main/resources/term.vm
index c516209..542c7d3 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/term.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/term.vm
@@ -22,12 +22,12 @@ import org.apache.olingo.ext.proxy.api.annotations.Namespace;
import org.apache.olingo.ext.proxy.api.annotations.Term;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
#foreach($ns in $namespaces)
-import ${basePackage}.${ns}.*;
-import ${basePackage}.${ns}.types.*;
+import #if($basePackage)${basePackage}.#end${ns}.*;
+import #if($basePackage)${basePackage}.#end${ns}.types.*;
#end
-@Namespace("$namespace")
-@Term(name = "$term.Name",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("$namespace")
+@org.apache.olingo.ext.proxy.api.annotations.Term(name = "$term.Name",
type="$term.Type"#if($term.getBaseTerm()),
baseTerm = "$term.getBaseTerm().getFullQualifiedName().toString()"#end)
public interface $utility.capitalize($term.Name) extends AbstractTerm {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm
index 2c3c7ff..3984259 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/v30/complexType.vm
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*#
-@Namespace("$namespace")
-@ComplexType(name = "$complexType.Name")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("$namespace")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "$complexType.Name")
public interface $utility.capitalize($complexType.Name)
- extends #if($complexType.getBaseType())$utility.getJavaType($complexType.getBaseType().getFullQualifiedName().toString())#{else}Serializable#end {
+ extends #if($complexType.getBaseType())$utility.getJavaType($complexType.getBaseType().getFullQualifiedName().toString())#{else}java.io.Serializable#end {
#set( $complexProps = [] )
#foreach($propertyName in $complexType.PropertyNames)
#set($property = $complexType.getProperty($propertyName))
- @Property(name = "$property.Name", type = "$property.Type.FullQualifiedName.toString()", nullable = $property.Nullable)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "$property.Name", type = "$property.Type.FullQualifiedName.toString()", nullable = $property.Nullable)
$utility.getJavaType($property.Type, $property.Collection) get$utility.capitalize($property.Name)();
void set$utility.capitalize($property.Name)($utility.getJavaType($property.Type, $property.Collection) _$utility.uncapitalize($property.Name));
@@ -36,19 +36,14 @@ public interface $utility.capitalize($complexType.Name)
#end
-#if( $complexProps.size() > 0 )
- #if( $complexType.baseType )
- @Override
- #end
ComplexFactory factory();
interface ComplexFactory #if( $complexType.baseType )
extends ${utility.getJavaType($complexType.getBaseType())}.ComplexFactory#end{
- #foreach($property in $complexProps)
- @Property(name = "$property.Name",
+#foreach($property in $complexProps)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "$property.Name",
type = "$property.Type.FullQualifiedName.toString()")
$utility.getJavaType($property.Type) new$utility.capitalize($property.Name)();
- #end
+#end
}
-#end
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm b/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm
index caba995..aa12d9a 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/v40/complexType.vm
@@ -16,19 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*#
-@Namespace("$namespace")
-@ComplexType(name = "$complexType.Name",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("$namespace")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "$complexType.Name",
isOpenType = $complexType.isOpenType(),
isAbstract = $complexType.Abstract#if($complexType.getBaseType()),
baseType = "$complexType.getBaseType().getFullQualifiedName().toString()"#end)
public interface $utility.capitalize($complexType.Name)
- extends #if($complexType.getBaseType())$utility.getJavaType($complexType.getBaseType().getFullQualifiedName().toString()),#{end}#if( $complexType.isOpenType() )AbstractOpenType,#{end}Serializable {
+ extends #if($complexType.getBaseType())$utility.getJavaType($complexType.getBaseType().getFullQualifiedName().toString()),#{end}#if( $complexType.isOpenType() )AbstractOpenType,#{end}java.io.Serializable {
#set( $complexProps = [] )
+#set( $contained = [] )
#foreach($propertyName in $complexType.PropertyNames)
#set($property = $complexType.getProperty($propertyName))
- @Property(name = "$property.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "$property.Name",
type = "$property.Type",
nullable = $property.Nullable,
defaultValue = "#if($property.getDefaultValue())$property.getDefaultValue()#end",
@@ -54,7 +55,10 @@ public interface $utility.capitalize($complexType.Name)
#set( $type = $utility.getNavigationType($property) )
#set( $binding = $utility.getNavigationBindingDetails($complexType, $property) )
- @NavigationProperty(name = "$property.Name",
+ #if($property.containsTarget() && $property.Collection)#*
+ *##set( $contains = $contained.add($property) )
+ #else#*
+ *#@org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "$property.Name",
type = "$type",
targetSchema = "$binding.Schema.Namespace",
targetContainer = "#if($binding.Container)$binding.Container.Name#end",
@@ -62,48 +66,77 @@ public interface $utility.capitalize($complexType.Name)
$utility.getJavaType($type, $property.Collection) get$utility.capitalize($property.Name)();
void set$utility.capitalize($property.Name)($utility.getJavaType($type, $property.Collection) _$utility.uncapitalize($property.Name));
-
+ #end
#end
-#if( $complexProps.size() > 0 )
- #if( $complexType.baseType )
- @Override
- #end
ComplexFactory factory();
interface ComplexFactory #if( $complexType.baseType )
extends ${utility.getJavaType($complexType.getBaseType())}.ComplexFactory#end{
- #foreach($property in $complexProps)
- @Property(name = "$property.Name",
+#foreach($property in $complexProps)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "$property.Name",
type = "$property.Type.FullQualifiedName.toString()")
$utility.getJavaType($property.Type) new$utility.capitalize($property.Name)();
- #end
- }
#end
+ }
- #if( $complexType.baseType )
- @Override
- #end
Annotations annotations();
interface Annotations #if( $complexType.baseType )
extends ${utility.getJavaType($complexType.getBaseType())}.Annotations#end{
- #foreach($propertyName in $complexType.PropertyNames)
+#foreach($propertyName in $complexType.PropertyNames)
#set($property = $complexType.getProperty($propertyName))
- @AnnotationsForProperty(name = "$property.Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "$property.Name",
type = "$property.Type.FullQualifiedName.toString()")
Annotatable get$utility.capitalize($property.Name)Annotations();
- #end
+#end
- #foreach($propertyName in $complexType.NavigationPropertyNames)
+#foreach($propertyName in $complexType.NavigationPropertyNames)
#set($property = $complexType.getNavigationProperty($propertyName))
#set($type = $utility.getNavigationType($property))
@AnnotationsForNavigationProperty(name = "$property.Name",
type = "$type")
Annotatable get$utility.capitalize($property.Name)Annotations();
+#end
+ }
+
+#foreach($property in $contained)
+ #if( !$entityType.BaseType.getNavigationProperty($property.Name))
+ #set( $pkgname = "${package}.${utility.capitalize($entityType.Name)}.$utility.capitalize($property.Name)" )
+ @NavigationProperty(name = "$property.Name",
+ type = "$type",
+ targetSchema = "$binding.Schema.Namespace",
+ targetContainer = "#if($binding.Container)$binding.Container.Name#end",
+ targetEntitySet = "#if($binding.EntitySet)$binding.EntitySet.Name#end",
+ containsTarget = $property.containsTarget())
+ $pkgname get$utility.capitalize($property.Name)();
+ void set$utility.capitalize($property.Name)($pkgname _$utility.uncapitalize($property.Name));
+
+ #set( $keys = $utility.getEntityKeyType($property) )
+ #if( $keys.size() > 1 )
+ #set( $type = $utility.getEdmType($property).EntityType.Name + "Key" )
+ #elseif( $keys.size() == 1 )
+ #set( $type = $keys.values().iterator().next() )
+ #else
+ #set( $type = "" )
+ #end
+
+ @EntitySet(name = "$property.Name", contained = true)
+ interface $utility.capitalize($property.Name)
+ extends AbstractEntitySet<$utility.getJavaType($property.Type), $type, $utility.getJavaType($property.Type)Collection> {
+
+ #foreach( $dos in $utility.getDescendantsOrSelf($utility.getEdmType($property)) )
+ #set( $djt = $utility.getJavaType($dos) )
+ #set( $sIdx = $djt.lastIndexOf('.') + 1 )
+ $djt new$djt.substring($sIdx)();
+ ${djt}Collection new$djt.substring($sIdx)Collection();
#end
}
+
+ #end
+#end
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/resources/v40/singleton.vm
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/resources/v40/singleton.vm b/ext/pojogen-maven-plugin/src/main/resources/v40/singleton.vm
index 2436556..cb45e6a 100644
--- a/ext/pojogen-maven-plugin/src/main/resources/v40/singleton.vm
+++ b/ext/pojogen-maven-plugin/src/main/resources/v40/singleton.vm
@@ -25,6 +25,6 @@
#set( $type = "" )
#end
-@Singleton(name = "$singleton.Name")
+@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "$singleton.Name")
public interface $utility.capitalize($singleton.Name) extends AbstractSingleton<$utility.getJavaType($singleton.EntityType), $type, $utility.getJavaType($singleton.EntityType)Collection> {
}
\ No newline at end of file
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/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
index 8c39f4b..8965f17 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "AllGeoCollectionTypesSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet")
public interface AllGeoCollectionTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection();
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/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
index af714bc..bcb0322 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "AllGeoTypesSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoTypesSet")
public interface AllGeoTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection();
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/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
index ba2b520..a84a9ac 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Car")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Car")
public interface Car
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection();
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/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
index f8f061a..d6c94d6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Computer")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Computer")
public interface Computer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection();
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/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
index b7bc7b0..27a2df4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ComputerDetail")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ComputerDetail")
public interface ComputerDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection();
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/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
index 5ce41d6..18bf4c5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Customer")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customer")
public interface Customer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection();
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/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
index d1724dd..249878f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "CustomerInfo")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CustomerInfo")
public interface CustomerInfo
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection();
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/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index 784a96f..13d370c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -20,8 +20,6 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
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.annotations.Property;
@@ -46,77 +44,53 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityContainer(name = "DefaultContainer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
Customer getCustomer();
-
Login getLogin();
-
OrderLine getOrderLine();
-
ComputerDetail getComputerDetail();
-
Product getProduct();
-
Message getMessage();
-
ProductDetail getProductDetail();
-
ProductPhoto getProductPhoto();
-
Order getOrder();
-
Computer getComputer();
-
MappedEntityType getMappedEntityType();
-
PageView getPageView();
-
Driver getDriver();
-
AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
-
Car getCar();
-
CustomerInfo getCustomerInfo();
-
License getLicense();
-
ProductReview getProductReview();
-
LastLogin getLastLogin();
-
MessageAttachment getMessageAttachment();
-
AllGeoTypesSet getAllGeoTypesSet();
-
PersonMetadata getPersonMetadata();
-
RSAToken getRSAToken();
-
Person getPerson();
-
Operations operations();
public interface Operations {
- @Operation(name = "UpdatePersonInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
type = OperationType.ACTION)
void updatePersonInfo(
);
- @Operation(name = "RetrieveProduct",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
type = OperationType.ACTION,
returnType = "Edm.Int32")
- Integer retrieveProduct(
+ java.lang.Integer retrieveProduct(
);
}
@@ -124,31 +98,31 @@ public interface DefaultContainer extends PersistenceManager {
ComplexFactory complexFactory();
interface ComplexFactory {
- @Property(name = "ContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newContactDetails();
- @Property(name = "Aliases",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Aliases",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newAliases();
- @Property(name = "Phone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newPhone();
- @Property(name = "AuditInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AuditInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditInfo();
- @Property(name = "ConcurrencyInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrencyInfo();
- @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 = "ComplexToCategory",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexToCategory",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newComplexToCategory();
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/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
index 8e5d22b..834fdf5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Driver")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Driver")
public interface Driver
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver, String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection();
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/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
index dfd2ada..5df97e3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "LastLogin")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "LastLogin")
public interface LastLogin
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection();
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/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
index 1f93e23..dec3606 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "License")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "License")
public interface License
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License, String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection();
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/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
index b30303c..220bcd5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Login")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Login")
public interface Login
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login, String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection();
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/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
index c389462..5ed0e94 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "MappedEntityType")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MappedEntityType")
public interface MappedEntityType
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection();
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/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
index b898ffe..e23927d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Message")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Message")
public interface Message
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
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/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
index b84305c..3a9f4da 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "MessageAttachment")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MessageAttachment")
public interface MessageAttachment
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, UUID, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, java.util.UUID, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection();
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/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
index 68edb0d..4b3241a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Order")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Order")
public interface Order
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection();
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/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
index 27adb1d..42b45b6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "OrderLine")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderLine")
public interface OrderLine
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
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/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
index 6ab8de0..728e7d4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "PageView")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView")
public interface PageView
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection();
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/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
index f6d8b0f..2d42a62 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Person")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Person")
public interface Person
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection();
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/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
index aab68c6..42205d5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "PersonMetadata")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonMetadata")
public interface PersonMetadata
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection();
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/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java
index 7ee0892..dd65646 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Product")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product")
public interface Product
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection();
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/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
index 09e9aef..5f83169 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ProductDetail")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetail")
public interface ProductDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection();
[18/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
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/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
index d19c45d..de48841 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.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 = "MappedEntityType",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MappedEntityType",
openType = false,
hasStream = false,
isAbstract = false)
public interface MappedEntityType
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @Property(name = "Href",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Href",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getHref();
+ java.lang.String getHref();
- void setHref(final String _href);
+ void setHref(java.lang.String _href);
- @Property(name = "Title",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTitle();
+ java.lang.String getTitle();
- void setTitle(final String _title);
+ void setTitle(java.lang.String _title);
- @Property(name = "HrefLang",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HrefLang",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getHrefLang();
+ java.lang.String getHrefLang();
- void setHrefLang(final String _hrefLang);
+ void setHrefLang(java.lang.String _hrefLang);
- @Property(name = "Type",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Type",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getType();
+ java.lang.String getType();
- void setType(final String _type);
+ void setType(java.lang.String _type);
- @Property(name = "Length",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Length",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getLength();
+ java.lang.Integer getLength();
- void setLength(final Integer _length);
+ void setLength(java.lang.Integer _length);
- @Property(name = "BagOfPrimitiveToLinks",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfPrimitiveToLinks",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -218,12 +216,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getBagOfPrimitiveToLinks();
+ java.util.Collection<java.lang.String> getBagOfPrimitiveToLinks();
- void setBagOfPrimitiveToLinks(final Collection<String> _bagOfPrimitiveToLinks);
+ void setBagOfPrimitiveToLinks(java.util.Collection<java.lang.String> _bagOfPrimitiveToLinks);
- @Property(name = "Logo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Logo",
type = "Edm.Binary",
nullable = true,
defaultValue = "",
@@ -243,10 +241,10 @@ public interface MappedEntityType
fcKeepInContent = false)
byte[] getLogo();
- void setLogo(final byte[] _logo);
+ void setLogo(byte[] _logo);
- @Property(name = "BagOfDecimals",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDecimals",
type = "Edm.Decimal",
nullable = false,
defaultValue = "",
@@ -264,12 +262,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<BigDecimal> getBagOfDecimals();
+ java.util.Collection<java.math.BigDecimal> getBagOfDecimals();
- void setBagOfDecimals(final Collection<BigDecimal> _bagOfDecimals);
+ void setBagOfDecimals(java.util.Collection<java.math.BigDecimal> _bagOfDecimals);
- @Property(name = "BagOfDoubles",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDoubles",
type = "Edm.Double",
nullable = false,
defaultValue = "",
@@ -287,12 +285,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Double> getBagOfDoubles();
+ java.util.Collection<java.lang.Double> getBagOfDoubles();
- void setBagOfDoubles(final Collection<Double> _bagOfDoubles);
+ void setBagOfDoubles(java.util.Collection<java.lang.Double> _bagOfDoubles);
- @Property(name = "BagOfSingles",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfSingles",
type = "Edm.Single",
nullable = false,
defaultValue = "",
@@ -310,12 +308,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Float> getBagOfSingles();
+ java.util.Collection<java.lang.Float> getBagOfSingles();
- void setBagOfSingles(final Collection<Float> _bagOfSingles);
+ void setBagOfSingles(java.util.Collection<java.lang.Float> _bagOfSingles);
- @Property(name = "BagOfBytes",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfBytes",
type = "Edm.Byte",
nullable = false,
defaultValue = "",
@@ -333,12 +331,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Short> getBagOfBytes();
+ java.util.Collection<java.lang.Short> getBagOfBytes();
- void setBagOfBytes(final Collection<Short> _bagOfBytes);
+ void setBagOfBytes(java.util.Collection<java.lang.Short> _bagOfBytes);
- @Property(name = "BagOfInt16s",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt16s",
type = "Edm.Int16",
nullable = false,
defaultValue = "",
@@ -356,12 +354,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Short> getBagOfInt16s();
+ java.util.Collection<java.lang.Short> getBagOfInt16s();
- void setBagOfInt16s(final Collection<Short> _bagOfInt16s);
+ void setBagOfInt16s(java.util.Collection<java.lang.Short> _bagOfInt16s);
- @Property(name = "BagOfInt32s",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt32s",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -379,12 +377,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Integer> getBagOfInt32s();
+ java.util.Collection<java.lang.Integer> getBagOfInt32s();
- void setBagOfInt32s(final Collection<Integer> _bagOfInt32s);
+ void setBagOfInt32s(java.util.Collection<java.lang.Integer> _bagOfInt32s);
- @Property(name = "BagOfInt64s",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt64s",
type = "Edm.Int64",
nullable = false,
defaultValue = "",
@@ -402,12 +400,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Long> getBagOfInt64s();
+ java.util.Collection<java.lang.Long> getBagOfInt64s();
- void setBagOfInt64s(final Collection<Long> _bagOfInt64s);
+ void setBagOfInt64s(java.util.Collection<java.lang.Long> _bagOfInt64s);
- @Property(name = "BagOfGuids",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfGuids",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -425,12 +423,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<UUID> getBagOfGuids();
+ java.util.Collection<java.util.UUID> getBagOfGuids();
- void setBagOfGuids(final Collection<UUID> _bagOfGuids);
+ void setBagOfGuids(java.util.Collection<java.util.UUID> _bagOfGuids);
- @Property(name = "BagOfDateTime",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDateTime",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -448,12 +446,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Calendar> getBagOfDateTime();
+ java.util.Collection<java.util.Calendar> getBagOfDateTime();
- void setBagOfDateTime(final Collection<Calendar> _bagOfDateTime);
+ void setBagOfDateTime(java.util.Collection<java.util.Calendar> _bagOfDateTime);
- @Property(name = "BagOfComplexToCategories",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory",
nullable = false,
defaultValue = "",
@@ -471,12 +469,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
- void setBagOfComplexToCategories(final Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
+ void setBagOfComplexToCategories(java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
- @Property(name = "ComplexPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
nullable = true,
defaultValue = "",
@@ -496,10 +494,10 @@ public interface MappedEntityType
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getComplexPhone();
- void setComplexPhone(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
+ void setComplexPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
- @Property(name = "ComplexContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
nullable = true,
defaultValue = "",
@@ -519,26 +517,114 @@ public interface MappedEntityType
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getComplexContactDetails();
- void setComplexContactDetails(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
+ void setComplexContactDetails(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "BagOfComplexToCategories",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newBagOfComplexToCategories();
- @Property(name = "ComplexPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newComplexPhone();
- @Property(name = "ComplexContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newComplexContactDetails();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Href",
+ type = "Edm.String")
+ Annotatable getHrefAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HrefLang",
+ type = "Edm.String")
+ Annotatable getHrefLangAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Type",
+ type = "Edm.String")
+ Annotatable getTypeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Length",
+ type = "Edm.Int32")
+ Annotatable getLengthAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfPrimitiveToLinks",
+ type = "Edm.String")
+ Annotatable getBagOfPrimitiveToLinksAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Logo",
+ type = "Edm.Binary")
+ Annotatable getLogoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDecimals",
+ type = "Edm.Decimal")
+ Annotatable getBagOfDecimalsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDoubles",
+ type = "Edm.Double")
+ Annotatable getBagOfDoublesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfSingles",
+ type = "Edm.Single")
+ Annotatable getBagOfSinglesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfBytes",
+ type = "Edm.Byte")
+ Annotatable getBagOfBytesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt16s",
+ type = "Edm.Int16")
+ Annotatable getBagOfInt16sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt32s",
+ type = "Edm.Int32")
+ Annotatable getBagOfInt32sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt64s",
+ type = "Edm.Int64")
+ Annotatable getBagOfInt64sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfGuids",
+ type = "Edm.Guid")
+ Annotatable getBagOfGuidsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDateTime",
+ type = "Edm.DateTime")
+ Annotatable getBagOfDateTimeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ Annotatable getBagOfComplexToCategoriesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ Annotatable getComplexPhoneAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getComplexContactDetailsAnnotations();
+
+
+ }
+
}
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/MappedEntityTypeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
index 6a3522a..0058d91 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.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 MappedEntityTypeCollection extends AbstractEntityCollection<MappedEntityType> {
+public interface MappedEntityTypeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType> {
+
+ 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/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
index 95bcd03..a17fe06 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.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;
@KeyRef(MessageKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Message",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Message",
openType = false,
hasStream = false,
isAbstract = false)
public interface Message
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "MessageId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MessageId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getMessageId();
+ java.lang.Integer getMessageId();
- void setMessageId(final Integer _messageId);
+ void setMessageId(java.lang.Integer _messageId);
@Key
- @Property(name = "FromUsername",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FromUsername",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getFromUsername();
+ java.lang.String getFromUsername();
- void setFromUsername(final String _fromUsername);
+ void setFromUsername(java.lang.String _fromUsername);
- @Property(name = "ToUsername",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ToUsername",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getToUsername();
+ java.lang.String getToUsername();
- void setToUsername(final String _toUsername);
+ void setToUsername(java.lang.String _toUsername);
- @Property(name = "Sent",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Sent",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getSent();
+ java.util.Calendar getSent();
- void setSent(final Calendar _sent);
+ void setSent(java.util.Calendar _sent);
- @Property(name = "Subject",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Subject",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getSubject();
+ java.lang.String getSubject();
- void setSubject(final String _subject);
+ void setSubject(java.lang.String _subject);
- @Property(name = "Body",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Body",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getBody();
+ java.lang.String getBody();
- void setBody(final String _body);
+ void setBody(java.lang.String _body);
- @Property(name = "IsRead",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsRead",
type = "Edm.Boolean",
nullable = false,
defaultValue = "",
@@ -218,42 +216,94 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Boolean getIsRead();
+ java.lang.Boolean getIsRead();
- void setIsRead(final Boolean _isRead);
+ void setIsRead(java.lang.Boolean _isRead);
- @NavigationProperty(name = "Sender",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Sender",
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 getSender();
- void setSender(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
-
-
- @NavigationProperty(name = "Recipient",
+ void setSender(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Recipient",
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 getRecipient();
- void setRecipient(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
-
-
- @NavigationProperty(name = "Attachments",
+ void setRecipient(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Attachments",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "MessageAttachment")
+ targetEntitySet = "MessageAttachment",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection getAttachments();
- void setAttachments(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
+ void setAttachments(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MessageId",
+ type = "Edm.Int32")
+ Annotatable getMessageIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FromUsername",
+ type = "Edm.String")
+ Annotatable getFromUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ToUsername",
+ type = "Edm.String")
+ Annotatable getToUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Sent",
+ type = "Edm.DateTimeOffset")
+ Annotatable getSentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Subject",
+ type = "Edm.String")
+ Annotatable getSubjectAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Body",
+ type = "Edm.String")
+ Annotatable getBodyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsRead",
+ type = "Edm.Boolean")
+ Annotatable getIsReadAnnotations();
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Sender",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getSenderAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Recipient",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getRecipientAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Attachments",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment")
+ Annotatable getAttachmentsAnnotations();
+ }
}
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/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
index 2716de0..844cb1e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.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 = "MessageAttachment",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MessageAttachment",
openType = false,
hasStream = false,
isAbstract = false)
public interface MessageAttachment
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "AttachmentId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AttachmentId",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface MessageAttachment
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- UUID getAttachmentId();
+ java.util.UUID getAttachmentId();
- void setAttachmentId(final UUID _attachmentId);
+ void setAttachmentId(java.util.UUID _attachmentId);
- @Property(name = "Attachment",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Attachment",
type = "Edm.Binary",
nullable = true,
defaultValue = "",
@@ -105,10 +103,30 @@ public interface MessageAttachment
fcKeepInContent = false)
byte[] getAttachment();
- void setAttachment(final byte[] _attachment);
+ void setAttachment(byte[] _attachment);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AttachmentId",
+ type = "Edm.Guid")
+ Annotatable getAttachmentIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Attachment",
+ type = "Edm.Binary")
+ Annotatable getAttachmentAnnotations();
+
+
+ }
+
}
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/MessageAttachmentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
index 511b303..0f00e36 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.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 MessageAttachmentCollection extends AbstractEntityCollection<MessageAttachment> {
+public interface MessageAttachmentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment> {
+
+ 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/MessageCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
index 8a0d8db..3592230 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.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 MessageCollection extends AbstractEntityCollection<Message> {
+public interface MessageCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Message> {
+
+ 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/MessageKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
index 917a311..ade91b2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
@@ -47,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class MessageKey extends AbstractEntityKey {
- private String _fromUsername;
+ private java.lang.String _fromUsername;
@CompoundKeyElement(name = "FromUsername", position = 0)
- public String getFromUsername() {
+ public java.lang.String getFromUsername() {
return _fromUsername;
}
- public void setFromUsername(final String _fromUsername) {
+ public void setFromUsername(java.lang.String _fromUsername) {
this._fromUsername = _fromUsername;
}
- private Integer _messageId;
+ private java.lang.Integer _messageId;
@CompoundKeyElement(name = "MessageId", position = 1)
- public Integer getMessageId() {
+ public java.lang.Integer getMessageId() {
return _messageId;
}
- public void setMessageId(final Integer _messageId) {
+ public void setMessageId(java.lang.Integer _messageId) {
this._messageId = _messageId;
}
}
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/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
index a0a9984..b52b679 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.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 = "Order",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Order",
openType = false,
hasStream = false,
isAbstract = false)
public interface Order
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
- @Property(name = "CustomerId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
type = "Edm.Int32",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCustomerId();
+ java.lang.Integer getCustomerId();
- void setCustomerId(final Integer _customerId);
+ void setCustomerId(java.lang.Integer _customerId);
- @Property(name = "Concurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
nullable = true,
defaultValue = "",
@@ -128,38 +126,66 @@ public interface Order
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
- void setConcurrency(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+ void setConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
- @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);
-
-
- @NavigationProperty(name = "Customer",
+ void setLogin(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ @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);
-
-
+ void setCustomer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
+
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "Concurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getConcurrencyAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getCustomerAnnotations();
+ }
+
}
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/OrderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
index cc7a740..8ce0c46 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.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 OrderCollection extends AbstractEntityCollection<Order> {
+public interface OrderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order> {
+
+ 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/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
index 9bcdf77..4d61e6d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.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;
@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "OrderLine",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "OrderLine",
openType = false,
hasStream = false,
isAbstract = false)
public interface OrderLine
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "OrderLineStream",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface OrderLine
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantity();
+ java.lang.Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(java.lang.Integer _quantity);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,43 +170,83 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @NavigationProperty(name = "Order",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
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.Order getOrder();
- void setOrder(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
-
- @NavigationProperty(name = "Product",
+ void setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
+ void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
Operations operations();
interface Operations {
- @Operation(name = "RetrieveProduct",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
type = OperationType.ACTION,
returnType = "Edm.Int32")
- Integer retrieveProduct(
+ java.lang.Integer retrieveProduct(
);
}
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
+
}
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/OrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
index cf6db35..3ae9edb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.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 OrderLineCollection extends AbstractEntityCollection<OrderLine> {
+public interface OrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine> {
+
+ 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/OrderLineKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
index a5f67e0..88ffd50 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
@@ -47,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class OrderLineKey extends AbstractEntityKey {
- private Integer _orderId;
+ private java.lang.Integer _orderId;
@CompoundKeyElement(name = "OrderId", position = 0)
- public Integer getOrderId() {
+ public java.lang.Integer getOrderId() {
return _orderId;
}
- public void setOrderId(final Integer _orderId) {
+ public void setOrderId(java.lang.Integer _orderId) {
this._orderId = _orderId;
}
- private Integer _productId;
+ private java.lang.Integer _productId;
@CompoundKeyElement(name = "ProductId", position = 1)
- public Integer getProductId() {
+ public java.lang.Integer getProductId() {
return _productId;
}
- public void setProductId(final Integer _productId) {
+ public void setProductId(java.lang.Integer _productId) {
this._productId = _productId;
}
}
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/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
index 968fc24..7665a5a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.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 = "PageView",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PageView",
openType = false,
hasStream = false,
isAbstract = false)
public interface PageView
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PageViewId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPageViewId();
+ java.lang.Integer getPageViewId();
- void setPageViewId(final Integer _pageViewId);
+ void setPageViewId(java.lang.Integer _pageViewId);
- @Property(name = "Username",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getUsername();
+ java.lang.String getUsername();
- void setUsername(final String _username);
+ void setUsername(java.lang.String _username);
- @Property(name = "Viewed",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getViewed();
+ java.util.Calendar getViewed();
- void setViewed(final Calendar _viewed);
+ void setViewed(java.util.Calendar _viewed);
- @Property(name = "TimeSpentOnPage",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
type = "Edm.Time",
nullable = false,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getTimeSpentOnPage();
+ java.math.BigDecimal getTimeSpentOnPage();
- void setTimeSpentOnPage(final BigDecimal _timeSpentOnPage);
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
- @Property(name = "PageUrl",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,22 +170,58 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPageUrl();
+ java.lang.String getPageUrl();
- void setPageUrl(final String _pageUrl);
+ void setPageUrl(java.lang.String _pageUrl);
- @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 = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+ @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/PageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
index a3725d8..7c5459f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.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 PageViewCollection extends AbstractEntityCollection<PageView> {
+public interface PageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView> {
+
+ 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/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
index 6713ec0..170ebf9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.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 = "Person",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
openType = false,
hasStream = false,
isAbstract = false)
public interface Person
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Person
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 = "",
@@ -103,32 +101,56 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @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);
-
-
+ void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
Operations operations();
interface Operations {
- @Operation(name = "UpdatePersonInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo",
type = OperationType.ACTION)
void updatePersonInfo(
);
}
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface 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.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
+
}
[07/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
deleted file mode 100644
index c1bf459..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "PersonDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface PersonDetail
- extends Serializable {
-
-
- @Key
- @Property(name = "PersonID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getPersonID();
-
- void setPersonID(Integer _personID);
-
-
- @Property(name = "Age",
- type = "Edm.Byte",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Short getAge();
-
- void setAge(Short _age);
-
-
- @Property(name = "Gender",
- type = "Edm.Boolean",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Boolean getGender();
-
- void setGender(Boolean _gender);
-
-
- @Property(name = "Phone",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getPhone();
-
- void setPhone(String _phone);
-
-
- @Property(name = "Address",
- type = "ODataDemo.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
-
- void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
-
-
- @Property(name = "Photo",
- type = "Edm.Stream",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- java.io.InputStream getPhoto();
-
- void setPhoto(java.io.InputStream _photo);
-
-
-
- @NavigationProperty(name = "Person",
- type = "ODataDemo.Person",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Persons",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson();
-
- void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @Property(name = "Address",
- type = "ODataDemo.Address")
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
-
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
deleted file mode 100644
index 12ad8c1..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface PersonDetailCollection extends AbstractEntityCollection<PersonDetail> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
deleted file mode 100644
index 296b40a..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "Product",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Product
- extends Serializable {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getID();
-
- void setID(Integer _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
- @Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getDescription();
-
- void setDescription(String _description);
-
-
- @Property(name = "ReleaseDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Calendar getReleaseDate();
-
- void setReleaseDate(Calendar _releaseDate);
-
-
- @Property(name = "DiscontinuedDate",
- type = "Edm.DateTimeOffset",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Calendar getDiscontinuedDate();
-
- void setDiscontinuedDate(Calendar _discontinuedDate);
-
-
- @Property(name = "Rating",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Short getRating();
-
- void setRating(Short _rating);
-
-
- @Property(name = "Price",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Double getPrice();
-
- void setPrice(Double _price);
-
-
-
- @NavigationProperty(name = "Categories",
- type = "ODataDemo.Category",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Categories",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
- void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
- @NavigationProperty(name = "Supplier",
- type = "ODataDemo.Supplier",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Suppliers",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
- void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
- @NavigationProperty(name = "ProductDetail",
- type = "ODataDemo.ProductDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "ProductDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
- void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
-
- Operations operations();
-
- interface Operations {
-
- @Operation(name = "Discount",
- type = OperationType.ACTION,
- returnType = "Edm.Double")
- Double discount(
- @Parameter(name = "discountPercentage", type = "Edm.Int32", nullable = false) Integer discountPercentage
- );
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
deleted file mode 100644
index e18a1e3..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface ProductCollection extends AbstractEntityCollection<Product> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java
deleted file mode 100644
index 71ec682..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "ProductDetail",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface ProductDetail
- extends Serializable {
-
-
- @Key
- @Property(name = "ProductID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getProductID();
-
- void setProductID(Integer _productID);
-
-
- @Property(name = "Details",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getDetails();
-
- void setDetails(String _details);
-
-
-
- @NavigationProperty(name = "Product",
- type = "ODataDemo.Product",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product getProduct();
-
- void setProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product _product);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java
deleted file mode 100644
index 6fe5dc0..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface ProductDetailCollection extends AbstractEntityCollection<ProductDetail> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java
deleted file mode 100644
index e458d9f..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "Supplier",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Supplier
- extends Serializable {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getID();
-
- void setID(Integer _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
- @Property(name = "Address",
- type = "ODataDemo.Address",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
-
- void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
-
-
- @Property(name = "Location",
- type = "Edm.GeographyPoint",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Point getLocation();
-
- void setLocation(Point _location);
-
-
- @Property(name = "Concurrency",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getConcurrency();
-
- void setConcurrency(Integer _concurrency);
-
-
-
- @NavigationProperty(name = "Products",
- type = "ODataDemo.Product",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
-
- void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
-
-
-
- ComplexFactory factory();
-
- interface ComplexFactory {
- @Property(name = "Address",
- type = "ODataDemo.Address")
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
-
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java
deleted file mode 100644
index a354606..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface SupplierCollection extends AbstractEntityCollection<Supplier> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java
deleted file mode 100644
index 9c9e0b7..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/package-info.java
new file mode 100644
index 0000000..1d277f0
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/package-info.java
@@ -0,0 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Address.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Address.java
new file mode 100644
index 0000000..3c23d57
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Address.java
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.Property;
+import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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.util.Collection;
+import java.util.Calendar;
+import javax.xml.datatype.Duration;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Address",
+ isOpenType = false,
+ isAbstract = false)
+public interface Address
+ extends java.io.Serializable {
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getStreet();
+
+ void setStreet(java.lang.String _street);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCity();
+
+ void setCity(java.lang.String _city);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "State",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getState();
+
+ void setState(java.lang.String _state);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ZipCode",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getZipCode();
+
+ void setZipCode(java.lang.String _zipCode);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "")
+ java.lang.String getCountry();
+
+ void setCountry(java.lang.String _country);
+
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
+ type = "Edm.String")
+ Annotatable getStreetAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
+ type = "Edm.String")
+ Annotatable getCityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "State",
+ type = "Edm.String")
+ Annotatable getStateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ZipCode",
+ type = "Edm.String")
+ Annotatable getZipCodeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country",
+ type = "Edm.String")
+ Annotatable getCountryAnnotations();
+
+
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Advertisement.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Advertisement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Advertisement.java
new file mode 100644
index 0000000..4c5e91f
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Advertisement.java
@@ -0,0 +1,176 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Advertisement",
+ openType = false,
+ hasStream = true,
+ isAbstract = false)
+public interface Advertisement
+ extends Annotatable,java.io.Serializable {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Guid",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.UUID getID();
+
+ void setID(java.util.UUID _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AirDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getAirDate();
+
+ void setAirDate(java.util.Calendar _airDate);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "FeaturedProduct",
+ type = "ODataDemo.FeaturedProduct",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct();
+
+ void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct);
+
+ void setStream(java.io.InputStream stream);
+
+ java.io.InputStream getStream();
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Guid")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AirDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getAirDateAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "FeaturedProduct",
+ type = "ODataDemo.FeaturedProduct")
+ Annotatable getFeaturedProductAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/AdvertisementCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/AdvertisementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/AdvertisementCollection.java
new file mode 100644
index 0000000..cb5c6ad
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/AdvertisementCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface AdvertisementCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement> {
+
+ 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/v4/demo/types/Category.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Category.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Category.java
new file mode 100644
index 0000000..afe06c2
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Category.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Category",
+ openType = true,
+ hasStream = false,
+ isAbstract = false)
+public interface Category
+ extends Annotatable,AbstractOpenType {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products",
+ type = "ODataDemo.Product",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
+
+ void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Products",
+ type = "ODataDemo.Product")
+ Annotatable getProductsAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CategoryCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CategoryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CategoryCollection.java
new file mode 100644
index 0000000..cb532b0
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CategoryCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface CategoryCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category> {
+
+ 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/v4/demo/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Customer.java
new file mode 100644
index 0000000..9702144
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Customer.java
@@ -0,0 +1,174 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "ODataDemo.Person")
+public interface Customer
+ extends Annotatable,org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TotalExpense",
+ type = "Edm.Decimal",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.math.BigDecimal getTotalExpense();
+
+ void setTotalExpense(java.math.BigDecimal _totalExpense);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "PersonDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+
+ void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TotalExpense",
+ type = "Edm.Decimal")
+ Annotatable getTotalExpenseAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail")
+ Annotatable getPersonDetailAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CustomerCollection.java
new file mode 100644
index 0000000..ea397c8
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/CustomerCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
+}
[24/24] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/olingo-odata4
Posted by fm...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/olingo-odata4
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/b0a0c20e
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/b0a0c20e
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/b0a0c20e
Branch: refs/heads/master
Commit: b0a0c20ebbfd21edeb01e90da5dab4052e3a5180
Parents: 24a031b b913717
Author: fmartelli <fa...@gmail.com>
Authored: Mon May 26 16:00:45 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Mon May 26 16:00:45 2014 +0200
----------------------------------------------------------------------
.../core/edm/primitivetype/EdmBinary.java | 22 +++++++++++++++-----
.../core/edm/primitivetype/EdmBinaryTest.java | 2 ++
2 files changed, 19 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[15/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
index 29354b6..b08b447 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmBoolean",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmBoolean",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmBoolean
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Boolean",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmBoolean
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Boolean getId();
+ java.lang.Boolean getId();
- void setId(final Boolean _id);
+ void setId(java.lang.Boolean _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Boolean")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
index 61c4eea..c900191 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmBooleanCollection extends AbstractEntityCollection<EdmBoolean> {
+public interface EdmBooleanCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
index 17cac92..2eb7acf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmByte",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmByte",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmByte
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Byte",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmByte
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Short getId();
+ java.lang.Short getId();
- void setId(final Short _id);
+ void setId(java.lang.Short _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Byte")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
index d99ae27..c69e742 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmByteCollection extends AbstractEntityCollection<EdmByte> {
+public interface EdmByteCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
index 564dda1..dc5994f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmDateTime",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDateTime",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmDateTime
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmDateTime
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getId();
+ java.util.Calendar getId();
- void setId(final Calendar _id);
+ void setId(java.util.Calendar _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.DateTime")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
index f70dc99..8faa93a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmDateTimeCollection extends AbstractEntityCollection<EdmDateTime> {
+public interface EdmDateTimeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
index 53abbca..e04f876 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmDateTimeOffset",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDateTimeOffset",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmDateTimeOffset
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmDateTimeOffset
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getId();
+ java.util.Calendar getId();
- void setId(final Calendar _id);
+ void setId(java.util.Calendar _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.DateTimeOffset")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
index 9b03d8b..65ca0a5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmDateTimeOffsetCollection extends AbstractEntityCollection<EdmDateTimeOffset> {
+public interface EdmDateTimeOffsetCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
index a387a12..a5c77eb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmDecimal",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDecimal",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmDecimal
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Decimal",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmDecimal
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getId();
+ java.math.BigDecimal getId();
- void setId(final BigDecimal _id);
+ void setId(java.math.BigDecimal _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Decimal")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
index accf524..35eecd2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmDecimalCollection extends AbstractEntityCollection<EdmDecimal> {
+public interface EdmDecimalCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
index 870d771..672ba9d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmDouble",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmDouble",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmDouble
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Double",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmDouble
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Double getId();
+ java.lang.Double getId();
- void setId(final Double _id);
+ void setId(java.lang.Double _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Double")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
index 72e47fe..1f6d7d3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmDoubleCollection extends AbstractEntityCollection<EdmDouble> {
+public interface EdmDoubleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
index e482868..e434aa5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmGuid",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmGuid",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmGuid
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmGuid
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- UUID getId();
+ java.util.UUID getId();
- void setId(final UUID _id);
+ void setId(java.util.UUID _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
index a405f0b..e98e32e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmGuidCollection extends AbstractEntityCollection<EdmGuid> {
+public interface EdmGuidCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
index f648a0b..9252ed4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmInt16",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmInt16",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmInt16
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int16",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmInt16
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Short getId();
+ java.lang.Short getId();
- void setId(final Short _id);
+ void setId(java.lang.Short _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int16")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
index 3f0017d..82c20f9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmInt16Collection extends AbstractEntityCollection<EdmInt16> {
+public interface EdmInt16Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
index 9975cb9..a7019b2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmInt32",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmInt32",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmInt32
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmInt32
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
index bd1d0b3..6b169d8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmInt32Collection extends AbstractEntityCollection<EdmInt32> {
+public interface EdmInt32Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
index 1a37b36..6bbcf6f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmInt64",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmInt64",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmInt64
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int64",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmInt64
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Long getId();
+ java.lang.Long getId();
- void setId(final Long _id);
+ void setId(java.lang.Long _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int64")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
index 770500f..d2c712b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmInt64Collection extends AbstractEntityCollection<EdmInt64> {
+public interface EdmInt64Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
index b685220..21db291 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmSingle",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmSingle",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmSingle
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Single",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmSingle
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Float getId();
+ java.lang.Float getId();
- void setId(final Float _id);
+ void setId(java.lang.Float _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Single")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
index 01cf3c4..b82b87f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmSingleCollection extends AbstractEntityCollection<EdmSingle> {
+public interface EdmSingleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
index 0e5ce1a..8f6b390 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmString",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmString",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmString
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmString
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getId();
+ java.lang.String getId();
- void setId(final String _id);
+ void setId(java.lang.String _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.String")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
index 45bc424..f114c75 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmStringCollection extends AbstractEntityCollection<EdmString> {
+public interface EdmStringCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
index e3dd359..3f4784c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmTime",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmTime",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmTime
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Time",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface EdmTime
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getId();
+ java.math.BigDecimal getId();
- void setId(final BigDecimal _id);
+ void setId(java.math.BigDecimal _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Time")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
index 6be8607..2b4604c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmTimeCollection extends AbstractEntityCollection<EdmTime> {
+public interface EdmTimeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
index 61ec838..25a5a42 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "Folder",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Folder",
openType = false,
hasStream = false,
isAbstract = false)
public interface Folder
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Folder
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,22 +101,46 @@ public interface Folder
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @NavigationProperty(name = "Parent",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
type = "Microsoft.Test.OData.Services.PrimitiveKeysService.Folder",
targetSchema = "Microsoft.Test.OData.Services.PrimitiveKeysService",
targetContainer = "TestContext",
- targetEntitySet = "Folders")
+ targetEntitySet = "Folders",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder getParent();
- void setParent(final org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder _parent);
+ void setParent(org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder _parent);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
+ type = "Microsoft.Test.OData.Services.PrimitiveKeysService.Folder")
+ Annotatable getParentAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
index f9c60a1..02e7e31 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 FolderCollection extends AbstractEntityCollection<Folder> {
+public interface FolderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
index 920320f..1b891d7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "AllGeoCollectionTypesSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoCollectionTypesSet")
public interface AllGeoCollectionTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes newAllSpatialCollectionTypes();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypesCollection newAllSpatialCollectionTypesCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
index 0af2cd9..2007975 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "AllGeoTypesSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "AllGeoTypesSet")
public interface AllGeoTypesSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes newAllSpatialTypes();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypesCollection newAllSpatialTypesCollection();
[12/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
index 1b0c246..d717ecf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ComputerDetailCollection extends AbstractEntityCollection<ComputerDetail> {
+public interface ComputerDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
index 251f5ad..a5cdd20 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,30 +43,33 @@ 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")
-@ComplexType(name = "ConcurrencyInfo")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo")
public interface ConcurrencyInfo
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Token", type = "Edm.String", nullable = true)
- String getToken();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
+ java.lang.String getToken();
- void setToken(final String _token);
+ void setToken(java.lang.String _token);
- @Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
- Calendar getQueriedDateTime();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
+ java.util.Calendar getQueriedDateTime();
- void setQueriedDateTime(final Calendar _queriedDateTime);
+ void setQueriedDateTime(java.util.Calendar _queriedDateTime);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
index 6d471b5..10a97b5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,78 +43,77 @@ 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")
-@ComplexType(name = "ContactDetails")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails")
public interface ContactDetails
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "EmailBag", type = "Edm.String", nullable = false)
- Collection<String> getEmailBag();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getEmailBag();
- void setEmailBag(final Collection<String> _emailBag);
+ void setEmailBag(java.util.Collection<java.lang.String> _emailBag);
- @Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- Collection<String> getAlternativeNames();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- void setAlternativeNames(final Collection<String> _alternativeNames);
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
- @Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
- void setContactAlias(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
+ void setContactAlias(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
- @Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
- void setHomePhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
+ void setHomePhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
- @Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
- void setWorkPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
+ void setWorkPhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
- @Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
- Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag();
- void setMobilePhoneBag(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
+ void setMobilePhoneBag(java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "ContactAlias",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newContactAlias();
- @Property(name = "HomePhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newHomePhone();
- @Property(name = "WorkPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newWorkPhone();
- @Property(name = "MobilePhoneBag",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
index 7ebdd6c..080ddc3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "Contractor",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Contractor",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
public interface Contractor
- extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.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 Contractor
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 Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @Property(name = "ContratorCompanyId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getContratorCompanyId();
+ java.lang.Integer getContratorCompanyId();
- void setContratorCompanyId(final Integer _contratorCompanyId);
+ void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
- @Property(name = "BillingRate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getBillingRate();
+ java.lang.Integer getBillingRate();
- void setBillingRate(final Integer _billingRate);
+ void setBillingRate(java.lang.Integer _billingRate);
- @Property(name = "TeamContactPersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -173,12 +171,12 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getTeamContactPersonId();
+ java.lang.Integer getTeamContactPersonId();
- void setTeamContactPersonId(final Integer _teamContactPersonId);
+ void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
- @Property(name = "JobDescription",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -196,22 +194,62 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getJobDescription();
+ java.lang.String getJobDescription();
- void setJobDescription(final String _jobDescription);
+ void setJobDescription(java.lang.String _jobDescription);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
- void setPersonMetadata(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+ void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.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 = "ContratorCompanyId",
+ type = "Edm.Int32")
+ Annotatable getContratorCompanyIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate",
+ type = "Edm.Int32")
+ Annotatable getBillingRateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId",
+ type = "Edm.Int32")
+ Annotatable getTeamContactPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription",
+ type = "Edm.String")
+ Annotatable getJobDescriptionAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
index 3322bdb..122bcb6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ContractorCollection extends AbstractEntityCollection<Contractor> {
+public interface ContractorCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
index db6bdff..5b51b0e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "Customer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
openType = false,
hasStream = false,
isAbstract = false)
public interface Customer
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "Thumbnail",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Thumbnail",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface Customer
fcKeepInContent = false)
java.io.InputStream getThumbnail();
- void setThumbnail(final java.io.InputStream _thumbnail);
+ void setThumbnail(java.io.InputStream _thumbnail);
- @Property(name = "Video",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -105,10 +103,10 @@ public interface Customer
fcKeepInContent = false)
java.io.InputStream getVideo();
- void setVideo(final java.io.InputStream _video);
+ void setVideo(java.io.InputStream _video);
@Key
- @Property(name = "CustomerId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCustomerId();
+ java.lang.Integer getCustomerId();
- void setCustomerId(final Integer _customerId);
+ void setCustomerId(java.lang.Integer _customerId);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @Property(name = "PrimaryContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
nullable = true,
defaultValue = "",
@@ -174,10 +172,10 @@ public interface Customer
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
- void setPrimaryContactInfo(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
+ void setPrimaryContactInfo(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
- @Property(name = "BackupContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
nullable = false,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
- void setBackupContactInfo(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
+ void setBackupContactInfo(java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
- @Property(name = "Auditing",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
nullable = true,
defaultValue = "",
@@ -220,76 +218,132 @@ public interface Customer
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
- void setAuditing(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
+ void setAuditing(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
- @NavigationProperty(name = "Orders",
+ @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
- void setOrders(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
-
-
- @NavigationProperty(name = "Logins",
+ void setOrders(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Logins",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection getLogins();
- void setLogins(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
-
-
- @NavigationProperty(name = "Husband",
+ void setLogins(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Husband",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getHusband();
- void setHusband(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
-
-
- @NavigationProperty(name = "Wife",
+ void setHusband(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Wife",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getWife();
- void setWife(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
-
-
- @NavigationProperty(name = "Info",
+ void setWife(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Info",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "CustomerInfo")
+ targetEntitySet = "CustomerInfo",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo getInfo();
- void setInfo(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
-
-
+ void setInfo(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
+
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "PrimaryContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo();
- @Property(name = "BackupContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo();
- @Property(name = "Auditing",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Thumbnail",
+ type = "Edm.Stream")
+ Annotatable getThumbnailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getPrimaryContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getBackupContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getAuditingAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrdersAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Logins",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Husband",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getHusbandAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Wife",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getWifeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Info",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo")
+ Annotatable getInfoAnnotations();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
index 09f760f..38cf43c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 CustomerCollection extends AbstractEntityCollection<Customer> {
+public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
index 4051518..4bf58ac 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "CustomerInfo",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CustomerInfo",
openType = false,
hasStream = true,
isAbstract = false)
public interface CustomerInfo
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "CustomerInfoId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerInfoId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface CustomerInfo
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCustomerInfoId();
+ java.lang.Integer getCustomerInfoId();
- void setCustomerInfoId(final Integer _customerInfoId);
+ void setCustomerInfoId(java.lang.Integer _customerInfoId);
- @Property(name = "Information",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Information",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,9 +101,9 @@ public interface CustomerInfo
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getInformation();
+ java.lang.String getInformation();
- void setInformation(final String _information);
+ void setInformation(java.lang.String _information);
@@ -114,4 +112,24 @@ public interface CustomerInfo
java.io.InputStream getStream();
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerInfoId",
+ type = "Edm.Int32")
+ Annotatable getCustomerInfoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Information",
+ type = "Edm.String")
+ Annotatable getInformationAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
index a691210..b7ee55f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 CustomerInfoCollection extends AbstractEntityCollection<CustomerInfo> {
+public interface CustomerInfoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
index f3d8733..fcbf94e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,37 +43,40 @@ 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")
-@ComplexType(name = "Dimensions")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Dimensions")
public interface Dimensions
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Width", type = "Edm.Decimal", nullable = false)
- BigDecimal getWidth();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getWidth();
- void setWidth(final BigDecimal _width);
+ void setWidth(java.math.BigDecimal _width);
- @Property(name = "Height", type = "Edm.Decimal", nullable = false)
- BigDecimal getHeight();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getHeight();
- void setHeight(final BigDecimal _height);
+ void setHeight(java.math.BigDecimal _height);
- @Property(name = "Depth", type = "Edm.Decimal", nullable = false)
- BigDecimal getDepth();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getDepth();
- void setDepth(final BigDecimal _depth);
+ void setDepth(java.math.BigDecimal _depth);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index e9eea17..73ded83 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
- void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+ void setDimensions(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
- void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+ void setComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
- void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+ void setNestedComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone();
- void setDiscontinuedPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
+ void setDiscontinuedPhone(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
- void setRelatedProducts(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
-
- @NavigationProperty(name = "Detail",
+ void setRelatedProducts(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
- void setDetail(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
-
- @NavigationProperty(name = "Reviews",
+ void setDetail(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
- void setReviews(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
-
- @NavigationProperty(name = "Photos",
+ void setReviews(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
- void setPhotos(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
+ void setPhotos(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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.staticservice.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.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
index f1ed0f2..943899e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
index 9a4a583..cf5f8c8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License getLicense();
- void setLicense(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License _license);
+ void setLicense(org.apache.olingo.fit.proxy.v3.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
index f7ba14e..fc5aea4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
[03/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
index 47aa8eb..8845b92 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -23,8 +24,8 @@ import org.apache.olingo.ext.proxy.api.annotations.EnumType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@EnumType(name = "CompanyCategory",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EnumType(name = "CompanyCategory",
underlyingType = EdmPrimitiveTypeKind.Int32,
isFlags = false)
public enum CompanyCategory {
@@ -33,13 +34,13 @@ public enum CompanyCategory {
Electronics(2),
Others(4);
- private Integer value;
+ private java.lang.Integer value;
- public Integer getValue(){
+ public java.lang.Integer getValue(){
return this.value;
}
- private CompanyCategory(final Integer value){
+ private CompanyCategory(final java.lang.Integer value){
this.value=value;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
index a5d0931..888bd00 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface CompanyCollection extends AbstractEntityCollection<Company> {
+public interface CompanyCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
index f14dc89..694d2bc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,17 +48,10 @@ 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.ODataWCFService")
-@EntityType(name = "CreditCardPI",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CreditCardPI",
openType = false,
hasStream = false,
isAbstract = false,
@@ -65,7 +61,7 @@ public interface CreditCardPI
@Key
- @Property(name = "PaymentInstrumentID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PaymentInstrumentID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -83,12 +79,12 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPaymentInstrumentID();
+ java.lang.Integer getPaymentInstrumentID();
- void setPaymentInstrumentID(Integer _paymentInstrumentID);
+ void setPaymentInstrumentID(java.lang.Integer _paymentInstrumentID);
- @Property(name = "FriendlyName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FriendlyName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -106,12 +102,12 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getFriendlyName();
+ java.lang.String getFriendlyName();
- void setFriendlyName(String _friendlyName);
+ void setFriendlyName(java.lang.String _friendlyName);
- @Property(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -129,12 +125,12 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getCreatedDate();
+ java.util.Calendar getCreatedDate();
- void setCreatedDate(Calendar _createdDate);
+ void setCreatedDate(java.util.Calendar _createdDate);
- @Property(name = "CardNumber",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CardNumber",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -152,12 +148,12 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getCardNumber();
+ java.lang.String getCardNumber();
- void setCardNumber(String _cardNumber);
+ void setCardNumber(java.lang.String _cardNumber);
- @Property(name = "CVV",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CVV",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -175,12 +171,12 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getCVV();
+ java.lang.String getCVV();
- void setCVV(String _cVV);
+ void setCVV(java.lang.String _cVV);
- @Property(name = "HolderName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HolderName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -198,12 +194,12 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getHolderName();
+ java.lang.String getHolderName();
- void setHolderName(String _holderName);
+ void setHolderName(java.lang.String _holderName);
- @Property(name = "Balance",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Balance",
type = "Edm.Double",
nullable = false,
defaultValue = "",
@@ -221,12 +217,12 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Double getBalance();
+ java.lang.Double getBalance();
- void setBalance(Double _balance);
+ void setBalance(java.lang.Double _balance);
- @Property(name = "ExperationDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -244,13 +240,13 @@ public interface CreditCardPI
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getExperationDate();
+ java.util.Calendar getExperationDate();
- void setExperationDate(Calendar _experationDate);
+ void setExperationDate(java.util.Calendar _experationDate);
- @NavigationProperty(name = "TheStoredPI",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "TheStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -260,17 +256,8 @@ public interface CreditCardPI
void setTheStoredPI(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI);
- @NavigationProperty(name = "BillingStatements",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Statement",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.BillingStatements getBillingStatements();
-
- void setBillingStatements(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.BillingStatements _billingStatements);
-
- @NavigationProperty(name = "BackupStoredPI",
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -280,72 +267,85 @@ public interface CreditCardPI
void setBackupStoredPI(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI);
- @NavigationProperty(name = "CreditRecords",
- type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.CreditRecords getCreditRecords();
+
- void setCreditRecords(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.CreditRecords _creditRecords);
-
+ ComplexFactory factory();
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.ComplexFactory{
+ }
- @Override
- Annotations annotations();
+ Annotations annotations();
interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.Annotations{
- @AnnotationsForProperty(name = "PaymentInstrumentID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PaymentInstrumentID",
type = "Edm.Int32")
Annotatable getPaymentInstrumentIDAnnotations();
- @AnnotationsForProperty(name = "FriendlyName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FriendlyName",
type = "Edm.String")
Annotatable getFriendlyNameAnnotations();
- @AnnotationsForProperty(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
type = "Edm.DateTimeOffset")
Annotatable getCreatedDateAnnotations();
- @AnnotationsForProperty(name = "CardNumber",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CardNumber",
type = "Edm.String")
Annotatable getCardNumberAnnotations();
- @AnnotationsForProperty(name = "CVV",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CVV",
type = "Edm.String")
Annotatable getCVVAnnotations();
- @AnnotationsForProperty(name = "HolderName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HolderName",
type = "Edm.String")
Annotatable getHolderNameAnnotations();
- @AnnotationsForProperty(name = "Balance",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Balance",
type = "Edm.Double")
Annotatable getBalanceAnnotations();
- @AnnotationsForProperty(name = "ExperationDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExperationDate",
type = "Edm.DateTimeOffset")
Annotatable getExperationDateAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "TheStoredPI",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "TheStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
Annotatable getTheStoredPIAnnotations();
-
- @AnnotationsForNavigationProperty(name = "BillingStatements",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BillingStatements",
type = "Microsoft.Test.OData.Services.ODataWCFService.Statement")
Annotatable getBillingStatementsAnnotations();
-
- @AnnotationsForNavigationProperty(name = "BackupStoredPI",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BackupStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
Annotatable getBackupStoredPIAnnotations();
-
- @AnnotationsForNavigationProperty(name = "CreditRecords",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CreditRecords",
type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord")
Annotatable getCreditRecordsAnnotations();
+ }
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CreditRecords",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "",
+ targetEntitySet = "",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords getCreditRecords();
+ void setCreditRecords(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords _creditRecords);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CreditRecords", contained = true)
+ interface CreditRecords
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord newCreditRecord();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecordCollection newCreditRecordCollection();
}
-}
+
+ }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
index 07139ae..dd88a14 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface CreditCardPICollection extends AbstractEntityCollection<CreditCardPI> {
+public interface CreditCardPICollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
index 93a49c8..1774c41 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "CreditRecord",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CreditRecord",
openType = false,
hasStream = false,
isAbstract = false)
public interface CreditRecord
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "CreditRecordID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreditRecordID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface CreditRecord
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCreditRecordID();
+ java.lang.Integer getCreditRecordID();
- void setCreditRecordID(Integer _creditRecordID);
+ void setCreditRecordID(java.lang.Integer _creditRecordID);
- @Property(name = "IsGood",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsGood",
type = "Edm.Boolean",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface CreditRecord
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Boolean getIsGood();
+ java.lang.Boolean getIsGood();
- void setIsGood(Boolean _isGood);
+ void setIsGood(java.lang.Boolean _isGood);
- @Property(name = "Reason",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Reason",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface CreditRecord
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getReason();
+ java.lang.String getReason();
- void setReason(String _reason);
+ void setReason(java.lang.String _reason);
- @Property(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -151,35 +147,40 @@ public interface CreditRecord
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getCreatedDate();
+ java.util.Calendar getCreatedDate();
- void setCreatedDate(Calendar _createdDate);
+ void setCreatedDate(java.util.Calendar _createdDate);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "CreditRecordID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreditRecordID",
type = "Edm.Int32")
Annotatable getCreditRecordIDAnnotations();
- @AnnotationsForProperty(name = "IsGood",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsGood",
type = "Edm.Boolean")
Annotatable getIsGoodAnnotations();
- @AnnotationsForProperty(name = "Reason",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Reason",
type = "Edm.String")
Annotatable getReasonAnnotations();
- @AnnotationsForProperty(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
type = "Edm.DateTimeOffset")
Annotatable getCreatedDateAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
index 93bdfbe..552fa51 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface CreditRecordCollection extends AbstractEntityCollection<CreditRecord> {
+public interface CreditRecordCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
index 2ddbd7a..648d99f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,17 +48,10 @@ 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.ODataWCFService")
-@EntityType(name = "Customer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
openType = false,
hasStream = false,
isAbstract = false,
@@ -65,7 +61,7 @@ public interface Customer
@Key
- @Property(name = "PersonID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -83,12 +79,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonID();
+ java.lang.Integer getPersonID();
- void setPersonID(Integer _personID);
+ void setPersonID(java.lang.Integer _personID);
- @Property(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -106,12 +102,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getFirstName();
+ java.lang.String getFirstName();
- void setFirstName(String _firstName);
+ void setFirstName(java.lang.String _firstName);
- @Property(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -129,12 +125,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getLastName();
+ java.lang.String getLastName();
- void setLastName(String _lastName);
+ void setLastName(java.lang.String _lastName);
- @Property(name = "MiddleName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -152,12 +148,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getMiddleName();
+ java.lang.String getMiddleName();
- void setMiddleName(String _middleName);
+ void setMiddleName(java.lang.String _middleName);
- @Property(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
nullable = true,
defaultValue = "",
@@ -180,7 +176,7 @@ public interface Customer
void setHomeAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
- @Property(name = "Home",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
type = "Edm.GeographyPoint",
nullable = true,
defaultValue = "",
@@ -198,12 +194,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getHome();
+ org.apache.olingo.commons.api.edm.geo.Point getHome();
- void setHome(Point _home);
+ void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
- @Property(name = "Numbers",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -221,12 +217,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getNumbers();
+ java.util.Collection<java.lang.String> getNumbers();
- void setNumbers(Collection<String> _numbers);
+ void setNumbers(java.util.Collection<java.lang.String> _numbers);
- @Property(name = "Emails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -244,12 +240,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getEmails();
+ java.util.Collection<java.lang.String> getEmails();
- void setEmails(Collection<String> _emails);
+ void setEmails(java.util.Collection<java.lang.String> _emails);
- @Property(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -267,12 +263,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getCity();
+ java.lang.String getCity();
- void setCity(String _city);
+ void setCity(java.lang.String _city);
- @Property(name = "Birthday",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Birthday",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -290,12 +286,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getBirthday();
+ java.util.Calendar getBirthday();
- void setBirthday(Calendar _birthday);
+ void setBirthday(java.util.Calendar _birthday);
- @Property(name = "TimeBetweenLastTwoOrders",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeBetweenLastTwoOrders",
type = "Edm.Duration",
nullable = false,
defaultValue = "",
@@ -313,13 +309,13 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getTimeBetweenLastTwoOrders();
+ java.math.BigDecimal getTimeBetweenLastTwoOrders();
- void setTimeBetweenLastTwoOrders(BigDecimal _timeBetweenLastTwoOrders);
+ void setTimeBetweenLastTwoOrders(java.math.BigDecimal _timeBetweenLastTwoOrders);
- @NavigationProperty(name = "Parent",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -329,7 +325,7 @@ public interface Customer
void setParent(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
- @NavigationProperty(name = "Orders",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders",
type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -339,7 +335,7 @@ public interface Customer
void setOrders(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection _orders);
- @NavigationProperty(name = "Company",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -357,77 +353,76 @@ public interface Customer
}
- @Override
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory{
- @Property(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress();
- }
+ }
- @Override
- Annotations annotations();
+ Annotations annotations();
interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations{
- @AnnotationsForProperty(name = "PersonID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
type = "Edm.Int32")
Annotatable getPersonIDAnnotations();
- @AnnotationsForProperty(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
type = "Edm.String")
Annotatable getFirstNameAnnotations();
- @AnnotationsForProperty(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
type = "Edm.String")
Annotatable getLastNameAnnotations();
- @AnnotationsForProperty(name = "MiddleName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
type = "Edm.String")
Annotatable getMiddleNameAnnotations();
- @AnnotationsForProperty(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
Annotatable getHomeAddressAnnotations();
- @AnnotationsForProperty(name = "Home",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
type = "Edm.GeographyPoint")
Annotatable getHomeAnnotations();
- @AnnotationsForProperty(name = "Numbers",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
type = "Edm.String")
Annotatable getNumbersAnnotations();
- @AnnotationsForProperty(name = "Emails",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
type = "Edm.String")
Annotatable getEmailsAnnotations();
- @AnnotationsForProperty(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
type = "Edm.String")
Annotatable getCityAnnotations();
- @AnnotationsForProperty(name = "Birthday",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Birthday",
type = "Edm.DateTimeOffset")
Annotatable getBirthdayAnnotations();
- @AnnotationsForProperty(name = "TimeBetweenLastTwoOrders",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeBetweenLastTwoOrders",
type = "Edm.Duration")
Annotatable getTimeBetweenLastTwoOrdersAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "Parent",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
Annotatable getParentAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Orders",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
Annotatable getOrdersAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Company",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
Annotatable getCompanyAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
index d4584e2..61c96c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface CustomerCollection extends AbstractEntityCollection<Customer> {
+public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
index f6a2531..3f9a329 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Department",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Department",
openType = false,
hasStream = false,
isAbstract = false)
public interface Department
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "DepartmentID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Department
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getDepartmentID();
+ java.lang.Integer getDepartmentID();
- void setDepartmentID(Integer _departmentID);
+ void setDepartmentID(java.lang.Integer _departmentID);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Department
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(String _name);
+ void setName(java.lang.String _name);
- @Property(name = "DepartmentNO",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DepartmentNO",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -128,13 +124,13 @@ public interface Department
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getDepartmentNO();
+ java.lang.String getDepartmentNO();
- void setDepartmentNO(String _departmentNO);
+ void setDepartmentNO(java.lang.String _departmentNO);
- @NavigationProperty(name = "Company",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -146,27 +142,32 @@ public interface Department
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "DepartmentID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DepartmentID",
type = "Edm.Int32")
Annotatable getDepartmentIDAnnotations();
- @AnnotationsForProperty(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
type = "Edm.String")
Annotatable getNameAnnotations();
- @AnnotationsForProperty(name = "DepartmentNO",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DepartmentNO",
type = "Edm.String")
Annotatable getDepartmentNOAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "Company",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
Annotatable getCompanyAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
index 498bf5b..4da5e12 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface DepartmentCollection extends AbstractEntityCollection<Department> {
+public interface DepartmentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
index 16f7074..6b86ec5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,17 +48,10 @@ 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.ODataWCFService")
-@EntityType(name = "Employee",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
openType = false,
hasStream = false,
isAbstract = false,
@@ -65,7 +61,7 @@ public interface Employee
@Key
- @Property(name = "PersonID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -83,12 +79,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonID();
+ java.lang.Integer getPersonID();
- void setPersonID(Integer _personID);
+ void setPersonID(java.lang.Integer _personID);
- @Property(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -106,12 +102,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getFirstName();
+ java.lang.String getFirstName();
- void setFirstName(String _firstName);
+ void setFirstName(java.lang.String _firstName);
- @Property(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -129,12 +125,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getLastName();
+ java.lang.String getLastName();
- void setLastName(String _lastName);
+ void setLastName(java.lang.String _lastName);
- @Property(name = "MiddleName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -152,12 +148,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getMiddleName();
+ java.lang.String getMiddleName();
- void setMiddleName(String _middleName);
+ void setMiddleName(java.lang.String _middleName);
- @Property(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
nullable = true,
defaultValue = "",
@@ -180,7 +176,7 @@ public interface Employee
void setHomeAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
- @Property(name = "Home",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
type = "Edm.GeographyPoint",
nullable = true,
defaultValue = "",
@@ -198,12 +194,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getHome();
+ org.apache.olingo.commons.api.edm.geo.Point getHome();
- void setHome(Point _home);
+ void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
- @Property(name = "Numbers",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -221,12 +217,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getNumbers();
+ java.util.Collection<java.lang.String> getNumbers();
- void setNumbers(Collection<String> _numbers);
+ void setNumbers(java.util.Collection<java.lang.String> _numbers);
- @Property(name = "Emails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -244,12 +240,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getEmails();
+ java.util.Collection<java.lang.String> getEmails();
- void setEmails(Collection<String> _emails);
+ void setEmails(java.util.Collection<java.lang.String> _emails);
- @Property(name = "DateHired",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateHired",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -267,12 +263,12 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getDateHired();
+ java.util.Calendar getDateHired();
- void setDateHired(Calendar _dateHired);
+ void setDateHired(java.util.Calendar _dateHired);
- @Property(name = "Office",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Office",
type = "Edm.GeographyPoint",
nullable = true,
defaultValue = "",
@@ -290,13 +286,13 @@ public interface Employee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getOffice();
+ org.apache.olingo.commons.api.edm.geo.Point getOffice();
- void setOffice(Point _office);
+ void setOffice(org.apache.olingo.commons.api.edm.geo.Point _office);
- @NavigationProperty(name = "Parent",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -306,7 +302,7 @@ public interface Employee
void setParent(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent);
- @NavigationProperty(name = "Company",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company",
type = "Microsoft.Test.OData.Services.ODataWCFService.Company",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -324,69 +320,68 @@ public interface Employee
}
- @Override
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.ComplexFactory{
- @Property(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress();
- }
+ }
- @Override
- Annotations annotations();
+ Annotations annotations();
interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations{
- @AnnotationsForProperty(name = "PersonID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
type = "Edm.Int32")
Annotatable getPersonIDAnnotations();
- @AnnotationsForProperty(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
type = "Edm.String")
Annotatable getFirstNameAnnotations();
- @AnnotationsForProperty(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
type = "Edm.String")
Annotatable getLastNameAnnotations();
- @AnnotationsForProperty(name = "MiddleName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
type = "Edm.String")
Annotatable getMiddleNameAnnotations();
- @AnnotationsForProperty(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
Annotatable getHomeAddressAnnotations();
- @AnnotationsForProperty(name = "Home",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
type = "Edm.GeographyPoint")
Annotatable getHomeAnnotations();
- @AnnotationsForProperty(name = "Numbers",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
type = "Edm.String")
Annotatable getNumbersAnnotations();
- @AnnotationsForProperty(name = "Emails",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
type = "Edm.String")
Annotatable getEmailsAnnotations();
- @AnnotationsForProperty(name = "DateHired",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DateHired",
type = "Edm.DateTimeOffset")
Annotatable getDateHiredAnnotations();
- @AnnotationsForProperty(name = "Office",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Office",
type = "Edm.GeographyPoint")
Annotatable getOfficeAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "Parent",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
Annotatable getParentAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Company",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Company",
type = "Microsoft.Test.OData.Services.ODataWCFService.Company")
Annotatable getCompanyAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
index 536d1a0..a04718c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
index 4d00981..4d04417 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "GiftCard",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "GiftCard",
openType = false,
hasStream = false,
isAbstract = false)
public interface GiftCard
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "GiftCardID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface GiftCard
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getGiftCardID();
+ java.lang.Integer getGiftCardID();
- void setGiftCardID(Integer _giftCardID);
+ void setGiftCardID(java.lang.Integer _giftCardID);
- @Property(name = "GiftCardNO",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GiftCardNO",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface GiftCard
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getGiftCardNO();
+ java.lang.String getGiftCardNO();
- void setGiftCardNO(String _giftCardNO);
+ void setGiftCardNO(java.lang.String _giftCardNO);
- @Property(name = "Amount",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Amount",
type = "Edm.Double",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface GiftCard
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Double getAmount();
+ java.lang.Double getAmount();
- void setAmount(Double _amount);
+ void setAmount(java.lang.Double _amount);
- @Property(name = "ExperationDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ExperationDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -151,12 +147,12 @@ public interface GiftCard
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getExperationDate();
+ java.util.Calendar getExperationDate();
- void setExperationDate(Calendar _experationDate);
+ void setExperationDate(java.util.Calendar _experationDate);
- @Property(name = "OwnerName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OwnerName",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -174,9 +170,9 @@ public interface GiftCard
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getOwnerName();
+ java.lang.String getOwnerName();
- void setOwnerName(String _ownerName);
+ void setOwnerName(java.lang.String _ownerName);
@@ -184,42 +180,47 @@ public interface GiftCard
Operations operations();
interface Operations {
- @Operation(name = "GetActualAmount",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetActualAmount",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Edm.Double")
- Double getActualAmount(
- @Parameter(name = "bonusRate", type = "Edm.Double", nullable = true) Double bonusRate
+ java.lang.Double getActualAmount(
+ @Parameter(name = "bonusRate", type = "Edm.Double", nullable = true) java.lang.Double bonusRate
);
}
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "GiftCardID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardID",
type = "Edm.Int32")
Annotatable getGiftCardIDAnnotations();
- @AnnotationsForProperty(name = "GiftCardNO",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GiftCardNO",
type = "Edm.String")
Annotatable getGiftCardNOAnnotations();
- @AnnotationsForProperty(name = "Amount",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Amount",
type = "Edm.Double")
Annotatable getAmountAnnotations();
- @AnnotationsForProperty(name = "ExperationDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ExperationDate",
type = "Edm.DateTimeOffset")
Annotatable getExperationDateAnnotations();
- @AnnotationsForProperty(name = "OwnerName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OwnerName",
type = "Edm.String")
Annotatable getOwnerNameAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
index eb03afd..9dd828b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface GiftCardCollection extends AbstractEntityCollection<GiftCard> {
+public interface GiftCardCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
index d67155c..8261557 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java
@@ -16,15 +16,18 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
@@ -40,22 +43,21 @@ 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.ODataWCFService")
-@ComplexType(name = "HomeAddress",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "HomeAddress",
isOpenType = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address")
public interface HomeAddress
- extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,Serializable {
+ extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address,java.io.Serializable {
- @Property(name = "Street",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -66,13 +68,13 @@ public interface HomeAddress
unicode = true,
collation = "",
srid = "")
- String getStreet();
+ java.lang.String getStreet();
- void setStreet(String _street);
+ void setStreet(java.lang.String _street);
- @Property(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -83,13 +85,13 @@ public interface HomeAddress
unicode = true,
collation = "",
srid = "")
- String getCity();
+ java.lang.String getCity();
- void setCity(String _city);
+ void setCity(java.lang.String _city);
- @Property(name = "PostalCode",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PostalCode",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -100,13 +102,13 @@ public interface HomeAddress
unicode = true,
collation = "",
srid = "")
- String getPostalCode();
+ java.lang.String getPostalCode();
- void setPostalCode(String _postalCode);
+ void setPostalCode(java.lang.String _postalCode);
- @Property(name = "FamilyName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FamilyName",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -117,35 +119,40 @@ public interface HomeAddress
unicode = true,
collation = "",
srid = "")
- String getFamilyName();
+ java.lang.String getFamilyName();
- void setFamilyName(String _familyName);
+ void setFamilyName(java.lang.String _familyName);
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.ComplexFactory{
+ }
- @Override
- Annotations annotations();
+ Annotations annotations();
interface Annotations extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations{
- @AnnotationsForProperty(name = "Street",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street",
type = "Edm.String")
Annotatable getStreetAnnotations();
- @AnnotationsForProperty(name = "City",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City",
type = "Edm.String")
Annotatable getCityAnnotations();
- @AnnotationsForProperty(name = "PostalCode",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PostalCode",
type = "Edm.String")
Annotatable getPostalCodeAnnotations();
- @AnnotationsForProperty(name = "FamilyName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FamilyName",
type = "Edm.String")
Annotatable getFamilyNameAnnotations();
-
- }
+
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
index f37419b..c186d4b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;
@@ -24,8 +25,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@Term(name = "IsBoss",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.Term(name = "IsBoss",
type="Edm.Boolean")
public interface IsBoss extends AbstractTerm {
}
[02/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
index dded85d..604c0a2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "LabourUnion",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "LabourUnion",
openType = false,
hasStream = false,
isAbstract = false)
public interface LabourUnion
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "LabourUnionID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LabourUnionID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface LabourUnion
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getLabourUnionID();
+ java.lang.Integer getLabourUnionID();
- void setLabourUnionID(Integer _labourUnionID);
+ void setLabourUnionID(java.lang.Integer _labourUnionID);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -105,27 +101,32 @@ public interface LabourUnion
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(String _name);
+ void setName(java.lang.String _name);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "LabourUnionID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LabourUnionID",
type = "Edm.Int32")
Annotatable getLabourUnionIDAnnotations();
- @AnnotationsForProperty(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
type = "Edm.String")
Annotatable getNameAnnotations();
-
- }
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
index fcbbd30..0343f3a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface LabourUnionCollection extends AbstractEntityCollection<LabourUnion> {
+public interface LabourUnionCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
index f1ad3dc..f1a1398 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Order",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Order",
openType = false,
hasStream = false,
isAbstract = false)
public interface Order
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "OrderID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderID();
+ java.lang.Integer getOrderID();
- void setOrderID(Integer _orderID);
+ void setOrderID(java.lang.Integer _orderID);
- @Property(name = "OrderDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getOrderDate();
+ java.util.Calendar getOrderDate();
- void setOrderDate(Calendar _orderDate);
+ void setOrderDate(java.util.Calendar _orderDate);
- @Property(name = "ShelfLife",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ShelfLife",
type = "Edm.Duration",
nullable = true,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getShelfLife();
+ java.math.BigDecimal getShelfLife();
- void setShelfLife(BigDecimal _shelfLife);
+ void setShelfLife(java.math.BigDecimal _shelfLife);
- @Property(name = "OrderShelfLifes",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderShelfLifes",
type = "Edm.Duration",
nullable = true,
defaultValue = "",
@@ -151,13 +147,13 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<BigDecimal> getOrderShelfLifes();
+ java.util.Collection<java.math.BigDecimal> getOrderShelfLifes();
- void setOrderShelfLifes(Collection<BigDecimal> _orderShelfLifes);
+ void setOrderShelfLifes(java.util.Collection<java.math.BigDecimal> _orderShelfLifes);
- @NavigationProperty(name = "LoggedInEmployee",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LoggedInEmployee",
type = "Microsoft.Test.OData.Services.ODataWCFService.Employee",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -167,7 +163,7 @@ public interface Order
void setLoggedInEmployee(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee _loggedInEmployee);
- @NavigationProperty(name = "CustomerForOrder",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CustomerForOrder",
type = "Microsoft.Test.OData.Services.ODataWCFService.Customer",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -177,7 +173,7 @@ public interface Order
void setCustomerForOrder(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _customerForOrder);
- @NavigationProperty(name = "OrderDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "OrderDetails",
type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -189,39 +185,44 @@ public interface Order
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "OrderID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderID",
type = "Edm.Int32")
Annotatable getOrderIDAnnotations();
- @AnnotationsForProperty(name = "OrderDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderDate",
type = "Edm.DateTimeOffset")
Annotatable getOrderDateAnnotations();
- @AnnotationsForProperty(name = "ShelfLife",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ShelfLife",
type = "Edm.Duration")
Annotatable getShelfLifeAnnotations();
- @AnnotationsForProperty(name = "OrderShelfLifes",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderShelfLifes",
type = "Edm.Duration")
Annotatable getOrderShelfLifesAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "LoggedInEmployee",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "LoggedInEmployee",
type = "Microsoft.Test.OData.Services.ODataWCFService.Employee")
Annotatable getLoggedInEmployeeAnnotations();
-
- @AnnotationsForNavigationProperty(name = "CustomerForOrder",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "CustomerForOrder",
type = "Microsoft.Test.OData.Services.ODataWCFService.Customer")
Annotatable getCustomerForOrderAnnotations();
-
- @AnnotationsForNavigationProperty(name = "OrderDetails",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "OrderDetails",
type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail")
Annotatable getOrderDetailsAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
index 5c4fc28..9b0210a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface OrderCollection extends AbstractEntityCollection<Order> {
+public interface OrderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
index 865cc72..b2ad224 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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;
@KeyRef(OrderDetailKey.class)
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@EntityType(name = "OrderDetail",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "OrderDetail",
openType = false,
hasStream = false,
isAbstract = false)
public interface OrderDetail
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "OrderID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface OrderDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderID();
+ java.lang.Integer getOrderID();
- void setOrderID(Integer _orderID);
+ void setOrderID(java.lang.Integer _orderID);
@Key
- @Property(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface OrderDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductID();
+ java.lang.Integer getProductID();
- void setProductID(Integer _productID);
+ void setProductID(java.lang.Integer _productID);
- @Property(name = "OrderPlaced",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderPlaced",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface OrderDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getOrderPlaced();
+ java.util.Calendar getOrderPlaced();
- void setOrderPlaced(Calendar _orderPlaced);
+ void setOrderPlaced(java.util.Calendar _orderPlaced);
- @Property(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -151,12 +147,12 @@ public interface OrderDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantity();
+ java.lang.Integer getQuantity();
- void setQuantity(Integer _quantity);
+ void setQuantity(java.lang.Integer _quantity);
- @Property(name = "UnitPrice",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice",
type = "Edm.Single",
nullable = false,
defaultValue = "",
@@ -174,13 +170,13 @@ public interface OrderDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Float getUnitPrice();
+ java.lang.Float getUnitPrice();
- void setUnitPrice(Float _unitPrice);
+ void setUnitPrice(java.lang.Float _unitPrice);
- @NavigationProperty(name = "ProductOrdered",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductOrdered",
type = "Microsoft.Test.OData.Services.ODataWCFService.Product",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -190,7 +186,7 @@ public interface OrderDetail
void setProductOrdered(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection _productOrdered);
- @NavigationProperty(name = "AssociatedOrder",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AssociatedOrder",
type = "Microsoft.Test.OData.Services.ODataWCFService.Order",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -202,39 +198,44 @@ public interface OrderDetail
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "OrderID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderID",
type = "Edm.Int32")
Annotatable getOrderIDAnnotations();
- @AnnotationsForProperty(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
type = "Edm.Int32")
Annotatable getProductIDAnnotations();
- @AnnotationsForProperty(name = "OrderPlaced",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderPlaced",
type = "Edm.DateTimeOffset")
Annotatable getOrderPlacedAnnotations();
- @AnnotationsForProperty(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
type = "Edm.Int32")
Annotatable getQuantityAnnotations();
- @AnnotationsForProperty(name = "UnitPrice",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UnitPrice",
type = "Edm.Single")
Annotatable getUnitPriceAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "ProductOrdered",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductOrdered",
type = "Microsoft.Test.OData.Services.ODataWCFService.Product")
Annotatable getProductOrderedAnnotations();
-
- @AnnotationsForNavigationProperty(name = "AssociatedOrder",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "AssociatedOrder",
type = "Microsoft.Test.OData.Services.ODataWCFService.Order")
Annotatable getAssociatedOrderAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
index 5e258a8..ece3be9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface OrderDetailCollection extends AbstractEntityCollection<OrderDetail> {
+public interface OrderDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
index a7d0af3..9090cf2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
@@ -46,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class OrderDetailKey extends AbstractEntityKey {
- private Integer _orderID;
+ private java.lang.Integer _orderID;
@CompoundKeyElement(name = "OrderID", position = 0)
- public Integer getOrderID() {
+ public java.lang.Integer getOrderID() {
return _orderID;
}
- public void setOrderID(Integer _orderID) {
+ public void setOrderID(java.lang.Integer _orderID) {
this._orderID = _orderID;
}
- private Integer _productID;
+ private java.lang.Integer _productID;
@CompoundKeyElement(name = "ProductID", position = 1)
- public Integer getProductID() {
+ public java.lang.Integer getProductID() {
return _productID;
}
- public void setProductID(Integer _productID) {
+ public void setProductID(java.lang.Integer _productID) {
this._productID = _productID;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
index 1e982b5..2a5bcd0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "PaymentInstrument",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PaymentInstrument",
openType = false,
hasStream = false,
isAbstract = false)
public interface PaymentInstrument
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PaymentInstrumentID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PaymentInstrumentID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface PaymentInstrument
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPaymentInstrumentID();
+ java.lang.Integer getPaymentInstrumentID();
- void setPaymentInstrumentID(Integer _paymentInstrumentID);
+ void setPaymentInstrumentID(java.lang.Integer _paymentInstrumentID);
- @Property(name = "FriendlyName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FriendlyName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface PaymentInstrument
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getFriendlyName();
+ java.lang.String getFriendlyName();
- void setFriendlyName(String _friendlyName);
+ void setFriendlyName(java.lang.String _friendlyName);
- @Property(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CreatedDate",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -128,13 +124,13 @@ public interface PaymentInstrument
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getCreatedDate();
+ java.util.Calendar getCreatedDate();
- void setCreatedDate(Calendar _createdDate);
+ void setCreatedDate(java.util.Calendar _createdDate);
- @NavigationProperty(name = "TheStoredPI",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "TheStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -144,17 +140,8 @@ public interface PaymentInstrument
void setTheStoredPI(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI);
- @NavigationProperty(name = "BillingStatements",
- type = "Microsoft.Test.OData.Services.ODataWCFService.Statement",
- targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
- targetContainer = "",
- targetEntitySet = "",
- containsTarget = true)
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.BillingStatements getBillingStatements();
-
- void setBillingStatements(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.BillingStatements _billingStatements);
-
- @NavigationProperty(name = "BackupStoredPI",
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -166,35 +153,58 @@ public interface PaymentInstrument
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "PaymentInstrumentID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PaymentInstrumentID",
type = "Edm.Int32")
Annotatable getPaymentInstrumentIDAnnotations();
- @AnnotationsForProperty(name = "FriendlyName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FriendlyName",
type = "Edm.String")
Annotatable getFriendlyNameAnnotations();
- @AnnotationsForProperty(name = "CreatedDate",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CreatedDate",
type = "Edm.DateTimeOffset")
Annotatable getCreatedDateAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "TheStoredPI",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "TheStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
Annotatable getTheStoredPIAnnotations();
-
- @AnnotationsForNavigationProperty(name = "BillingStatements",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BillingStatements",
type = "Microsoft.Test.OData.Services.ODataWCFService.Statement")
Annotatable getBillingStatementsAnnotations();
-
- @AnnotationsForNavigationProperty(name = "BackupStoredPI",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "BackupStoredPI",
type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI")
Annotatable getBackupStoredPIAnnotations();
+ }
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BillingStatements",
+ type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI",
+ targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
+ targetContainer = "InMemoryEntities",
+ targetEntitySet = "StoredPIs",
+ containsTarget = true)
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements getBillingStatements();
+ void setBillingStatements(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements _billingStatements);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "BillingStatements", contained = true)
+ interface BillingStatements
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection> {
+
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement newStatement();
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StatementCollection newStatementCollection();
}
-}
+
+ }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
index 44e8f23..b30e7c5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface PaymentInstrumentCollection extends AbstractEntityCollection<PaymentInstrument> {
+public interface PaymentInstrumentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
index fcd58ff..f6693e8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Person",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
openType = false,
hasStream = false,
isAbstract = false)
public interface Person
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PersonID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonID();
+ java.lang.Integer getPersonID();
- void setPersonID(Integer _personID);
+ void setPersonID(java.lang.Integer _personID);
- @Property(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getFirstName();
+ java.lang.String getFirstName();
- void setFirstName(String _firstName);
+ void setFirstName(java.lang.String _firstName);
- @Property(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getLastName();
+ java.lang.String getLastName();
- void setLastName(String _lastName);
+ void setLastName(java.lang.String _lastName);
- @Property(name = "MiddleName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MiddleName",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -151,12 +147,12 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getMiddleName();
+ java.lang.String getMiddleName();
- void setMiddleName(String _middleName);
+ void setMiddleName(java.lang.String _middleName);
- @Property(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address",
nullable = true,
defaultValue = "",
@@ -179,7 +175,7 @@ public interface Person
void setHomeAddress(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
- @Property(name = "Home",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home",
type = "Edm.GeographyPoint",
nullable = true,
defaultValue = "",
@@ -197,12 +193,12 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getHome();
+ org.apache.olingo.commons.api.edm.geo.Point getHome();
- void setHome(Point _home);
+ void setHome(org.apache.olingo.commons.api.edm.geo.Point _home);
- @Property(name = "Numbers",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Numbers",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -220,12 +216,12 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getNumbers();
+ java.util.Collection<java.lang.String> getNumbers();
- void setNumbers(Collection<String> _numbers);
+ void setNumbers(java.util.Collection<java.lang.String> _numbers);
- @Property(name = "Emails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Emails",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -243,13 +239,13 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getEmails();
+ java.util.Collection<java.lang.String> getEmails();
- void setEmails(Collection<String> _emails);
+ void setEmails(java.util.Collection<java.lang.String> _emails);
- @NavigationProperty(name = "Parent",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Parent",
type = "Microsoft.Test.OData.Services.ODataWCFService.Person",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -263,7 +259,7 @@ public interface Person
Operations operations();
interface Operations {
- @Operation(name = "GetHomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetHomeAddress",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress")
@@ -271,65 +267,66 @@ public interface Person
);
- @Operation(name = "ResetAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetAddress",
type = OperationType.ACTION,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person resetAddress(
- @Parameter(name = "addresses", type = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)", nullable = false) Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address> addresses,
- @Parameter(name = "index", type = "Edm.Int32", nullable = false) Integer index
+ @Parameter(name = "addresses", type = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)", nullable = false) java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address> addresses,
+ @Parameter(name = "index", type = "Edm.Int32", nullable = false) java.lang.Integer index
);
}
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress();
- }
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "PersonID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID",
type = "Edm.Int32")
Annotatable getPersonIDAnnotations();
- @AnnotationsForProperty(name = "FirstName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FirstName",
type = "Edm.String")
Annotatable getFirstNameAnnotations();
- @AnnotationsForProperty(name = "LastName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "LastName",
type = "Edm.String")
Annotatable getLastNameAnnotations();
- @AnnotationsForProperty(name = "MiddleName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MiddleName",
type = "Edm.String")
Annotatable getMiddleNameAnnotations();
- @AnnotationsForProperty(name = "HomeAddress",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HomeAddress",
type = "Microsoft.Test.OData.Services.ODataWCFService.Address")
Annotatable getHomeAddressAnnotations();
- @AnnotationsForProperty(name = "Home",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Home",
type = "Edm.GeographyPoint")
Annotatable getHomeAnnotations();
- @AnnotationsForProperty(name = "Numbers",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Numbers",
type = "Edm.String")
Annotatable getNumbersAnnotations();
- @AnnotationsForProperty(name = "Emails",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Emails",
type = "Edm.String")
Annotatable getEmailsAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "Parent",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Parent",
type = "Microsoft.Test.OData.Services.ODataWCFService.Person")
Annotatable getParentAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
index 9f159dc..2642070 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface PersonCollection extends AbstractEntityCollection<Person> {
+public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
index 8d60324..a1ea927 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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.ODataWCFService")
-@EntityType(name = "Product",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
openType = false,
hasStream = false,
isAbstract = false)
public interface Product
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductID();
+ java.lang.Integer getProductID();
- void setProductID(Integer _productID);
+ void setProductID(java.lang.Integer _productID);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(String _name);
+ void setName(java.lang.String _name);
- @Property(name = "QuantityPerUnit",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QuantityPerUnit",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getQuantityPerUnit();
+ java.lang.String getQuantityPerUnit();
- void setQuantityPerUnit(String _quantityPerUnit);
+ void setQuantityPerUnit(java.lang.String _quantityPerUnit);
- @Property(name = "UnitPrice",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UnitPrice",
type = "Edm.Single",
nullable = false,
defaultValue = "",
@@ -151,12 +147,12 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Float getUnitPrice();
+ java.lang.Float getUnitPrice();
- void setUnitPrice(Float _unitPrice);
+ void setUnitPrice(java.lang.Float _unitPrice);
- @Property(name = "QuantityInStock",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QuantityInStock",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -174,12 +170,12 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantityInStock();
+ java.lang.Integer getQuantityInStock();
- void setQuantityInStock(Integer _quantityInStock);
+ void setQuantityInStock(java.lang.Integer _quantityInStock);
- @Property(name = "Discontinued",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Discontinued",
type = "Edm.Boolean",
nullable = false,
defaultValue = "",
@@ -197,12 +193,12 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Boolean getDiscontinued();
+ java.lang.Boolean getDiscontinued();
- void setDiscontinued(Boolean _discontinued);
+ void setDiscontinued(java.lang.Boolean _discontinued);
- @Property(name = "UserAccess",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "UserAccess",
type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel",
nullable = true,
defaultValue = "",
@@ -225,7 +221,7 @@ public interface Product
void setUserAccess(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess);
- @Property(name = "SkinColor",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SkinColor",
type = "Microsoft.Test.OData.Services.ODataWCFService.Color",
nullable = true,
defaultValue = "",
@@ -248,7 +244,7 @@ public interface Product
void setSkinColor(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor);
- @Property(name = "CoverColors",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CoverColors",
type = "Microsoft.Test.OData.Services.ODataWCFService.Color",
nullable = false,
defaultValue = "",
@@ -266,13 +262,13 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> getCoverColors();
+ java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> getCoverColors();
- void setCoverColors(Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> _coverColors);
+ void setCoverColors(java.util.Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> _coverColors);
- @NavigationProperty(name = "Details",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Details",
type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -286,16 +282,16 @@ public interface Product
Operations operations();
interface Operations {
- @Operation(name = "GetProductDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetProductDetails",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection getProductDetails(
- @Parameter(name = "count", type = "Edm.Int32", nullable = true) Integer count
+ @Parameter(name = "count", type = "Edm.Int32", nullable = true) java.lang.Integer count
);
- @Operation(name = "AddAccessRight",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "AddAccessRight",
type = OperationType.ACTION,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel addAccessRight(
@@ -304,51 +300,56 @@ public interface Product
}
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
type = "Edm.Int32")
Annotatable getProductIDAnnotations();
- @AnnotationsForProperty(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
type = "Edm.String")
Annotatable getNameAnnotations();
- @AnnotationsForProperty(name = "QuantityPerUnit",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "QuantityPerUnit",
type = "Edm.String")
Annotatable getQuantityPerUnitAnnotations();
- @AnnotationsForProperty(name = "UnitPrice",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UnitPrice",
type = "Edm.Single")
Annotatable getUnitPriceAnnotations();
- @AnnotationsForProperty(name = "QuantityInStock",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "QuantityInStock",
type = "Edm.Int32")
Annotatable getQuantityInStockAnnotations();
- @AnnotationsForProperty(name = "Discontinued",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Discontinued",
type = "Edm.Boolean")
Annotatable getDiscontinuedAnnotations();
- @AnnotationsForProperty(name = "UserAccess",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "UserAccess",
type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel")
Annotatable getUserAccessAnnotations();
- @AnnotationsForProperty(name = "SkinColor",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SkinColor",
type = "Microsoft.Test.OData.Services.ODataWCFService.Color")
Annotatable getSkinColorAnnotations();
- @AnnotationsForProperty(name = "CoverColors",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CoverColors",
type = "Microsoft.Test.OData.Services.ODataWCFService.Color")
Annotatable getCoverColorsAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "Details",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Details",
type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail")
Annotatable getDetailsAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
index 1f408e0..3aa96fc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface ProductCollection extends AbstractEntityCollection<Product> {
+public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product> {
Operations operations();
public interface Operations {
@@ -53,7 +54,7 @@ public interface ProductCollection extends AbstractEntityCollection<Product> {
type = OperationType.ACTION,
returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection discount(
- @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) Integer percentage
+ @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage
);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
index 154d2c0..2a07981 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -23,6 +24,7 @@ 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;
@@ -32,6 +34,7 @@ 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.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
@@ -45,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;
@KeyRef(ProductDetailKey.class)
-@Namespace("Microsoft.Test.OData.Services.ODataWCFService")
-@EntityType(name = "ProductDetail",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductDetail
- extends Annotatable,Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -82,12 +78,12 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductID();
+ java.lang.Integer getProductID();
- void setProductID(Integer _productID);
+ void setProductID(java.lang.Integer _productID);
@Key
- @Property(name = "ProductDetailID",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductDetailID",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -105,12 +101,12 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductDetailID();
+ java.lang.Integer getProductDetailID();
- void setProductDetailID(Integer _productDetailID);
+ void setProductDetailID(java.lang.Integer _productDetailID);
- @Property(name = "ProductName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductName",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -128,12 +124,12 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getProductName();
+ java.lang.String getProductName();
- void setProductName(String _productName);
+ void setProductName(java.lang.String _productName);
- @Property(name = "Description",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -151,13 +147,13 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getDescription();
+ java.lang.String getDescription();
- void setDescription(String _description);
+ void setDescription(java.lang.String _description);
- @NavigationProperty(name = "RelatedProduct",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "RelatedProduct",
type = "Microsoft.Test.OData.Services.ODataWCFService.Product",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -167,7 +163,7 @@ public interface ProductDetail
void setRelatedProduct(org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product _relatedProduct);
- @NavigationProperty(name = "Reviews",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews",
type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview",
targetSchema = "Microsoft.Test.OData.Services.ODataWCFService",
targetContainer = "InMemoryEntities",
@@ -181,7 +177,7 @@ public interface ProductDetail
Operations operations();
interface Operations {
- @Operation(name = "GetRelatedProduct",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetRelatedProduct",
type = OperationType.FUNCTION,
isComposable = true,
returnType = "Microsoft.Test.OData.Services.ODataWCFService.Product")
@@ -191,35 +187,40 @@ public interface ProductDetail
}
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
- Annotations annotations();
+ Annotations annotations();
interface Annotations {
- @AnnotationsForProperty(name = "ProductID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
type = "Edm.Int32")
Annotatable getProductIDAnnotations();
- @AnnotationsForProperty(name = "ProductDetailID",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductDetailID",
type = "Edm.Int32")
Annotatable getProductDetailIDAnnotations();
- @AnnotationsForProperty(name = "ProductName",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductName",
type = "Edm.String")
Annotatable getProductNameAnnotations();
- @AnnotationsForProperty(name = "Description",
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
type = "Edm.String")
Annotatable getDescriptionAnnotations();
-
-
- @AnnotationsForNavigationProperty(name = "RelatedProduct",
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "RelatedProduct",
type = "Microsoft.Test.OData.Services.ODataWCFService.Product")
Annotatable getRelatedProductAnnotations();
-
- @AnnotationsForNavigationProperty(name = "Reviews",
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Reviews",
type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview")
Annotatable getReviewsAnnotations();
- }
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
index 55ce7a2..44a68a9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.client.api.http.HttpMethod;
@@ -43,7 +44,7 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-public interface ProductDetailCollection extends AbstractEntityCollection<ProductDetail> {
+public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail> {
Object getAnnotation(Class<? extends AbstractTerm> term);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
index b1d8508..44def1b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
@@ -46,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductDetailKey extends AbstractEntityKey {
- private Integer _productID;
+ private java.lang.Integer _productID;
@CompoundKeyElement(name = "ProductID", position = 0)
- public Integer getProductID() {
+ public java.lang.Integer getProductID() {
return _productID;
}
- public void setProductID(Integer _productID) {
+ public void setProductID(java.lang.Integer _productID) {
this._productID = _productID;
}
- private Integer _productDetailID;
+ private java.lang.Integer _productDetailID;
@CompoundKeyElement(name = "ProductDetailID", position = 1)
- public Integer getProductDetailID() {
+ public java.lang.Integer getProductDetailID() {
return _productDetailID;
}
- public void setProductDetailID(Integer _productDetailID) {
+ public void setProductDetailID(java.lang.Integer _productDetailID) {
this._productDetailID = _productDetailID;
}
}
[08/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
deleted file mode 100644
index 627a08f..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
-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.annotations.Property;
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityContainer(name = "DemoService",
- namespace = "ODataDemo",
- isDefaultEntityContainer = true)
-public interface DemoService extends PersistenceManager {
-
- Products getProducts();
- Advertisements getAdvertisements();
- Persons getPersons();
- Categories getCategories();
- PersonDetails getPersonDetails();
- Suppliers getSuppliers();
- ProductDetails getProductDetails();
-
-
-
- Operations operations();
-
- public interface Operations {
-
- @Operation(name = "IncreaseSalaries",
- type = OperationType.ACTION)
- void increaseSalaries(
- @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) Integer percentage
- );
-
- }
-
- ComplexFactory complexFactory();
-
- interface ComplexFactory {
- @Property(name = "Address",
- type = "ODataDemo.Address")
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
-
- }
- }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java
deleted file mode 100644
index fb2e905..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "PersonDetails")
-public interface PersonDetails
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail newPersonDetail();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection newPersonDetailCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java
deleted file mode 100644
index 1e38cb3..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "Persons")
-public interface Persons
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person newPerson();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection newPersonCollection();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer newCustomer();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection newCustomerCollection();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee newEmployee();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection newEmployeeCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java
deleted file mode 100644
index 5031efb..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "ProductDetails")
-public interface ProductDetails
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail newProductDetail();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection newProductDetailCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java
deleted file mode 100644
index 18a4e77..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "Products")
-public interface Products
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product newProduct();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection newProductCollection();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct newFeaturedProduct();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection newFeaturedProductCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java
deleted file mode 100644
index 53d4403..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "Suppliers")
-public interface Suppliers
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier newSupplier();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection newSupplierCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java
deleted file mode 100644
index 1d277f0..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java
deleted file mode 100644
index 34ba0ec..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.ComplexType;
-import org.apache.olingo.ext.proxy.api.annotations.Property;
-import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@ComplexType(name = "Address",
- isOpenType = false,
- isAbstract = false)
-public interface Address
- extends Serializable {
-
-
- @Property(name = "Street",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- String getStreet();
-
- void setStreet(String _street);
-
-
-
- @Property(name = "City",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- String getCity();
-
- void setCity(String _city);
-
-
-
- @Property(name = "State",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- String getState();
-
- void setState(String _state);
-
-
-
- @Property(name = "ZipCode",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- String getZipCode();
-
- void setZipCode(String _zipCode);
-
-
-
- @Property(name = "Country",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "")
- String getCountry();
-
- void setCountry(String _country);
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java
deleted file mode 100644
index 9612afb..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "Advertisement",
- openType = false,
- hasStream = true,
- isAbstract = false)
-public interface Advertisement
- extends Serializable {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Guid",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- UUID getID();
-
- void setID(UUID _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
- @Property(name = "AirDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Calendar getAirDate();
-
- void setAirDate(Calendar _airDate);
-
-
-
- @NavigationProperty(name = "FeaturedProduct",
- type = "ODataDemo.FeaturedProduct",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct();
-
- void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct);
-
- void setStream(java.io.InputStream stream);
-
- java.io.InputStream getStream();
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java
deleted file mode 100644
index 87a90ef..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface AdvertisementCollection extends AbstractEntityCollection<Advertisement> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java
deleted file mode 100644
index 4dd5fef..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "Category",
- openType = true,
- hasStream = false,
- isAbstract = false)
-public interface Category
- extends AbstractOpenType {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getID();
-
- void setID(Integer _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
-
- @NavigationProperty(name = "Products",
- type = "ODataDemo.Product",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Products",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
-
- void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java
deleted file mode 100644
index 2800ebe..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface CategoryCollection extends AbstractEntityCollection<Category> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
deleted file mode 100644
index ef79053..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "Customer",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "ODataDemo.Person")
-public interface Customer
- extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getID();
-
- void setID(Integer _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
- @Property(name = "TotalExpense",
- type = "Edm.Decimal",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- BigDecimal getTotalExpense();
-
- void setTotalExpense(BigDecimal _totalExpense);
-
-
-
- @NavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "PersonDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
- void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
deleted file mode 100644
index 1a18681..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface CustomerCollection extends AbstractEntityCollection<Customer> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
deleted file mode 100644
index 7150978..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "Employee",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "ODataDemo.Person")
-public interface Employee
- extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getID();
-
- void setID(Integer _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
- @Property(name = "EmployeeID",
- type = "Edm.Int64",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Long getEmployeeID();
-
- void setEmployeeID(Long _employeeID);
-
-
- @Property(name = "HireDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Calendar getHireDate();
-
- void setHireDate(Calendar _hireDate);
-
-
- @Property(name = "Salary",
- type = "Edm.Single",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Float getSalary();
-
- void setSalary(Float _salary);
-
-
-
- @NavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "PersonDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
- void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
deleted file mode 100644
index 1a94d83..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface EmployeeCollection extends AbstractEntityCollection<Employee> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
deleted file mode 100644
index 2987f70..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "FeaturedProduct",
- openType = false,
- hasStream = false,
- isAbstract = false,
- baseType = "ODataDemo.Product")
-public interface FeaturedProduct
- extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getID();
-
- void setID(Integer _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
- @Property(name = "Description",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getDescription();
-
- void setDescription(String _description);
-
-
- @Property(name = "ReleaseDate",
- type = "Edm.DateTimeOffset",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Calendar getReleaseDate();
-
- void setReleaseDate(Calendar _releaseDate);
-
-
- @Property(name = "DiscontinuedDate",
- type = "Edm.DateTimeOffset",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Calendar getDiscontinuedDate();
-
- void setDiscontinuedDate(Calendar _discontinuedDate);
-
-
- @Property(name = "Rating",
- type = "Edm.Int16",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Short getRating();
-
- void setRating(Short _rating);
-
-
- @Property(name = "Price",
- type = "Edm.Double",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Double getPrice();
-
- void setPrice(Double _price);
-
-
-
- @NavigationProperty(name = "Categories",
- type = "ODataDemo.Category",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Categories",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
-
- void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
-
- @NavigationProperty(name = "Supplier",
- type = "ODataDemo.Supplier",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Suppliers",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
-
- void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
-
- @NavigationProperty(name = "ProductDetail",
- type = "ODataDemo.ProductDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "ProductDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
-
- void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
-
- @NavigationProperty(name = "Advertisement",
- type = "ODataDemo.Advertisement",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "Advertisements",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
-
- void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
-
-
- @Override
- Operations operations();
-
- interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations{
-
- }
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
deleted file mode 100644
index d2da736..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface FeaturedProductCollection extends AbstractEntityCollection<FeaturedProduct> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
deleted file mode 100644
index c5175de..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-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.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.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.OperationType;
-import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
-import org.apache.olingo.client.api.edm.ConcurrencyMode;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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("ODataDemo")
-@EntityType(name = "Person",
- openType = false,
- hasStream = false,
- isAbstract = false)
-public interface Person
- extends Serializable {
-
-
- @Key
- @Property(name = "ID",
- type = "Edm.Int32",
- nullable = false,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- Integer getID();
-
- void setID(Integer _iD);
-
-
- @Property(name = "Name",
- type = "Edm.String",
- nullable = true,
- defaultValue = "",
- maxLenght = Integer.MAX_VALUE,
- fixedLenght = false,
- precision = 0,
- scale = 0,
- unicode = true,
- collation = "",
- srid = "",
- concurrencyMode = ConcurrencyMode.None,
- fcSourcePath = "",
- fcTargetPath = "",
- fcContentKind = EdmContentKind.text,
- fcNSPrefix = "",
- fcNSURI = "",
- fcKeepInContent = false)
- String getName();
-
- void setName(String _name);
-
-
-
- @NavigationProperty(name = "PersonDetail",
- type = "ODataDemo.PersonDetail",
- targetSchema = "ODataDemo",
- targetContainer = "DemoService",
- targetEntitySet = "PersonDetails",
- containsTarget = false)
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
-
- void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
deleted file mode 100644
index 6399b5e..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
-
-import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.AbstractEntityCollection;
-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;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-public interface PersonCollection extends AbstractEntityCollection<Person> {
-}
[17/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
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/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
index 9fd388a..8f70362 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.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 PersonCollection extends AbstractEntityCollection<Person> {
+public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person> {
+
+ 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/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
index 04f1aa7..e152ac0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.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 = "PersonMetadata",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PersonMetadata",
openType = false,
hasStream = false,
isAbstract = false)
public interface PersonMetadata
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PersonMetadataId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonMetadataId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonMetadataId();
+ java.lang.Integer getPersonMetadataId();
- void setPersonMetadataId(final Integer _personMetadataId);
+ void setPersonMetadataId(java.lang.Integer _personMetadataId);
- @Property(name = "PersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonId();
+ java.lang.Integer getPersonId();
- void setPersonId(final Integer _personId);
+ void setPersonId(java.lang.Integer _personId);
- @Property(name = "PropertyName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyName",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPropertyName();
+ java.lang.String getPropertyName();
- void setPropertyName(final String _propertyName);
+ void setPropertyName(java.lang.String _propertyName);
- @Property(name = "PropertyValue",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyValue",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,22 +147,54 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPropertyValue();
+ java.lang.String getPropertyValue();
- void setPropertyValue(final String _propertyValue);
+ void setPropertyValue(java.lang.String _propertyValue);
- @NavigationProperty(name = "Person",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person",
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.Person getPerson();
- void setPerson(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
+ void setPerson(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonMetadataId",
+ type = "Edm.Int32")
+ Annotatable getPersonMetadataIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyName",
+ type = "Edm.String")
+ Annotatable getPropertyNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyValue",
+ type = "Edm.String")
+ Annotatable getPropertyValueAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+ Annotatable getPersonAnnotations();
+ }
}
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/PersonMetadataCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
index f365a12..bc5084f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.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 PersonMetadataCollection extends AbstractEntityCollection<PersonMetadata> {
+public interface PersonMetadataCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata> {
+
+ 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/Phone.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
index a963830..fb66c4c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,30 +43,33 @@ 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")
-@ComplexType(name = "Phone")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Phone")
public interface Phone
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
- String getPhoneNumber();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
+ java.lang.String getPhoneNumber();
- void setPhoneNumber(final String _phoneNumber);
+ void setPhoneNumber(java.lang.String _phoneNumber);
- @Property(name = "Extension", type = "Edm.String", nullable = true)
- String getExtension();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
+ java.lang.String getExtension();
- void setExtension(final String _extension);
+ void setExtension(java.lang.String _extension);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
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/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
index ca9c206..6586645 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.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 = "Product",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
openType = false,
hasStream = false,
isAbstract = false)
public interface Product
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "Picture",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface Product
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 = "",
@@ -103,12 +101,12 @@ public interface Product
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 = "",
@@ -126,12 +124,12 @@ public interface Product
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 = "",
@@ -151,10 +149,10 @@ public interface Product
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 = "",
@@ -172,12 +170,12 @@ public interface Product
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 = "",
@@ -197,10 +195,10 @@ public interface Product
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 = "",
@@ -220,77 +218,129 @@ public interface Product
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);
- @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);
+
Operations operations();
interface Operations {
- @Operation(name = "RetrieveProduct",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "RetrieveProduct",
type = OperationType.ACTION,
returnType = "Edm.Int32")
- Integer retrieveProduct(
+ java.lang.Integer retrieveProduct(
);
}
- ComplexFactory factory();
+ ComplexFactory factory();
interface 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();
- }
+ }
+
+ Annotations annotations();
+
+ interface 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.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/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
index 53cb511..4002f3d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.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 ProductCollection extends AbstractEntityCollection<Product> {
+public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product> {
+
+ 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/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
index 75ab9dd..aeb66ed 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.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 = "ProductDetail",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductDetail
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Details",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,22 +101,46 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getDetails();
+ java.lang.String getDetails();
- void setDetails(final String _details);
+ void setDetails(java.lang.String _details);
- @NavigationProperty(name = "Product",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+ void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
+ type = "Edm.String")
+ Annotatable getDetailsAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
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/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
index 19e7fe1..c92fd75 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.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 ProductDetailCollection extends AbstractEntityCollection<ProductDetail> {
+public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail> {
+
+ 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/ProductPageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
index 0a45532..f422b25 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.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 = "ProductPageView",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPageView",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.PageView")
public interface ProductPageView
- extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
@Key
- @Property(name = "PageViewId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -81,12 +79,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPageViewId();
+ java.lang.Integer getPageViewId();
- void setPageViewId(final Integer _pageViewId);
+ void setPageViewId(java.lang.Integer _pageViewId);
- @Property(name = "Username",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getUsername();
+ java.lang.String getUsername();
- void setUsername(final String _username);
+ void setUsername(java.lang.String _username);
- @Property(name = "Viewed",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getViewed();
+ java.util.Calendar getViewed();
- void setViewed(final Calendar _viewed);
+ void setViewed(java.util.Calendar _viewed);
- @Property(name = "TimeSpentOnPage",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
type = "Edm.Time",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getTimeSpentOnPage();
+ java.math.BigDecimal getTimeSpentOnPage();
- void setTimeSpentOnPage(final BigDecimal _timeSpentOnPage);
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
- @Property(name = "PageUrl",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,12 +171,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPageUrl();
+ java.lang.String getPageUrl();
- void setPageUrl(final String _pageUrl);
+ void setPageUrl(java.lang.String _pageUrl);
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -196,12 +194,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -219,22 +217,66 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @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 extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PageView.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+ @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/ProductPageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
index f250633..fe70955 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.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 ProductPageViewCollection extends AbstractEntityCollection<ProductPageView> {
+public interface ProductPageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView> {
+
+ 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/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
index 7c8ffff..00c81ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.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;
@KeyRef(ProductPhotoKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductPhoto",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPhoto",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductPhoto
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ProductPhoto
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
@Key
- @Property(name = "PhotoId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhotoId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface ProductPhoto
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPhotoId();
+ java.lang.Integer getPhotoId();
- void setPhotoId(final Integer _photoId);
+ void setPhotoId(java.lang.Integer _photoId);
- @Property(name = "Photo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
type = "Edm.Binary",
nullable = true,
defaultValue = "",
@@ -128,10 +126,34 @@ public interface ProductPhoto
fcKeepInContent = false)
byte[] getPhoto();
- void setPhoto(final byte[] _photo);
+ void setPhoto(byte[] _photo);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PhotoId",
+ type = "Edm.Int32")
+ Annotatable getPhotoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Binary")
+ Annotatable getPhotoAnnotations();
+
+
+ }
+
}
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/ProductPhotoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
index 6acee23..8015f2d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.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 ProductPhotoCollection extends AbstractEntityCollection<ProductPhoto> {
+public interface ProductPhotoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto> {
+
+ 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/ProductPhotoKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
index f20b718..b778fc5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
@@ -47,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductPhotoKey extends AbstractEntityKey {
- private Integer _photoId;
+ private java.lang.Integer _photoId;
@CompoundKeyElement(name = "PhotoId", position = 0)
- public Integer getPhotoId() {
+ public java.lang.Integer getPhotoId() {
return _photoId;
}
- public void setPhotoId(final Integer _photoId) {
+ public void setPhotoId(java.lang.Integer _photoId) {
this._photoId = _photoId;
}
- private Integer _productId;
+ private java.lang.Integer _productId;
@CompoundKeyElement(name = "ProductId", position = 1)
- public Integer getProductId() {
+ public java.lang.Integer getProductId() {
return _productId;
}
- public void setProductId(final Integer _productId) {
+ public void setProductId(java.lang.Integer _productId) {
this._productId = _productId;
}
}
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/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
index b2da175..a598d43 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.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;
@KeyRef(ProductReviewKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductReview",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductReview",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductReview
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
@Key
- @Property(name = "ReviewId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getReviewId();
+ java.lang.Integer getReviewId();
- void setReviewId(final Integer _reviewId);
+ void setReviewId(java.lang.Integer _reviewId);
- @Property(name = "Review",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Review",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getReview();
+ java.lang.String getReview();
- void setReview(final String _review);
+ void setReview(java.lang.String _review);
@Key
- @Property(name = "RevisionId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionId",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -149,22 +147,54 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getRevisionId();
+ java.lang.String getRevisionId();
- void setRevisionId(final String _revisionId);
+ void setRevisionId(java.lang.String _revisionId);
- @NavigationProperty(name = "Product",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+ void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewId",
+ type = "Edm.Int32")
+ Annotatable getReviewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Review",
+ type = "Edm.String")
+ Annotatable getReviewAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionId",
+ type = "Edm.String")
+ Annotatable getRevisionIdAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
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/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
index a7a8f87..5280441 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.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 ProductReviewCollection extends AbstractEntityCollection<ProductReview> {
+public interface ProductReviewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview> {
+
+ 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/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
index 1720048..f62a5b1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
@@ -47,39 +47,39 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductReviewKey extends AbstractEntityKey {
- private Integer _productId;
+ private java.lang.Integer _productId;
@CompoundKeyElement(name = "ProductId", position = 0)
- public Integer getProductId() {
+ public java.lang.Integer getProductId() {
return _productId;
}
- public void setProductId(final Integer _productId) {
+ public void setProductId(java.lang.Integer _productId) {
this._productId = _productId;
}
- private Integer _reviewId;
+ private java.lang.Integer _reviewId;
@CompoundKeyElement(name = "ReviewId", position = 1)
- public Integer getReviewId() {
+ public java.lang.Integer getReviewId() {
return _reviewId;
}
- public void setReviewId(final Integer _reviewId) {
+ public void setReviewId(java.lang.Integer _reviewId) {
this._reviewId = _reviewId;
}
- private String _revisionId;
+ private java.lang.String _revisionId;
@CompoundKeyElement(name = "RevisionId", position = 2)
- public String getRevisionId() {
+ public java.lang.String getRevisionId() {
return _revisionId;
}
- public void setRevisionId(final String _revisionId) {
+ public void setRevisionId(java.lang.String _revisionId) {
this._revisionId = _revisionId;
}
}
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/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
index a5d1aa4..7de79ca 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.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 = "RSAToken",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RSAToken",
openType = false,
hasStream = false,
isAbstract = false)
public interface RSAToken
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Serial",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface RSAToken
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getSerial();
+ java.lang.String getSerial();
- void setSerial(final String _serial);
+ void setSerial(java.lang.String _serial);
- @Property(name = "Issued",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Issued",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -103,22 +101,46 @@ public interface RSAToken
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getIssued();
+ java.util.Calendar getIssued();
- void setIssued(final Calendar _issued);
+ void setIssued(java.util.Calendar _issued);
- @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 = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Issued",
+ type = "Edm.DateTime")
+ Annotatable getIssuedAnnotations();
+ @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/RSATokenCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
index 8ae6bfd..0639322 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.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 RSATokenCollection extends AbstractEntityCollection<RSAToken> {
+public interface RSATokenCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
[09/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
index 5b3d1fb..a175f6c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "ProductPageView",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPageView",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.PageView")
public interface ProductPageView
- extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView {
@Key
- @Property(name = "PageViewId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -81,12 +79,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPageViewId();
+ java.lang.Integer getPageViewId();
- void setPageViewId(final Integer _pageViewId);
+ void setPageViewId(java.lang.Integer _pageViewId);
- @Property(name = "Username",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getUsername();
+ java.lang.String getUsername();
- void setUsername(final String _username);
+ void setUsername(java.lang.String _username);
- @Property(name = "Viewed",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getViewed();
+ java.util.Calendar getViewed();
- void setViewed(final Calendar _viewed);
+ void setViewed(java.util.Calendar _viewed);
- @Property(name = "TimeSpentOnPage",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
type = "Edm.Time",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getTimeSpentOnPage();
+ java.math.BigDecimal getTimeSpentOnPage();
- void setTimeSpentOnPage(final BigDecimal _timeSpentOnPage);
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
- @Property(name = "PageUrl",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,12 +171,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPageUrl();
+ java.lang.String getPageUrl();
- void setPageUrl(final String _pageUrl);
+ void setPageUrl(java.lang.String _pageUrl);
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -196,12 +194,12 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -219,22 +217,66 @@ public interface ProductPageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
- void setLogin(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+ void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+ @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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
index 7dda48d..2e792a6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ProductPageViewCollection extends AbstractEntityCollection<ProductPageView> {
+public interface ProductPageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPageView> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
index 1d24889..080ee20 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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;
@KeyRef(ProductPhotoKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductPhoto",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductPhoto",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductPhoto
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ProductPhoto
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
@Key
- @Property(name = "PhotoId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhotoId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface ProductPhoto
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPhotoId();
+ java.lang.Integer getPhotoId();
- void setPhotoId(final Integer _photoId);
+ void setPhotoId(java.lang.Integer _photoId);
- @Property(name = "Photo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
type = "Edm.Binary",
nullable = true,
defaultValue = "",
@@ -128,10 +126,34 @@ public interface ProductPhoto
fcKeepInContent = false)
byte[] getPhoto();
- void setPhoto(final byte[] _photo);
+ void setPhoto(byte[] _photo);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PhotoId",
+ type = "Edm.Int32")
+ Annotatable getPhotoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Binary")
+ Annotatable getPhotoAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
index 479be7f..ab14959 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ProductPhotoCollection extends AbstractEntityCollection<ProductPhoto> {
+public interface ProductPhotoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
index 0a90db3..0c5caaa 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java
@@ -47,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductPhotoKey extends AbstractEntityKey {
- private Integer _photoId;
+ private java.lang.Integer _photoId;
@CompoundKeyElement(name = "PhotoId", position = 0)
- public Integer getPhotoId() {
+ public java.lang.Integer getPhotoId() {
return _photoId;
}
- public void setPhotoId(final Integer _photoId) {
+ public void setPhotoId(java.lang.Integer _photoId) {
this._photoId = _photoId;
}
- private Integer _productId;
+ private java.lang.Integer _productId;
@CompoundKeyElement(name = "ProductId", position = 1)
- public Integer getProductId() {
+ public java.lang.Integer getProductId() {
return _productId;
}
- public void setProductId(final Integer _productId) {
+ public void setProductId(java.lang.Integer _productId) {
this._productId = _productId;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
index f58bf44..e6d2f2e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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;
@KeyRef(ProductReviewKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "ProductReview",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductReview",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductReview
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
@Key
- @Property(name = "ReviewId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReviewId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getReviewId();
+ java.lang.Integer getReviewId();
- void setReviewId(final Integer _reviewId);
+ void setReviewId(java.lang.Integer _reviewId);
- @Property(name = "Review",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Review",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getReview();
+ java.lang.String getReview();
- void setReview(final String _review);
+ void setReview(java.lang.String _review);
@Key
- @Property(name = "RevisionId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "RevisionId",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -149,22 +147,54 @@ public interface ProductReview
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getRevisionId();
+ java.lang.String getRevisionId();
- void setRevisionId(final String _revisionId);
+ void setRevisionId(java.lang.String _revisionId);
- @NavigationProperty(name = "Product",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+ void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReviewId",
+ type = "Edm.Int32")
+ Annotatable getReviewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Review",
+ type = "Edm.String")
+ Annotatable getReviewAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "RevisionId",
+ type = "Edm.String")
+ Annotatable getRevisionIdAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
index e529765..055b065 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ProductReviewCollection extends AbstractEntityCollection<ProductReview> {
+public interface ProductReviewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
index 5803023..8303513 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java
@@ -47,39 +47,39 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class ProductReviewKey extends AbstractEntityKey {
- private Integer _productId;
+ private java.lang.Integer _productId;
@CompoundKeyElement(name = "ProductId", position = 0)
- public Integer getProductId() {
+ public java.lang.Integer getProductId() {
return _productId;
}
- public void setProductId(final Integer _productId) {
+ public void setProductId(java.lang.Integer _productId) {
this._productId = _productId;
}
- private Integer _reviewId;
+ private java.lang.Integer _reviewId;
@CompoundKeyElement(name = "ReviewId", position = 1)
- public Integer getReviewId() {
+ public java.lang.Integer getReviewId() {
return _reviewId;
}
- public void setReviewId(final Integer _reviewId) {
+ public void setReviewId(java.lang.Integer _reviewId) {
this._reviewId = _reviewId;
}
- private String _revisionId;
+ private java.lang.String _revisionId;
@CompoundKeyElement(name = "RevisionId", position = 2)
- public String getRevisionId() {
+ public java.lang.String getRevisionId() {
return _revisionId;
}
- public void setRevisionId(final String _revisionId) {
+ public void setRevisionId(java.lang.String _revisionId) {
this._revisionId = _revisionId;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
index 5d14033..0cabafd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "RSAToken",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RSAToken",
openType = false,
hasStream = false,
isAbstract = false)
public interface RSAToken
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Serial",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface RSAToken
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getSerial();
+ java.lang.String getSerial();
- void setSerial(final String _serial);
+ void setSerial(java.lang.String _serial);
- @Property(name = "Issued",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Issued",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -103,22 +101,46 @@ public interface RSAToken
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getIssued();
+ java.util.Calendar getIssued();
- void setIssued(final Calendar _issued);
+ void setIssued(java.util.Calendar _issued);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
- void setLogin(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+ void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.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 = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Issued",
+ type = "Edm.DateTime")
+ Annotatable getIssuedAnnotations();
+ @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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
index 31f67ed..3baa19d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 RSATokenCollection extends AbstractEntityCollection<RSAToken> {
+public interface RSATokenCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
index f32a2a0..ec4ad23 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "SpecialEmployee",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "SpecialEmployee",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
public interface SpecialEmployee
- extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
@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 SpecialEmployee
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 SpecialEmployee
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 SpecialEmployee
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 SpecialEmployee
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,12 +171,12 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTitle();
+ java.lang.String getTitle();
- void setTitle(final String _title);
+ void setTitle(java.lang.String _title);
- @Property(name = "CarsVIN",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CarsVIN",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -196,12 +194,12 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCarsVIN();
+ java.lang.Integer getCarsVIN();
- void setCarsVIN(final Integer _carsVIN);
+ void setCarsVIN(java.lang.Integer _carsVIN);
- @Property(name = "Bonus",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Bonus",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -219,12 +217,12 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getBonus();
+ java.lang.Integer getBonus();
- void setBonus(final Integer _bonus);
+ void setBonus(java.lang.Integer _bonus);
- @Property(name = "IsFullyVested",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsFullyVested",
type = "Edm.Boolean",
nullable = false,
defaultValue = "",
@@ -242,42 +240,42 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Boolean getIsFullyVested();
+ java.lang.Boolean getIsFullyVested();
- void setIsFullyVested(final Boolean _isFullyVested);
+ void setIsFullyVested(java.lang.Boolean _isFullyVested);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
- void setPersonMetadata(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
- @NavigationProperty(name = "Manager",
+ void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
- void setManager(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
-
- @NavigationProperty(name = "Car",
+ void setManager(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Car",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Car")
+ targetEntitySet = "Car",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car getCar();
- void setCar(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
-
-
+ void setCar(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
+
@Override
Operations operations();
@@ -286,4 +284,60 @@ public interface SpecialEmployee
}
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee.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.AnnotationsForProperty(name = "CarsVIN",
+ type = "Edm.Int32")
+ Annotatable getCarsVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Bonus",
+ type = "Edm.Int32")
+ Annotatable getBonusAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsFullyVested",
+ type = "Edm.Boolean")
+ Annotatable getIsFullyVestedAnnotations();
+
+
+
+ @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();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Car",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car")
+ Annotatable getCarAnnotations();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
index 7217701..6a02064 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 SpecialEmployeeCollection extends AbstractEntityCollection<SpecialEmployee> {
+public interface SpecialEmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee> {
+
+ 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/v4/demo/Advertisements.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Advertisements.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Advertisements.java
new file mode 100644
index 0000000..4b6c17e
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Advertisements.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Advertisements")
+public interface Advertisements
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, java.util.UUID, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement newAdvertisement();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection newAdvertisementCollection();
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Categories.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Categories.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Categories.java
new file mode 100644
index 0000000..8fea038
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Categories.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Categories")
+public interface Categories
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category newCategory();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection newCategoryCollection();
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/DemoService.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/DemoService.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/DemoService.java
new file mode 100644
index 0000000..920e022
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/DemoService.java
@@ -0,0 +1,83 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.client.api.http.HttpMethod;
+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.annotations.Property;
+import org.apache.olingo.ext.proxy.api.PersistenceManager;
+import org.apache.olingo.ext.proxy.api.OperationType;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DemoService",
+ namespace = "ODataDemo",
+ isDefaultEntityContainer = true)
+public interface DemoService extends PersistenceManager {
+
+ Products getProducts();
+ Advertisements getAdvertisements();
+ Persons getPersons();
+ Categories getCategories();
+ PersonDetails getPersonDetails();
+ Suppliers getSuppliers();
+ ProductDetails getProductDetails();
+
+
+
+ Operations operations();
+
+ public interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseSalaries",
+ type = OperationType.ACTION)
+ void increaseSalaries(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage
+ );
+
+ }
+
+ ComplexFactory complexFactory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address")
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
+
+ }
+ }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/PersonDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/PersonDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/PersonDetails.java
new file mode 100644
index 0000000..0e9ed6f
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/PersonDetails.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonDetails")
+public interface PersonDetails
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail newPersonDetail();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection newPersonDetailCollection();
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Persons.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Persons.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Persons.java
new file mode 100644
index 0000000..0e7a48a
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Persons.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Persons")
+public interface Persons
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person newPerson();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection newPersonCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer newCustomer();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CustomerCollection newCustomerCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee newEmployee();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.EmployeeCollection newEmployeeCollection();
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/ProductDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/ProductDetails.java
new file mode 100644
index 0000000..fa876c7
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/ProductDetails.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails")
+public interface ProductDetails
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail newProductDetail();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection newProductDetailCollection();
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Products.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Products.java
new file mode 100644
index 0000000..554f169
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Products.java
@@ -0,0 +1,54 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products")
+public interface Products
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product newProduct();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection newProductCollection();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct newFeaturedProduct();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProductCollection newFeaturedProductCollection();
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Suppliers.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Suppliers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Suppliers.java
new file mode 100644
index 0000000..48bd7ec
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Suppliers.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo;
+
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
+import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Suppliers")
+public interface Suppliers
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection> {
+
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier newSupplier();
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection newSupplierCollection();
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java
deleted file mode 100644
index c03410d..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "Advertisements")
-public interface Advertisements
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, UUID, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement newAdvertisement();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection newAdvertisementCollection();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java
deleted file mode 100644
index 5f78c65..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * 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
- *
- * 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
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.olingo.fit.proxy.v4.demo.odatademo;
-
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKey;
-import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
-import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
-
-import org.apache.olingo.commons.api.edm.geo.Geospatial;
-import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
-import org.apache.olingo.commons.api.edm.geo.LineString;
-import org.apache.olingo.commons.api.edm.geo.MultiLineString;
-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;
-
-
-@EntitySet(name = "Categories")
-public interface Categories
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> {
-
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category newCategory();
- org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection newCategoryCollection();
-}
[19/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
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();
}
[14/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
index dd62c22..f067d1e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Car")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Car")
public interface Car
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car newCar();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection newCarCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
index 93fbfc3..c0022a4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Computer")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Computer")
public interface Computer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer newComputer();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerCollection newComputerCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
index c8b6463..a343d6b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ComputerDetail")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ComputerDetail")
public interface ComputerDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail newComputerDetail();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetailCollection newComputerDetailCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
index d2b6492..bcc8ebd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Customer")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Customer")
public interface Customer
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer newCustomer();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection newCustomerCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
index 5dd3151..c4b6785 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "CustomerInfo")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CustomerInfo")
public interface CustomerInfo
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo newCustomerInfo();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfoCollection newCustomerInfoCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index 894fd90..16f8502 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -20,8 +20,6 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice;
import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
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.annotations.Property;
@@ -46,113 +44,89 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityContainer(name = "DefaultContainer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
namespace = "Microsoft.Test.OData.Services.AstoriaDefaultService",
isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
Customer getCustomer();
-
Login getLogin();
-
OrderLine getOrderLine();
-
ComputerDetail getComputerDetail();
-
Product getProduct();
-
Message getMessage();
-
ProductDetail getProductDetail();
-
ProductPhoto getProductPhoto();
-
Order getOrder();
-
Computer getComputer();
-
MappedEntityType getMappedEntityType();
-
PageView getPageView();
-
Driver getDriver();
-
AllGeoCollectionTypesSet getAllGeoCollectionTypesSet();
-
Car getCar();
-
CustomerInfo getCustomerInfo();
-
License getLicense();
-
ProductReview getProductReview();
-
LastLogin getLastLogin();
-
MessageAttachment getMessageAttachment();
-
AllGeoTypesSet getAllGeoTypesSet();
-
PersonMetadata getPersonMetadata();
-
RSAToken getRSAToken();
-
Person getPerson();
-
Operations operations();
public interface Operations {
- @Operation(name = "GetSpecificCustomer",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetSpecificCustomer",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection getSpecificCustomer(
- @Parameter(name = "Name", type = "Edm.String", nullable = true) String name
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "Name", type = "Edm.String", nullable = true) java.lang.String name
);
- @Operation(name = "InStreamErrorGetCustomer",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "InStreamErrorGetCustomer",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.Customer)")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection inStreamErrorGetCustomer(
);
- @Operation(name = "GetPrimitiveString",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetPrimitiveString",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Edm.String")
- String getPrimitiveString(
+ java.lang.String getPrimitiveString(
);
- @Operation(name = "EntityProjectionReturnsCollectionOfComplexTypes",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "EntityProjectionReturnsCollectionOfComplexTypes",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Collection(Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails)")
- Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> entityProjectionReturnsCollectionOfComplexTypes(
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> entityProjectionReturnsCollectionOfComplexTypes(
);
- @Operation(name = "GetArgumentPlusOne",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetArgumentPlusOne",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Edm.Int32")
- Integer getArgumentPlusOne(
- @Parameter(name = "arg1", type = "Edm.Int32", nullable = false) Integer arg1
+ java.lang.Integer getArgumentPlusOne(
+ @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "arg1", type = "Edm.Int32", nullable = false) java.lang.Integer arg1
);
- @Operation(name = "GetCustomerCount",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetCustomerCount",
type = OperationType.FUNCTION,
isComposable = false,
returnType = "Edm.Int32")
- Integer getCustomerCount(
+ java.lang.Integer getCustomerCount(
);
- @Operation(name = "ResetDataSource",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetDataSource",
type = OperationType.ACTION)
void resetDataSource(
);
@@ -162,35 +136,35 @@ public interface DefaultContainer extends PersistenceManager {
ComplexFactory complexFactory();
interface ComplexFactory {
- @Property(name = "ContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newContactDetails();
- @Property(name = "AuditInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AuditInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditInfo();
- @Property(name = "ConcurrencyInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrencyInfo();
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
- @Property(name = "ComplexToCategory",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexToCategory",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newComplexToCategory();
- @Property(name = "Phone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newPhone();
- @Property(name = "Aliases",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Aliases",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newAliases();
- @Property(name = "ComplexWithAllPrimitiveTypes",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexWithAllPrimitiveTypes",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexWithAllPrimitiveTypes")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexWithAllPrimitiveTypes newComplexWithAllPrimitiveTypes();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
index fc5a9a2..bd0517f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Driver")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Driver")
public interface Driver
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver, String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver newDriver();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.DriverCollection newDriverCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
index 8d627e5..27333bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "LastLogin")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "LastLogin")
public interface LastLogin
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin newLastLogin();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLoginCollection newLastLoginCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
index 94331be..bfca449 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "License")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "License")
public interface License
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License, String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.License newLicense();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LicenseCollection newLicenseCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
index c3b400a..664b62e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Login")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Login")
public interface Login
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login, String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login newLogin();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection newLoginCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
index 6a544b2..363491c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "MappedEntityType")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MappedEntityType")
public interface MappedEntityType
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType newMappedEntityType();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityTypeCollection newMappedEntityTypeCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
index 00bee19..9bc53dd 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Message")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Message")
public interface Message
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message, MessageKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
index a90742b..fc97e12 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "MessageAttachment")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MessageAttachment")
public interface MessageAttachment
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, UUID, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment, java.util.UUID, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment newMessageAttachment();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection newMessageAttachmentCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
index 56ca048..d46b417 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Order")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Order")
public interface Order
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order newOrder();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection newOrderCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
index 5124fef..d9135b1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "OrderLine")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "OrderLine")
public interface OrderLine
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine, OrderLineKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
index 6b49a3a..820335d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "PageView")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PageView")
public interface PageView
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView newPageView();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageViewCollection newPageViewCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
index 7afb903..25cfc1f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Person")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Person")
public interface Person
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person newPerson();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection newPersonCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
index 35fe069..6fed193 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "PersonMetadata")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonMetadata")
public interface PersonMetadata
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata newPersonMetadata();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection newPersonMetadataCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
index ce63ac6..3f2656a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Product")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Product")
public interface Product
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product newProduct();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection newProductCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
index 4877ce4..a8d4871 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ProductDetail")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetail")
public interface ProductDetail
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail newProductDetail();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetailCollection newProductDetailCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
index 9c00c37..6062d47 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ProductPhoto")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductPhoto")
public interface ProductPhoto
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
index 98dee31..4937f9e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ProductReview")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReview")
public interface ProductReview
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
index 5d5c9b1..8268ba9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "RSAToken")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RSAToken")
public interface RSAToken
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, java.lang.String, org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken();
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
index e413f29..a72f8b6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,23 +43,26 @@ 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")
-@ComplexType(name = "Aliases")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Aliases")
public interface Aliases
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- Collection<String> getAlternativeNames();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- void setAlternativeNames(final Collection<String> _alternativeNames);
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
index c3c8ca6..330d22f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "AllSpatialCollectionTypes",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes",
openType = false,
hasStream = false,
isAbstract = true)
public interface AllSpatialCollectionTypes
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface AllSpatialCollectionTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
index 922fc0c..15bc2c0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 AllSpatialCollectionTypesCollection extends AbstractEntityCollection<AllSpatialCollectionTypes> {
+public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index 2a58052..9682b90 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "AllSpatialCollectionTypes_Simple",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes_Simple",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes")
public interface AllSpatialCollectionTypes_Simple
- extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -81,12 +79,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @Property(name = "ManyGeogPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPoint",
type = "Edm.GeographyPoint",
nullable = false,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Point> getManyGeogPoint();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeogPoint();
- void setManyGeogPoint(final Collection<Point> _manyGeogPoint);
+ void setManyGeogPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeogPoint);
- @Property(name = "ManyGeogLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogLine",
type = "Edm.GeographyLineString",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<LineString> getManyGeogLine();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeogLine();
- void setManyGeogLine(final Collection<LineString> _manyGeogLine);
+ void setManyGeogLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeogLine);
- @Property(name = "ManyGeogPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPolygon",
type = "Edm.GeographyPolygon",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Polygon> getManyGeogPolygon();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeogPolygon();
- void setManyGeogPolygon(final Collection<Polygon> _manyGeogPolygon);
+ void setManyGeogPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeogPolygon);
- @Property(name = "ManyGeomPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPoint",
type = "Edm.GeometryPoint",
nullable = false,
defaultValue = "",
@@ -173,12 +171,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Point> getManyGeomPoint();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeomPoint();
- void setManyGeomPoint(final Collection<Point> _manyGeomPoint);
+ void setManyGeomPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeomPoint);
- @Property(name = "ManyGeomLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomLine",
type = "Edm.GeometryLineString",
nullable = false,
defaultValue = "",
@@ -196,12 +194,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<LineString> getManyGeomLine();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeomLine();
- void setManyGeomLine(final Collection<LineString> _manyGeomLine);
+ void setManyGeomLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeomLine);
- @Property(name = "ManyGeomPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPolygon",
type = "Edm.GeometryPolygon",
nullable = false,
defaultValue = "",
@@ -219,12 +217,52 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Polygon> getManyGeomPolygon();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeomPolygon();
- void setManyGeomPolygon(final Collection<Polygon> _manyGeomPolygon);
+ void setManyGeomPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeomPolygon);
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getManyGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getManyGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getManyGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getManyGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getManyGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getManyGeomPolygonAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
index c1f9517..180cb85 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<AllSpatialCollectionTypes_Simple> {
+public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
[21/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
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/ProductPhoto.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
index 8223311..d407ca9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ProductPhoto")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductPhoto")
public interface ProductPhoto
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhoto, ProductPhotoKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection> {
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/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
index 3d4cba8..9ae0fc8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "ProductReview")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductReview")
public interface ProductReview
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReview, ProductReviewKey, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection> {
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/RSAToken.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
index 7c098f2..6788bdf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "RSAToken")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RSAToken")
public interface RSAToken
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken, java.lang.String, org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection> {
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSAToken newRSAToken();
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.RSATokenCollection newRSATokenCollection();
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/Aliases.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
index 221e7cd..b21e155 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,23 +43,26 @@ 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")
-@ComplexType(name = "Aliases")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Aliases")
public interface Aliases
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- Collection<String> getAlternativeNames();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- void setAlternativeNames(final Collection<String> _alternativeNames);
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
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/AllSpatialCollectionTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
index 0b4dd1c..f8c08b1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.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 = "AllSpatialCollectionTypes",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes",
openType = false,
hasStream = false,
isAbstract = true)
public interface AllSpatialCollectionTypes
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface AllSpatialCollectionTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
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/AllSpatialCollectionTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
index 7587808..7c4e952 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.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 AllSpatialCollectionTypesCollection extends AbstractEntityCollection<AllSpatialCollectionTypes> {
+public interface AllSpatialCollectionTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes> {
+
+ 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/AllSpatialCollectionTypes_Simple.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
index f1ba67b..bc77581 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.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 = "AllSpatialCollectionTypes_Simple",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialCollectionTypes_Simple",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialCollectionTypes")
public interface AllSpatialCollectionTypes_Simple
- extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -81,12 +79,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @Property(name = "ManyGeogPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPoint",
type = "Edm.GeographyPoint",
nullable = false,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Point> getManyGeogPoint();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeogPoint();
- void setManyGeogPoint(final Collection<Point> _manyGeogPoint);
+ void setManyGeogPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeogPoint);
- @Property(name = "ManyGeogLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogLine",
type = "Edm.GeographyLineString",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<LineString> getManyGeogLine();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeogLine();
- void setManyGeogLine(final Collection<LineString> _manyGeogLine);
+ void setManyGeogLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeogLine);
- @Property(name = "ManyGeogPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeogPolygon",
type = "Edm.GeographyPolygon",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Polygon> getManyGeogPolygon();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeogPolygon();
- void setManyGeogPolygon(final Collection<Polygon> _manyGeogPolygon);
+ void setManyGeogPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeogPolygon);
- @Property(name = "ManyGeomPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPoint",
type = "Edm.GeometryPoint",
nullable = false,
defaultValue = "",
@@ -173,12 +171,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Point> getManyGeomPoint();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> getManyGeomPoint();
- void setManyGeomPoint(final Collection<Point> _manyGeomPoint);
+ void setManyGeomPoint(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Point> _manyGeomPoint);
- @Property(name = "ManyGeomLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomLine",
type = "Edm.GeometryLineString",
nullable = false,
defaultValue = "",
@@ -196,12 +194,12 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<LineString> getManyGeomLine();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> getManyGeomLine();
- void setManyGeomLine(final Collection<LineString> _manyGeomLine);
+ void setManyGeomLine(java.util.Collection<org.apache.olingo.commons.api.edm.geo.LineString> _manyGeomLine);
- @Property(name = "ManyGeomPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ManyGeomPolygon",
type = "Edm.GeometryPolygon",
nullable = false,
defaultValue = "",
@@ -219,12 +217,52 @@ public interface AllSpatialCollectionTypes_Simple
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Polygon> getManyGeomPolygon();
+ java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> getManyGeomPolygon();
- void setManyGeomPolygon(final Collection<Polygon> _manyGeomPolygon);
+ void setManyGeomPolygon(java.util.Collection<org.apache.olingo.commons.api.edm.geo.Polygon> _manyGeomPolygon);
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getManyGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getManyGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getManyGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getManyGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getManyGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ManyGeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getManyGeomPolygonAnnotations();
+
+
+ }
+
}
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/AllSpatialCollectionTypes_SimpleCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
index deb92fe..f3e2467 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.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 AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<AllSpatialCollectionTypes_Simple> {
+public interface AllSpatialCollectionTypes_SimpleCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialCollectionTypes_Simple> {
+
+ 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/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
index be7403b..d95405d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.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 = "AllSpatialTypes",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialTypes",
openType = false,
hasStream = false,
isAbstract = false)
public interface AllSpatialTypes
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @Property(name = "Geog",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog",
type = "Edm.Geography",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Geospatial getGeog();
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeog();
- void setGeog(final Geospatial _geog);
+ void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
- @Property(name = "GeogPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint",
type = "Edm.GeographyPoint",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getGeogPoint();
+ org.apache.olingo.commons.api.edm.geo.Point getGeogPoint();
- void setGeogPoint(final Point _geogPoint);
+ void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
- @Property(name = "GeogLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine",
type = "Edm.GeographyLineString",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- LineString getGeogLine();
+ org.apache.olingo.commons.api.edm.geo.LineString getGeogLine();
- void setGeogLine(final LineString _geogLine);
+ void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString _geogLine);
- @Property(name = "GeogPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPolygon",
type = "Edm.GeographyPolygon",
nullable = true,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Polygon getGeogPolygon();
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeogPolygon();
- void setGeogPolygon(final Polygon _geogPolygon);
+ void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geogPolygon);
- @Property(name = "GeogCollection",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogCollection",
type = "Edm.GeographyCollection",
nullable = true,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- GeospatialCollection getGeogCollection();
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeogCollection();
- void setGeogCollection(final GeospatialCollection _geogCollection);
+ void setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geogCollection);
- @Property(name = "GeogMultiPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPoint",
type = "Edm.GeographyMultiPoint",
nullable = true,
defaultValue = "",
@@ -218,12 +216,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPoint getGeogMultiPoint();
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
- void setGeogMultiPoint(final MultiPoint _geogMultiPoint);
+ void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geogMultiPoint);
- @Property(name = "GeogMultiLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiLine",
type = "Edm.GeographyMultiLineString",
nullable = true,
defaultValue = "",
@@ -241,12 +239,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiLineString getGeogMultiLine();
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeogMultiLine();
- void setGeogMultiLine(final MultiLineString _geogMultiLine);
+ void setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geogMultiLine);
- @Property(name = "GeogMultiPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPolygon",
type = "Edm.GeographyMultiPolygon",
nullable = true,
defaultValue = "",
@@ -264,12 +262,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPolygon getGeogMultiPolygon();
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
- void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon);
+ void setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geogMultiPolygon);
- @Property(name = "Geom",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom",
type = "Edm.Geometry",
nullable = true,
defaultValue = "",
@@ -287,12 +285,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Geospatial getGeom();
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeom();
- void setGeom(final Geospatial _geom);
+ void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
- @Property(name = "GeomPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint",
type = "Edm.GeometryPoint",
nullable = true,
defaultValue = "",
@@ -310,12 +308,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getGeomPoint();
+ org.apache.olingo.commons.api.edm.geo.Point getGeomPoint();
- void setGeomPoint(final Point _geomPoint);
+ void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
- @Property(name = "GeomLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine",
type = "Edm.GeometryLineString",
nullable = true,
defaultValue = "",
@@ -333,12 +331,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- LineString getGeomLine();
+ org.apache.olingo.commons.api.edm.geo.LineString getGeomLine();
- void setGeomLine(final LineString _geomLine);
+ void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString _geomLine);
- @Property(name = "GeomPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPolygon",
type = "Edm.GeometryPolygon",
nullable = true,
defaultValue = "",
@@ -356,12 +354,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Polygon getGeomPolygon();
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeomPolygon();
- void setGeomPolygon(final Polygon _geomPolygon);
+ void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geomPolygon);
- @Property(name = "GeomCollection",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomCollection",
type = "Edm.GeometryCollection",
nullable = true,
defaultValue = "",
@@ -379,12 +377,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- GeospatialCollection getGeomCollection();
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeomCollection();
- void setGeomCollection(final GeospatialCollection _geomCollection);
+ void setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geomCollection);
- @Property(name = "GeomMultiPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPoint",
type = "Edm.GeometryMultiPoint",
nullable = true,
defaultValue = "",
@@ -402,12 +400,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPoint getGeomMultiPoint();
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
- void setGeomMultiPoint(final MultiPoint _geomMultiPoint);
+ void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geomMultiPoint);
- @Property(name = "GeomMultiLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiLine",
type = "Edm.GeometryMultiLineString",
nullable = true,
defaultValue = "",
@@ -425,12 +423,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiLineString getGeomMultiLine();
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeomMultiLine();
- void setGeomMultiLine(final MultiLineString _geomMultiLine);
+ void setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geomMultiLine);
- @Property(name = "GeomMultiPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPolygon",
type = "Edm.GeometryMultiPolygon",
nullable = true,
defaultValue = "",
@@ -448,12 +446,92 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPolygon getGeomMultiPolygon();
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
- void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon);
+ void setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geomMultiPolygon);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geog",
+ type = "Edm.Geography")
+ Annotatable getGeogAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogCollection",
+ type = "Edm.GeographyCollection")
+ Annotatable getGeogCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPoint",
+ type = "Edm.GeographyMultiPoint")
+ Annotatable getGeogMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiLine",
+ type = "Edm.GeographyMultiLineString")
+ Annotatable getGeogMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPolygon",
+ type = "Edm.GeographyMultiPolygon")
+ Annotatable getGeogMultiPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geom",
+ type = "Edm.Geometry")
+ Annotatable getGeomAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getGeomPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomCollection",
+ type = "Edm.GeometryCollection")
+ Annotatable getGeomCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPoint",
+ type = "Edm.GeometryMultiPoint")
+ Annotatable getGeomMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiLine",
+ type = "Edm.GeometryMultiLineString")
+ Annotatable getGeomMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPolygon",
+ type = "Edm.GeometryMultiPolygon")
+ Annotatable getGeomMultiPolygonAnnotations();
+
+
+ }
+
}
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/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
index 554f353..0d31650 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.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 AllSpatialTypesCollection extends AbstractEntityCollection<AllSpatialTypes> {
+public interface AllSpatialTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes> {
+
+ 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/AuditInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
index 569cec4..c0bfa34 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,45 +43,44 @@ 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")
-@ComplexType(name = "AuditInfo")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AuditInfo")
public interface AuditInfo
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
- Calendar getModifiedDate();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getModifiedDate();
- void setModifiedDate(final Calendar _modifiedDate);
+ void setModifiedDate(java.util.Calendar _modifiedDate);
- @Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
- String getModifiedBy();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
+ java.lang.String getModifiedBy();
- void setModifiedBy(final String _modifiedBy);
+ void setModifiedBy(java.lang.String _modifiedBy);
- @Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
- void setConcurrency(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+ void setConcurrency(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "Concurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
- }
+ }
}
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/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index afba38e..a275af5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.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;
@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine")
public interface BackOrderLine
- extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
- @Property(name = "OrderLineStream",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -83,10 +81,10 @@ public interface BackOrderLine
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantity();
+ java.lang.Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(java.lang.Integer _quantity);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,32 +171,32 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @NavigationProperty(name = "Order",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
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.Order getOrder();
- void setOrder(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
-
- @NavigationProperty(name = "Product",
+ void setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
+ void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
@Override
Operations operations();
@@ -207,4 +205,44 @@ public interface BackOrderLine
}
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
+
}
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/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index b3aca1d..3a9263c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.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;
@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine2",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine2",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine")
public interface BackOrderLine2
- extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
- @Property(name = "OrderLineStream",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -83,10 +81,10 @@ public interface BackOrderLine2
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantity();
+ java.lang.Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(java.lang.Integer _quantity);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,32 +171,32 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @NavigationProperty(name = "Order",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
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.Order getOrder();
- void setOrder(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
-
- @NavigationProperty(name = "Product",
+ void setOrder(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
-
-
+ void setProduct(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
@Override
Operations operations();
@@ -207,4 +205,44 @@ public interface BackOrderLine2
}
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
+
}
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/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
index 27304f6..1c38805 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.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 BackOrderLine2Collection extends AbstractEntityCollection<BackOrderLine2> {
+public interface BackOrderLine2Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2> {
+
+ 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/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
index 465a2c3..b3703e4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.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 BackOrderLineCollection extends AbstractEntityCollection<BackOrderLine> {
+public interface BackOrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine> {
+
+ 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/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
index 2f4da2e..5053016 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.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 = "Car",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Car",
openType = false,
hasStream = true,
isAbstract = false)
public interface Car
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "Photo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface Car
fcKeepInContent = false)
java.io.InputStream getPhoto();
- void setPhoto(final java.io.InputStream _photo);
+ void setPhoto(java.io.InputStream _photo);
- @Property(name = "Video",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -105,10 +103,10 @@ public interface Car
fcKeepInContent = false)
java.io.InputStream getVideo();
- void setVideo(final java.io.InputStream _video);
+ void setVideo(java.io.InputStream _video);
@Key
- @Property(name = "VIN",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getVIN();
+ java.lang.Integer getVIN();
- void setVIN(final Integer _vIN);
+ void setVIN(java.lang.Integer _vIN);
- @Property(name = "Description",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,9 +147,9 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getDescription();
+ java.lang.String getDescription();
- void setDescription(final String _description);
+ void setDescription(java.lang.String _description);
@@ -160,4 +158,32 @@ public interface Car
java.io.InputStream getStream();
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Stream")
+ Annotatable getPhotoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN",
+ type = "Edm.Int32")
+ Annotatable getVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+
+ }
+
}
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/CarCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
index b05d820..3a76468 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.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 CarCollection extends AbstractEntityCollection<Car> {
+public interface CarCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car> {
+
+ 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/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
index 5a75a5f..f40fe98 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,37 +43,40 @@ 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")
-@ComplexType(name = "ComplexToCategory")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexToCategory")
public interface ComplexToCategory
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Term", type = "Edm.String", nullable = true)
- String getTerm();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
+ java.lang.String getTerm();
- void setTerm(final String _term);
+ void setTerm(java.lang.String _term);
- @Property(name = "Scheme", type = "Edm.String", nullable = true)
- String getScheme();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
+ java.lang.String getScheme();
- void setScheme(final String _scheme);
+ void setScheme(java.lang.String _scheme);
- @Property(name = "Label", type = "Edm.String", nullable = true)
- String getLabel();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
+ java.lang.String getLabel();
- void setLabel(final String _label);
+ void setLabel(java.lang.String _label);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
[11/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
index 7ecd7c4..d5a33f2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.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,42 +171,82 @@ 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
- void setPersonMetadata(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
-
-
- @NavigationProperty(name = "Manager",
+ void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee getManager();
- void setManager(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
-
-
+ void setManager(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
Operations operations();
interface Operations {
- @Operation(name = "Sack",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Sack",
type = OperationType.ACTION)
void sack(
);
}
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
index 76d4ee4..089ca2e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
index 117cabf..2908c96 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
- void setLogin(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+ void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
index 6f18a59..f6277cc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
index fb84e53..302a32f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver getDriver();
- void setDriver(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver _driver);
+ void setDriver(org.apache.olingo.fit.proxy.v3.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
index 3d48053..64ebeb0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
index 1481f18..e1639db 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
- void setCustomer(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
- @NavigationProperty(name = "LastLogin",
+ void setCustomer(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin getLastLogin();
- void setLastLogin(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.LastLogin _lastLogin);
-
-
- @NavigationProperty(name = "SentMessages",
+ void setLastLogin(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getSentMessages();
- void setSentMessages(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _sentMessages);
-
-
- @NavigationProperty(name = "ReceivedMessages",
+ void setSentMessages(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection getReceivedMessages();
- void setReceivedMessages(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageCollection _receivedMessages);
-
-
- @NavigationProperty(name = "Orders",
+ void setReceivedMessages(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection getOrders();
- void setOrders(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+ void setOrders(org.apache.olingo.fit.proxy.v3.staticservice.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
index 9c6031c..afc5dd6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
index 175e2b0..4c01877 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "MappedEntityType",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MappedEntityType",
openType = false,
hasStream = false,
isAbstract = false)
public interface MappedEntityType
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @Property(name = "Href",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Href",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getHref();
+ java.lang.String getHref();
- void setHref(final String _href);
+ void setHref(java.lang.String _href);
- @Property(name = "Title",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Title",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTitle();
+ java.lang.String getTitle();
- void setTitle(final String _title);
+ void setTitle(java.lang.String _title);
- @Property(name = "HrefLang",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HrefLang",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getHrefLang();
+ java.lang.String getHrefLang();
- void setHrefLang(final String _hrefLang);
+ void setHrefLang(java.lang.String _hrefLang);
- @Property(name = "Type",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Type",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getType();
+ java.lang.String getType();
- void setType(final String _type);
+ void setType(java.lang.String _type);
- @Property(name = "Length",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Length",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getLength();
+ java.lang.Integer getLength();
- void setLength(final Integer _length);
+ void setLength(java.lang.Integer _length);
- @Property(name = "BagOfPrimitiveToLinks",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfPrimitiveToLinks",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -218,12 +216,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getBagOfPrimitiveToLinks();
+ java.util.Collection<java.lang.String> getBagOfPrimitiveToLinks();
- void setBagOfPrimitiveToLinks(final Collection<String> _bagOfPrimitiveToLinks);
+ void setBagOfPrimitiveToLinks(java.util.Collection<java.lang.String> _bagOfPrimitiveToLinks);
- @Property(name = "Logo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Logo",
type = "Edm.Binary",
nullable = true,
defaultValue = "",
@@ -243,10 +241,10 @@ public interface MappedEntityType
fcKeepInContent = false)
byte[] getLogo();
- void setLogo(final byte[] _logo);
+ void setLogo(byte[] _logo);
- @Property(name = "BagOfDecimals",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDecimals",
type = "Edm.Decimal",
nullable = false,
defaultValue = "",
@@ -264,12 +262,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<BigDecimal> getBagOfDecimals();
+ java.util.Collection<java.math.BigDecimal> getBagOfDecimals();
- void setBagOfDecimals(final Collection<BigDecimal> _bagOfDecimals);
+ void setBagOfDecimals(java.util.Collection<java.math.BigDecimal> _bagOfDecimals);
- @Property(name = "BagOfDoubles",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDoubles",
type = "Edm.Double",
nullable = false,
defaultValue = "",
@@ -287,12 +285,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Double> getBagOfDoubles();
+ java.util.Collection<java.lang.Double> getBagOfDoubles();
- void setBagOfDoubles(final Collection<Double> _bagOfDoubles);
+ void setBagOfDoubles(java.util.Collection<java.lang.Double> _bagOfDoubles);
- @Property(name = "BagOfSingles",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfSingles",
type = "Edm.Single",
nullable = false,
defaultValue = "",
@@ -310,12 +308,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Float> getBagOfSingles();
+ java.util.Collection<java.lang.Float> getBagOfSingles();
- void setBagOfSingles(final Collection<Float> _bagOfSingles);
+ void setBagOfSingles(java.util.Collection<java.lang.Float> _bagOfSingles);
- @Property(name = "BagOfBytes",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfBytes",
type = "Edm.Byte",
nullable = false,
defaultValue = "",
@@ -333,12 +331,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Short> getBagOfBytes();
+ java.util.Collection<java.lang.Short> getBagOfBytes();
- void setBagOfBytes(final Collection<Short> _bagOfBytes);
+ void setBagOfBytes(java.util.Collection<java.lang.Short> _bagOfBytes);
- @Property(name = "BagOfInt16s",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt16s",
type = "Edm.Int16",
nullable = false,
defaultValue = "",
@@ -356,12 +354,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Short> getBagOfInt16s();
+ java.util.Collection<java.lang.Short> getBagOfInt16s();
- void setBagOfInt16s(final Collection<Short> _bagOfInt16s);
+ void setBagOfInt16s(java.util.Collection<java.lang.Short> _bagOfInt16s);
- @Property(name = "BagOfInt32s",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt32s",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -379,12 +377,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Integer> getBagOfInt32s();
+ java.util.Collection<java.lang.Integer> getBagOfInt32s();
- void setBagOfInt32s(final Collection<Integer> _bagOfInt32s);
+ void setBagOfInt32s(java.util.Collection<java.lang.Integer> _bagOfInt32s);
- @Property(name = "BagOfInt64s",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfInt64s",
type = "Edm.Int64",
nullable = false,
defaultValue = "",
@@ -402,12 +400,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Long> getBagOfInt64s();
+ java.util.Collection<java.lang.Long> getBagOfInt64s();
- void setBagOfInt64s(final Collection<Long> _bagOfInt64s);
+ void setBagOfInt64s(java.util.Collection<java.lang.Long> _bagOfInt64s);
- @Property(name = "BagOfGuids",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfGuids",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -425,12 +423,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<UUID> getBagOfGuids();
+ java.util.Collection<java.util.UUID> getBagOfGuids();
- void setBagOfGuids(final Collection<UUID> _bagOfGuids);
+ void setBagOfGuids(java.util.Collection<java.util.UUID> _bagOfGuids);
- @Property(name = "BagOfDateTime",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfDateTime",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -448,12 +446,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<Calendar> getBagOfDateTime();
+ java.util.Collection<java.util.Calendar> getBagOfDateTime();
- void setBagOfDateTime(final Collection<Calendar> _bagOfDateTime);
+ void setBagOfDateTime(java.util.Collection<java.util.Calendar> _bagOfDateTime);
- @Property(name = "BagOfComplexToCategories",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory",
nullable = false,
defaultValue = "",
@@ -471,12 +469,12 @@ public interface MappedEntityType
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> getBagOfComplexToCategories();
- void setBagOfComplexToCategories(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
+ void setBagOfComplexToCategories(java.util.Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory> _bagOfComplexToCategories);
- @Property(name = "ComplexPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
nullable = true,
defaultValue = "",
@@ -496,10 +494,10 @@ public interface MappedEntityType
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getComplexPhone();
- void setComplexPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
+ void setComplexPhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _complexPhone);
- @Property(name = "ComplexContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
nullable = true,
defaultValue = "",
@@ -519,26 +517,114 @@ public interface MappedEntityType
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getComplexContactDetails();
- void setComplexContactDetails(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
+ void setComplexContactDetails(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _complexContactDetails);
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "BagOfComplexToCategories",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BagOfComplexToCategories",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory newBagOfComplexToCategories();
- @Property(name = "ComplexPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newComplexPhone();
- @Property(name = "ComplexContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComplexContactDetails",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newComplexContactDetails();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Href",
+ type = "Edm.String")
+ Annotatable getHrefAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Title",
+ type = "Edm.String")
+ Annotatable getTitleAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HrefLang",
+ type = "Edm.String")
+ Annotatable getHrefLangAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Type",
+ type = "Edm.String")
+ Annotatable getTypeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Length",
+ type = "Edm.Int32")
+ Annotatable getLengthAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfPrimitiveToLinks",
+ type = "Edm.String")
+ Annotatable getBagOfPrimitiveToLinksAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Logo",
+ type = "Edm.Binary")
+ Annotatable getLogoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDecimals",
+ type = "Edm.Decimal")
+ Annotatable getBagOfDecimalsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDoubles",
+ type = "Edm.Double")
+ Annotatable getBagOfDoublesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfSingles",
+ type = "Edm.Single")
+ Annotatable getBagOfSinglesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfBytes",
+ type = "Edm.Byte")
+ Annotatable getBagOfBytesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt16s",
+ type = "Edm.Int16")
+ Annotatable getBagOfInt16sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt32s",
+ type = "Edm.Int32")
+ Annotatable getBagOfInt32sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfInt64s",
+ type = "Edm.Int64")
+ Annotatable getBagOfInt64sAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfGuids",
+ type = "Edm.Guid")
+ Annotatable getBagOfGuidsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfDateTime",
+ type = "Edm.DateTime")
+ Annotatable getBagOfDateTimeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BagOfComplexToCategories",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComplexToCategory")
+ Annotatable getBagOfComplexToCategoriesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
+ Annotatable getComplexPhoneAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComplexContactDetails",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getComplexContactDetailsAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
index 8981ccc..ecc3a3e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 MappedEntityTypeCollection extends AbstractEntityCollection<MappedEntityType> {
+public interface MappedEntityTypeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MappedEntityType> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
index 9357035..4d64d2b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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;
@KeyRef(MessageKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "Message",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Message",
openType = false,
hasStream = false,
isAbstract = false)
public interface Message
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "MessageId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MessageId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getMessageId();
+ java.lang.Integer getMessageId();
- void setMessageId(final Integer _messageId);
+ void setMessageId(java.lang.Integer _messageId);
@Key
- @Property(name = "FromUsername",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FromUsername",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getFromUsername();
+ java.lang.String getFromUsername();
- void setFromUsername(final String _fromUsername);
+ void setFromUsername(java.lang.String _fromUsername);
- @Property(name = "ToUsername",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ToUsername",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getToUsername();
+ java.lang.String getToUsername();
- void setToUsername(final String _toUsername);
+ void setToUsername(java.lang.String _toUsername);
- @Property(name = "Sent",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Sent",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getSent();
+ java.util.Calendar getSent();
- void setSent(final Calendar _sent);
+ void setSent(java.util.Calendar _sent);
- @Property(name = "Subject",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Subject",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getSubject();
+ java.lang.String getSubject();
- void setSubject(final String _subject);
+ void setSubject(java.lang.String _subject);
- @Property(name = "Body",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Body",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getBody();
+ java.lang.String getBody();
- void setBody(final String _body);
+ void setBody(java.lang.String _body);
- @Property(name = "IsRead",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsRead",
type = "Edm.Boolean",
nullable = false,
defaultValue = "",
@@ -218,42 +216,94 @@ public interface Message
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Boolean getIsRead();
+ java.lang.Boolean getIsRead();
- void setIsRead(final Boolean _isRead);
+ void setIsRead(java.lang.Boolean _isRead);
- @NavigationProperty(name = "Sender",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Sender",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getSender();
- void setSender(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
-
-
- @NavigationProperty(name = "Recipient",
+ void setSender(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _sender);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Recipient",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getRecipient();
- void setRecipient(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
-
-
- @NavigationProperty(name = "Attachments",
+ void setRecipient(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _recipient);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Attachments",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "MessageAttachment")
+ targetEntitySet = "MessageAttachment",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection getAttachments();
- void setAttachments(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
+ void setAttachments(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachmentCollection _attachments);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "MessageId",
+ type = "Edm.Int32")
+ Annotatable getMessageIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "FromUsername",
+ type = "Edm.String")
+ Annotatable getFromUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ToUsername",
+ type = "Edm.String")
+ Annotatable getToUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Sent",
+ type = "Edm.DateTimeOffset")
+ Annotatable getSentAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Subject",
+ type = "Edm.String")
+ Annotatable getSubjectAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Body",
+ type = "Edm.String")
+ Annotatable getBodyAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsRead",
+ type = "Edm.Boolean")
+ Annotatable getIsReadAnnotations();
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Sender",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getSenderAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Recipient",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getRecipientAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Attachments",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.MessageAttachment")
+ Annotatable getAttachmentsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
index 3f6f59b..32b4a58 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "MessageAttachment",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "MessageAttachment",
openType = false,
hasStream = false,
isAbstract = false)
public interface MessageAttachment
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "AttachmentId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AttachmentId",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface MessageAttachment
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- UUID getAttachmentId();
+ java.util.UUID getAttachmentId();
- void setAttachmentId(final UUID _attachmentId);
+ void setAttachmentId(java.util.UUID _attachmentId);
- @Property(name = "Attachment",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Attachment",
type = "Edm.Binary",
nullable = true,
defaultValue = "",
@@ -105,10 +103,30 @@ public interface MessageAttachment
fcKeepInContent = false)
byte[] getAttachment();
- void setAttachment(final byte[] _attachment);
+ void setAttachment(byte[] _attachment);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "AttachmentId",
+ type = "Edm.Guid")
+ Annotatable getAttachmentIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Attachment",
+ type = "Edm.Binary")
+ Annotatable getAttachmentAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
index 67e7cd0..0f1c69c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 MessageAttachmentCollection extends AbstractEntityCollection<MessageAttachment> {
+public interface MessageAttachmentCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageAttachment> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
[20/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
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/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
index 7f1fa1c..1b9b9b3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.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 = "Computer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Computer",
openType = false,
hasStream = false,
isAbstract = false)
public interface Computer
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ComputerId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Computer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getComputerId();
+ java.lang.Integer getComputerId();
- void setComputerId(final Integer _computerId);
+ void setComputerId(java.lang.Integer _computerId);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,22 +101,46 @@ public interface Computer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @NavigationProperty(name = "ComputerDetail",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ComputerDetail",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "ComputerDetail")
+ targetEntitySet = "ComputerDetail",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail getComputerDetail();
- void setComputerDetail(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
+ void setComputerDetail(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId",
+ type = "Edm.Int32")
+ Annotatable getComputerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail")
+ Annotatable getComputerDetailAnnotations();
+ }
}
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/ComputerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
index 6f02360..4e0e1be 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.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 ComputerCollection extends AbstractEntityCollection<Computer> {
+public interface ComputerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer> {
+
+ 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/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
index fe05306..acaa884 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.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 = "ComputerDetail",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ComputerDetail",
openType = false,
hasStream = false,
isAbstract = false)
public interface ComputerDetail
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ComputerDetailId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getComputerDetailId();
+ java.lang.Integer getComputerDetailId();
- void setComputerDetailId(final Integer _computerDetailId);
+ void setComputerDetailId(java.lang.Integer _computerDetailId);
- @Property(name = "Manufacturer",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getManufacturer();
+ java.lang.String getManufacturer();
- void setManufacturer(final String _manufacturer);
+ void setManufacturer(java.lang.String _manufacturer);
- @Property(name = "Model",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getModel();
+ java.lang.String getModel();
- void setModel(final String _model);
+ void setModel(java.lang.String _model);
- @Property(name = "Serial",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getSerial();
+ java.lang.String getSerial();
- void setSerial(final String _serial);
+ void setSerial(java.lang.String _serial);
- @Property(name = "SpecificationsBag",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getSpecificationsBag();
+ java.util.Collection<java.lang.String> getSpecificationsBag();
- void setSpecificationsBag(final Collection<String> _specificationsBag);
+ void setSpecificationsBag(java.util.Collection<java.lang.String> _specificationsBag);
- @Property(name = "PurchaseDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getPurchaseDate();
+ java.util.Calendar getPurchaseDate();
- void setPurchaseDate(final Calendar _purchaseDate);
+ void setPurchaseDate(java.util.Calendar _purchaseDate);
- @Property(name = "Dimensions",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
nullable = true,
defaultValue = "",
@@ -220,28 +218,68 @@ public interface ComputerDetail
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);
- @NavigationProperty(name = "Computer",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Computer")
+ targetEntitySet = "Computer",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer();
- void setComputer(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
-
-
+ void setComputer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
+
- ComplexFactory factory();
+ ComplexFactory factory();
interface 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();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId",
+ type = "Edm.Int32")
+ Annotatable getComputerDetailIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer",
+ type = "Edm.String")
+ Annotatable getManufacturerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model",
+ type = "Edm.String")
+ Annotatable getModelAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag",
+ type = "Edm.String")
+ Annotatable getSpecificationsBagAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate",
+ type = "Edm.DateTime")
+ Annotatable getPurchaseDateAnnotations();
+
+ @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.AnnotationsForNavigationProperty(name = "Computer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
+ Annotatable getComputerAnnotations();
+ }
+
}
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/ComputerDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
index 5b506a0..db2cf21 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.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 ComputerDetailCollection extends AbstractEntityCollection<ComputerDetail> {
+public interface ComputerDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail> {
+
+ 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/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
index 2ff3e54..9f3325a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,30 +43,33 @@ 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")
-@ComplexType(name = "ConcurrencyInfo")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo")
public interface ConcurrencyInfo
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Token", type = "Edm.String", nullable = true)
- String getToken();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
+ java.lang.String getToken();
- void setToken(final String _token);
+ void setToken(java.lang.String _token);
- @Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
- Calendar getQueriedDateTime();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
+ java.util.Calendar getQueriedDateTime();
- void setQueriedDateTime(final Calendar _queriedDateTime);
+ void setQueriedDateTime(java.util.Calendar _queriedDateTime);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
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/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
index 8e1e947..942f038 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,78 +43,77 @@ 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")
-@ComplexType(name = "ContactDetails")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails")
public interface ContactDetails
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "EmailBag", type = "Edm.String", nullable = false)
- Collection<String> getEmailBag();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getEmailBag();
- void setEmailBag(final Collection<String> _emailBag);
+ void setEmailBag(java.util.Collection<java.lang.String> _emailBag);
- @Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
- Collection<String> getAlternativeNames();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
+ java.util.Collection<java.lang.String> getAlternativeNames();
- void setAlternativeNames(final Collection<String> _alternativeNames);
+ void setAlternativeNames(java.util.Collection<java.lang.String> _alternativeNames);
- @Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
- void setContactAlias(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
+ void setContactAlias(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
- @Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
- void setHomePhone(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
+ void setHomePhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
- @Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
- void setWorkPhone(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
+ void setWorkPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
- @Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
- Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone> getMobilePhoneBag();
- void setMobilePhoneBag(final Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
+ void setMobilePhoneBag(java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "ContactAlias",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newContactAlias();
- @Property(name = "HomePhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newHomePhone();
- @Property(name = "WorkPhone",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newWorkPhone();
- @Property(name = "MobilePhoneBag",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag();
- }
+ }
}
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/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
index 0f5cc00..06c15b9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.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 = "Contractor",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Contractor",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
public interface Contractor
- 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 Contractor
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 Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @Property(name = "ContratorCompanyId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getContratorCompanyId();
+ java.lang.Integer getContratorCompanyId();
- void setContratorCompanyId(final Integer _contratorCompanyId);
+ void setContratorCompanyId(java.lang.Integer _contratorCompanyId);
- @Property(name = "BillingRate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getBillingRate();
+ java.lang.Integer getBillingRate();
- void setBillingRate(final Integer _billingRate);
+ void setBillingRate(java.lang.Integer _billingRate);
- @Property(name = "TeamContactPersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -173,12 +171,12 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getTeamContactPersonId();
+ java.lang.Integer getTeamContactPersonId();
- void setTeamContactPersonId(final Integer _teamContactPersonId);
+ void setTeamContactPersonId(java.lang.Integer _teamContactPersonId);
- @Property(name = "JobDescription",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -196,33 +194,73 @@ public interface Contractor
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getJobDescription();
+ java.lang.String getJobDescription();
- void setJobDescription(final String _jobDescription);
+ void setJobDescription(java.lang.String _jobDescription);
- @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);
-
-
+ void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
@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(
);
}
+ 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 = "ContratorCompanyId",
+ type = "Edm.Int32")
+ Annotatable getContratorCompanyIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate",
+ type = "Edm.Int32")
+ Annotatable getBillingRateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId",
+ type = "Edm.Int32")
+ Annotatable getTeamContactPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription",
+ type = "Edm.String")
+ Annotatable getJobDescriptionAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
+
}
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/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
index aa165db..761b0fe 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.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 ContractorCollection extends AbstractEntityCollection<Contractor> {
+public interface ContractorCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Contractor> {
+
+ 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/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
index 12471d2..e07e8ec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.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 = "Customer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Customer",
openType = false,
hasStream = false,
isAbstract = false)
public interface Customer
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "Thumbnail",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Thumbnail",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface Customer
fcKeepInContent = false)
java.io.InputStream getThumbnail();
- void setThumbnail(final java.io.InputStream _thumbnail);
+ void setThumbnail(java.io.InputStream _thumbnail);
- @Property(name = "Video",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -105,10 +103,10 @@ public interface Customer
fcKeepInContent = false)
java.io.InputStream getVideo();
- void setVideo(final java.io.InputStream _video);
+ void setVideo(java.io.InputStream _video);
@Key
- @Property(name = "CustomerId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCustomerId();
+ java.lang.Integer getCustomerId();
- void setCustomerId(final Integer _customerId);
+ void setCustomerId(java.lang.Integer _customerId);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @Property(name = "PrimaryContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
nullable = true,
defaultValue = "",
@@ -174,10 +172,10 @@ public interface Customer
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
- void setPrimaryContactInfo(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
+ void setPrimaryContactInfo(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
- @Property(name = "BackupContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails",
nullable = false,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
+ java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
- void setBackupContactInfo(final Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
+ void setBackupContactInfo(java.util.Collection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
- @Property(name = "Auditing",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo",
nullable = true,
defaultValue = "",
@@ -220,76 +218,132 @@ public interface Customer
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
- void setAuditing(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
+ void setAuditing(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
- @NavigationProperty(name = "Orders",
+ @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);
-
-
- @NavigationProperty(name = "Logins",
+ void setOrders(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection _orders);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Logins",
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.LoginCollection getLogins();
- void setLogins(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
-
-
- @NavigationProperty(name = "Husband",
+ void setLogins(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.LoginCollection _logins);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Husband",
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 getHusband();
- void setHusband(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
-
-
- @NavigationProperty(name = "Wife",
+ void setHusband(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _husband);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Wife",
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 getWife();
- void setWife(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
-
-
- @NavigationProperty(name = "Info",
+ void setWife(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer _wife);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Info",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "CustomerInfo")
+ targetEntitySet = "CustomerInfo",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo getInfo();
- void setInfo(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
-
-
+ void setInfo(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo _info);
+
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "PrimaryContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PrimaryContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo();
- @Property(name = "BackupContactInfo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BackupContactInfo",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo();
- @Property(name = "Auditing",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Auditing",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Thumbnail",
+ type = "Edm.Stream")
+ Annotatable getThumbnailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PrimaryContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getPrimaryContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BackupContactInfo",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ContactDetails")
+ Annotatable getBackupContactInfoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Auditing",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.AuditInfo")
+ Annotatable getAuditingAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Orders",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrdersAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Logins",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginsAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Husband",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getHusbandAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Wife",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getWifeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Info",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.CustomerInfo")
+ Annotatable getInfoAnnotations();
+ }
+
}
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/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
index dffc8e6..04b2391 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.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 CustomerCollection extends AbstractEntityCollection<Customer> {
+public interface CustomerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Customer> {
+
+ 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/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
index 0f30d9f..bc7fa13 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.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 = "CustomerInfo",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "CustomerInfo",
openType = false,
hasStream = true,
isAbstract = false)
public interface CustomerInfo
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "CustomerInfoId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerInfoId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface CustomerInfo
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCustomerInfoId();
+ java.lang.Integer getCustomerInfoId();
- void setCustomerInfoId(final Integer _customerInfoId);
+ void setCustomerInfoId(java.lang.Integer _customerInfoId);
- @Property(name = "Information",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Information",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,9 +101,9 @@ public interface CustomerInfo
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getInformation();
+ java.lang.String getInformation();
- void setInformation(final String _information);
+ void setInformation(java.lang.String _information);
@@ -114,4 +112,24 @@ public interface CustomerInfo
java.io.InputStream getStream();
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerInfoId",
+ type = "Edm.Int32")
+ Annotatable getCustomerInfoIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Information",
+ type = "Edm.String")
+ Annotatable getInformationAnnotations();
+
+
+ }
+
}
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/CustomerInfoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
index fc09e12..4071f42 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.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 CustomerInfoCollection extends AbstractEntityCollection<CustomerInfo> {
+public interface CustomerInfoCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo> {
+
+ 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/Dimensions.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
index af09ab5..72c24b6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,37 +43,40 @@ 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")
-@ComplexType(name = "Dimensions")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Dimensions")
public interface Dimensions
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Width", type = "Edm.Decimal", nullable = false)
- BigDecimal getWidth();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getWidth();
- void setWidth(final BigDecimal _width);
+ void setWidth(java.math.BigDecimal _width);
- @Property(name = "Height", type = "Edm.Decimal", nullable = false)
- BigDecimal getHeight();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getHeight();
- void setHeight(final BigDecimal _height);
+ void setHeight(java.math.BigDecimal _height);
- @Property(name = "Depth", type = "Edm.Decimal", nullable = false)
- BigDecimal getDepth();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getDepth();
- void setDepth(final BigDecimal _depth);
+ void setDepth(java.math.BigDecimal _depth);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
[16/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
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/SpecialEmployee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
index 8f326c4..55427ee 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.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 = "SpecialEmployee",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "SpecialEmployee",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Employee")
public interface SpecialEmployee
- extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee {
@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 SpecialEmployee
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 SpecialEmployee
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 SpecialEmployee
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 SpecialEmployee
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,12 +171,12 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getTitle();
+ java.lang.String getTitle();
- void setTitle(final String _title);
+ void setTitle(java.lang.String _title);
- @Property(name = "CarsVIN",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CarsVIN",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -196,12 +194,12 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCarsVIN();
+ java.lang.Integer getCarsVIN();
- void setCarsVIN(final Integer _carsVIN);
+ void setCarsVIN(java.lang.Integer _carsVIN);
- @Property(name = "Bonus",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Bonus",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -219,12 +217,12 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getBonus();
+ java.lang.Integer getBonus();
- void setBonus(final Integer _bonus);
+ void setBonus(java.lang.Integer _bonus);
- @Property(name = "IsFullyVested",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "IsFullyVested",
type = "Edm.Boolean",
nullable = false,
defaultValue = "",
@@ -242,59 +240,115 @@ public interface SpecialEmployee
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Boolean getIsFullyVested();
+ java.lang.Boolean getIsFullyVested();
- void setIsFullyVested(final Boolean _isFullyVested);
+ void setIsFullyVested(java.lang.Boolean _isFullyVested);
- @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);
-
-
- @NavigationProperty(name = "Car",
+ void setManager(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee _manager);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Car",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Car")
+ targetEntitySet = "Car",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car getCar();
- void setCar(final org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
-
-
+ void setCar(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Car _car);
+
@Override
Operations operations();
interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.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.Int32")
- Integer increaseEmployeeSalary(
+ java.lang.Integer increaseEmployeeSalary(
);
}
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee.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.AnnotationsForProperty(name = "CarsVIN",
+ type = "Edm.Int32")
+ Annotatable getCarsVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Bonus",
+ type = "Edm.Int32")
+ Annotatable getBonusAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "IsFullyVested",
+ type = "Edm.Boolean")
+ Annotatable getIsFullyVestedAnnotations();
+
+
+
+ @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();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Car",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Car")
+ Annotatable getCarAnnotations();
+ }
+
}
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/SpecialEmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
index bf24627..2fd0e5a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.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 SpecialEmployeeCollection extends AbstractEntityCollection<SpecialEmployee> {
+public interface SpecialEmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee> {
Operations operations();
public interface Operations {
@@ -52,8 +53,12 @@ public interface SpecialEmployeeCollection extends AbstractEntityCollection<Spec
@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/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
index 95186f1..117a28e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
@@ -20,8 +20,6 @@
package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3;
import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
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.annotations.Property;
@@ -46,20 +44,18 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
-@EntityContainer(name = "DefaultContainer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer",
namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV3",
isDefaultEntityContainer = true)
public interface DefaultContainer extends PersistenceManager {
Row getRow();
-
RowIndex getRowIndex();
-
Operations operations();
public interface Operations {
@@ -69,7 +65,7 @@ public interface DefaultContainer extends PersistenceManager {
ComplexFactory complexFactory();
interface ComplexFactory {
- @Property(name = "ContactDetails",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactDetails",
type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails")
org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.ContactDetails newContactDetails();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
index cb570dc..dfff0a7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Row")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Row")
public interface Row
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row, UUID, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row, java.util.UUID, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection> {
org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row newRow();
org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowCollection newRowCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
index 0cac346..ce72303 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "RowIndex")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "RowIndex")
public interface RowIndex
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex, Integer, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex, java.lang.Integer, org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection> {
org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex newRowIndex();
org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndexCollection newRowIndexCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
index bdf2d78..158cfef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*;
import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*;
@@ -37,100 +43,103 @@ 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.OpenTypesServiceV3")
-@ComplexType(name = "ContactDetails")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails")
public interface ContactDetails
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "FirstContacted", type = "Edm.Binary", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstContacted", type = "Edm.Binary", nullable = true)
byte[] getFirstContacted();
- void setFirstContacted(final byte[] _firstContacted);
+ void setFirstContacted(byte[] _firstContacted);
- @Property(name = "LastContacted", type = "Edm.DateTimeOffset", nullable = false)
- Calendar getLastContacted();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted", type = "Edm.DateTimeOffset", nullable = false)
+ java.util.Calendar getLastContacted();
- void setLastContacted(final Calendar _lastContacted);
+ void setLastContacted(java.util.Calendar _lastContacted);
- @Property(name = "Contacted", type = "Edm.DateTime", nullable = false)
- Calendar getContacted();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getContacted();
- void setContacted(final Calendar _contacted);
+ void setContacted(java.util.Calendar _contacted);
- @Property(name = "GUID", type = "Edm.Guid", nullable = false)
- UUID getGUID();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID", type = "Edm.Guid", nullable = false)
+ java.util.UUID getGUID();
- void setGUID(final UUID _gUID);
+ void setGUID(java.util.UUID _gUID);
- @Property(name = "PreferedContactTime", type = "Edm.Time", nullable = false)
- BigDecimal getPreferedContactTime();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PreferedContactTime", type = "Edm.Time", nullable = false)
+ java.math.BigDecimal getPreferedContactTime();
- void setPreferedContactTime(final BigDecimal _preferedContactTime);
+ void setPreferedContactTime(java.math.BigDecimal _preferedContactTime);
- @Property(name = "Byte", type = "Edm.Byte", nullable = false)
- Short getByte();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
+ java.lang.Short getByte();
- void setByte(final Short _byte);
+ void setByte(java.lang.Short _byte);
- @Property(name = "SignedByte", type = "Edm.SByte", nullable = false)
- Byte getSignedByte();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte", type = "Edm.SByte", nullable = false)
+ java.lang.Byte getSignedByte();
- void setSignedByte(final Byte _signedByte);
+ void setSignedByte(java.lang.Byte _signedByte);
- @Property(name = "Double", type = "Edm.Double", nullable = false)
- Double getDouble();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
+ java.lang.Double getDouble();
- void setDouble(final Double _double);
+ void setDouble(java.lang.Double _double);
- @Property(name = "Single", type = "Edm.Single", nullable = false)
- Float getSingle();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
+ java.lang.Float getSingle();
- void setSingle(final Float _single);
+ void setSingle(java.lang.Float _single);
- @Property(name = "Short", type = "Edm.Int16", nullable = false)
- Short getShort();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short", type = "Edm.Int16", nullable = false)
+ java.lang.Short getShort();
- void setShort(final Short _short);
+ void setShort(java.lang.Short _short);
- @Property(name = "Int", type = "Edm.Int32", nullable = false)
- Integer getInt();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int", type = "Edm.Int32", nullable = false)
+ java.lang.Integer getInt();
- void setInt(final Integer _int);
+ void setInt(java.lang.Integer _int);
- @Property(name = "Long", type = "Edm.Int64", nullable = false)
- Long getLong();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long", type = "Edm.Int64", nullable = false)
+ java.lang.Long getLong();
- void setLong(final Long _long);
+ void setLong(java.lang.Long _long);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
index 21140fe..635e3d9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.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.opentype.microsoft.test.odata.services.opentypesservicev3.*;
@@ -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.OpenTypesServiceV3")
-@EntityType(name = "IndexedRow",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "IndexedRow",
openType = true,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.OpenTypesServiceV3.Row")
public interface IndexedRow
- extends org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -81,12 +79,28 @@ public interface IndexedRow
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- UUID getId();
+ java.util.UUID getId();
- void setId(final UUID _id);
+ void setId(java.util.UUID _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
index 22afa8c..3d97e42 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.op
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 IndexedRowCollection extends AbstractEntityCollection<IndexedRow> {
+public interface IndexedRowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRow> {
+
+ 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/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
index 04c8583..2400b16 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.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.opentype.microsoft.test.odata.services.opentypesservicev3.*;
@@ -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.OpenTypesServiceV3")
-@EntityType(name = "Row",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Row",
openType = true,
hasStream = false,
isAbstract = false)
public interface Row
- extends AbstractOpenType {
+ extends Annotatable,AbstractOpenType {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Guid",
nullable = false,
defaultValue = "",
@@ -80,12 +78,28 @@ public interface Row
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- UUID getId();
+ java.util.UUID getId();
- void setId(final UUID _id);
+ void setId(java.util.UUID _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Guid")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
index 45413b7..bb08b6a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.op
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 RowCollection extends AbstractEntityCollection<Row> {
+public interface RowCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row> {
+
+ 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/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
index 1c4d7d2..8089faf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.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.opentype.microsoft.test.odata.services.opentypesservicev3.*;
@@ -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.OpenTypesServiceV3")
-@EntityType(name = "RowIndex",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "RowIndex",
openType = true,
hasStream = false,
isAbstract = false)
public interface RowIndex
- extends AbstractOpenType {
+ extends Annotatable,AbstractOpenType {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,22 +78,42 @@ public interface RowIndex
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @NavigationProperty(name = "Rows",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Rows",
type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.IndexedRow",
targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV3",
targetContainer = "DefaultContainer",
- targetEntitySet = "Row")
+ targetEntitySet = "Row",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection getRows();
- void setRows(final org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection _rows);
+ void setRows(org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.IndexedRowCollection _rows);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Rows",
+ type = "Microsoft.Test.OData.Services.OpenTypesServiceV3.IndexedRow")
+ Annotatable getRowsAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
index 064bf4b..e66cd96 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.op
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 RowIndexCollection extends AbstractEntityCollection<RowIndex> {
+public interface RowIndexCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex> {
+
+ 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/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
index 179d663..776681c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java
@@ -43,8 +43,7 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmBinarySet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmBinarySet")
public interface EdmBinarySet
extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary, byte[], org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinaryCollection> {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
index 60d3bd7..b1a950b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmBooleanSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmBooleanSet")
public interface EdmBooleanSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean, Boolean, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean, java.lang.Boolean, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBoolean newEdmBoolean();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBooleanCollection newEdmBooleanCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
index 0dea089..95b051e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmByteSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmByteSet")
public interface EdmByteSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte, Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte, java.lang.Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByte newEdmByte();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmByteCollection newEdmByteCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
index c9cfee1..8df4e7d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmDateTimeOffsetSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDateTimeOffsetSet")
public interface EdmDateTimeOffsetSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset, Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset, java.util.Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffset newEdmDateTimeOffset();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeOffsetCollection newEdmDateTimeOffsetCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
index 5da3e4d..b1cfbda 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmDateTimeSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDateTimeSet")
public interface EdmDateTimeSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime, Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime, java.util.Calendar, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTime newEdmDateTime();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDateTimeCollection newEdmDateTimeCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
index 2e2e307..920a9ef 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmDecimalSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDecimalSet")
public interface EdmDecimalSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal, BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal, java.math.BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimal newEdmDecimal();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDecimalCollection newEdmDecimalCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
index e90a764..f006be7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmDoubleSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmDoubleSet")
public interface EdmDoubleSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble, Double, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble, java.lang.Double, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDouble newEdmDouble();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmDoubleCollection newEdmDoubleCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
index bc7f92b..1a59c71 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmGuidSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmGuidSet")
public interface EdmGuidSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid, UUID, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid, java.util.UUID, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuid newEdmGuid();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmGuidCollection newEdmGuidCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
index ac3c543..bc1b5ec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmInt16Set")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt16Set")
public interface EdmInt16Set
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16, Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16, java.lang.Short, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16 newEdmInt16();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt16Collection newEdmInt16Collection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
index 6311074..6bd87a4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmInt32Set")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt32Set")
public interface EdmInt32Set
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32, Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32, java.lang.Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32 newEdmInt32();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt32Collection newEdmInt32Collection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
index a292d01..d9fbc9d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmInt64Set")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmInt64Set")
public interface EdmInt64Set
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64, Long, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64, java.lang.Long, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64 newEdmInt64();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmInt64Collection newEdmInt64Collection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
index 2794ab7..d055aac 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmSingleSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmSingleSet")
public interface EdmSingleSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle, Float, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle, java.lang.Float, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingle newEdmSingle();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmSingleCollection newEdmSingleCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
index 1fad8c4..9cbf840 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmStringSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmStringSet")
public interface EdmStringSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString, String, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString, java.lang.String, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString newEdmString();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmStringCollection newEdmStringCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
index 2d3f208..bdef918 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "EdmTimeSet")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "EdmTimeSet")
public interface EdmTimeSet
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime, BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime, java.math.BigDecimal, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTime newEdmTime();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmTimeCollection newEdmTimeCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
index 7f00eac..82b014f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java
@@ -43,10 +43,9 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
-
-@EntitySet(name = "Folders")
+@org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Folders")
public interface Folders
- extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder, Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection> {
+ extends AbstractEntitySet<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder, java.lang.Integer, org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection> {
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.Folder newFolder();
org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.FolderCollection newFolderCollection();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
index aa4f588..aee4490 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
@@ -20,8 +20,6 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice;
import org.apache.olingo.client.api.http.HttpMethod;
-import org.apache.olingo.ext.proxy.api.annotations.Namespace;
-import org.apache.olingo.ext.proxy.api.annotations.EntityContainer;
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.annotations.Property;
@@ -46,46 +44,31 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
-@EntityContainer(name = "TestContext",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "TestContext",
namespace = "Microsoft.Test.OData.Services.PrimitiveKeysService",
isDefaultEntityContainer = true)
public interface TestContext extends PersistenceManager {
EdmTimeSet getEdmTimeSet();
-
EdmDoubleSet getEdmDoubleSet();
-
EdmStringSet getEdmStringSet();
-
EdmBooleanSet getEdmBooleanSet();
-
EdmBinarySet getEdmBinarySet();
-
EdmDecimalSet getEdmDecimalSet();
-
EdmGuidSet getEdmGuidSet();
-
EdmInt32Set getEdmInt32Set();
-
EdmInt64Set getEdmInt64Set();
-
EdmInt16Set getEdmInt16Set();
-
EdmByteSet getEdmByteSet();
-
EdmDateTimeSet getEdmDateTimeSet();
-
Folders getFolders();
-
EdmSingleSet getEdmSingleSet();
-
EdmDateTimeOffsetSet getEdmDateTimeOffsetSet();
-
Operations operations();
public interface Operations {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
index df690b9..b966c8d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.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.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*;
@@ -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.PrimitiveKeysService")
-@EntityType(name = "EdmBinary",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "EdmBinary",
openType = false,
hasStream = false,
isAbstract = false)
public interface EdmBinary
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Binary",
nullable = false,
defaultValue = "",
@@ -82,10 +80,26 @@ public interface EdmBinary
fcKeepInContent = false)
byte[] getId();
- void setId(final byte[] _id);
+ void setId(byte[] _id);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Binary")
+ Annotatable getIdAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
index 297a797..b3031aa 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.servic
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 EdmBinaryCollection extends AbstractEntityCollection<EdmBinary> {
+public interface EdmBinaryCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmBinary> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
[13/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
index 500111d..777f8c2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "AllSpatialTypes",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "AllSpatialTypes",
openType = false,
hasStream = false,
isAbstract = false)
public interface AllSpatialTypes
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "Id",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getId();
+ java.lang.Integer getId();
- void setId(final Integer _id);
+ void setId(java.lang.Integer _id);
- @Property(name = "Geog",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geog",
type = "Edm.Geography",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Geospatial getGeog();
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeog();
- void setGeog(final Geospatial _geog);
+ void setGeog(org.apache.olingo.commons.api.edm.geo.Geospatial _geog);
- @Property(name = "GeogPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPoint",
type = "Edm.GeographyPoint",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getGeogPoint();
+ org.apache.olingo.commons.api.edm.geo.Point getGeogPoint();
- void setGeogPoint(final Point _geogPoint);
+ void setGeogPoint(org.apache.olingo.commons.api.edm.geo.Point _geogPoint);
- @Property(name = "GeogLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogLine",
type = "Edm.GeographyLineString",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- LineString getGeogLine();
+ org.apache.olingo.commons.api.edm.geo.LineString getGeogLine();
- void setGeogLine(final LineString _geogLine);
+ void setGeogLine(org.apache.olingo.commons.api.edm.geo.LineString _geogLine);
- @Property(name = "GeogPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogPolygon",
type = "Edm.GeographyPolygon",
nullable = true,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Polygon getGeogPolygon();
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeogPolygon();
- void setGeogPolygon(final Polygon _geogPolygon);
+ void setGeogPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geogPolygon);
- @Property(name = "GeogCollection",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogCollection",
type = "Edm.GeographyCollection",
nullable = true,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- GeospatialCollection getGeogCollection();
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeogCollection();
- void setGeogCollection(final GeospatialCollection _geogCollection);
+ void setGeogCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geogCollection);
- @Property(name = "GeogMultiPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPoint",
type = "Edm.GeographyMultiPoint",
nullable = true,
defaultValue = "",
@@ -218,12 +216,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPoint getGeogMultiPoint();
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeogMultiPoint();
- void setGeogMultiPoint(final MultiPoint _geogMultiPoint);
+ void setGeogMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geogMultiPoint);
- @Property(name = "GeogMultiLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiLine",
type = "Edm.GeographyMultiLineString",
nullable = true,
defaultValue = "",
@@ -241,12 +239,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiLineString getGeogMultiLine();
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeogMultiLine();
- void setGeogMultiLine(final MultiLineString _geogMultiLine);
+ void setGeogMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geogMultiLine);
- @Property(name = "GeogMultiPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeogMultiPolygon",
type = "Edm.GeographyMultiPolygon",
nullable = true,
defaultValue = "",
@@ -264,12 +262,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPolygon getGeogMultiPolygon();
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeogMultiPolygon();
- void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon);
+ void setGeogMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geogMultiPolygon);
- @Property(name = "Geom",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Geom",
type = "Edm.Geometry",
nullable = true,
defaultValue = "",
@@ -287,12 +285,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Geospatial getGeom();
+ org.apache.olingo.commons.api.edm.geo.Geospatial getGeom();
- void setGeom(final Geospatial _geom);
+ void setGeom(org.apache.olingo.commons.api.edm.geo.Geospatial _geom);
- @Property(name = "GeomPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPoint",
type = "Edm.GeometryPoint",
nullable = true,
defaultValue = "",
@@ -310,12 +308,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Point getGeomPoint();
+ org.apache.olingo.commons.api.edm.geo.Point getGeomPoint();
- void setGeomPoint(final Point _geomPoint);
+ void setGeomPoint(org.apache.olingo.commons.api.edm.geo.Point _geomPoint);
- @Property(name = "GeomLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomLine",
type = "Edm.GeometryLineString",
nullable = true,
defaultValue = "",
@@ -333,12 +331,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- LineString getGeomLine();
+ org.apache.olingo.commons.api.edm.geo.LineString getGeomLine();
- void setGeomLine(final LineString _geomLine);
+ void setGeomLine(org.apache.olingo.commons.api.edm.geo.LineString _geomLine);
- @Property(name = "GeomPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomPolygon",
type = "Edm.GeometryPolygon",
nullable = true,
defaultValue = "",
@@ -356,12 +354,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Polygon getGeomPolygon();
+ org.apache.olingo.commons.api.edm.geo.Polygon getGeomPolygon();
- void setGeomPolygon(final Polygon _geomPolygon);
+ void setGeomPolygon(org.apache.olingo.commons.api.edm.geo.Polygon _geomPolygon);
- @Property(name = "GeomCollection",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomCollection",
type = "Edm.GeometryCollection",
nullable = true,
defaultValue = "",
@@ -379,12 +377,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- GeospatialCollection getGeomCollection();
+ org.apache.olingo.commons.api.edm.geo.GeospatialCollection getGeomCollection();
- void setGeomCollection(final GeospatialCollection _geomCollection);
+ void setGeomCollection(org.apache.olingo.commons.api.edm.geo.GeospatialCollection _geomCollection);
- @Property(name = "GeomMultiPoint",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPoint",
type = "Edm.GeometryMultiPoint",
nullable = true,
defaultValue = "",
@@ -402,12 +400,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPoint getGeomMultiPoint();
+ org.apache.olingo.commons.api.edm.geo.MultiPoint getGeomMultiPoint();
- void setGeomMultiPoint(final MultiPoint _geomMultiPoint);
+ void setGeomMultiPoint(org.apache.olingo.commons.api.edm.geo.MultiPoint _geomMultiPoint);
- @Property(name = "GeomMultiLine",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiLine",
type = "Edm.GeometryMultiLineString",
nullable = true,
defaultValue = "",
@@ -425,12 +423,12 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiLineString getGeomMultiLine();
+ org.apache.olingo.commons.api.edm.geo.MultiLineString getGeomMultiLine();
- void setGeomMultiLine(final MultiLineString _geomMultiLine);
+ void setGeomMultiLine(org.apache.olingo.commons.api.edm.geo.MultiLineString _geomMultiLine);
- @Property(name = "GeomMultiPolygon",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeomMultiPolygon",
type = "Edm.GeometryMultiPolygon",
nullable = true,
defaultValue = "",
@@ -448,12 +446,92 @@ public interface AllSpatialTypes
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- MultiPolygon getGeomMultiPolygon();
+ org.apache.olingo.commons.api.edm.geo.MultiPolygon getGeomMultiPolygon();
- void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon);
+ void setGeomMultiPolygon(org.apache.olingo.commons.api.edm.geo.MultiPolygon _geomMultiPolygon);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id",
+ type = "Edm.Int32")
+ Annotatable getIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geog",
+ type = "Edm.Geography")
+ Annotatable getGeogAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPoint",
+ type = "Edm.GeographyPoint")
+ Annotatable getGeogPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogLine",
+ type = "Edm.GeographyLineString")
+ Annotatable getGeogLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogPolygon",
+ type = "Edm.GeographyPolygon")
+ Annotatable getGeogPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogCollection",
+ type = "Edm.GeographyCollection")
+ Annotatable getGeogCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPoint",
+ type = "Edm.GeographyMultiPoint")
+ Annotatable getGeogMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiLine",
+ type = "Edm.GeographyMultiLineString")
+ Annotatable getGeogMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeogMultiPolygon",
+ type = "Edm.GeographyMultiPolygon")
+ Annotatable getGeogMultiPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Geom",
+ type = "Edm.Geometry")
+ Annotatable getGeomAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPoint",
+ type = "Edm.GeometryPoint")
+ Annotatable getGeomPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomLine",
+ type = "Edm.GeometryLineString")
+ Annotatable getGeomLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomPolygon",
+ type = "Edm.GeometryPolygon")
+ Annotatable getGeomPolygonAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomCollection",
+ type = "Edm.GeometryCollection")
+ Annotatable getGeomCollectionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPoint",
+ type = "Edm.GeometryMultiPoint")
+ Annotatable getGeomMultiPointAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiLine",
+ type = "Edm.GeometryMultiLineString")
+ Annotatable getGeomMultiLineAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "GeomMultiPolygon",
+ type = "Edm.GeometryMultiPolygon")
+ Annotatable getGeomMultiPolygonAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
index 6c89342..b63cae6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 AllSpatialTypesCollection extends AbstractEntityCollection<AllSpatialTypes> {
+public interface AllSpatialTypesCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
index 1b74f97..8f2b42b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,45 +43,44 @@ 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")
-@ComplexType(name = "AuditInfo")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AuditInfo")
public interface AuditInfo
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
- Calendar getModifiedDate();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getModifiedDate();
- void setModifiedDate(final Calendar _modifiedDate);
+ void setModifiedDate(java.util.Calendar _modifiedDate);
- @Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
- String getModifiedBy();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
+ java.lang.String getModifiedBy();
- void setModifiedBy(final String _modifiedBy);
+ void setModifiedBy(java.lang.String _modifiedBy);
- @Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
- void setConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+ void setConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "Concurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
- }
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index db9bb9c..8cc1230 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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;
@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.OrderLine")
public interface BackOrderLine
- extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
- @Property(name = "OrderLineStream",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -83,10 +81,10 @@ public interface BackOrderLine
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantity();
+ java.lang.Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(java.lang.Integer _quantity);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,32 +171,72 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @NavigationProperty(name = "Order",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
- void setOrder(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
-
- @NavigationProperty(name = "Product",
+ void setOrder(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+ void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 4637c8b..021b330 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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;
@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "BackOrderLine2",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "BackOrderLine2",
openType = false,
hasStream = false,
isAbstract = false,
baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.BackOrderLine")
public interface BackOrderLine2
- extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
+ extends Annotatable,org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
- @Property(name = "OrderLineStream",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -83,10 +81,10 @@ public interface BackOrderLine2
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -104,12 +102,12 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -127,12 +125,12 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -150,12 +148,12 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantity();
+ java.lang.Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(java.lang.Integer _quantity);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -173,32 +171,72 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @NavigationProperty(name = "Order",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
- void setOrder(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
-
- @NavigationProperty(name = "Product",
+ void setOrder(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+ void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
index 706a202..3d94ec0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 BackOrderLine2Collection extends AbstractEntityCollection<BackOrderLine2> {
+public interface BackOrderLine2Collection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine2> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
index d39673c..cf9a4f9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 BackOrderLineCollection extends AbstractEntityCollection<BackOrderLine> {
+public interface BackOrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
index d598cf9..26deea3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "Car",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Car",
openType = false,
hasStream = true,
isAbstract = false)
public interface Car
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "Photo",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface Car
fcKeepInContent = false)
java.io.InputStream getPhoto();
- void setPhoto(final java.io.InputStream _photo);
+ void setPhoto(java.io.InputStream _photo);
- @Property(name = "Video",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -105,10 +103,10 @@ public interface Car
fcKeepInContent = false)
java.io.InputStream getVideo();
- void setVideo(final java.io.InputStream _video);
+ void setVideo(java.io.InputStream _video);
@Key
- @Property(name = "VIN",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getVIN();
+ java.lang.Integer getVIN();
- void setVIN(final Integer _vIN);
+ void setVIN(java.lang.Integer _vIN);
- @Property(name = "Description",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,9 +147,9 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getDescription();
+ java.lang.String getDescription();
- void setDescription(final String _description);
+ void setDescription(java.lang.String _description);
@@ -160,4 +158,32 @@ public interface Car
java.io.InputStream getStream();
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Stream")
+ Annotatable getPhotoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video",
+ type = "Edm.Stream")
+ Annotatable getVideoAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN",
+ type = "Edm.Int32")
+ Annotatable getVINAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
index a8f8e06..7c42934 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 CarCollection extends AbstractEntityCollection<Car> {
+public interface CarCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
index 62cb22b..d72cc08 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,37 +43,40 @@ 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")
-@ComplexType(name = "ComplexToCategory")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexToCategory")
public interface ComplexToCategory
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Term", type = "Edm.String", nullable = true)
- String getTerm();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
+ java.lang.String getTerm();
- void setTerm(final String _term);
+ void setTerm(java.lang.String _term);
- @Property(name = "Scheme", type = "Edm.String", nullable = true)
- String getScheme();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
+ java.lang.String getScheme();
- void setScheme(final String _scheme);
+ void setScheme(java.lang.String _scheme);
- @Property(name = "Label", type = "Edm.String", nullable = true)
- String getLabel();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
+ java.lang.String getLabel();
- void setLabel(final String _label);
+ void setLabel(java.lang.String _label);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
index 9270532..16f7736 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,114 +43,117 @@ 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")
-@ComplexType(name = "ComplexWithAllPrimitiveTypes")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexWithAllPrimitiveTypes")
public interface ComplexWithAllPrimitiveTypes
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "Binary", type = "Edm.Binary", nullable = true)
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Binary", type = "Edm.Binary", nullable = true)
byte[] getBinary();
- void setBinary(final byte[] _binary);
+ void setBinary(byte[] _binary);
- @Property(name = "Boolean", type = "Edm.Boolean", nullable = false)
- Boolean getBoolean();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Boolean", type = "Edm.Boolean", nullable = false)
+ java.lang.Boolean getBoolean();
- void setBoolean(final Boolean _boolean);
+ void setBoolean(java.lang.Boolean _boolean);
- @Property(name = "Byte", type = "Edm.Byte", nullable = false)
- Short getByte();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
+ java.lang.Short getByte();
- void setByte(final Short _byte);
+ void setByte(java.lang.Short _byte);
- @Property(name = "DateTime", type = "Edm.DateTime", nullable = false)
- Calendar getDateTime();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateTime", type = "Edm.DateTime", nullable = false)
+ java.util.Calendar getDateTime();
- void setDateTime(final Calendar _dateTime);
+ void setDateTime(java.util.Calendar _dateTime);
- @Property(name = "Decimal", type = "Edm.Decimal", nullable = false)
- BigDecimal getDecimal();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Decimal", type = "Edm.Decimal", nullable = false)
+ java.math.BigDecimal getDecimal();
- void setDecimal(final BigDecimal _decimal);
+ void setDecimal(java.math.BigDecimal _decimal);
- @Property(name = "Double", type = "Edm.Double", nullable = false)
- Double getDouble();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
+ java.lang.Double getDouble();
- void setDouble(final Double _double);
+ void setDouble(java.lang.Double _double);
- @Property(name = "Int16", type = "Edm.Int16", nullable = false)
- Short getInt16();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int16", type = "Edm.Int16", nullable = false)
+ java.lang.Short getInt16();
- void setInt16(final Short _int16);
+ void setInt16(java.lang.Short _int16);
- @Property(name = "Int32", type = "Edm.Int32", nullable = false)
- Integer getInt32();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int32", type = "Edm.Int32", nullable = false)
+ java.lang.Integer getInt32();
- void setInt32(final Integer _int32);
+ void setInt32(java.lang.Integer _int32);
- @Property(name = "Int64", type = "Edm.Int64", nullable = false)
- Long getInt64();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int64", type = "Edm.Int64", nullable = false)
+ java.lang.Long getInt64();
- void setInt64(final Long _int64);
+ void setInt64(java.lang.Long _int64);
- @Property(name = "SByte", type = "Edm.SByte", nullable = false)
- Byte getSByte();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SByte", type = "Edm.SByte", nullable = false)
+ java.lang.Byte getSByte();
- void setSByte(final Byte _sByte);
+ void setSByte(java.lang.Byte _sByte);
- @Property(name = "String", type = "Edm.String", nullable = true)
- String getString();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "String", type = "Edm.String", nullable = true)
+ java.lang.String getString();
- void setString(final String _string);
+ void setString(java.lang.String _string);
- @Property(name = "Single", type = "Edm.Single", nullable = false)
- Float getSingle();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
+ java.lang.Float getSingle();
- void setSingle(final Float _single);
+ void setSingle(java.lang.Float _single);
- @Property(name = "GeographyPoint", type = "Edm.GeographyPoint", nullable = true)
- Point getGeographyPoint();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeographyPoint", type = "Edm.GeographyPoint", nullable = true)
+ org.apache.olingo.commons.api.edm.geo.Point getGeographyPoint();
- void setGeographyPoint(final Point _geographyPoint);
+ void setGeographyPoint(org.apache.olingo.commons.api.edm.geo.Point _geographyPoint);
- @Property(name = "GeometryPoint", type = "Edm.GeometryPoint", nullable = true)
- Point getGeometryPoint();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeometryPoint", type = "Edm.GeometryPoint", nullable = true)
+ org.apache.olingo.commons.api.edm.geo.Point getGeometryPoint();
- void setGeometryPoint(final Point _geometryPoint);
+ void setGeometryPoint(org.apache.olingo.commons.api.edm.geo.Point _geometryPoint);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
index f8b0bcb..9874a32 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "Computer",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Computer",
openType = false,
hasStream = false,
isAbstract = false)
public interface Computer
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ComputerId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Computer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getComputerId();
+ java.lang.Integer getComputerId();
- void setComputerId(final Integer _computerId);
+ void setComputerId(java.lang.Integer _computerId);
- @Property(name = "Name",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,28 +101,28 @@ public interface Computer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @NavigationProperty(name = "ComputerDetail",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ComputerDetail",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "ComputerDetail")
+ targetEntitySet = "ComputerDetail",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail getComputerDetail();
- void setComputerDetail(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
-
-
+ void setComputerDetail(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail);
+
Operations operations();
interface Operations {
- @Operation(name = "GetComputer",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetComputer",
type = OperationType.ACTION,
returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(
@@ -132,4 +130,28 @@ public interface Computer
}
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId",
+ type = "Edm.Int32")
+ Annotatable getComputerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail")
+ Annotatable getComputerDetailAnnotations();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
index 5766948..577e16e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ComputerCollection extends AbstractEntityCollection<Computer> {
+public interface ComputerCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
index 2d5df3b..ee4e989 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "ComputerDetail",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ComputerDetail",
openType = false,
hasStream = false,
isAbstract = false)
public interface ComputerDetail
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ComputerDetailId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getComputerDetailId();
+ java.lang.Integer getComputerDetailId();
- void setComputerDetailId(final Integer _computerDetailId);
+ void setComputerDetailId(java.lang.Integer _computerDetailId);
- @Property(name = "Manufacturer",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getManufacturer();
+ java.lang.String getManufacturer();
- void setManufacturer(final String _manufacturer);
+ void setManufacturer(java.lang.String _manufacturer);
- @Property(name = "Model",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getModel();
+ java.lang.String getModel();
- void setModel(final String _model);
+ void setModel(java.lang.String _model);
- @Property(name = "Serial",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getSerial();
+ java.lang.String getSerial();
- void setSerial(final String _serial);
+ void setSerial(java.lang.String _serial);
- @Property(name = "SpecificationsBag",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag",
type = "Edm.String",
nullable = false,
defaultValue = "",
@@ -172,12 +170,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Collection<String> getSpecificationsBag();
+ java.util.Collection<java.lang.String> getSpecificationsBag();
- void setSpecificationsBag(final Collection<String> _specificationsBag);
+ void setSpecificationsBag(java.util.Collection<java.lang.String> _specificationsBag);
- @Property(name = "PurchaseDate",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate",
type = "Edm.DateTime",
nullable = false,
defaultValue = "",
@@ -195,12 +193,12 @@ public interface ComputerDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getPurchaseDate();
+ java.util.Calendar getPurchaseDate();
- void setPurchaseDate(final Calendar _purchaseDate);
+ void setPurchaseDate(java.util.Calendar _purchaseDate);
- @Property(name = "Dimensions",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
nullable = true,
defaultValue = "",
@@ -220,40 +218,80 @@ public interface ComputerDetail
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
- void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+ void setDimensions(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
- @NavigationProperty(name = "Computer",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Computer")
+ targetEntitySet = "Computer",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer();
- void setComputer(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
-
-
+ void setComputer(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer);
+
Operations operations();
interface Operations {
- @Operation(name = "ResetComputerDetailsSpecifications",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetComputerDetailsSpecifications",
type = OperationType.ACTION)
void resetComputerDetailsSpecifications(
- @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection<String> specifications,
- @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Calendar purchaseTime
+ @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) java.util.Collection<java.lang.String> specifications,
+ @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) java.util.Calendar purchaseTime
);
}
- ComplexFactory factory();
+ ComplexFactory factory();
interface 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId",
+ type = "Edm.Int32")
+ Annotatable getComputerDetailIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer",
+ type = "Edm.String")
+ Annotatable getManufacturerAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model",
+ type = "Edm.String")
+ Annotatable getModelAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial",
+ type = "Edm.String")
+ Annotatable getSerialAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag",
+ type = "Edm.String")
+ Annotatable getSpecificationsBagAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate",
+ type = "Edm.DateTime")
+ Annotatable getPurchaseDateAnnotations();
+
+ @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.AnnotationsForNavigationProperty(name = "Computer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
+ Annotatable getComputerAnnotations();
+ }
+
}
[23/24] git commit: Some refinements arounf pojogen
Posted by fm...@apache.org.
Some refinements arounf pojogen
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/24a031b7
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/24a031b7
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/24a031b7
Branch: refs/heads/master
Commit: 24a031b7503b85a1f972b578285663a880704915
Parents: 5b5ff8e
Author: fmartelli <fa...@gmail.com>
Authored: Mon May 26 16:00:25 2014 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Mon May 26 16:00:25 2014 +0200
----------------------------------------------------------------------
.../src/it/exchangeMail/pom.xml | 93 +++++
.../src/test/resources/metadata.xml | 353 +++++++++++++++++++
.../src/it/exchangeMail/verify.groovy | 20 ++
.../src/it/exchangeMailNoBasePkg/pom.xml | 92 +++++
.../src/test/resources/metadata.xml | 353 +++++++++++++++++++
.../src/it/exchangeMailNoBasePkg/verify.groovy | 20 ++
.../olingo/ext/pojogen/AbstractPOJOGenMojo.java | 39 +-
.../olingo/ext/pojogen/AbstractUtility.java | 31 +-
.../src/main/resources/complexType.vm | 13 +-
.../src/main/resources/containedEntitySet.vm | 65 ----
.../src/main/resources/container.vm | 20 +-
.../src/main/resources/entityCollection.vm | 6 +-
.../src/main/resources/entitySet.vm | 6 +-
.../src/main/resources/entityType.vm | 98 +++--
.../src/main/resources/entityTypeKey.vm | 6 +-
.../src/main/resources/enumType.vm | 4 +-
.../src/main/resources/singleton.vm | 4 +-
.../src/main/resources/term.vm | 8 +-
.../src/main/resources/v30/complexType.vm | 19 +-
.../src/main/resources/v40/complexType.vm | 75 ++--
.../src/main/resources/v40/singleton.vm | 2 +-
.../AllGeoCollectionTypesSet.java | 5 +-
.../astoriadefaultservice/AllGeoTypesSet.java | 5 +-
.../services/astoriadefaultservice/Car.java | 5 +-
.../astoriadefaultservice/Computer.java | 5 +-
.../astoriadefaultservice/ComputerDetail.java | 5 +-
.../astoriadefaultservice/Customer.java | 5 +-
.../astoriadefaultservice/CustomerInfo.java | 5 +-
.../astoriadefaultservice/DefaultContainer.java | 50 +--
.../services/astoriadefaultservice/Driver.java | 5 +-
.../astoriadefaultservice/LastLogin.java | 5 +-
.../services/astoriadefaultservice/License.java | 5 +-
.../services/astoriadefaultservice/Login.java | 5 +-
.../astoriadefaultservice/MappedEntityType.java | 5 +-
.../services/astoriadefaultservice/Message.java | 3 +-
.../MessageAttachment.java | 5 +-
.../services/astoriadefaultservice/Order.java | 5 +-
.../astoriadefaultservice/OrderLine.java | 3 +-
.../astoriadefaultservice/PageView.java | 5 +-
.../services/astoriadefaultservice/Person.java | 5 +-
.../astoriadefaultservice/PersonMetadata.java | 5 +-
.../services/astoriadefaultservice/Product.java | 5 +-
.../astoriadefaultservice/ProductDetail.java | 5 +-
.../astoriadefaultservice/ProductPhoto.java | 3 +-
.../astoriadefaultservice/ProductReview.java | 3 +-
.../astoriadefaultservice/RSAToken.java | 5 +-
.../astoriadefaultservice/types/Aliases.java | 23 +-
.../types/AllSpatialCollectionTypes.java | 40 ++-
.../AllSpatialCollectionTypesCollection.java | 7 +-
.../types/AllSpatialCollectionTypes_Simple.java | 100 ++++--
...SpatialCollectionTypes_SimpleCollection.java | 7 +-
.../types/AllSpatialTypes.java | 200 +++++++----
.../types/AllSpatialTypesCollection.java | 7 +-
.../astoriadefaultservice/types/AuditInfo.java | 35 +-
.../types/BackOrderLine.java | 106 ++++--
.../types/BackOrderLine2.java | 106 ++++--
.../types/BackOrderLine2Collection.java | 7 +-
.../types/BackOrderLineCollection.java | 7 +-
.../astoriadefaultservice/types/Car.java | 66 ++--
.../types/CarCollection.java | 7 +-
.../types/ComplexToCategory.java | 35 +-
.../astoriadefaultservice/types/Computer.java | 60 +++-
.../types/ComputerCollection.java | 7 +-
.../types/ComputerDetail.java | 114 ++++--
.../types/ComputerDetailCollection.java | 7 +-
.../types/ConcurrencyInfo.java | 29 +-
.../types/ContactDetails.java | 55 +--
.../astoriadefaultservice/types/Contractor.java | 106 ++++--
.../types/ContractorCollection.java | 7 +-
.../astoriadefaultservice/types/Customer.java | 168 ++++++---
.../types/CustomerCollection.java | 7 +-
.../types/CustomerInfo.java | 50 ++-
.../types/CustomerInfoCollection.java | 7 +-
.../astoriadefaultservice/types/Dimensions.java | 35 +-
.../types/DiscontinuedProduct.java | 195 ++++++----
.../types/DiscontinuedProductCollection.java | 7 +-
.../astoriadefaultservice/types/Driver.java | 60 +++-
.../types/DriverCollection.java | 7 +-
.../astoriadefaultservice/types/Employee.java | 116 ++++--
.../types/EmployeeCollection.java | 9 +-
.../astoriadefaultservice/types/LastLogin.java | 80 +++--
.../types/LastLoginCollection.java | 7 +-
.../astoriadefaultservice/types/License.java | 90 +++--
.../types/LicenseCollection.java | 7 +-
.../astoriadefaultservice/types/Login.java | 116 ++++--
.../types/LoginCollection.java | 7 +-
.../types/MappedEntityType.java | 230 ++++++++----
.../types/MappedEntityTypeCollection.java | 7 +-
.../astoriadefaultservice/types/Message.java | 138 +++++---
.../types/MessageAttachment.java | 48 ++-
.../types/MessageAttachmentCollection.java | 7 +-
.../types/MessageCollection.java | 7 +-
.../astoriadefaultservice/types/MessageKey.java | 14 +-
.../astoriadefaultservice/types/Order.java | 88 +++--
.../types/OrderCollection.java | 7 +-
.../astoriadefaultservice/types/OrderLine.java | 110 ++++--
.../types/OrderLineCollection.java | 7 +-
.../types/OrderLineKey.java | 14 +-
.../astoriadefaultservice/types/PageView.java | 90 +++--
.../types/PageViewCollection.java | 7 +-
.../astoriadefaultservice/types/Person.java | 66 ++--
.../types/PersonCollection.java | 7 +-
.../types/PersonMetadata.java | 80 +++--
.../types/PersonMetadataCollection.java | 7 +-
.../astoriadefaultservice/types/Phone.java | 29 +-
.../astoriadefaultservice/types/Product.java | 158 ++++++---
.../types/ProductCollection.java | 7 +-
.../types/ProductDetail.java | 60 +++-
.../types/ProductDetailCollection.java | 7 +-
.../types/ProductPageView.java | 110 ++++--
.../types/ProductPageViewCollection.java | 7 +-
.../types/ProductPhoto.java | 58 ++-
.../types/ProductPhotoCollection.java | 7 +-
.../types/ProductPhotoKey.java | 14 +-
.../types/ProductReview.java | 80 +++--
.../types/ProductReviewCollection.java | 7 +-
.../types/ProductReviewKey.java | 20 +-
.../astoriadefaultservice/types/RSAToken.java | 60 +++-
.../types/RSATokenCollection.java | 7 +-
.../types/SpecialEmployee.java | 158 ++++++---
.../types/SpecialEmployeeCollection.java | 9 +-
.../opentypesservicev3/DefaultContainer.java | 10 +-
.../odata/services/opentypesservicev3/Row.java | 5 +-
.../services/opentypesservicev3/RowIndex.java | 5 +-
.../types/ContactDetails.java | 87 +++--
.../opentypesservicev3/types/IndexedRow.java | 40 ++-
.../types/IndexedRowCollection.java | 7 +-
.../services/opentypesservicev3/types/Row.java | 40 ++-
.../opentypesservicev3/types/RowCollection.java | 7 +-
.../opentypesservicev3/types/RowIndex.java | 50 ++-
.../types/RowIndexCollection.java | 7 +-
.../primitivekeysservice/EdmBinarySet.java | 3 +-
.../primitivekeysservice/EdmBooleanSet.java | 5 +-
.../primitivekeysservice/EdmByteSet.java | 5 +-
.../EdmDateTimeOffsetSet.java | 5 +-
.../primitivekeysservice/EdmDateTimeSet.java | 5 +-
.../primitivekeysservice/EdmDecimalSet.java | 5 +-
.../primitivekeysservice/EdmDoubleSet.java | 5 +-
.../primitivekeysservice/EdmGuidSet.java | 5 +-
.../primitivekeysservice/EdmInt16Set.java | 5 +-
.../primitivekeysservice/EdmInt32Set.java | 5 +-
.../primitivekeysservice/EdmInt64Set.java | 5 +-
.../primitivekeysservice/EdmSingleSet.java | 5 +-
.../primitivekeysservice/EdmStringSet.java | 5 +-
.../primitivekeysservice/EdmTimeSet.java | 5 +-
.../services/primitivekeysservice/Folders.java | 5 +-
.../primitivekeysservice/TestContext.java | 21 +-
.../primitivekeysservice/types/EdmBinary.java | 38 +-
.../types/EdmBinaryCollection.java | 7 +-
.../primitivekeysservice/types/EdmBoolean.java | 40 ++-
.../types/EdmBooleanCollection.java | 7 +-
.../primitivekeysservice/types/EdmByte.java | 40 ++-
.../types/EdmByteCollection.java | 7 +-
.../primitivekeysservice/types/EdmDateTime.java | 40 ++-
.../types/EdmDateTimeCollection.java | 7 +-
.../types/EdmDateTimeOffset.java | 40 ++-
.../types/EdmDateTimeOffsetCollection.java | 7 +-
.../primitivekeysservice/types/EdmDecimal.java | 40 ++-
.../types/EdmDecimalCollection.java | 7 +-
.../primitivekeysservice/types/EdmDouble.java | 40 ++-
.../types/EdmDoubleCollection.java | 7 +-
.../primitivekeysservice/types/EdmGuid.java | 40 ++-
.../types/EdmGuidCollection.java | 7 +-
.../primitivekeysservice/types/EdmInt16.java | 40 ++-
.../types/EdmInt16Collection.java | 7 +-
.../primitivekeysservice/types/EdmInt32.java | 40 ++-
.../types/EdmInt32Collection.java | 7 +-
.../primitivekeysservice/types/EdmInt64.java | 40 ++-
.../types/EdmInt64Collection.java | 7 +-
.../primitivekeysservice/types/EdmSingle.java | 40 ++-
.../types/EdmSingleCollection.java | 7 +-
.../primitivekeysservice/types/EdmString.java | 40 ++-
.../types/EdmStringCollection.java | 7 +-
.../primitivekeysservice/types/EdmTime.java | 40 ++-
.../types/EdmTimeCollection.java | 7 +-
.../primitivekeysservice/types/Folder.java | 60 +++-
.../types/FolderCollection.java | 7 +-
.../AllGeoCollectionTypesSet.java | 5 +-
.../astoriadefaultservice/AllGeoTypesSet.java | 5 +-
.../services/astoriadefaultservice/Car.java | 5 +-
.../astoriadefaultservice/Computer.java | 5 +-
.../astoriadefaultservice/ComputerDetail.java | 5 +-
.../astoriadefaultservice/Customer.java | 5 +-
.../astoriadefaultservice/CustomerInfo.java | 5 +-
.../astoriadefaultservice/DefaultContainer.java | 72 ++--
.../services/astoriadefaultservice/Driver.java | 5 +-
.../astoriadefaultservice/LastLogin.java | 5 +-
.../services/astoriadefaultservice/License.java | 5 +-
.../services/astoriadefaultservice/Login.java | 5 +-
.../astoriadefaultservice/MappedEntityType.java | 5 +-
.../services/astoriadefaultservice/Message.java | 3 +-
.../MessageAttachment.java | 5 +-
.../services/astoriadefaultservice/Order.java | 5 +-
.../astoriadefaultservice/OrderLine.java | 3 +-
.../astoriadefaultservice/PageView.java | 5 +-
.../services/astoriadefaultservice/Person.java | 5 +-
.../astoriadefaultservice/PersonMetadata.java | 5 +-
.../services/astoriadefaultservice/Product.java | 5 +-
.../astoriadefaultservice/ProductDetail.java | 5 +-
.../astoriadefaultservice/ProductPhoto.java | 3 +-
.../astoriadefaultservice/ProductReview.java | 3 +-
.../astoriadefaultservice/RSAToken.java | 5 +-
.../astoriadefaultservice/types/Aliases.java | 23 +-
.../types/AllSpatialCollectionTypes.java | 40 ++-
.../AllSpatialCollectionTypesCollection.java | 7 +-
.../types/AllSpatialCollectionTypes_Simple.java | 100 ++++--
...SpatialCollectionTypes_SimpleCollection.java | 7 +-
.../types/AllSpatialTypes.java | 200 +++++++----
.../types/AllSpatialTypesCollection.java | 7 +-
.../astoriadefaultservice/types/AuditInfo.java | 35 +-
.../types/BackOrderLine.java | 102 ++++--
.../types/BackOrderLine2.java | 102 ++++--
.../types/BackOrderLine2Collection.java | 7 +-
.../types/BackOrderLineCollection.java | 7 +-
.../astoriadefaultservice/types/Car.java | 66 ++--
.../types/CarCollection.java | 7 +-
.../types/ComplexToCategory.java | 35 +-
.../types/ComplexWithAllPrimitiveTypes.java | 99 +++---
.../astoriadefaultservice/types/Computer.java | 66 ++--
.../types/ComputerCollection.java | 7 +-
.../types/ComputerDetail.java | 120 ++++---
.../types/ComputerDetailCollection.java | 7 +-
.../types/ConcurrencyInfo.java | 29 +-
.../types/ContactDetails.java | 55 +--
.../astoriadefaultservice/types/Contractor.java | 100 ++++--
.../types/ContractorCollection.java | 7 +-
.../astoriadefaultservice/types/Customer.java | 168 ++++++---
.../types/CustomerCollection.java | 7 +-
.../types/CustomerInfo.java | 50 ++-
.../types/CustomerInfoCollection.java | 7 +-
.../astoriadefaultservice/types/Dimensions.java | 35 +-
.../types/DiscontinuedProduct.java | 195 ++++++----
.../types/DiscontinuedProductCollection.java | 7 +-
.../astoriadefaultservice/types/Driver.java | 60 +++-
.../types/DriverCollection.java | 7 +-
.../astoriadefaultservice/types/Employee.java | 110 ++++--
.../types/EmployeeCollection.java | 9 +-
.../astoriadefaultservice/types/LastLogin.java | 80 +++--
.../types/LastLoginCollection.java | 7 +-
.../astoriadefaultservice/types/License.java | 90 +++--
.../types/LicenseCollection.java | 7 +-
.../astoriadefaultservice/types/Login.java | 116 ++++--
.../types/LoginCollection.java | 7 +-
.../types/MappedEntityType.java | 230 ++++++++----
.../types/MappedEntityTypeCollection.java | 7 +-
.../astoriadefaultservice/types/Message.java | 138 +++++---
.../types/MessageAttachment.java | 48 ++-
.../types/MessageAttachmentCollection.java | 7 +-
.../types/MessageCollection.java | 7 +-
.../astoriadefaultservice/types/MessageKey.java | 14 +-
.../astoriadefaultservice/types/Order.java | 88 +++--
.../types/OrderCollection.java | 7 +-
.../astoriadefaultservice/types/OrderLine.java | 102 ++++--
.../types/OrderLineCollection.java | 7 +-
.../types/OrderLineKey.java | 14 +-
.../astoriadefaultservice/types/PageView.java | 90 +++--
.../types/PageViewCollection.java | 7 +-
.../astoriadefaultservice/types/Person.java | 60 +++-
.../types/PersonCollection.java | 7 +-
.../types/PersonMetadata.java | 80 +++--
.../types/PersonMetadataCollection.java | 7 +-
.../astoriadefaultservice/types/Phone.java | 29 +-
.../astoriadefaultservice/types/Product.java | 156 +++++---
.../types/ProductCollection.java | 7 +-
.../types/ProductDetail.java | 60 +++-
.../types/ProductDetailCollection.java | 7 +-
.../types/ProductPageView.java | 110 ++++--
.../types/ProductPageViewCollection.java | 7 +-
.../types/ProductPhoto.java | 58 ++-
.../types/ProductPhotoCollection.java | 7 +-
.../types/ProductPhotoKey.java | 14 +-
.../types/ProductReview.java | 80 +++--
.../types/ProductReviewCollection.java | 7 +-
.../types/ProductReviewKey.java | 20 +-
.../astoriadefaultservice/types/RSAToken.java | 60 +++-
.../types/RSATokenCollection.java | 7 +-
.../types/SpecialEmployee.java | 152 +++++---
.../types/SpecialEmployeeCollection.java | 7 +-
.../fit/proxy/v4/demo/Advertisements.java | 52 +++
.../olingo/fit/proxy/v4/demo/Categories.java | 52 +++
.../olingo/fit/proxy/v4/demo/DemoService.java | 83 +++++
.../olingo/fit/proxy/v4/demo/PersonDetails.java | 52 +++
.../olingo/fit/proxy/v4/demo/Persons.java | 56 +++
.../fit/proxy/v4/demo/ProductDetails.java | 52 +++
.../olingo/fit/proxy/v4/demo/Products.java | 54 +++
.../olingo/fit/proxy/v4/demo/Suppliers.java | 52 +++
.../proxy/v4/demo/odatademo/Advertisements.java | 52 ---
.../fit/proxy/v4/demo/odatademo/Categories.java | 52 ---
.../proxy/v4/demo/odatademo/DemoService.java | 85 -----
.../proxy/v4/demo/odatademo/PersonDetails.java | 52 ---
.../fit/proxy/v4/demo/odatademo/Persons.java | 56 ---
.../proxy/v4/demo/odatademo/ProductDetails.java | 52 ---
.../fit/proxy/v4/demo/odatademo/Products.java | 54 ---
.../fit/proxy/v4/demo/odatademo/Suppliers.java | 52 ---
.../proxy/v4/demo/odatademo/package-info.java | 21 --
.../proxy/v4/demo/odatademo/types/Address.java | 140 --------
.../v4/demo/odatademo/types/Advertisement.java | 150 --------
.../types/AdvertisementCollection.java | 47 ---
.../proxy/v4/demo/odatademo/types/Category.java | 124 -------
.../odatademo/types/CategoryCollection.java | 47 ---
.../proxy/v4/demo/odatademo/types/Customer.java | 148 --------
.../odatademo/types/CustomerCollection.java | 47 ---
.../proxy/v4/demo/odatademo/types/Employee.java | 194 ----------
.../odatademo/types/EmployeeCollection.java | 47 ---
.../demo/odatademo/types/FeaturedProduct.java | 276 ---------------
.../types/FeaturedProductCollection.java | 47 ---
.../proxy/v4/demo/odatademo/types/Person.java | 124 -------
.../demo/odatademo/types/PersonCollection.java | 47 ---
.../v4/demo/odatademo/types/PersonDetail.java | 224 ------------
.../odatademo/types/PersonDetailCollection.java | 47 ---
.../proxy/v4/demo/odatademo/types/Product.java | 271 --------------
.../demo/odatademo/types/ProductCollection.java | 47 ---
.../v4/demo/odatademo/types/ProductDetail.java | 124 -------
.../types/ProductDetailCollection.java | 47 ---
.../proxy/v4/demo/odatademo/types/Supplier.java | 201 -----------
.../odatademo/types/SupplierCollection.java | 47 ---
.../v4/demo/odatademo/types/package-info.java | 21 --
.../olingo/fit/proxy/v4/demo/package-info.java | 21 ++
.../olingo/fit/proxy/v4/demo/types/Address.java | 178 ++++++++++
.../fit/proxy/v4/demo/types/Advertisement.java | 176 +++++++++
.../v4/demo/types/AdvertisementCollection.java | 52 +++
.../fit/proxy/v4/demo/types/Category.java | 146 ++++++++
.../proxy/v4/demo/types/CategoryCollection.java | 52 +++
.../fit/proxy/v4/demo/types/Customer.java | 174 +++++++++
.../proxy/v4/demo/types/CustomerCollection.java | 52 +++
.../fit/proxy/v4/demo/types/Employee.java | 228 ++++++++++++
.../proxy/v4/demo/types/EmployeeCollection.java | 52 +++
.../proxy/v4/demo/types/FeaturedProduct.java | 330 +++++++++++++++++
.../demo/types/FeaturedProductCollection.java | 52 +++
.../olingo/fit/proxy/v4/demo/types/Person.java | 146 ++++++++
.../proxy/v4/demo/types/PersonCollection.java | 52 +++
.../fit/proxy/v4/demo/types/PersonDetail.java | 258 ++++++++++++++
.../v4/demo/types/PersonDetailCollection.java | 52 +++
.../olingo/fit/proxy/v4/demo/types/Product.java | 321 +++++++++++++++++
.../proxy/v4/demo/types/ProductCollection.java | 52 +++
.../fit/proxy/v4/demo/types/ProductDetail.java | 146 ++++++++
.../v4/demo/types/ProductDetailCollection.java | 52 +++
.../fit/proxy/v4/demo/types/Supplier.java | 231 ++++++++++++
.../proxy/v4/demo/types/SupplierCollection.java | 52 +++
.../fit/proxy/v4/demo/types/package-info.java | 21 ++
.../opentypesservicev4/DefaultContainer.java | 10 +-
.../odata/services/opentypesservicev4/Row.java | 4 +-
.../services/opentypesservicev4/RowIndex.java | 4 +-
.../opentypesservicev4/types/AccountInfo.java | 45 ++-
.../opentypesservicev4/types/Color.java | 10 +-
.../types/ContactDetails.java | 141 ++++++--
.../opentypesservicev4/types/IndexedRow.java | 37 +-
.../types/IndexedRowCollection.java | 2 +-
.../services/opentypesservicev4/types/Row.java | 37 +-
.../opentypesservicev4/types/RowCollection.java | 2 +-
.../opentypesservicev4/types/RowIndex.java | 43 ++-
.../types/RowIndexCollection.java | 2 +-
.../services/odatawcfservice/Accounts.java | 5 +-
.../odatawcfservice/ActiveSubscriptions.java | 51 ---
.../odata/services/odatawcfservice/Assets.java | 51 ---
.../odatawcfservice/BillingStatements.java | 51 ---
.../odata/services/odatawcfservice/Boss.java | 5 +-
.../odata/services/odatawcfservice/Club.java | 51 ---
.../odata/services/odatawcfservice/Company.java | 5 +-
.../services/odatawcfservice/CreditRecords.java | 51 ---
.../services/odatawcfservice/Customers.java | 5 +-
.../odatawcfservice/DefaultStoredPI.java | 5 +-
.../services/odatawcfservice/Departments.java | 5 +-
.../services/odatawcfservice/Employees.java | 5 +-
.../odatawcfservice/InMemoryEntities.java | 57 ++-
.../services/odatawcfservice/LabourUnion.java | 5 +-
.../services/odatawcfservice/MyGiftCard.java | 51 ---
.../odatawcfservice/MyPaymentInstruments.java | 53 ---
.../services/odatawcfservice/OrderDetails.java | 3 +-
.../odata/services/odatawcfservice/Orders.java | 5 +-
.../odata/services/odatawcfservice/People.java | 5 +-
.../odatawcfservice/ProductDetails.java | 3 +-
.../odatawcfservice/ProductReviews.java | 3 +-
.../services/odatawcfservice/Products.java | 5 +-
.../services/odatawcfservice/PublicCompany.java | 5 +-
.../services/odatawcfservice/StoredPIs.java | 5 +-
.../odatawcfservice/SubscriptionTemplates.java | 5 +-
.../services/odatawcfservice/VipCustomer.java | 5 +-
.../services/odatawcfservice/package-info.java | 1 +
.../odatawcfservice/types/AccessLevel.java | 11 +-
.../services/odatawcfservice/types/Account.java | 137 +++----
.../types/AccountCollection.java | 3 +-
.../odatawcfservice/types/AccountInfo.java | 38 +-
.../services/odatawcfservice/types/Address.java | 46 ++-
.../services/odatawcfservice/types/Asset.java | 51 +--
.../odatawcfservice/types/AssetCollection.java | 3 +-
.../services/odatawcfservice/types/Club.java | 43 +--
.../odatawcfservice/types/ClubCollection.java | 3 +-
.../services/odatawcfservice/types/Color.java | 11 +-
.../services/odatawcfservice/types/Company.java | 93 +++--
.../odatawcfservice/types/CompanyAddress.java | 55 +--
.../odatawcfservice/types/CompanyCategory.java | 11 +-
.../types/CompanyCollection.java | 3 +-
.../odatawcfservice/types/CreditCardPI.java | 148 ++++----
.../types/CreditCardPICollection.java | 3 +-
.../odatawcfservice/types/CreditRecord.java | 59 ++--
.../types/CreditRecordCollection.java | 3 +-
.../odatawcfservice/types/Customer.java | 131 ++++---
.../types/CustomerCollection.java | 3 +-
.../odatawcfservice/types/Department.java | 57 +--
.../types/DepartmentCollection.java | 3 +-
.../odatawcfservice/types/Employee.java | 117 +++---
.../types/EmployeeCollection.java | 3 +-
.../odatawcfservice/types/GiftCard.java | 73 ++--
.../types/GiftCardCollection.java | 3 +-
.../odatawcfservice/types/HomeAddress.java | 55 +--
.../services/odatawcfservice/types/IsBoss.java | 5 +-
.../odatawcfservice/types/LabourUnion.java | 43 +--
.../types/LabourUnionCollection.java | 3 +-
.../services/odatawcfservice/types/Order.java | 77 ++--
.../odatawcfservice/types/OrderCollection.java | 3 +-
.../odatawcfservice/types/OrderDetail.java | 79 +++--
.../types/OrderDetailCollection.java | 3 +-
.../odatawcfservice/types/OrderDetailKey.java | 15 +-
.../types/PaymentInstrument.java | 96 ++---
.../types/PaymentInstrumentCollection.java | 3 +-
.../services/odatawcfservice/types/Person.java | 103 +++---
.../odatawcfservice/types/PersonCollection.java | 3 +-
.../services/odatawcfservice/types/Product.java | 103 +++---
.../types/ProductCollection.java | 5 +-
.../odatawcfservice/types/ProductDetail.java | 73 ++--
.../types/ProductDetailCollection.java | 3 +-
.../odatawcfservice/types/ProductDetailKey.java | 15 +-
.../odatawcfservice/types/ProductReview.java | 75 ++--
.../types/ProductReviewCollection.java | 3 +-
.../odatawcfservice/types/ProductReviewKey.java | 27 +-
.../odatawcfservice/types/PublicCompany.java | 138 ++++----
.../types/PublicCompanyCollection.java | 3 +-
.../odatawcfservice/types/Statement.java | 59 ++--
.../types/StatementCollection.java | 3 +-
.../odatawcfservice/types/StoredPI.java | 59 ++--
.../types/StoredPICollection.java | 3 +-
.../odatawcfservice/types/Subscription.java | 67 ++--
.../types/SubscriptionCollection.java | 3 +-
.../odatawcfservice/types/package-info.java | 1 +
.../olingo/fit/v4/ErrorResponseTestITCase.java | 2 -
.../olingo/client/core/edm/EdmSchemaImpl.java | 11 +-
.../commons/core/edm/AbstractEdmSchema.java | 6 +-
438 files changed, 12043 insertions(+), 7836 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
new file mode 100644
index 0000000..b918061
--- /dev/null
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMail/pom.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ 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
+
+ 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
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>pojogen-maven-plugin-v4test</artifactId>
+ <groupId>org.apache.olingo</groupId>
+ <version>@project.version@</version>
+ <name>${project.artifactId}</name>
+ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <artifactId>pojogen-maven-plugin</artifactId>
+ <groupId>org.apache.olingo</groupId>
+ <version>@project.version@</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <artifactId>olingo-client-proxy</artifactId>
+ <groupId>org.apache.olingo</groupId>
+ <version>@project.version@</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>pojogen-maven-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+ <localEdm>${project.basedir}/src/test/resources/metadata.xml</localEdm>
+ <basePackage>org.apache.olingo.fit.proxy.v4.staticservice</basePackage>
+ </configuration>
+ <id>v4pojoGen</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>v4pojoGen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/it/exchangeMail/src/test/resources/metadata.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMail/src/test/resources/metadata.xml b/ext/pojogen-maven-plugin/src/it/exchangeMail/src/test/resources/metadata.xml
new file mode 100644
index 0000000..9cb28ec
--- /dev/null
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMail/src/test/resources/metadata.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ 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
+
+ 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
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
+ <edmx:DataServices>
+ <Schema Namespace="Microsoft.Exchange.Services.OData.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+ <EnumType Name="BodyType">
+ <Member Name="Text" Value="0" />
+ <Member Name="HTML" Value="1" />
+ </EnumType>
+ <EnumType Name="Importance">
+ <Member Name="Normal" Value="0" />
+ <Member Name="Low" Value="1" />
+ <Member Name="High" Value="2" />
+ </EnumType>
+ <EnumType Name="AttendeeType">
+ <Member Name="Required" Value="0" />
+ <Member Name="Optional" Value="1" />
+ <Member Name="Resource" Value="2" />
+ </EnumType>
+ <EnumType Name="ResponseType">
+ <Member Name="None" Value="0" />
+ <Member Name="Organizer" Value="1" />
+ <Member Name="TentativelyAccepted" Value="2" />
+ <Member Name="Accepted" Value="3" />
+ <Member Name="Declined" Value="4" />
+ <Member Name="NotResponded" Value="5" />
+ </EnumType>
+ <EnumType Name="EventType">
+ <Member Name="SingleInstance" Value="0" />
+ <Member Name="Occurrence" Value="1" />
+ <Member Name="Exception" Value="2" />
+ <Member Name="SeriesMaster" Value="3" />
+ </EnumType>
+ <EnumType Name="FreeBusyStatus">
+ <Member Name="Unknown" Value="0" />
+ <Member Name="Free" Value="1" />
+ <Member Name="Tentative" Value="2" />
+ <Member Name="Busy" Value="3" />
+ <Member Name="Oof" Value="4" />
+ <Member Name="WorkingElsewhere" Value="5" />
+ </EnumType>
+ <EnumType Name="MeetingMessageType">
+ <Member Name="None" Value="0" />
+ <Member Name="MeetingRequest" Value="1" />
+ <Member Name="MeetingCancelled" Value="2" />
+ <Member Name="MeetingAccepted" Value="3" />
+ <Member Name="MeetingTenativelyAccepted" Value="4" />
+ <Member Name="MeetingDeclined" Value="5" />
+ </EnumType>
+ <EnumType Name="RecurrencePatternType">
+ <Member Name="Daily" Value="0" />
+ <Member Name="Weekly" Value="1" />
+ <Member Name="AbsoluteMonthly" Value="2" />
+ <Member Name="RelativeMonthly" Value="3" />
+ <Member Name="AbsoluteYearly" Value="4" />
+ <Member Name="RelativeYearly" Value="5" />
+ </EnumType>
+ <EnumType Name="RecurrenceRangeType">
+ <Member Name="EndDate" Value="0" />
+ <Member Name="NoEnd" Value="1" />
+ <Member Name="Numbered" Value="2" />
+ </EnumType>
+ <EnumType Name="WeekIndex">
+ <Member Name="First" Value="0" />
+ <Member Name="Second" Value="1" />
+ <Member Name="Third" Value="2" />
+ <Member Name="Fourth" Value="3" />
+ <Member Name="Last" Value="4" />
+ </EnumType>
+ <ComplexType Name="Recipient">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="Address" Type="Edm.String" />
+ </ComplexType>
+ <ComplexType Name="Attendee" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
+ <Property Name="Status" Type="Microsoft.Exchange.Services.OData.Model.ResponseStatus" />
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.AttendeeType" />
+ </ComplexType>
+ <ComplexType Name="ItemBody">
+ <Property Name="ContentType" Type="Microsoft.Exchange.Services.OData.Model.BodyType" />
+ <Property Name="Content" Type="Edm.String" />
+ </ComplexType>
+ <ComplexType Name="Location">
+ <Property Name="DisplayName" Type="Edm.String" />
+ </ComplexType>
+ <ComplexType Name="ResponseStatus" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
+ <Property Name="Response" Type="Microsoft.Exchange.Services.OData.Model.ResponseType" />
+ <Property Name="Time" Type="Edm.DateTimeOffset" />
+ </ComplexType>
+ <ComplexType Name="RecurrencePattern">
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.RecurrencePatternType" />
+ <Property Name="Interval" Type="Edm.Int32" Nullable="false" />
+ <Property Name="DayOfMonth" Type="Edm.Int32" Nullable="false" />
+ <Property Name="Month" Type="Edm.Int32" Nullable="false" />
+ <Property Name="DaysOfWeek" Type="Collection(System.DayOfWeek)" />
+ <Property Name="FirstDayOfWeek" Type="System.DayOfWeek" />
+ <Property Name="Index" Type="Microsoft.Exchange.Services.OData.Model.WeekIndex" />
+ </ComplexType>
+ <ComplexType Name="RecurrenceRange">
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.RecurrenceRangeType" />
+ <Property Name="StartDate" Type="Edm.DateTimeOffset" />
+ <Property Name="EndDate" Type="Edm.DateTimeOffset" />
+ <Property Name="NumberOfOccurrences" Type="Edm.Int32" Nullable="false" />
+ </ComplexType>
+ <ComplexType Name="PatternedRecurrence">
+ <Property Name="Pattern" Type="Microsoft.Exchange.Services.OData.Model.RecurrencePattern" />
+ <Property Name="Range" Type="Microsoft.Exchange.Services.OData.Model.RecurrenceRange" />
+ </ComplexType>
+ <EntityType Name="Entity" Abstract="true">
+ <Key>
+ <PropertyRef Name="Id" />
+ </Key>
+ <Property Name="Id" Type="Edm.String" Nullable="false" />
+ </EntityType>
+ <EntityType Name="User" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="DisplayName" Type="Edm.String" />
+ <Property Name="Alias" Type="Edm.String" />
+ <Property Name="MailboxGuid" Type="Edm.Guid" />
+ <NavigationProperty Name="Folders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" ContainsTarget="true" />
+ <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.Message)" ContainsTarget="true" />
+ <NavigationProperty Name="RootFolder" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="Inbox" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="Drafts" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="SentItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="DeletedItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="Calendars" Type="Collection(Microsoft.Exchange.Services.OData.Model.Calendar)" ContainsTarget="true" />
+ <NavigationProperty Name="Calendar" Type="Microsoft.Exchange.Services.OData.Model.Calendar" ContainsTarget="true" />
+ <NavigationProperty Name="CalendarGroups" Type="Collection(Microsoft.Exchange.Services.OData.Model.CalendarGroup)" ContainsTarget="true" />
+ <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" ContainsTarget="true" />
+ <NavigationProperty Name="Contacts" Type="Collection(Microsoft.Exchange.Services.OData.Model.Contact)" ContainsTarget="true" />
+ <NavigationProperty Name="ContactFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.ContactFolder)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Folder" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="DisplayName" Type="Edm.String" />
+ <Property Name="ClassName" Type="Edm.String" />
+ <Property Name="TotalCount" Type="Edm.Int32" />
+ <Property Name="ChildFolderCount" Type="Edm.Int32" />
+ <Property Name="UnreadItemCount" Type="Edm.Int32" />
+ <NavigationProperty Name="ChildFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" ContainsTarget="true" />
+ <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.Message)" ContainsTarget="true" />
+ </EntityType>
+ <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ </Action>
+ <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ </Action>
+ <EntityType Name="Item" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
+ <Property Name="ChangeKey" Type="Edm.String" />
+ <Property Name="ClassName" Type="Edm.String" />
+ <Property Name="Subject" Type="Edm.String" />
+ <Property Name="Body" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
+ <Property Name="BodyPreview" Type="Edm.String" />
+ <Property Name="Importance" Type="Microsoft.Exchange.Services.OData.Model.Importance" />
+ <Property Name="Categories" Type="Collection(Edm.String)" />
+ <Property Name="HasAttachments" Type="Edm.Boolean" />
+ <NavigationProperty Name="Attachments" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attachment)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Message" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="From" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
+ <Property Name="Sender" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
+ <Property Name="ToRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="CcRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="BccRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="ReplyTo" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="ConversationId" Type="Edm.String" />
+ <Property Name="UniqueBody" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
+ <Property Name="DateTimeReceived" Type="Edm.DateTimeOffset" />
+ <Property Name="DateTimeSent" Type="Edm.DateTimeOffset" />
+ <Property Name="IsDeliveryReceiptRequested" Type="Edm.Boolean" />
+ <Property Name="IsReadReceiptRequested" Type="Edm.Boolean" />
+ <Property Name="IsDraft" Type="Edm.Boolean" />
+ <Property Name="IsRead" Type="Edm.Boolean" />
+ <Property Name="EventId" Type="Edm.String" />
+ <Property Name="MeetingMessageType" Type="Microsoft.Exchange.Services.OData.Model.MeetingMessageType" />
+ <Property Name="DateTimeCreated" Type="Edm.DateTimeOffset" />
+ <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
+ </EntityType>
+ <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="CreateReply" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="CreateReplyAll" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="CreateForward" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="Reply" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="ReplyAll" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="Forward" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ <Parameter Name="ToRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ </Action>
+ <Action Name="Send" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <EntityType Name="Attachment" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="ContentType" Type="Edm.String" />
+ <Property Name="Size" Type="Edm.Int32" Nullable="false" />
+ <Property Name="IsInline" Type="Edm.Boolean" Nullable="false" />
+ <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
+ </EntityType>
+ <EntityType Name="FileAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
+ <Property Name="ContentId" Type="Edm.String" />
+ <Property Name="ContentLocation" Type="Edm.String" />
+ <Property Name="IsContactPhoto" Type="Edm.Boolean" Nullable="false" />
+ <Property Name="ContentBytes" Type="Edm.Binary" />
+ </EntityType>
+ <EntityType Name="ItemAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
+ <NavigationProperty Name="Item" Type="Microsoft.Exchange.Services.OData.Model.Item" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Calendar" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="ChangeKey" Type="Edm.String" />
+ <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="CalendarGroup" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="ChangeKey" Type="Edm.String" />
+ <Property Name="ClassId" Type="Edm.Guid" />
+ <NavigationProperty Name="Calendars" Type="Collection(Microsoft.Exchange.Services.OData.Model.Calendar)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Event" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
+ <Property Name="Start" Type="Edm.DateTimeOffset" />
+ <Property Name="End" Type="Edm.DateTimeOffset" />
+ <Property Name="Location" Type="Microsoft.Exchange.Services.OData.Model.Location" />
+ <Property Name="ShowAs" Type="Microsoft.Exchange.Services.OData.Model.FreeBusyStatus" />
+ <Property Name="IsAllDay" Type="Edm.Boolean" />
+ <Property Name="IsCancelled" Type="Edm.Boolean" />
+ <Property Name="IsOrganizer" Type="Edm.Boolean" />
+ <Property Name="ResponseRequested" Type="Edm.Boolean" />
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.EventType" />
+ <Property Name="SeriesId" Type="Edm.String" />
+ <Property Name="Attendees" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attendee)" />
+ <Property Name="Recurrence" Type="Microsoft.Exchange.Services.OData.Model.PatternedRecurrence" />
+ <NavigationProperty Name="Calendar" Type="Microsoft.Exchange.Services.OData.Model.Calendar" ContainsTarget="true" />
+ </EntityType>
+ <Action Name="Accept" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Event" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="Decline" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Event" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="TentativelyAccept" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Event" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <EntityType Name="Contact" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="Birthday" Type="Edm.DateTimeOffset" />
+ <Property Name="FileAs" Type="Edm.String" />
+ <Property Name="DisplayName" Type="Edm.String" />
+ <Property Name="GivenName" Type="Edm.String" />
+ <Property Name="Initials" Type="Edm.String" />
+ <Property Name="MiddleName" Type="Edm.String" />
+ <Property Name="NickName" Type="Edm.String" />
+ <Property Name="Surname" Type="Edm.String" />
+ <Property Name="Title" Type="Edm.String" />
+ <Property Name="Generation" Type="Edm.String" />
+ <Property Name="EmailAddress1" Type="Edm.String" />
+ <Property Name="EmailAddress2" Type="Edm.String" />
+ <Property Name="EmailAddress3" Type="Edm.String" />
+ <Property Name="ImAddress1" Type="Edm.String" />
+ <Property Name="ImAddress2" Type="Edm.String" />
+ <Property Name="ImAddress3" Type="Edm.String" />
+ <Property Name="JobTitle" Type="Edm.String" />
+ <Property Name="CompanyName" Type="Edm.String" />
+ <Property Name="Department" Type="Edm.String" />
+ <Property Name="OfficeLocation" Type="Edm.String" />
+ <Property Name="Profession" Type="Edm.String" />
+ <Property Name="BusinessHomePage" Type="Edm.String" />
+ <Property Name="AssistantName" Type="Edm.String" />
+ <Property Name="Manager" Type="Edm.String" />
+ <Property Name="HomePhone1" Type="Edm.String" />
+ <Property Name="HomePhone2" Type="Edm.String" />
+ <Property Name="BusinessPhone1" Type="Edm.String" />
+ <Property Name="BusinessPhone2" Type="Edm.String" />
+ <Property Name="MobilePhone1" Type="Edm.String" />
+ <Property Name="OtherPhone" Type="Edm.String" />
+ <Property Name="DateTimeCreated" Type="Edm.DateTimeOffset" />
+ <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
+ </EntityType>
+ <EntityType Name="ContactFolder" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="DisplayName" Type="Edm.String" />
+ <NavigationProperty Name="Contacts" Type="Collection(Microsoft.Exchange.Services.OData.Model.Contact)" ContainsTarget="true" />
+ <NavigationProperty Name="ChildFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.ContactFolder)" ContainsTarget="true" />
+ </EntityType>
+ <EntityContainer Name="EntityContainer">
+ <EntitySet Name="Users" EntityType="Microsoft.Exchange.Services.OData.Model.User" />
+ <Singleton Name="Me" Type="Microsoft.Exchange.Services.OData.Model.User" />
+ </EntityContainer>
+ </Schema>
+ <Schema Namespace="System" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+ <EnumType Name="DayOfWeek">
+ <Member Name="Sunday" Value="0" />
+ <Member Name="Monday" Value="1" />
+ <Member Name="Tuesday" Value="2" />
+ <Member Name="Wednesday" Value="3" />
+ <Member Name="Thursday" Value="4" />
+ <Member Name="Friday" Value="5" />
+ <Member Name="Saturday" Value="6" />
+ </EnumType>
+ </Schema>
+ </edmx:DataServices>
+</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/it/exchangeMail/verify.groovy
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMail/verify.groovy b/ext/pojogen-maven-plugin/src/it/exchangeMail/verify.groovy
new file mode 100644
index 0000000..02f0407
--- /dev/null
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMail/verify.groovy
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File basepkg = new File( basedir, "target/generated-sources/ojc-plugin/org/apache/olingo/fit/proxy/v4" );
+assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
new file mode 100644
index 0000000..2cc2fa0
--- /dev/null
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/pom.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ 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
+
+ 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
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>pojogen-maven-plugin-v4test</artifactId>
+ <groupId>org.apache.olingo</groupId>
+ <version>@project.version@</version>
+ <name>${project.artifactId}</name>
+ <description>A simple IT verifying the basic use case of pojogen-man-plugin.</description>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <artifactId>pojogen-maven-plugin</artifactId>
+ <groupId>org.apache.olingo</groupId>
+ <version>@project.version@</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <artifactId>olingo-client-proxy</artifactId>
+ <groupId>org.apache.olingo</groupId>
+ <version>@project.version@</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>${project.build.directory}/generated-sources</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>@project.groupId@</groupId>
+ <artifactId>pojogen-maven-plugin</artifactId>
+ <version>@project.version@</version>
+ <executions>
+ <execution>
+ <configuration>
+ <outputDirectory>${project.build.directory}/generated-sources</outputDirectory>
+ <localEdm>${project.basedir}/src/test/resources/metadata.xml</localEdm>
+ </configuration>
+ <id>v4pojoGen</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>v4pojoGen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/src/test/resources/metadata.xml
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/src/test/resources/metadata.xml b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/src/test/resources/metadata.xml
new file mode 100644
index 0000000..9cb28ec
--- /dev/null
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/src/test/resources/metadata.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ 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
+
+ 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
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<edmx:Edmx Version="4.0" xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx">
+ <edmx:DataServices>
+ <Schema Namespace="Microsoft.Exchange.Services.OData.Model" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+ <EnumType Name="BodyType">
+ <Member Name="Text" Value="0" />
+ <Member Name="HTML" Value="1" />
+ </EnumType>
+ <EnumType Name="Importance">
+ <Member Name="Normal" Value="0" />
+ <Member Name="Low" Value="1" />
+ <Member Name="High" Value="2" />
+ </EnumType>
+ <EnumType Name="AttendeeType">
+ <Member Name="Required" Value="0" />
+ <Member Name="Optional" Value="1" />
+ <Member Name="Resource" Value="2" />
+ </EnumType>
+ <EnumType Name="ResponseType">
+ <Member Name="None" Value="0" />
+ <Member Name="Organizer" Value="1" />
+ <Member Name="TentativelyAccepted" Value="2" />
+ <Member Name="Accepted" Value="3" />
+ <Member Name="Declined" Value="4" />
+ <Member Name="NotResponded" Value="5" />
+ </EnumType>
+ <EnumType Name="EventType">
+ <Member Name="SingleInstance" Value="0" />
+ <Member Name="Occurrence" Value="1" />
+ <Member Name="Exception" Value="2" />
+ <Member Name="SeriesMaster" Value="3" />
+ </EnumType>
+ <EnumType Name="FreeBusyStatus">
+ <Member Name="Unknown" Value="0" />
+ <Member Name="Free" Value="1" />
+ <Member Name="Tentative" Value="2" />
+ <Member Name="Busy" Value="3" />
+ <Member Name="Oof" Value="4" />
+ <Member Name="WorkingElsewhere" Value="5" />
+ </EnumType>
+ <EnumType Name="MeetingMessageType">
+ <Member Name="None" Value="0" />
+ <Member Name="MeetingRequest" Value="1" />
+ <Member Name="MeetingCancelled" Value="2" />
+ <Member Name="MeetingAccepted" Value="3" />
+ <Member Name="MeetingTenativelyAccepted" Value="4" />
+ <Member Name="MeetingDeclined" Value="5" />
+ </EnumType>
+ <EnumType Name="RecurrencePatternType">
+ <Member Name="Daily" Value="0" />
+ <Member Name="Weekly" Value="1" />
+ <Member Name="AbsoluteMonthly" Value="2" />
+ <Member Name="RelativeMonthly" Value="3" />
+ <Member Name="AbsoluteYearly" Value="4" />
+ <Member Name="RelativeYearly" Value="5" />
+ </EnumType>
+ <EnumType Name="RecurrenceRangeType">
+ <Member Name="EndDate" Value="0" />
+ <Member Name="NoEnd" Value="1" />
+ <Member Name="Numbered" Value="2" />
+ </EnumType>
+ <EnumType Name="WeekIndex">
+ <Member Name="First" Value="0" />
+ <Member Name="Second" Value="1" />
+ <Member Name="Third" Value="2" />
+ <Member Name="Fourth" Value="3" />
+ <Member Name="Last" Value="4" />
+ </EnumType>
+ <ComplexType Name="Recipient">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="Address" Type="Edm.String" />
+ </ComplexType>
+ <ComplexType Name="Attendee" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
+ <Property Name="Status" Type="Microsoft.Exchange.Services.OData.Model.ResponseStatus" />
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.AttendeeType" />
+ </ComplexType>
+ <ComplexType Name="ItemBody">
+ <Property Name="ContentType" Type="Microsoft.Exchange.Services.OData.Model.BodyType" />
+ <Property Name="Content" Type="Edm.String" />
+ </ComplexType>
+ <ComplexType Name="Location">
+ <Property Name="DisplayName" Type="Edm.String" />
+ </ComplexType>
+ <ComplexType Name="ResponseStatus" BaseType="Microsoft.Exchange.Services.OData.Model.Recipient">
+ <Property Name="Response" Type="Microsoft.Exchange.Services.OData.Model.ResponseType" />
+ <Property Name="Time" Type="Edm.DateTimeOffset" />
+ </ComplexType>
+ <ComplexType Name="RecurrencePattern">
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.RecurrencePatternType" />
+ <Property Name="Interval" Type="Edm.Int32" Nullable="false" />
+ <Property Name="DayOfMonth" Type="Edm.Int32" Nullable="false" />
+ <Property Name="Month" Type="Edm.Int32" Nullable="false" />
+ <Property Name="DaysOfWeek" Type="Collection(System.DayOfWeek)" />
+ <Property Name="FirstDayOfWeek" Type="System.DayOfWeek" />
+ <Property Name="Index" Type="Microsoft.Exchange.Services.OData.Model.WeekIndex" />
+ </ComplexType>
+ <ComplexType Name="RecurrenceRange">
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.RecurrenceRangeType" />
+ <Property Name="StartDate" Type="Edm.DateTimeOffset" />
+ <Property Name="EndDate" Type="Edm.DateTimeOffset" />
+ <Property Name="NumberOfOccurrences" Type="Edm.Int32" Nullable="false" />
+ </ComplexType>
+ <ComplexType Name="PatternedRecurrence">
+ <Property Name="Pattern" Type="Microsoft.Exchange.Services.OData.Model.RecurrencePattern" />
+ <Property Name="Range" Type="Microsoft.Exchange.Services.OData.Model.RecurrenceRange" />
+ </ComplexType>
+ <EntityType Name="Entity" Abstract="true">
+ <Key>
+ <PropertyRef Name="Id" />
+ </Key>
+ <Property Name="Id" Type="Edm.String" Nullable="false" />
+ </EntityType>
+ <EntityType Name="User" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="DisplayName" Type="Edm.String" />
+ <Property Name="Alias" Type="Edm.String" />
+ <Property Name="MailboxGuid" Type="Edm.Guid" />
+ <NavigationProperty Name="Folders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" ContainsTarget="true" />
+ <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.Message)" ContainsTarget="true" />
+ <NavigationProperty Name="RootFolder" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="Inbox" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="Drafts" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="SentItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="DeletedItems" Type="Microsoft.Exchange.Services.OData.Model.Folder" ContainsTarget="true" />
+ <NavigationProperty Name="Calendars" Type="Collection(Microsoft.Exchange.Services.OData.Model.Calendar)" ContainsTarget="true" />
+ <NavigationProperty Name="Calendar" Type="Microsoft.Exchange.Services.OData.Model.Calendar" ContainsTarget="true" />
+ <NavigationProperty Name="CalendarGroups" Type="Collection(Microsoft.Exchange.Services.OData.Model.CalendarGroup)" ContainsTarget="true" />
+ <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" ContainsTarget="true" />
+ <NavigationProperty Name="Contacts" Type="Collection(Microsoft.Exchange.Services.OData.Model.Contact)" ContainsTarget="true" />
+ <NavigationProperty Name="ContactFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.ContactFolder)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Folder" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="DisplayName" Type="Edm.String" />
+ <Property Name="ClassName" Type="Edm.String" />
+ <Property Name="TotalCount" Type="Edm.Int32" />
+ <Property Name="ChildFolderCount" Type="Edm.Int32" />
+ <Property Name="UnreadItemCount" Type="Edm.Int32" />
+ <NavigationProperty Name="ChildFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.Folder)" ContainsTarget="true" />
+ <NavigationProperty Name="Messages" Type="Collection(Microsoft.Exchange.Services.OData.Model.Message)" ContainsTarget="true" />
+ </EntityType>
+ <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ </Action>
+ <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Folder" />
+ </Action>
+ <EntityType Name="Item" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
+ <Property Name="ChangeKey" Type="Edm.String" />
+ <Property Name="ClassName" Type="Edm.String" />
+ <Property Name="Subject" Type="Edm.String" />
+ <Property Name="Body" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
+ <Property Name="BodyPreview" Type="Edm.String" />
+ <Property Name="Importance" Type="Microsoft.Exchange.Services.OData.Model.Importance" />
+ <Property Name="Categories" Type="Collection(Edm.String)" />
+ <Property Name="HasAttachments" Type="Edm.Boolean" />
+ <NavigationProperty Name="Attachments" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attachment)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Message" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="From" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
+ <Property Name="Sender" Type="Microsoft.Exchange.Services.OData.Model.Recipient" />
+ <Property Name="ToRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="CcRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="BccRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="ReplyTo" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ <Property Name="ConversationId" Type="Edm.String" />
+ <Property Name="UniqueBody" Type="Microsoft.Exchange.Services.OData.Model.ItemBody" />
+ <Property Name="DateTimeReceived" Type="Edm.DateTimeOffset" />
+ <Property Name="DateTimeSent" Type="Edm.DateTimeOffset" />
+ <Property Name="IsDeliveryReceiptRequested" Type="Edm.Boolean" />
+ <Property Name="IsReadReceiptRequested" Type="Edm.Boolean" />
+ <Property Name="IsDraft" Type="Edm.Boolean" />
+ <Property Name="IsRead" Type="Edm.Boolean" />
+ <Property Name="EventId" Type="Edm.String" />
+ <Property Name="MeetingMessageType" Type="Microsoft.Exchange.Services.OData.Model.MeetingMessageType" />
+ <Property Name="DateTimeCreated" Type="Edm.DateTimeOffset" />
+ <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
+ </EntityType>
+ <Action Name="Copy" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="Move" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="DestinationId" Type="Edm.String" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="CreateReply" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="CreateReplyAll" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="CreateForward" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <ReturnType Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <Action Name="Reply" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="ReplyAll" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="Forward" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ <Parameter Name="ToRecipients" Type="Collection(Microsoft.Exchange.Services.OData.Model.Recipient)" />
+ </Action>
+ <Action Name="Send" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Message" />
+ </Action>
+ <EntityType Name="Attachment" BaseType="Microsoft.Exchange.Services.OData.Model.Entity" Abstract="true">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="ContentType" Type="Edm.String" />
+ <Property Name="Size" Type="Edm.Int32" Nullable="false" />
+ <Property Name="IsInline" Type="Edm.Boolean" Nullable="false" />
+ <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
+ </EntityType>
+ <EntityType Name="FileAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
+ <Property Name="ContentId" Type="Edm.String" />
+ <Property Name="ContentLocation" Type="Edm.String" />
+ <Property Name="IsContactPhoto" Type="Edm.Boolean" Nullable="false" />
+ <Property Name="ContentBytes" Type="Edm.Binary" />
+ </EntityType>
+ <EntityType Name="ItemAttachment" BaseType="Microsoft.Exchange.Services.OData.Model.Attachment">
+ <NavigationProperty Name="Item" Type="Microsoft.Exchange.Services.OData.Model.Item" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Calendar" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="ChangeKey" Type="Edm.String" />
+ <NavigationProperty Name="Events" Type="Collection(Microsoft.Exchange.Services.OData.Model.Event)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="CalendarGroup" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="Name" Type="Edm.String" />
+ <Property Name="ChangeKey" Type="Edm.String" />
+ <Property Name="ClassId" Type="Edm.Guid" />
+ <NavigationProperty Name="Calendars" Type="Collection(Microsoft.Exchange.Services.OData.Model.Calendar)" ContainsTarget="true" />
+ </EntityType>
+ <EntityType Name="Event" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
+ <Property Name="Start" Type="Edm.DateTimeOffset" />
+ <Property Name="End" Type="Edm.DateTimeOffset" />
+ <Property Name="Location" Type="Microsoft.Exchange.Services.OData.Model.Location" />
+ <Property Name="ShowAs" Type="Microsoft.Exchange.Services.OData.Model.FreeBusyStatus" />
+ <Property Name="IsAllDay" Type="Edm.Boolean" />
+ <Property Name="IsCancelled" Type="Edm.Boolean" />
+ <Property Name="IsOrganizer" Type="Edm.Boolean" />
+ <Property Name="ResponseRequested" Type="Edm.Boolean" />
+ <Property Name="Type" Type="Microsoft.Exchange.Services.OData.Model.EventType" />
+ <Property Name="SeriesId" Type="Edm.String" />
+ <Property Name="Attendees" Type="Collection(Microsoft.Exchange.Services.OData.Model.Attendee)" />
+ <Property Name="Recurrence" Type="Microsoft.Exchange.Services.OData.Model.PatternedRecurrence" />
+ <NavigationProperty Name="Calendar" Type="Microsoft.Exchange.Services.OData.Model.Calendar" ContainsTarget="true" />
+ </EntityType>
+ <Action Name="Accept" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Event" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="Decline" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Event" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <Action Name="TentativelyAccept" IsBound="true" EntitySetPath="bindingParameter">
+ <Parameter Name="bindingParameter" Type="Microsoft.Exchange.Services.OData.Model.Event" />
+ <Parameter Name="Comment" Type="Edm.String" />
+ </Action>
+ <EntityType Name="Contact" BaseType="Microsoft.Exchange.Services.OData.Model.Item">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="Birthday" Type="Edm.DateTimeOffset" />
+ <Property Name="FileAs" Type="Edm.String" />
+ <Property Name="DisplayName" Type="Edm.String" />
+ <Property Name="GivenName" Type="Edm.String" />
+ <Property Name="Initials" Type="Edm.String" />
+ <Property Name="MiddleName" Type="Edm.String" />
+ <Property Name="NickName" Type="Edm.String" />
+ <Property Name="Surname" Type="Edm.String" />
+ <Property Name="Title" Type="Edm.String" />
+ <Property Name="Generation" Type="Edm.String" />
+ <Property Name="EmailAddress1" Type="Edm.String" />
+ <Property Name="EmailAddress2" Type="Edm.String" />
+ <Property Name="EmailAddress3" Type="Edm.String" />
+ <Property Name="ImAddress1" Type="Edm.String" />
+ <Property Name="ImAddress2" Type="Edm.String" />
+ <Property Name="ImAddress3" Type="Edm.String" />
+ <Property Name="JobTitle" Type="Edm.String" />
+ <Property Name="CompanyName" Type="Edm.String" />
+ <Property Name="Department" Type="Edm.String" />
+ <Property Name="OfficeLocation" Type="Edm.String" />
+ <Property Name="Profession" Type="Edm.String" />
+ <Property Name="BusinessHomePage" Type="Edm.String" />
+ <Property Name="AssistantName" Type="Edm.String" />
+ <Property Name="Manager" Type="Edm.String" />
+ <Property Name="HomePhone1" Type="Edm.String" />
+ <Property Name="HomePhone2" Type="Edm.String" />
+ <Property Name="BusinessPhone1" Type="Edm.String" />
+ <Property Name="BusinessPhone2" Type="Edm.String" />
+ <Property Name="MobilePhone1" Type="Edm.String" />
+ <Property Name="OtherPhone" Type="Edm.String" />
+ <Property Name="DateTimeCreated" Type="Edm.DateTimeOffset" />
+ <Property Name="LastModifiedTime" Type="Edm.DateTimeOffset" />
+ </EntityType>
+ <EntityType Name="ContactFolder" BaseType="Microsoft.Exchange.Services.OData.Model.Entity">
+ <Property Name="ParentFolderId" Type="Edm.String" />
+ <Property Name="DisplayName" Type="Edm.String" />
+ <NavigationProperty Name="Contacts" Type="Collection(Microsoft.Exchange.Services.OData.Model.Contact)" ContainsTarget="true" />
+ <NavigationProperty Name="ChildFolders" Type="Collection(Microsoft.Exchange.Services.OData.Model.ContactFolder)" ContainsTarget="true" />
+ </EntityType>
+ <EntityContainer Name="EntityContainer">
+ <EntitySet Name="Users" EntityType="Microsoft.Exchange.Services.OData.Model.User" />
+ <Singleton Name="Me" Type="Microsoft.Exchange.Services.OData.Model.User" />
+ </EntityContainer>
+ </Schema>
+ <Schema Namespace="System" xmlns="http://docs.oasis-open.org/odata/ns/edm">
+ <EnumType Name="DayOfWeek">
+ <Member Name="Sunday" Value="0" />
+ <Member Name="Monday" Value="1" />
+ <Member Name="Tuesday" Value="2" />
+ <Member Name="Wednesday" Value="3" />
+ <Member Name="Thursday" Value="4" />
+ <Member Name="Friday" Value="5" />
+ <Member Name="Saturday" Value="6" />
+ </EnumType>
+ </Schema>
+ </edmx:DataServices>
+</edmx:Edmx>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/verify.groovy
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/verify.groovy b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/verify.groovy
new file mode 100644
index 0000000..3b7941b
--- /dev/null
+++ b/ext/pojogen-maven-plugin/src/it/exchangeMailNoBasePkg/verify.groovy
@@ -0,0 +1,20 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+File basepkg = new File( basedir, "target/generated-sources/ojc-plugin" );
+assert basepkg.isDirectory() && basepkg.listFiles().length>0;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
----------------------------------------------------------------------
diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
index ee09e65..ea29767 100644
--- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
+++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java
@@ -44,7 +44,6 @@ import org.apache.olingo.commons.api.edm.EdmEntityContainer;
import org.apache.olingo.commons.api.edm.EdmEntitySet;
import org.apache.olingo.commons.api.edm.EdmEntityType;
import org.apache.olingo.commons.api.edm.EdmEnumType;
-import org.apache.olingo.commons.api.edm.EdmNavigationProperty;
import org.apache.olingo.commons.api.edm.EdmSchema;
import org.apache.olingo.commons.api.edm.EdmSingleton;
import org.apache.olingo.commons.api.edm.EdmTerm;
@@ -78,7 +77,7 @@ public abstract class AbstractPOJOGenMojo extends AbstractMojo {
/**
* Base package.
*/
- @Parameter(property = "basePackage", required = true)
+ @Parameter(property = "basePackage", required = false)
protected String basePackage;
protected final Set<String> namespaces = new HashSet<String>();
@@ -104,7 +103,9 @@ public abstract class AbstractPOJOGenMojo extends AbstractMojo {
}
protected File mkPkgDir(final String path) {
- return mkdir(basePackage.replace('.', File.separatorChar) + File.separator + path);
+ return StringUtils.isBlank(basePackage)
+ ? mkdir(path)
+ : mkdir(basePackage.replace('.', File.separatorChar) + File.separator + path);
}
protected void writeFile(final String name, final File path, final VelocityContext ctx, final Template template,
@@ -242,7 +243,9 @@ public abstract class AbstractPOJOGenMojo extends AbstractMojo {
// write package-info for the base package
final String schemaPath = utility.getNamespace().toLowerCase().replace('.', File.separatorChar);
final File base = mkPkgDir(schemaPath);
- final String pkg = basePackage + "." + utility.getNamespace().toLowerCase();
+ final String pkg = StringUtils.isBlank(basePackage)
+ ? utility.getNamespace().toLowerCase()
+ : basePackage + "." + utility.getNamespace().toLowerCase();
parseObj(base, pkg, "package-info", "package-info.java");
// write package-info for types package
@@ -277,20 +280,6 @@ public abstract class AbstractPOJOGenMojo extends AbstractMojo {
objs.clear();
objs.put("complexType", complex);
parseObj(typesBaseDir, typesPkg, "complexType", className + ".java", objs);
-
- for (String navPropName : complex.getNavigationPropertyNames()) {
- final EdmNavigationProperty navProp = complex.getNavigationProperty(navPropName);
- if ((complex.getBaseType() == null
- || edm.getEntityType(complex.getBaseType().getFullQualifiedName()).
- getNavigationProperty(navPropName) == null)
- && navProp.containsTarget()) {
-
- objs.clear();
- objs.put("navProp", navProp);
- parseObj(base, pkg, "containedEntitySet",
- utility.capitalize(navProp.getName()) + ".java", objs);
- }
- }
}
for (EdmEntityType entity : schema.getEntityTypes()) {
@@ -328,20 +317,6 @@ public abstract class AbstractPOJOGenMojo extends AbstractMojo {
utility.capitalize(entity.getName()) + ".java", objs);
parseObj(typesBaseDir, typesPkg, "entityCollection",
utility.capitalize(entity.getName()) + "Collection.java", objs);
-
- for (String navPropName : entity.getNavigationPropertyNames()) {
- final EdmNavigationProperty navProp = entity.getNavigationProperty(navPropName);
- if ((entity.getBaseType() == null
- || edm.getEntityType(entity.getBaseType().getFullQualifiedName()).
- getNavigationProperty(navPropName) == null)
- && navProp.containsTarget()) {
-
- objs.clear();
- objs.put("navProp", navProp);
- parseObj(base, pkg, "containedEntitySet",
- utility.capitalize(navProp.getName()) + ".java", objs);
- }
- }
}
// write container and top entity sets into the base package
[10/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
index cc4d726..71c8e7e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 MessageCollection extends AbstractEntityCollection<Message> {
+public interface MessageCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
index 03a3706..142f87c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java
@@ -47,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class MessageKey extends AbstractEntityKey {
- private String _fromUsername;
+ private java.lang.String _fromUsername;
@CompoundKeyElement(name = "FromUsername", position = 0)
- public String getFromUsername() {
+ public java.lang.String getFromUsername() {
return _fromUsername;
}
- public void setFromUsername(final String _fromUsername) {
+ public void setFromUsername(java.lang.String _fromUsername) {
this._fromUsername = _fromUsername;
}
- private Integer _messageId;
+ private java.lang.Integer _messageId;
@CompoundKeyElement(name = "MessageId", position = 1)
- public Integer getMessageId() {
+ public java.lang.Integer getMessageId() {
return _messageId;
}
- public void setMessageId(final Integer _messageId) {
+ public void setMessageId(java.lang.Integer _messageId) {
this._messageId = _messageId;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
index e4c1b24..0f137e2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "Order",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Order",
openType = false,
hasStream = false,
isAbstract = false)
public interface Order
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
- @Property(name = "CustomerId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
type = "Edm.Int32",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface Order
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getCustomerId();
+ java.lang.Integer getCustomerId();
- void setCustomerId(final Integer _customerId);
+ void setCustomerId(java.lang.Integer _customerId);
- @Property(name = "Concurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
nullable = true,
defaultValue = "",
@@ -128,38 +126,66 @@ public interface Order
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
- void setConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
+ void setConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
- void setLogin(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
-
-
- @NavigationProperty(name = "Customer",
+ void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+
+ @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer getCustomer();
- void setCustomer(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
-
-
+ void setCustomer(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer _customer);
+
- ComplexFactory factory();
+ ComplexFactory factory();
interface ComplexFactory {
- @Property(name = "Concurrency",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
- }
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CustomerId",
+ type = "Edm.Int32")
+ Annotatable getCustomerIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo")
+ Annotatable getConcurrencyAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Login",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Login")
+ Annotatable getLoginAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Customer",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Customer")
+ Annotatable getCustomerAnnotations();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
index 2c74b42..04fb16f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 OrderCollection extends AbstractEntityCollection<Order> {
+public interface OrderCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
index 8f4e882..9259705 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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;
@KeyRef(OrderLineKey.class)
-@Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
-@EntityType(name = "OrderLine",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "OrderLine",
openType = false,
hasStream = false,
isAbstract = false)
public interface OrderLine
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "OrderLineStream",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderLineStream",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface OrderLine
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(java.io.InputStream _orderLineStream);
@Key
- @Property(name = "OrderId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getOrderId();
+ java.lang.Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(java.lang.Integer _orderId);
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Quantity",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Quantity",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getQuantity();
+ java.lang.Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(java.lang.Integer _quantity);
- @Property(name = "ConcurrencyToken",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ConcurrencyToken",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,32 +170,72 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getConcurrencyToken();
+ java.lang.String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(java.lang.String _concurrencyToken);
- @NavigationProperty(name = "Order",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Order",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order getOrder();
- void setOrder(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
-
-
- @NavigationProperty(name = "Product",
+ void setOrder(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order _order);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+ void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderLineStream",
+ type = "Edm.Stream")
+ Annotatable getOrderLineStreamAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "OrderId",
+ type = "Edm.Int32")
+ Annotatable getOrderIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Quantity",
+ type = "Edm.Int32")
+ Annotatable getQuantityAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ConcurrencyToken",
+ type = "Edm.String")
+ Annotatable getConcurrencyTokenAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Order",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Order")
+ Annotatable getOrderAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
index f099fb8..56daf2b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 OrderLineCollection extends AbstractEntityCollection<OrderLine> {
+public interface OrderLineCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
index 01ce42a..6363e84 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java
@@ -47,28 +47,28 @@ import java.util.Collection;
import java.util.Calendar;
import javax.xml.datatype.Duration;
-@CompoundKey
+@org.apache.olingo.ext.proxy.api.annotations.CompoundKey
public class OrderLineKey extends AbstractEntityKey {
- private Integer _orderId;
+ private java.lang.Integer _orderId;
@CompoundKeyElement(name = "OrderId", position = 0)
- public Integer getOrderId() {
+ public java.lang.Integer getOrderId() {
return _orderId;
}
- public void setOrderId(final Integer _orderId) {
+ public void setOrderId(java.lang.Integer _orderId) {
this._orderId = _orderId;
}
- private Integer _productId;
+ private java.lang.Integer _productId;
@CompoundKeyElement(name = "ProductId", position = 1)
- public Integer getProductId() {
+ public java.lang.Integer getProductId() {
return _productId;
}
- public void setProductId(final Integer _productId) {
+ public void setProductId(java.lang.Integer _productId) {
this._productId = _productId;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
index a60310f..9b1e61f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "PageView",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PageView",
openType = false,
hasStream = false,
isAbstract = false)
public interface PageView
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PageViewId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageViewId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPageViewId();
+ java.lang.Integer getPageViewId();
- void setPageViewId(final Integer _pageViewId);
+ void setPageViewId(java.lang.Integer _pageViewId);
- @Property(name = "Username",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Username",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getUsername();
+ java.lang.String getUsername();
- void setUsername(final String _username);
+ void setUsername(java.lang.String _username);
- @Property(name = "Viewed",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Viewed",
type = "Edm.DateTimeOffset",
nullable = false,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Calendar getViewed();
+ java.util.Calendar getViewed();
- void setViewed(final Calendar _viewed);
+ void setViewed(java.util.Calendar _viewed);
- @Property(name = "TimeSpentOnPage",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TimeSpentOnPage",
type = "Edm.Time",
nullable = false,
defaultValue = "",
@@ -149,12 +147,12 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- BigDecimal getTimeSpentOnPage();
+ java.math.BigDecimal getTimeSpentOnPage();
- void setTimeSpentOnPage(final BigDecimal _timeSpentOnPage);
+ void setTimeSpentOnPage(java.math.BigDecimal _timeSpentOnPage);
- @Property(name = "PageUrl",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PageUrl",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -172,22 +170,58 @@ public interface PageView
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPageUrl();
+ java.lang.String getPageUrl();
- void setPageUrl(final String _pageUrl);
+ void setPageUrl(java.lang.String _pageUrl);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login getLogin();
- void setLogin(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login _login);
+ void setLogin(org.apache.olingo.fit.proxy.v3.staticservice.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 = "PageViewId",
+ type = "Edm.Int32")
+ Annotatable getPageViewIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Username",
+ type = "Edm.String")
+ Annotatable getUsernameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Viewed",
+ type = "Edm.DateTimeOffset")
+ Annotatable getViewedAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TimeSpentOnPage",
+ type = "Edm.Time")
+ Annotatable getTimeSpentOnPageAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PageUrl",
+ type = "Edm.String")
+ Annotatable getPageUrlAnnotations();
+ @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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
index 93fa4b8..2f0aa84 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 PageViewCollection extends AbstractEntityCollection<PageView> {
+public interface PageViewCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PageView> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
index 5227f1e..3430a90 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "Person",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
openType = false,
hasStream = false,
isAbstract = false)
public interface Person
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface Person
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 = "",
@@ -103,22 +101,46 @@ public interface Person
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getName();
+ java.lang.String getName();
- void setName(final String _name);
+ void setName(java.lang.String _name);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata();
- void setPersonMetadata(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+ void setPersonMetadata(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface 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.AnnotationsForNavigationProperty(name = "PersonMetadata",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata")
+ Annotatable getPersonMetadataAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
index be1a9c4..79b80ea 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 PersonCollection extends AbstractEntityCollection<Person> {
+public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
index 86032b4..218c569 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "PersonMetadata",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PersonMetadata",
openType = false,
hasStream = false,
isAbstract = false)
public interface PersonMetadata
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "PersonMetadataId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonMetadataId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonMetadataId();
+ java.lang.Integer getPersonMetadataId();
- void setPersonMetadataId(final Integer _personMetadataId);
+ void setPersonMetadataId(java.lang.Integer _personMetadataId);
- @Property(name = "PersonId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -103,12 +101,12 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getPersonId();
+ java.lang.Integer getPersonId();
- void setPersonId(final Integer _personId);
+ void setPersonId(java.lang.Integer _personId);
- @Property(name = "PropertyName",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyName",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -126,12 +124,12 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPropertyName();
+ java.lang.String getPropertyName();
- void setPropertyName(final String _propertyName);
+ void setPropertyName(java.lang.String _propertyName);
- @Property(name = "PropertyValue",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PropertyValue",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -149,22 +147,54 @@ public interface PersonMetadata
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getPropertyValue();
+ java.lang.String getPropertyValue();
- void setPropertyValue(final String _propertyValue);
+ void setPropertyValue(java.lang.String _propertyValue);
- @NavigationProperty(name = "Person",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person",
targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService",
targetContainer = "DefaultContainer",
- targetEntitySet = "Person")
+ targetEntitySet = "Person",
+ containsTarget = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person getPerson();
- void setPerson(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
+ void setPerson(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person _person);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonMetadataId",
+ type = "Edm.Int32")
+ Annotatable getPersonMetadataIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId",
+ type = "Edm.Int32")
+ Annotatable getPersonIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyName",
+ type = "Edm.String")
+ Annotatable getPropertyNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PropertyValue",
+ type = "Edm.String")
+ Annotatable getPropertyValueAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person")
+ Annotatable getPersonAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
index e06f0e4..c73a84d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 PersonMetadataCollection extends AbstractEntityCollection<PersonMetadata> {
+public interface PersonMetadataCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadata> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
index 9f92009..6902a88 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
@@ -19,10 +19,16 @@
package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types;
+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.ComplexType;
+import org.apache.olingo.ext.proxy.api.annotations.EntitySet;
import org.apache.olingo.ext.proxy.api.annotations.Property;
import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
+import org.apache.olingo.ext.proxy.api.AbstractOpenType;
+import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
+import org.apache.olingo.ext.proxy.api.Annotatable;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
@@ -37,30 +43,33 @@ 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")
-@ComplexType(name = "Phone")
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Phone")
public interface Phone
- extends Serializable {
+ extends java.io.Serializable {
- @Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
- String getPhoneNumber();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
+ java.lang.String getPhoneNumber();
- void setPhoneNumber(final String _phoneNumber);
+ void setPhoneNumber(java.lang.String _phoneNumber);
- @Property(name = "Extension", type = "Edm.String", nullable = true)
- String getExtension();
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
+ java.lang.String getExtension();
- void setExtension(final String _extension);
+ void setExtension(java.lang.String _extension);
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
index ab0271e..d73fdaf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "Product",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
openType = false,
hasStream = false,
isAbstract = false)
public interface Product
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
- @Property(name = "Picture",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Picture",
type = "Edm.Stream",
nullable = false,
defaultValue = "",
@@ -82,10 +80,10 @@ public interface Product
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 = "",
@@ -103,12 +101,12 @@ public interface Product
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 = "",
@@ -126,12 +124,12 @@ public interface Product
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 = "",
@@ -151,10 +149,10 @@ public interface Product
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
- void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+ void setDimensions(org.apache.olingo.fit.proxy.v3.staticservice.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 = "",
@@ -172,12 +170,12 @@ public interface Product
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 = "",
@@ -197,10 +195,10 @@ public interface Product
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
- void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+ void setComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.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 = "",
@@ -220,56 +218,56 @@ public interface Product
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
- void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+ void setNestedComplexConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
- @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection getRelatedProducts();
- void setRelatedProducts(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection _relatedProducts);
-
-
- @NavigationProperty(name = "Detail",
+ void setRelatedProducts(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail getDetail();
- void setDetail(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail _detail);
-
-
- @NavigationProperty(name = "Reviews",
+ void setDetail(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection getReviews();
- void setReviews(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductReviewCollection _reviews);
-
-
- @NavigationProperty(name = "Photos",
+ void setReviews(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection getPhotos();
- void setPhotos(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
-
-
+ void setPhotos(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductPhotoCollection _photos);
+
Operations operations();
interface Operations {
- @Operation(name = "ChangeProductDimensions",
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ChangeProductDimensions",
type = OperationType.ACTION)
void changeProductDimensions(
@Parameter(name = "dimensions", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", nullable = true) org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions dimensions
@@ -277,20 +275,72 @@ public interface Product
}
- ComplexFactory factory();
+ ComplexFactory factory();
interface 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.staticservice.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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency();
- }
+ }
+
+ Annotations annotations();
+
+ interface 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.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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
index 5c6d3c2..2b447d5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ProductCollection extends AbstractEntityCollection<Product> {
+public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product> {
+
+ 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/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
index 4d34093..3c9696c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java
@@ -20,16 +20,21 @@
package org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.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 = "ProductDetail",
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
openType = false,
hasStream = false,
isAbstract = false)
public interface ProductDetail
- extends Serializable {
+ extends Annotatable,java.io.Serializable {
@Key
- @Property(name = "ProductId",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
type = "Edm.Int32",
nullable = false,
defaultValue = "",
@@ -80,12 +78,12 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- Integer getProductId();
+ java.lang.Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(java.lang.Integer _productId);
- @Property(name = "Details",
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
type = "Edm.String",
nullable = true,
defaultValue = "",
@@ -103,22 +101,46 @@ public interface ProductDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- String getDetails();
+ java.lang.String getDetails();
- void setDetails(final String _details);
+ void setDetails(java.lang.String _details);
- @NavigationProperty(name = "Product",
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product getProduct();
- void setProduct(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+ void setProduct(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductId",
+ type = "Edm.Int32")
+ Annotatable getProductIdAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
+ type = "Edm.String")
+ Annotatable getDetailsAnnotations();
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Product")
+ Annotatable getProductAnnotations();
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
index 1320754..9779703 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java
@@ -21,6 +21,7 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.servic
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 ProductDetailCollection extends AbstractEntityCollection<ProductDetail> {
+public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductDetail> {
+
+ Object getAnnotation(Class<? extends AbstractTerm> term);
+
+ Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
}
[06/24] Some refinements arounf pojogen
Posted by fm...@apache.org.
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Employee.java
new file mode 100644
index 0000000..86b9167
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Employee.java
@@ -0,0 +1,228 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Employee",
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "ODataDemo.Person")
+public interface Employee
+ extends Annotatable,org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmployeeID",
+ type = "Edm.Int64",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Long getEmployeeID();
+
+ void setEmployeeID(java.lang.Long _employeeID);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HireDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getHireDate();
+
+ void setHireDate(java.util.Calendar _hireDate);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Salary",
+ type = "Edm.Single",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Float getSalary();
+
+ void setSalary(java.lang.Float _salary);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "PersonDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+
+ void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "EmployeeID",
+ type = "Edm.Int64")
+ Annotatable getEmployeeIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "HireDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getHireDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Salary",
+ type = "Edm.Single")
+ Annotatable getSalaryAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail")
+ Annotatable getPersonDetailAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/EmployeeCollection.java
new file mode 100644
index 0000000..f619ee5
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/EmployeeCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface EmployeeCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee> {
+
+ 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/v4/demo/types/FeaturedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/FeaturedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/FeaturedProduct.java
new file mode 100644
index 0000000..65c94fe
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/FeaturedProduct.java
@@ -0,0 +1,330 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "FeaturedProduct",
+ openType = false,
+ hasStream = false,
+ isAbstract = false,
+ baseType = "ODataDemo.Product")
+public interface FeaturedProduct
+ extends Annotatable,org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getReleaseDate();
+
+ void setReleaseDate(java.util.Calendar _releaseDate);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getDiscontinuedDate();
+
+ void setDiscontinuedDate(java.util.Calendar _discontinuedDate);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getRating();
+
+ void setRating(java.lang.Short _rating);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getPrice();
+
+ void setPrice(java.lang.Double _price);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
+ type = "ODataDemo.Category",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Categories",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
+
+ void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Suppliers",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
+
+ void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "ProductDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
+
+ void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement",
+ type = "ODataDemo.Advertisement",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Advertisements",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement();
+
+ void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement);
+
+
+ @Override
+ Operations operations();
+
+ interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations{
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.ComplexFactory{
+ }
+
+ Annotations annotations();
+
+ interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Annotations{
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getReleaseDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getDiscontinuedDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
+ type = "Edm.Int16")
+ Annotatable getRatingAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
+ type = "Edm.Double")
+ Annotatable getPriceAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
+ type = "ODataDemo.Category")
+ Annotatable getCategoriesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier")
+ Annotatable getSupplierAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail")
+ Annotatable getProductDetailAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Advertisement",
+ type = "ODataDemo.Advertisement")
+ Annotatable getAdvertisementAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/FeaturedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/FeaturedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/FeaturedProductCollection.java
new file mode 100644
index 0000000..e3c0a70
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/FeaturedProductCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface FeaturedProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct> {
+
+ 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/v4/demo/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Person.java
new file mode 100644
index 0000000..45ed75c
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Person.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Person",
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Person
+ extends Annotatable,java.io.Serializable {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "PersonDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail();
+
+ void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonDetail",
+ type = "ODataDemo.PersonDetail")
+ Annotatable getPersonDetailAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonCollection.java
new file mode 100644
index 0000000..c397f29
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface PersonCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person> {
+
+ 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/v4/demo/types/PersonDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonDetail.java
new file mode 100644
index 0000000..ff7231d
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonDetail.java
@@ -0,0 +1,258 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "PersonDetail",
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface PersonDetail
+ extends Annotatable,java.io.Serializable {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getPersonID();
+
+ void setPersonID(java.lang.Integer _personID);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Age",
+ type = "Edm.Byte",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getAge();
+
+ void setAge(java.lang.Short _age);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Gender",
+ type = "Edm.Boolean",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Boolean getGender();
+
+ void setGender(java.lang.Boolean _gender);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Phone",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getPhone();
+
+ void setPhone(java.lang.String _phone);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
+
+ void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo",
+ type = "Edm.Stream",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.io.InputStream getPhoto();
+
+ void setPhoto(java.io.InputStream _photo);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
+ type = "ODataDemo.Person",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Persons",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson();
+
+ void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address")
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
+
+ }
+
+ Annotations annotations();
+
+ interface 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 = "Age",
+ type = "Edm.Byte")
+ Annotatable getAgeAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Gender",
+ type = "Edm.Boolean")
+ Annotatable getGenderAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Phone",
+ type = "Edm.String")
+ Annotatable getPhoneAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
+ type = "ODataDemo.Address")
+ Annotatable getAddressAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo",
+ type = "Edm.Stream")
+ Annotatable getPhotoAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Person",
+ type = "ODataDemo.Person")
+ Annotatable getPersonAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonDetailCollection.java
new file mode 100644
index 0000000..bb4dfd1
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/PersonDetailCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface PersonDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail> {
+
+ 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/v4/demo/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Product.java
new file mode 100644
index 0000000..af46c8d
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Product.java
@@ -0,0 +1,321 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Product",
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Product
+ extends Annotatable,java.io.Serializable {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDescription();
+
+ void setDescription(java.lang.String _description);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getReleaseDate();
+
+ void setReleaseDate(java.util.Calendar _releaseDate);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.util.Calendar getDiscontinuedDate();
+
+ void setDiscontinuedDate(java.util.Calendar _discontinuedDate);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Rating",
+ type = "Edm.Int16",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Short getRating();
+
+ void setRating(java.lang.Short _rating);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Price",
+ type = "Edm.Double",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Double getPrice();
+
+ void setPrice(java.lang.Double _price);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Categories",
+ type = "ODataDemo.Category",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Categories",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories();
+
+ void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Suppliers",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier();
+
+ void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier);
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "ProductDetails",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail();
+
+ void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail);
+
+
+ Operations operations();
+
+ interface Operations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "Discount",
+ type = OperationType.ACTION,
+ returnType = "Edm.Double")
+ java.lang.Double discount(
+ @Parameter(name = "discountPercentage", type = "Edm.Int32", nullable = false) java.lang.Integer discountPercentage
+ );
+
+ }
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description",
+ type = "Edm.String")
+ Annotatable getDescriptionAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ReleaseDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getReleaseDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "DiscontinuedDate",
+ type = "Edm.DateTimeOffset")
+ Annotatable getDiscontinuedDateAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Rating",
+ type = "Edm.Int16")
+ Annotatable getRatingAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Price",
+ type = "Edm.Double")
+ Annotatable getPriceAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Categories",
+ type = "ODataDemo.Category")
+ Annotatable getCategoriesAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Supplier",
+ type = "ODataDemo.Supplier")
+ Annotatable getSupplierAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ProductDetail",
+ type = "ODataDemo.ProductDetail")
+ Annotatable getProductDetailAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductCollection.java
new file mode 100644
index 0000000..c65cef7
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface ProductCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product> {
+
+ 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/v4/demo/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductDetail.java
new file mode 100644
index 0000000..875da63
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductDetail.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ProductDetail",
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface ProductDetail
+ extends Annotatable,java.io.Serializable {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getProductID();
+
+ void setProductID(java.lang.Integer _productID);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Details",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getDetails();
+
+ void setDetails(java.lang.String _details);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Product",
+ type = "ODataDemo.Product",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product getProduct();
+
+ void setProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product _product);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ProductID",
+ type = "Edm.Int32")
+ Annotatable getProductIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Details",
+ type = "Edm.String")
+ Annotatable getDetailsAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Product",
+ type = "ODataDemo.Product")
+ Annotatable getProductAnnotations();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductDetailCollection.java
new file mode 100644
index 0000000..a90c3fa
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/ProductDetailCollection.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.types;
+
+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;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+public interface ProductDetailCollection extends AbstractEntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail> {
+
+ 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/v4/demo/types/Supplier.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Supplier.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Supplier.java
new file mode 100644
index 0000000..40df7e9
--- /dev/null
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/types/Supplier.java
@@ -0,0 +1,231 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * 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
+ *
+ * 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
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.olingo.fit.proxy.v4.demo.odatademo.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.v4.demo.odatademo.*;
+import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*;
+
+import org.apache.olingo.commons.api.edm.geo.Geospatial;
+import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
+import org.apache.olingo.commons.api.edm.geo.LineString;
+import org.apache.olingo.commons.api.edm.geo.MultiLineString;
+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;
+
+
+@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
+@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Supplier",
+ openType = false,
+ hasStream = false,
+ isAbstract = false)
+public interface Supplier
+ extends Annotatable,java.io.Serializable {
+
+
+ @Key
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getID();
+
+ void setID(java.lang.Integer _iD);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name",
+ type = "Edm.String",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.String getName();
+
+ void setName(java.lang.String _name);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress();
+
+ void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Location",
+ type = "Edm.GeographyPoint",
+ nullable = true,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ org.apache.olingo.commons.api.edm.geo.Point getLocation();
+
+ void setLocation(org.apache.olingo.commons.api.edm.geo.Point _location);
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency",
+ type = "Edm.Int32",
+ nullable = false,
+ defaultValue = "",
+ maxLenght = Integer.MAX_VALUE,
+ fixedLenght = false,
+ precision = 0,
+ scale = 0,
+ unicode = true,
+ collation = "",
+ srid = "",
+ concurrencyMode = ConcurrencyMode.None,
+ fcSourcePath = "",
+ fcTargetPath = "",
+ fcContentKind = EdmContentKind.text,
+ fcNSPrefix = "",
+ fcNSURI = "",
+ fcKeepInContent = false)
+ java.lang.Integer getConcurrency();
+
+ void setConcurrency(java.lang.Integer _concurrency);
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products",
+ type = "ODataDemo.Product",
+ targetSchema = "ODataDemo",
+ targetContainer = "DemoService",
+ targetEntitySet = "Products",
+ containsTarget = false)
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts();
+
+ void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products);
+
+
+
+ ComplexFactory factory();
+
+ interface ComplexFactory {
+ @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Address",
+ type = "ODataDemo.Address")
+ org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address newAddress();
+
+ }
+
+ Annotations annotations();
+
+ interface Annotations {
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID",
+ type = "Edm.Int32")
+ Annotatable getIDAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name",
+ type = "Edm.String")
+ Annotatable getNameAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Address",
+ type = "ODataDemo.Address")
+ Annotatable getAddressAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Location",
+ type = "Edm.GeographyPoint")
+ Annotatable getLocationAnnotations();
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Concurrency",
+ type = "Edm.Int32")
+ Annotatable getConcurrencyAnnotations();
+
+
+
+ @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Products",
+ type = "ODataDemo.Product")
+ Annotatable getProductsAnnotations();
+ }
+
+}