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:00 UTC
[03/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/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 {
}