You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by fm...@apache.org on 2014/05/26 16:05:08 UTC
[11/24] Some refinements arounf pojogen
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/24a031b7/fit/src/test/java/org/apache/olingo/fit/proxy/v3/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();
}