You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/12 10:07:48 UTC
[10/17] Various small fixes and improvements
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
index f0898d5..3d18d0d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface AllSpatialTypes
extends Serializable {
+
@Key
@Property(name = "Id",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
Integer getId();
- void setId(final Integer _id);
+ void setId(final Integer _id);
@Property(name = "Geog",
@@ -105,7 +105,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
Geospatial getGeog();
- void setGeog(final Geospatial _geog);
+ void setGeog(final Geospatial _geog);
@Property(name = "GeogPoint",
@@ -128,7 +128,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
Point getGeogPoint();
- void setGeogPoint(final Point _geogPoint);
+ void setGeogPoint(final Point _geogPoint);
@Property(name = "GeogLine",
@@ -151,7 +151,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
LineString getGeogLine();
- void setGeogLine(final LineString _geogLine);
+ void setGeogLine(final LineString _geogLine);
@Property(name = "GeogPolygon",
@@ -174,7 +174,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
Polygon getGeogPolygon();
- void setGeogPolygon(final Polygon _geogPolygon);
+ void setGeogPolygon(final Polygon _geogPolygon);
@Property(name = "GeogCollection",
@@ -197,7 +197,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
GeospatialCollection getGeogCollection();
- void setGeogCollection(final GeospatialCollection _geogCollection);
+ void setGeogCollection(final GeospatialCollection _geogCollection);
@Property(name = "GeogMultiPoint",
@@ -220,7 +220,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
MultiPoint getGeogMultiPoint();
- void setGeogMultiPoint(final MultiPoint _geogMultiPoint);
+ void setGeogMultiPoint(final MultiPoint _geogMultiPoint);
@Property(name = "GeogMultiLine",
@@ -243,7 +243,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
MultiLineString getGeogMultiLine();
- void setGeogMultiLine(final MultiLineString _geogMultiLine);
+ void setGeogMultiLine(final MultiLineString _geogMultiLine);
@Property(name = "GeogMultiPolygon",
@@ -266,7 +266,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
MultiPolygon getGeogMultiPolygon();
- void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon);
+ void setGeogMultiPolygon(final MultiPolygon _geogMultiPolygon);
@Property(name = "Geom",
@@ -289,7 +289,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
Geospatial getGeom();
- void setGeom(final Geospatial _geom);
+ void setGeom(final Geospatial _geom);
@Property(name = "GeomPoint",
@@ -312,7 +312,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
Point getGeomPoint();
- void setGeomPoint(final Point _geomPoint);
+ void setGeomPoint(final Point _geomPoint);
@Property(name = "GeomLine",
@@ -335,7 +335,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
LineString getGeomLine();
- void setGeomLine(final LineString _geomLine);
+ void setGeomLine(final LineString _geomLine);
@Property(name = "GeomPolygon",
@@ -358,7 +358,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
Polygon getGeomPolygon();
- void setGeomPolygon(final Polygon _geomPolygon);
+ void setGeomPolygon(final Polygon _geomPolygon);
@Property(name = "GeomCollection",
@@ -381,7 +381,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
GeospatialCollection getGeomCollection();
- void setGeomCollection(final GeospatialCollection _geomCollection);
+ void setGeomCollection(final GeospatialCollection _geomCollection);
@Property(name = "GeomMultiPoint",
@@ -404,7 +404,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
MultiPoint getGeomMultiPoint();
- void setGeomMultiPoint(final MultiPoint _geomMultiPoint);
+ void setGeomMultiPoint(final MultiPoint _geomMultiPoint);
@Property(name = "GeomMultiLine",
@@ -427,7 +427,7 @@ public interface AllSpatialTypes
fcKeepInContent = false)
MultiLineString getGeomMultiLine();
- void setGeomMultiLine(final MultiLineString _geomMultiLine);
+ void setGeomMultiLine(final MultiLineString _geomMultiLine);
@Property(name = "GeomMultiPolygon",
@@ -450,9 +450,11 @@ public interface AllSpatialTypes
fcKeepInContent = false)
MultiPolygon getGeomMultiPolygon();
- void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon);
+ void setGeomMultiPolygon(final MultiPolygon _geomMultiPolygon);
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
index 48001b8..df8edbc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 b4f6c39..56b63af 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
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,6 +47,7 @@ import javax.xml.datatype.Duration;
public interface AuditInfo extends Serializable {
+
@Property(name = "ModifiedDate", type = "Edm.DateTime", nullable = false)
Calendar getModifiedDate();
@@ -68,5 +68,7 @@ public interface AuditInfo extends Serializable {
void setConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _concurrency);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newConcurrency();
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 c19ebd4..b257e46 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
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -62,6 +61,7 @@ public interface BackOrderLine
extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderLine {
+
@Property(name = "OrderLineStream",
type = "Edm.Stream",
@@ -83,7 +83,7 @@ public interface BackOrderLine
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(final java.io.InputStream _orderLineStream);
@Key
@Property(name = "OrderId",
@@ -106,7 +106,7 @@ public interface BackOrderLine
fcKeepInContent = false)
Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(final Integer _orderId);
@Key
@Property(name = "ProductId",
@@ -129,7 +129,7 @@ public interface BackOrderLine
fcKeepInContent = false)
Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(final Integer _productId);
@Property(name = "Quantity",
@@ -152,7 +152,7 @@ public interface BackOrderLine
fcKeepInContent = false)
Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(final Integer _quantity);
@Property(name = "ConcurrencyToken",
@@ -175,7 +175,7 @@ public interface BackOrderLine
fcKeepInContent = false)
String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(final String _concurrencyToken);
@@ -200,4 +200,6 @@ public interface BackOrderLine
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 85caf19..6cad5a5 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
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -62,6 +61,7 @@ public interface BackOrderLine2
extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.BackOrderLine {
+
@Property(name = "OrderLineStream",
type = "Edm.Stream",
@@ -83,7 +83,7 @@ public interface BackOrderLine2
fcKeepInContent = false)
java.io.InputStream getOrderLineStream();
- void setOrderLineStream(final java.io.InputStream _orderLineStream);
+ void setOrderLineStream(final java.io.InputStream _orderLineStream);
@Key
@Property(name = "OrderId",
@@ -106,7 +106,7 @@ public interface BackOrderLine2
fcKeepInContent = false)
Integer getOrderId();
- void setOrderId(final Integer _orderId);
+ void setOrderId(final Integer _orderId);
@Key
@Property(name = "ProductId",
@@ -129,7 +129,7 @@ public interface BackOrderLine2
fcKeepInContent = false)
Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(final Integer _productId);
@Property(name = "Quantity",
@@ -152,7 +152,7 @@ public interface BackOrderLine2
fcKeepInContent = false)
Integer getQuantity();
- void setQuantity(final Integer _quantity);
+ void setQuantity(final Integer _quantity);
@Property(name = "ConcurrencyToken",
@@ -175,7 +175,7 @@ public interface BackOrderLine2
fcKeepInContent = false)
String getConcurrencyToken();
- void setConcurrencyToken(final String _concurrencyToken);
+ void setConcurrencyToken(final String _concurrencyToken);
@@ -200,4 +200,6 @@ public interface BackOrderLine2
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
index 257723c..1777b86 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
index 07f93e2..d728be2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 08e86f1..91c9f36 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
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface Car
extends Serializable {
+
@Property(name = "Photo",
type = "Edm.Stream",
@@ -82,7 +82,7 @@ public interface Car
fcKeepInContent = false)
java.io.InputStream getPhoto();
- void setPhoto(final java.io.InputStream _photo);
+ void setPhoto(final java.io.InputStream _photo);
@Property(name = "Video",
@@ -105,7 +105,7 @@ public interface Car
fcKeepInContent = false)
java.io.InputStream getVideo();
- void setVideo(final java.io.InputStream _video);
+ void setVideo(final java.io.InputStream _video);
@Key
@Property(name = "VIN",
@@ -128,7 +128,7 @@ public interface Car
fcKeepInContent = false)
Integer getVIN();
- void setVIN(final Integer _vIN);
+ void setVIN(final Integer _vIN);
@Property(name = "Description",
@@ -151,7 +151,7 @@ public interface Car
fcKeepInContent = false)
String getDescription();
- void setDescription(final String _description);
+ void setDescription(final String _description);
@@ -159,4 +159,6 @@ public interface Car
java.io.InputStream getStream();
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
index 0bb77fd..5288113 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 5c7d216..6f71b0c 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
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,6 +47,7 @@ import javax.xml.datatype.Duration;
public interface ComplexToCategory extends Serializable {
+
@Property(name = "Term", type = "Edm.String", nullable = true)
String getTerm();
@@ -68,4 +68,5 @@ public interface ComplexToCategory extends Serializable {
void setLabel(final String _label);
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 4035852..404db4c 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
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,6 +47,7 @@ import javax.xml.datatype.Duration;
public interface ComplexWithAllPrimitiveTypes extends Serializable {
+
@Property(name = "Binary", type = "Edm.Binary", nullable = true)
byte[] getBinary();
@@ -145,4 +145,5 @@ public interface ComplexWithAllPrimitiveTypes extends Serializable {
void setGeometryPoint(final Point _geometryPoint);
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
index 28319f9..e5bd861 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface Computer
extends Serializable {
+
@Key
@Property(name = "ComputerId",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface Computer
fcKeepInContent = false)
Integer getComputerId();
- void setComputerId(final Integer _computerId);
+ void setComputerId(final Integer _computerId);
@Property(name = "Name",
@@ -105,7 +105,7 @@ public interface Computer
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@@ -123,13 +123,14 @@ public interface Computer
Operations operations();
public interface Operations {
+
@Operation(name = "GetComputer",
- type = OperationType.FUNCTION,
- isComposable = false,
+ type = OperationType.ACTION,
returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(
);
-
}
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
index f7acf0f..745542c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -44,17 +43,4 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface ComputerCollection extends AbstractEntityCollection<Computer> {
- Operations operations();
-
- public interface Operations {
-
- @Operation(name = "GetComputer",
- type = OperationType.FUNCTION,
- isComposable = false,
- returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer")
- org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(
- );
-
-
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
index 57f8382..d31a582 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface ComputerDetail
extends Serializable {
+
@Key
@Property(name = "ComputerDetailId",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface ComputerDetail
fcKeepInContent = false)
Integer getComputerDetailId();
- void setComputerDetailId(final Integer _computerDetailId);
+ void setComputerDetailId(final Integer _computerDetailId);
@Property(name = "Manufacturer",
@@ -105,7 +105,7 @@ public interface ComputerDetail
fcKeepInContent = false)
String getManufacturer();
- void setManufacturer(final String _manufacturer);
+ void setManufacturer(final String _manufacturer);
@Property(name = "Model",
@@ -128,7 +128,7 @@ public interface ComputerDetail
fcKeepInContent = false)
String getModel();
- void setModel(final String _model);
+ void setModel(final String _model);
@Property(name = "Serial",
@@ -151,7 +151,7 @@ public interface ComputerDetail
fcKeepInContent = false)
String getSerial();
- void setSerial(final String _serial);
+ void setSerial(final String _serial);
@Property(name = "SpecificationsBag",
@@ -174,7 +174,7 @@ public interface ComputerDetail
fcKeepInContent = false)
Collection<String> getSpecificationsBag();
- void setSpecificationsBag(final Collection<String> _specificationsBag);
+ void setSpecificationsBag(final Collection<String> _specificationsBag);
@Property(name = "PurchaseDate",
@@ -197,7 +197,7 @@ public interface ComputerDetail
fcKeepInContent = false)
Calendar getPurchaseDate();
- void setPurchaseDate(final Calendar _purchaseDate);
+ void setPurchaseDate(final Calendar _purchaseDate);
@Property(name = "Dimensions",
@@ -220,8 +220,9 @@ public interface ComputerDetail
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
- void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+ void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
+
@@ -239,14 +240,15 @@ public interface ComputerDetail
Operations operations();
public interface Operations {
+
@Operation(name = "ResetComputerDetailsSpecifications",
- type = OperationType.FUNCTION,
- isComposable = false)
+ type = OperationType.ACTION)
void resetComputerDetailsSpecifications(
@Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection<String> specifications,
@Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Calendar purchaseTime
);
-
}
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
index eca299d..940fd47 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -44,18 +43,4 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface ComputerDetailCollection extends AbstractEntityCollection<ComputerDetail> {
- Operations operations();
-
- public interface Operations {
-
- @Operation(name = "ResetComputerDetailsSpecifications",
- type = OperationType.FUNCTION,
- isComposable = false)
- void resetComputerDetailsSpecifications(
- @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) Collection<String> specifications,
- @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) Calendar purchaseTime
- );
-
-
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 8426bfa..2e76f75 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
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,6 +47,7 @@ import javax.xml.datatype.Duration;
public interface ConcurrencyInfo extends Serializable {
+
@Property(name = "Token", type = "Edm.String", nullable = true)
String getToken();
@@ -61,4 +61,5 @@ public interface ConcurrencyInfo extends Serializable {
void setQueriedDateTime(final Calendar _queriedDateTime);
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 4b618f3..0787db4 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
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,6 +47,7 @@ import javax.xml.datatype.Duration;
public interface ContactDetails extends Serializable {
+
@Property(name = "EmailBag", type = "Edm.String", nullable = false)
Collection<String> getEmailBag();
@@ -68,6 +68,7 @@ public interface ContactDetails extends Serializable {
void setContactAlias(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newContactAlias();
+
@Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
@@ -76,6 +77,7 @@ public interface ContactDetails extends Serializable {
void setHomePhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newHomePhone();
+
@Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true)
@@ -84,6 +86,7 @@ public interface ContactDetails extends Serializable {
void setWorkPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newWorkPhone();
+
@Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false)
@@ -92,5 +95,7 @@ public interface ContactDetails extends Serializable {
void setMobilePhoneBag(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone> _mobilePhoneBag);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag();
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
index a020012..72000fe 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -62,6 +61,7 @@ public interface Contractor
extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+
@Key
@Property(name = "PersonId",
type = "Edm.Int32",
@@ -83,7 +83,7 @@ public interface Contractor
fcKeepInContent = false)
Integer getPersonId();
- void setPersonId(final Integer _personId);
+ void setPersonId(final Integer _personId);
@Property(name = "Name",
@@ -106,7 +106,7 @@ public interface Contractor
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@Property(name = "ContratorCompanyId",
@@ -129,7 +129,7 @@ public interface Contractor
fcKeepInContent = false)
Integer getContratorCompanyId();
- void setContratorCompanyId(final Integer _contratorCompanyId);
+ void setContratorCompanyId(final Integer _contratorCompanyId);
@Property(name = "BillingRate",
@@ -152,7 +152,7 @@ public interface Contractor
fcKeepInContent = false)
Integer getBillingRate();
- void setBillingRate(final Integer _billingRate);
+ void setBillingRate(final Integer _billingRate);
@Property(name = "TeamContactPersonId",
@@ -175,7 +175,7 @@ public interface Contractor
fcKeepInContent = false)
Integer getTeamContactPersonId();
- void setTeamContactPersonId(final Integer _teamContactPersonId);
+ void setTeamContactPersonId(final Integer _teamContactPersonId);
@Property(name = "JobDescription",
@@ -198,7 +198,7 @@ public interface Contractor
fcKeepInContent = false)
String getJobDescription();
- void setJobDescription(final String _jobDescription);
+ void setJobDescription(final String _jobDescription);
@@ -213,4 +213,6 @@ public interface Contractor
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
index 79b8e04..f9d2ac1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 9bd8f4d..75dc0cd 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
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface Customer
extends Serializable {
+
@Property(name = "Thumbnail",
type = "Edm.Stream",
@@ -82,7 +82,7 @@ public interface Customer
fcKeepInContent = false)
java.io.InputStream getThumbnail();
- void setThumbnail(final java.io.InputStream _thumbnail);
+ void setThumbnail(final java.io.InputStream _thumbnail);
@Property(name = "Video",
@@ -105,7 +105,7 @@ public interface Customer
fcKeepInContent = false)
java.io.InputStream getVideo();
- void setVideo(final java.io.InputStream _video);
+ void setVideo(final java.io.InputStream _video);
@Key
@Property(name = "CustomerId",
@@ -128,7 +128,7 @@ public interface Customer
fcKeepInContent = false)
Integer getCustomerId();
- void setCustomerId(final Integer _customerId);
+ void setCustomerId(final Integer _customerId);
@Property(name = "Name",
@@ -151,7 +151,7 @@ public interface Customer
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@Property(name = "PrimaryContactInfo",
@@ -174,8 +174,9 @@ public interface Customer
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails getPrimaryContactInfo();
- void setPrimaryContactInfo(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
+ void setPrimaryContactInfo(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails _primaryContactInfo);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newPrimaryContactInfo();
+
@Property(name = "BackupContactInfo",
@@ -198,8 +199,9 @@ public interface Customer
fcKeepInContent = false)
Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> getBackupContactInfo();
- void setBackupContactInfo(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
+ void setBackupContactInfo(final Collection<org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails> _backupContactInfo);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails newBackupContactInfo();
+
@Property(name = "Auditing",
@@ -222,8 +224,9 @@ public interface Customer
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getAuditing();
- void setAuditing(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
+ void setAuditing(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _auditing);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newAuditing();
+
@@ -278,4 +281,6 @@ public interface Customer
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
index 719b889..87f44c2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
index 0c5a7ad..321487b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface CustomerInfo
extends Serializable {
+
@Key
@Property(name = "CustomerInfoId",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface CustomerInfo
fcKeepInContent = false)
Integer getCustomerInfoId();
- void setCustomerInfoId(final Integer _customerInfoId);
+ void setCustomerInfoId(final Integer _customerInfoId);
@Property(name = "Information",
@@ -105,7 +105,7 @@ public interface CustomerInfo
fcKeepInContent = false)
String getInformation();
- void setInformation(final String _information);
+ void setInformation(final String _information);
@@ -113,4 +113,6 @@ public interface CustomerInfo
java.io.InputStream getStream();
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
index 5f1d747..c3cb026 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 5c9d829..5b4bbef 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
@@ -25,7 +25,6 @@ import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,6 +47,7 @@ import javax.xml.datatype.Duration;
public interface Dimensions extends Serializable {
+
@Property(name = "Width", type = "Edm.Decimal", nullable = false)
BigDecimal getWidth();
@@ -68,4 +68,5 @@ public interface Dimensions extends Serializable {
void setDepth(final BigDecimal _depth);
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/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 f5e6a94..9327cbb 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
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -62,6 +61,7 @@ public interface DiscontinuedProduct
extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product {
+
@Property(name = "Picture",
type = "Edm.Stream",
@@ -83,7 +83,7 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
java.io.InputStream getPicture();
- void setPicture(final java.io.InputStream _picture);
+ void setPicture(final java.io.InputStream _picture);
@Key
@Property(name = "ProductId",
@@ -106,7 +106,7 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
Integer getProductId();
- void setProductId(final Integer _productId);
+ void setProductId(final Integer _productId);
@Property(name = "Description",
@@ -129,7 +129,7 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
String getDescription();
- void setDescription(final String _description);
+ void setDescription(final String _description);
@Property(name = "Dimensions",
@@ -152,8 +152,9 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions();
- void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
+ void setDimensions(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions();
+
@Property(name = "BaseConcurrency",
@@ -176,7 +177,7 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
String getBaseConcurrency();
- void setBaseConcurrency(final String _baseConcurrency);
+ void setBaseConcurrency(final String _baseConcurrency);
@Property(name = "ComplexConcurrency",
@@ -199,8 +200,9 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo getComplexConcurrency();
- void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
+ void setComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo _complexConcurrency);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo newComplexConcurrency();
+
@Property(name = "NestedComplexConcurrency",
@@ -223,8 +225,9 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo getNestedComplexConcurrency();
- void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
+ void setNestedComplexConcurrency(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo _nestedComplexConcurrency);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AuditInfo newNestedComplexConcurrency();
+
@Property(name = "Discontinued",
@@ -247,7 +250,7 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
Calendar getDiscontinued();
- void setDiscontinued(final Calendar _discontinued);
+ void setDiscontinued(final Calendar _discontinued);
@Property(name = "ReplacementProductId",
@@ -270,7 +273,7 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
Integer getReplacementProductId();
- void setReplacementProductId(final Integer _replacementProductId);
+ void setReplacementProductId(final Integer _replacementProductId);
@Property(name = "DiscontinuedPhone",
@@ -293,8 +296,9 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone getDiscontinuedPhone();
- void setDiscontinuedPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
+ void setDiscontinuedPhone(final org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone _discontinuedPhone);
org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone newDiscontinuedPhone();
+
@Property(name = "ChildConcurrencyToken",
@@ -317,7 +321,7 @@ public interface DiscontinuedProduct
fcKeepInContent = false)
String getChildConcurrencyToken();
- void setChildConcurrencyToken(final String _childConcurrencyToken);
+ void setChildConcurrencyToken(final String _childConcurrencyToken);
@@ -362,4 +366,6 @@ public interface DiscontinuedProduct
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
index 5f51306..0feb751 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
index a4e755a..fcdc8f5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface Driver
extends Serializable {
+
@Key
@Property(name = "Name",
type = "Edm.String",
@@ -82,7 +82,7 @@ public interface Driver
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@Property(name = "BirthDate",
@@ -105,7 +105,7 @@ public interface Driver
fcKeepInContent = false)
Calendar getBirthDate();
- void setBirthDate(final Calendar _birthDate);
+ void setBirthDate(final Calendar _birthDate);
@@ -120,4 +120,6 @@ public interface Driver
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
index 896323e..3673a0f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
index 935119f..b2d2475 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -62,6 +61,7 @@ public interface Employee
extends org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person {
+
@Key
@Property(name = "PersonId",
type = "Edm.Int32",
@@ -83,7 +83,7 @@ public interface Employee
fcKeepInContent = false)
Integer getPersonId();
- void setPersonId(final Integer _personId);
+ void setPersonId(final Integer _personId);
@Property(name = "Name",
@@ -106,7 +106,7 @@ public interface Employee
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@Property(name = "ManagersPersonId",
@@ -129,7 +129,7 @@ public interface Employee
fcKeepInContent = false)
Integer getManagersPersonId();
- void setManagersPersonId(final Integer _managersPersonId);
+ void setManagersPersonId(final Integer _managersPersonId);
@Property(name = "Salary",
@@ -152,7 +152,7 @@ public interface Employee
fcKeepInContent = false)
Integer getSalary();
- void setSalary(final Integer _salary);
+ void setSalary(final Integer _salary);
@Property(name = "Title",
@@ -175,7 +175,7 @@ public interface Employee
fcKeepInContent = false)
String getTitle();
- void setTitle(final String _title);
+ void setTitle(final String _title);
@@ -203,12 +203,13 @@ public interface Employee
Operations operations();
public interface Operations {
+
@Operation(name = "Sack",
- type = OperationType.FUNCTION,
- isComposable = false)
+ type = OperationType.ACTION)
void sack(
);
-
}
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
index e239f17..9c0c22f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -48,12 +47,12 @@ public interface EmployeeCollection extends AbstractEntityCollection<Employee> {
public interface Operations {
- @Operation(name = "Sack",
- type = OperationType.FUNCTION,
- isComposable = false)
- void sack(
+
+ @Operation(name = "IncreaseSalaries",
+ type = OperationType.ACTION)
+ void increaseSalaries(
+ @Parameter(name = "n", type = "Edm.Int32", nullable = false) Integer n
);
-
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
index d7f5bda..4f7570b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface LastLogin
extends Serializable {
+
@Key
@Property(name = "Username",
type = "Edm.String",
@@ -82,7 +82,7 @@ public interface LastLogin
fcKeepInContent = false)
String getUsername();
- void setUsername(final String _username);
+ void setUsername(final String _username);
@Property(name = "LoggedIn",
@@ -105,7 +105,7 @@ public interface LastLogin
fcKeepInContent = false)
Calendar getLoggedIn();
- void setLoggedIn(final Calendar _loggedIn);
+ void setLoggedIn(final Calendar _loggedIn);
@Property(name = "LoggedOut",
@@ -128,7 +128,7 @@ public interface LastLogin
fcKeepInContent = false)
Calendar getLoggedOut();
- void setLoggedOut(final Calendar _loggedOut);
+ void setLoggedOut(final Calendar _loggedOut);
@Property(name = "Duration",
@@ -151,7 +151,7 @@ public interface LastLogin
fcKeepInContent = false)
Duration getDuration();
- void setDuration(final Duration _duration);
+ void setDuration(final Duration _duration);
@@ -166,4 +166,6 @@ public interface LastLogin
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
index f4e0b62..ab132b2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
index e6318f4..c3ee9d9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface License
extends Serializable {
+
@Key
@Property(name = "Name",
type = "Edm.String",
@@ -82,7 +82,7 @@ public interface License
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@Property(name = "LicenseNumber",
@@ -105,7 +105,7 @@ public interface License
fcKeepInContent = false)
String getLicenseNumber();
- void setLicenseNumber(final String _licenseNumber);
+ void setLicenseNumber(final String _licenseNumber);
@Property(name = "LicenseClass",
@@ -128,7 +128,7 @@ public interface License
fcKeepInContent = false)
String getLicenseClass();
- void setLicenseClass(final String _licenseClass);
+ void setLicenseClass(final String _licenseClass);
@Property(name = "Restrictions",
@@ -151,7 +151,7 @@ public interface License
fcKeepInContent = false)
String getRestrictions();
- void setRestrictions(final String _restrictions);
+ void setRestrictions(final String _restrictions);
@Property(name = "ExpirationDate",
@@ -174,7 +174,7 @@ public interface License
fcKeepInContent = false)
Calendar getExpirationDate();
- void setExpirationDate(final Calendar _expirationDate);
+ void setExpirationDate(final Calendar _expirationDate);
@@ -189,4 +189,6 @@ public interface License
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
index 4ae6c8d..c8cc61f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
index f08e828..e5f51bb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*;
import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*;
-// EdmSimpleType property imports
import org.apache.olingo.commons.api.edm.geo.Geospatial;
import org.apache.olingo.commons.api.edm.geo.GeospatialCollection;
import org.apache.olingo.commons.api.edm.geo.LineString;
@@ -61,6 +60,7 @@ public interface Login
extends Serializable {
+
@Key
@Property(name = "Username",
type = "Edm.String",
@@ -82,7 +82,7 @@ public interface Login
fcKeepInContent = false)
String getUsername();
- void setUsername(final String _username);
+ void setUsername(final String _username);
@Property(name = "CustomerId",
@@ -105,7 +105,7 @@ public interface Login
fcKeepInContent = false)
Integer getCustomerId();
- void setCustomerId(final Integer _customerId);
+ void setCustomerId(final Integer _customerId);
@@ -160,4 +160,6 @@ public interface Login
+
+
}