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/07/23 12:56:09 UTC
[2/3] [OLINGO-366] provide some improvements around streams,
singletons and delete requests
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 1e90f5a..7455df7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -59,9 +59,9 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getOrderLineStream();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getOrderLineStream();
- void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamType _orderLineStream);
+ void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamValue _orderLineStream);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
index d65a2ea..24377bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
@@ -55,9 +55,9 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getPhoto();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getPhoto();
- void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamType _photo);
+ void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamValue _photo);
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
@@ -78,9 +78,9 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getVideo();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getVideo();
- void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamType _video);
+ void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamValue _video);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
index a753d84..f469246 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
@@ -28,21 +28,33 @@ public interface ComplexToCategory
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Term",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getTerm();
void setTerm(java.lang.String _term);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Scheme",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getScheme();
void setScheme(java.lang.String _scheme);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Label",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getLabel();
void setLabel(java.lang.String _label);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
index 574fd61..bf7819f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
@@ -28,14 +28,22 @@ public interface ConcurrencyInfo
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Token",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getToken();
void setToken(java.lang.String _token);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "QueriedDateTime",
+ type = "Edm.DateTime",
+ nullable = true)
java.sql.Timestamp getQueriedDateTime();
void setQueriedDateTime(java.sql.Timestamp _queriedDateTime);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
index 76191be..5f8f1d6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
@@ -28,42 +28,66 @@ public interface ContactDetails
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "EmailBag",
+ type = "Edm.String",
+ nullable = false)
org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmailBag();
void setEmailBag(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emailBag);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "AlternativeNames",
+ type = "Edm.String",
+ nullable = false)
org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getAlternativeNames();
void setAlternativeNames(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _alternativeNames);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "ContactAlias",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases",
+ nullable = true)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
void setContactAlias(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "HomePhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
void setHomePhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "WorkPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
void setWorkPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "MobilePhoneBag",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = false)
org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection getMobilePhoneBag();
void setMobilePhoneBag(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection _mobilePhoneBag);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
index c088d06..eb52f83 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
@@ -55,9 +55,9 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getThumbnail();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getThumbnail();
- void setThumbnail(org.apache.olingo.ext.proxy.api.EdmStreamType _thumbnail);
+ void setThumbnail(org.apache.olingo.ext.proxy.api.EdmStreamValue _thumbnail);
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
@@ -78,9 +78,9 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getVideo();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getVideo();
- void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamType _video);
+ void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamValue _video);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
index acf138f..3b4fd45 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
@@ -28,21 +28,33 @@ public interface Dimensions
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Width",
+ type = "Edm.Decimal",
+ nullable = false)
java.math.BigDecimal getWidth();
void setWidth(java.math.BigDecimal _width);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Height",
+ type = "Edm.Decimal",
+ nullable = false)
java.math.BigDecimal getHeight();
void setHeight(java.math.BigDecimal _height);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Depth",
+ type = "Edm.Decimal",
+ nullable = false)
java.math.BigDecimal getDepth();
void setDepth(java.math.BigDecimal _depth);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index 23a4567..c5126ca 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -58,9 +58,9 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getPicture();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getPicture();
- void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamType _picture);
+ void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamValue _picture);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
index 8555414..59161bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
@@ -57,9 +57,9 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getOrderLineStream();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getOrderLineStream();
- void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamType _orderLineStream);
+ void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamValue _orderLineStream);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
index d235dfe..a68e4d5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
@@ -28,14 +28,22 @@ public interface Phone
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "PhoneNumber",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getPhoneNumber();
void setPhoneNumber(java.lang.String _phoneNumber);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Extension",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getExtension();
void setExtension(java.lang.String _extension);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
index e40f16e..484bd00 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
@@ -56,9 +56,9 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getPicture();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getPicture();
- void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamType _picture);
+ void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamValue _picture);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
index b4e0551..ce848b1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java
@@ -25,7 +25,9 @@ import org.apache.olingo.ext.proxy.api.ComplexType;
import org.apache.olingo.ext.proxy.api.EntityCollection;
import org.apache.olingo.ext.proxy.api.EntityType;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import java.io.Serializable;
+import java.io.InputStream;
//CHECKSTYLE:ON (Maven checkstyle)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3")
@@ -57,4 +59,6 @@ public interface DefaultContainer extends PersistenceManager {
<T extends ComplexType, NEC extends ComplexCollection<T>> NEC newComplexCollection(Class<NEC> ref);
<T extends Serializable, NEC extends PrimitiveCollection<T>> NEC newPrimitiveCollection(Class<T> ref);
+
+ EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
index e15eba4..1bf84be 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java
@@ -28,84 +28,132 @@ public interface ContactDetails
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstContacted", type = "Edm.Binary", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "FirstContacted",
+ type = "Edm.Binary",
+ nullable = true)
byte[] getFirstContacted();
void setFirstContacted(byte[] _firstContacted);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted", type = "Edm.DateTimeOffset", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "LastContacted",
+ type = "Edm.DateTimeOffset",
+ nullable = false)
java.sql.Timestamp getLastContacted();
void setLastContacted(java.sql.Timestamp _lastContacted);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted", type = "Edm.DateTime", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Contacted",
+ type = "Edm.DateTime",
+ nullable = false)
java.sql.Timestamp getContacted();
void setContacted(java.sql.Timestamp _contacted);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID", type = "Edm.Guid", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "GUID",
+ type = "Edm.Guid",
+ nullable = false)
java.util.UUID getGUID();
void setGUID(java.util.UUID _gUID);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PreferedContactTime", type = "Edm.Time", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "PreferedContactTime",
+ type = "Edm.Time",
+ nullable = false)
java.math.BigDecimal getPreferedContactTime();
void setPreferedContactTime(java.math.BigDecimal _preferedContactTime);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Byte",
+ type = "Edm.Byte",
+ nullable = false)
java.lang.Short getByte();
void setByte(java.lang.Short _byte);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte", type = "Edm.SByte", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "SignedByte",
+ type = "Edm.SByte",
+ nullable = false)
java.lang.Byte getSignedByte();
void setSignedByte(java.lang.Byte _signedByte);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Double",
+ type = "Edm.Double",
+ nullable = false)
java.lang.Double getDouble();
void setDouble(java.lang.Double _double);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Single",
+ type = "Edm.Single",
+ nullable = false)
java.lang.Float getSingle();
void setSingle(java.lang.Float _single);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short", type = "Edm.Int16", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Short",
+ type = "Edm.Int16",
+ nullable = false)
java.lang.Short getShort();
void setShort(java.lang.Short _short);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int", type = "Edm.Int32", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Int",
+ type = "Edm.Int32",
+ nullable = false)
java.lang.Integer getInt();
void setInt(java.lang.Integer _int);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long", type = "Edm.Int64", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Long",
+ type = "Edm.Int64",
+ nullable = false)
java.lang.Long getLong();
void setLong(java.lang.Long _long);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
index 0c87752..f3a3f85 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java
@@ -25,7 +25,9 @@ import org.apache.olingo.ext.proxy.api.ComplexType;
import org.apache.olingo.ext.proxy.api.EntityCollection;
import org.apache.olingo.ext.proxy.api.EntityType;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import java.io.Serializable;
+import java.io.InputStream;
//CHECKSTYLE:ON (Maven checkstyle)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService")
@@ -83,4 +85,6 @@ public interface TestContext extends PersistenceManager {
<T extends ComplexType, NEC extends ComplexCollection<T>> NEC newComplexCollection(Class<NEC> ref);
<T extends Serializable, NEC extends PrimitiveCollection<T>> NEC newPrimitiveCollection(Class<T> ref);
+
+ EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
index a4bd080..d95cbe8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java
@@ -26,7 +26,9 @@ import org.apache.olingo.ext.proxy.api.ComplexType;
import org.apache.olingo.ext.proxy.api.EntityCollection;
import org.apache.olingo.ext.proxy.api.EntityType;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import java.io.Serializable;
+import java.io.InputStream;
//CHECKSTYLE:ON (Maven checkstyle)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService")
@@ -151,4 +153,6 @@ public interface DefaultContainer extends PersistenceManager {
<T extends ComplexType, NEC extends ComplexCollection<T>> NEC newComplexCollection(Class<NEC> ref);
<T extends Serializable, NEC extends PrimitiveCollection<T>> NEC newPrimitiveCollection(Class<T> ref);
+
+ EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
index 2b049bd..1dca6a7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java
@@ -28,7 +28,11 @@ public interface Aliases
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "AlternativeNames",
+ type = "Edm.String",
+ nullable = false)
org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getAlternativeNames();
void setAlternativeNames(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _alternativeNames);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
index 52b9c08..22e2625 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java
@@ -28,21 +28,33 @@ public interface AuditInfo
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "ModifiedDate",
+ type = "Edm.DateTime",
+ nullable = false)
java.sql.Timestamp getModifiedDate();
void setModifiedDate(java.sql.Timestamp _modifiedDate);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ModifiedBy", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "ModifiedBy",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getModifiedBy();
void setModifiedBy(java.lang.String _modifiedBy);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Concurrency", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Concurrency",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ConcurrencyInfo",
+ nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getConcurrency();
void setConcurrency(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
index 9e80aa2..99f7bf6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java
@@ -59,9 +59,9 @@ public interface BackOrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getOrderLineStream();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getOrderLineStream();
- void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamType _orderLineStream);
+ void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamValue _orderLineStream);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
index 84b26c1..de71571 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java
@@ -59,9 +59,9 @@ public interface BackOrderLine2
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getOrderLineStream();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getOrderLineStream();
- void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamType _orderLineStream);
+ void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamValue _orderLineStream);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
index d94b633..74a5ef7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java
@@ -55,9 +55,9 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getPhoto();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getPhoto();
- void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamType _photo);
+ void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamValue _photo);
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
@@ -78,9 +78,9 @@ public interface Car
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getVideo();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getVideo();
- void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamType _video);
+ void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamValue _video);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
index 0eb7354..56fbd2a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java
@@ -28,21 +28,33 @@ public interface ComplexToCategory
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Term",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getTerm();
void setTerm(java.lang.String _term);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Scheme",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getScheme();
void setScheme(java.lang.String _scheme);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Label",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getLabel();
void setLabel(java.lang.String _label);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
index 5f072bb..8354369 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java
@@ -28,98 +28,154 @@ public interface ComplexWithAllPrimitiveTypes
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Binary", type = "Edm.Binary", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Binary",
+ type = "Edm.Binary",
+ nullable = true)
byte[] getBinary();
void setBinary(byte[] _binary);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Boolean", type = "Edm.Boolean", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Boolean",
+ type = "Edm.Boolean",
+ nullable = false)
java.lang.Boolean getBoolean();
void setBoolean(java.lang.Boolean _boolean);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Byte",
+ type = "Edm.Byte",
+ nullable = false)
java.lang.Short getByte();
void setByte(java.lang.Short _byte);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateTime", type = "Edm.DateTime", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "DateTime",
+ type = "Edm.DateTime",
+ nullable = false)
java.sql.Timestamp getDateTime();
void setDateTime(java.sql.Timestamp _dateTime);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Decimal", type = "Edm.Decimal", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Decimal",
+ type = "Edm.Decimal",
+ nullable = false)
java.math.BigDecimal getDecimal();
void setDecimal(java.math.BigDecimal _decimal);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Double",
+ type = "Edm.Double",
+ nullable = false)
java.lang.Double getDouble();
void setDouble(java.lang.Double _double);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int16", type = "Edm.Int16", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Int16",
+ type = "Edm.Int16",
+ nullable = false)
java.lang.Short getInt16();
void setInt16(java.lang.Short _int16);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int32", type = "Edm.Int32", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Int32",
+ type = "Edm.Int32",
+ nullable = false)
java.lang.Integer getInt32();
void setInt32(java.lang.Integer _int32);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int64", type = "Edm.Int64", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Int64",
+ type = "Edm.Int64",
+ nullable = false)
java.lang.Long getInt64();
void setInt64(java.lang.Long _int64);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SByte", type = "Edm.SByte", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "SByte",
+ type = "Edm.SByte",
+ nullable = false)
java.lang.Byte getSByte();
void setSByte(java.lang.Byte _sByte);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "String", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "String",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getString();
void setString(java.lang.String _string);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Single",
+ type = "Edm.Single",
+ nullable = false)
java.lang.Float getSingle();
void setSingle(java.lang.Float _single);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeographyPoint", type = "Edm.GeographyPoint", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "GeographyPoint",
+ type = "Edm.GeographyPoint",
+ nullable = true)
org.apache.olingo.commons.api.edm.geo.Point getGeographyPoint();
void setGeographyPoint(org.apache.olingo.commons.api.edm.geo.Point _geographyPoint);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeometryPoint", type = "Edm.GeometryPoint", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "GeometryPoint",
+ type = "Edm.GeometryPoint",
+ nullable = true)
org.apache.olingo.commons.api.edm.geo.Point getGeometryPoint();
void setGeometryPoint(org.apache.olingo.commons.api.edm.geo.Point _geometryPoint);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
index ca3a773..6e20706 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java
@@ -28,14 +28,22 @@ public interface ConcurrencyInfo
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Token",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getToken();
void setToken(java.lang.String _token);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "QueriedDateTime",
+ type = "Edm.DateTime",
+ nullable = true)
java.sql.Timestamp getQueriedDateTime();
void setQueriedDateTime(java.sql.Timestamp _queriedDateTime);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
index c325131..40cb586 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java
@@ -28,42 +28,66 @@ public interface ContactDetails
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "EmailBag",
+ type = "Edm.String",
+ nullable = false)
org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getEmailBag();
void setEmailBag(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _emailBag);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "AlternativeNames",
+ type = "Edm.String",
+ nullable = false)
org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> getAlternativeNames();
void setAlternativeNames(org.apache.olingo.ext.proxy.api.PrimitiveCollection<java.lang.String> _alternativeNames);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "ContactAlias",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases",
+ nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias();
void setContactAlias(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "HomePhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone();
void setHomePhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "WorkPhone",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = true)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone();
void setWorkPhone(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "MobilePhoneBag",
+ type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone",
+ nullable = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection getMobilePhoneBag();
void setMobilePhoneBag(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection _mobilePhoneBag);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
index 886ded4..5212c22 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java
@@ -55,9 +55,9 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getThumbnail();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getThumbnail();
- void setThumbnail(org.apache.olingo.ext.proxy.api.EdmStreamType _thumbnail);
+ void setThumbnail(org.apache.olingo.ext.proxy.api.EdmStreamValue _thumbnail);
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video",
@@ -78,9 +78,9 @@ public interface Customer
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getVideo();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getVideo();
- void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamType _video);
+ void setVideo(org.apache.olingo.ext.proxy.api.EdmStreamValue _video);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "CustomerId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
index 98c7a10..d743fb2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java
@@ -28,21 +28,33 @@ public interface Dimensions
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Width", type = "Edm.Decimal", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Width",
+ type = "Edm.Decimal",
+ nullable = false)
java.math.BigDecimal getWidth();
void setWidth(java.math.BigDecimal _width);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Height", type = "Edm.Decimal", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Height",
+ type = "Edm.Decimal",
+ nullable = false)
java.math.BigDecimal getHeight();
void setHeight(java.math.BigDecimal _height);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Depth", type = "Edm.Decimal", nullable = false)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Depth",
+ type = "Edm.Decimal",
+ nullable = false)
java.math.BigDecimal getDepth();
void setDepth(java.math.BigDecimal _depth);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
index f1de800..50fae22 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java
@@ -58,9 +58,9 @@ public interface DiscontinuedProduct
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getPicture();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getPicture();
- void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamType _picture);
+ void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamValue _picture);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
index 51e402c..4a1e581 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java
@@ -56,9 +56,9 @@ public interface OrderLine
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getOrderLineStream();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getOrderLineStream();
- void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamType _orderLineStream);
+ void setOrderLineStream(org.apache.olingo.ext.proxy.api.EdmStreamValue _orderLineStream);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "OrderId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
index 6db36fe..032b6fb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java
@@ -28,14 +28,22 @@ public interface Phone
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PhoneNumber", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "PhoneNumber",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getPhoneNumber();
void setPhoneNumber(java.lang.String _phoneNumber);
- @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Extension", type = "Edm.String", nullable = true)
+
+ @org.apache.olingo.ext.proxy.api.annotations.Property(
+ name = "Extension",
+ type = "Edm.String",
+ nullable = true)
java.lang.String getExtension();
void setExtension(java.lang.String _extension);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
index d2c41ec..233b801 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java
@@ -57,9 +57,9 @@ public interface Product
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getPicture();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getPicture();
- void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamType _picture);
+ void setPicture(org.apache.olingo.ext.proxy.api.EdmStreamValue _picture);
@Key
@org.apache.olingo.ext.proxy.api.annotations.Property(name = "ProductId",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
index b0dbde4..1997287 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertEquals;
@@ -38,7 +39,6 @@ import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-import org.apache.olingo.ext.proxy.commons.EdmStreamTypeImpl;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetailsCollection;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PhoneCollection;
@@ -210,10 +210,20 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase {
service.getContext().detachAll();
- // Delete order ...
+ // (1) Delete by key (see EntityCreateTestITCase)
+ getContainer().getOrders().delete(1105);
+ assertNull(getContainer().getOrders().getByKey(1105));
+
+ service.getContext().detachAll(); // detach to show the second delete case
+
+ // (2) Delete by object (see EntityCreateTestITCase)
getContainer().getOrders().delete(getContainer().getOrders().getByKey(1105));
- actual = getContainer().getOrders().getByKey(1105);
- assertNull(actual);
+ assertNull(getContainer().getOrders().getByKey(1105));
+
+ // (3) Delete by invoking delete method on the object itself
+ service.getContext().detachAll(); // detach to show the third delete case
+ getContainer().getOrders().getByKey(1105).delete();
+ assertNull(getContainer().getOrders().getByKey(1105));
getContainer().flush();
@@ -255,8 +265,7 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase {
final PersonDetail personDetail = dcontainer.getPersonDetails().getByKey(1); // NO HTTP Request
// 1 HTTP Request to add an Edm.Stream property value about MediaEditLink Photo
- personDetail.setPhoto(
- new EdmStreamTypeImpl(new EdmStreamValue("application/octet-stream", IOUtils.toInputStream(random))));
+ personDetail.setPhoto(dcontainer.newEdmStreamValue("application/octet-stream", IOUtils.toInputStream(random)));
dcontainer.flush();
@@ -362,4 +371,9 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase {
// Not supported by the test service BTW generates a single request as expected:
// <service root>/Orders(1)/CustomerForOrder/Emails
}
+
+ @Test
+ public void workingWithSingletons() {
+ assertNotNull(container.getCompany().getVipCustomer().load().getPersonID());
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
index ca1166f..6a74d50 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
index 8e4f87c..bc4b604 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java
index 041d6ec..19bd356 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
index 8779e11..77fb3d1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertNotNull;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
index aaff867..6f05792 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
//CHECKSTYLE:OFF (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
index d2fd6b4..35f7754 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
//CHECKSTYLE:OFF (Maven checkstyle)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
index 6d117e6..a6188cb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertEquals;
@@ -81,7 +82,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final UUID uuid = UUID.fromString("f89dee73-af9f-4cd4-b330-db93c25ff3c7");
final Advertisement adv = getContainer().getAdvertisements().getByKey(uuid);
final String random = RandomStringUtils.random(124, "abcdefghijklmnopqrstuvwxyz");
- adv.uploadStream(new EdmStreamValue("application/octet-stream", IOUtils.toInputStream(random)));
+ adv.uploadStream(getContainer().newEdmStreamValue("application/octet-stream", IOUtils.toInputStream(random)));
getContainer().flush();
assertEquals(random,
IOUtils.toString(getContainer().getAdvertisements().getByKey(uuid).loadStream().getStream()));
@@ -93,7 +94,7 @@ public class MediaEntityTestITCase extends AbstractTestITCase {
final String random = RandomStringUtils.random(124, "abcdefghijklmnopqrstuvwxyz");
final Advertisement adv = getContainer().newEntityInstance(Advertisement.class);
- adv.uploadStream(new EdmStreamValue("application/octet-stream", IOUtils.toInputStream(random)));
+ adv.uploadStream(getContainer().newEdmStreamValue("application/octet-stream", IOUtils.toInputStream(random)));
adv.setAirDate(new Timestamp(Calendar.getInstance().getTimeInMillis()));
getContainer().getAdvertisements().add(adv);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
index 1f70cc9..044b4f7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertEquals;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
index 64b4af8..73ed1cf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java
@@ -26,7 +26,9 @@ import org.apache.olingo.ext.proxy.api.ComplexType;
import org.apache.olingo.ext.proxy.api.EntityCollection;
import org.apache.olingo.ext.proxy.api.EntityType;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import java.io.Serializable;
+import java.io.InputStream;
//CHECKSTYLE:ON (Maven checkstyle)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo")
@@ -73,4 +75,6 @@ public interface DemoService extends PersistenceManager {
<T extends ComplexType, NEC extends ComplexCollection<T>> NEC newComplexCollection(Class<NEC> ref);
<T extends Serializable, NEC extends PrimitiveCollection<T>> NEC newPrimitiveCollection(Class<T> ref);
+
+ EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
index 80305b6..4abf8c8 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java
@@ -170,9 +170,9 @@ public interface PersonDetail
fcNSPrefix = "",
fcNSURI = "",
fcKeepInContent = false)
- org.apache.olingo.ext.proxy.api.EdmStreamType getPhoto();
+ org.apache.olingo.ext.proxy.api.EdmStreamValue getPhoto();
- void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamType _photo);
+ void setPhoto(org.apache.olingo.ext.proxy.api.EdmStreamValue _photo);
@org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Person",
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
index 39dea9d..54f2b36 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java
@@ -25,7 +25,9 @@ import org.apache.olingo.ext.proxy.api.ComplexType;
import org.apache.olingo.ext.proxy.api.EntityCollection;
import org.apache.olingo.ext.proxy.api.EntityType;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
import java.io.Serializable;
+import java.io.InputStream;
//CHECKSTYLE:ON (Maven checkstyle)
@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4")
@@ -56,4 +58,6 @@ public interface DefaultContainer extends PersistenceManager {
<T extends ComplexType, NEC extends ComplexCollection<T>> NEC newComplexCollection(Class<NEC> ref);
<T extends Serializable, NEC extends PrimitiveCollection<T>> NEC newPrimitiveCollection(Class<T> ref);
+
+ EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
deleted file mode 100644
index 25f1d7c..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
-@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "Boss", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Boss extends org.apache.olingo.ext.proxy.api.SingleQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person>,AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
deleted file mode 100644
index 788ab93..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
-@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "Company", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface Company extends org.apache.olingo.ext.proxy.api.SingleQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company>,AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCollection> {
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2822fe60/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
deleted file mode 100644
index ae0bb91..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice;
-
-//CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractSingleton;
-//CHECKSTYLE:ON (Maven checkstyle)
-
-
-
-@org.apache.olingo.ext.proxy.api.annotations.Singleton(name = "DefaultStoredPI", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities")
-public interface DefaultStoredPI extends org.apache.olingo.ext.proxy.api.SingleQuery<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI>,AbstractSingleton<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI, java.lang.Integer, org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection> {
-}