You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/05/12 10:39:15 UTC
[40/50] [abbrv] 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
index 69dc4bf..b9318fc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 PaymentInstrument
extends Serializable {
+
@Key
@Property(name = "PaymentInstrumentID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface PaymentInstrument
fcKeepInContent = false)
Integer getPaymentInstrumentID();
- void setPaymentInstrumentID(final Integer _paymentInstrumentID);
+ void setPaymentInstrumentID(final Integer _paymentInstrumentID);
@Property(name = "FriendlyName",
@@ -105,7 +105,7 @@ public interface PaymentInstrument
fcKeepInContent = false)
String getFriendlyName();
- void setFriendlyName(final String _friendlyName);
+ void setFriendlyName(final String _friendlyName);
@Property(name = "CreatedDate",
@@ -128,7 +128,7 @@ public interface PaymentInstrument
fcKeepInContent = false)
Calendar getCreatedDate();
- void setCreatedDate(final Calendar _createdDate);
+ void setCreatedDate(final Calendar _createdDate);
@@ -163,4 +163,6 @@ public interface PaymentInstrument
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
index aa35780..878a3ff 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
index d67f217..03c48d1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 Person
extends Serializable {
+
@Key
@Property(name = "PersonID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface Person
fcKeepInContent = false)
Integer getPersonID();
- void setPersonID(final Integer _personID);
+ void setPersonID(final Integer _personID);
@Property(name = "FirstName",
@@ -105,7 +105,7 @@ public interface Person
fcKeepInContent = false)
String getFirstName();
- void setFirstName(final String _firstName);
+ void setFirstName(final String _firstName);
@Property(name = "LastName",
@@ -128,7 +128,7 @@ public interface Person
fcKeepInContent = false)
String getLastName();
- void setLastName(final String _lastName);
+ void setLastName(final String _lastName);
@Property(name = "MiddleName",
@@ -151,7 +151,7 @@ public interface Person
fcKeepInContent = false)
String getMiddleName();
- void setMiddleName(final String _middleName);
+ void setMiddleName(final String _middleName);
@Property(name = "HomeAddress",
@@ -174,8 +174,9 @@ public interface Person
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getHomeAddress();
- void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
+ void setHomeAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress);
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newHomeAddress();
+
@Property(name = "Home",
@@ -198,7 +199,7 @@ public interface Person
fcKeepInContent = false)
Point getHome();
- void setHome(final Point _home);
+ void setHome(final Point _home);
@Property(name = "Numbers",
@@ -221,7 +222,7 @@ public interface Person
fcKeepInContent = false)
Collection<String> getNumbers();
- void setNumbers(final Collection<String> _numbers);
+ void setNumbers(final Collection<String> _numbers);
@Property(name = "Emails",
@@ -244,7 +245,7 @@ public interface Person
fcKeepInContent = false)
Collection<String> getEmails();
- void setEmails(final Collection<String> _emails);
+ void setEmails(final Collection<String> _emails);
@@ -279,4 +280,6 @@ public interface Person
);
}
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
index 84e4f5b..778e8cc 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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,25 +43,4 @@ import java.util.Calendar;
import javax.xml.datatype.Duration;
public interface PersonCollection extends AbstractEntityCollection<Person> {
- Operations operations();
-
- public interface Operations {
-
- @Operation(name = "GetHomeAddress",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress getHomeAddress(
- );
-
-
- @Operation(name = "ResetAddress",
- type = OperationType.ACTION,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person resetAddress(
- @Parameter(name = "addresses", type = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)", nullable = false) Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address> addresses,
- @Parameter(name = "index", type = "Edm.Int32", nullable = false) Integer index
- );
-
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
index b087931..043f9c5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 Product
extends Serializable {
+
@Key
@Property(name = "ProductID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface Product
fcKeepInContent = false)
Integer getProductID();
- void setProductID(final Integer _productID);
+ void setProductID(final Integer _productID);
@Property(name = "Name",
@@ -105,7 +105,7 @@ public interface Product
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@Property(name = "QuantityPerUnit",
@@ -128,7 +128,7 @@ public interface Product
fcKeepInContent = false)
String getQuantityPerUnit();
- void setQuantityPerUnit(final String _quantityPerUnit);
+ void setQuantityPerUnit(final String _quantityPerUnit);
@Property(name = "UnitPrice",
@@ -151,7 +151,7 @@ public interface Product
fcKeepInContent = false)
Float getUnitPrice();
- void setUnitPrice(final Float _unitPrice);
+ void setUnitPrice(final Float _unitPrice);
@Property(name = "QuantityInStock",
@@ -174,7 +174,7 @@ public interface Product
fcKeepInContent = false)
Integer getQuantityInStock();
- void setQuantityInStock(final Integer _quantityInStock);
+ void setQuantityInStock(final Integer _quantityInStock);
@Property(name = "Discontinued",
@@ -197,7 +197,7 @@ public interface Product
fcKeepInContent = false)
Boolean getDiscontinued();
- void setDiscontinued(final Boolean _discontinued);
+ void setDiscontinued(final Boolean _discontinued);
@Property(name = "UserAccess",
@@ -220,7 +220,7 @@ public interface Product
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel getUserAccess();
- void setUserAccess(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess);
+ void setUserAccess(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess);
@Property(name = "SkinColor",
@@ -243,7 +243,7 @@ public interface Product
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getSkinColor();
- void setSkinColor(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor);
+ void setSkinColor(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor);
@Property(name = "CoverColors",
@@ -266,7 +266,7 @@ public interface Product
fcKeepInContent = false)
Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> getCoverColors();
- void setCoverColors(final Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> _coverColors);
+ void setCoverColors(final Collection<org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color> _coverColors);
@@ -301,4 +301,6 @@ public interface Product
);
}
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
index 60f7c89..88cd63d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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,20 +47,12 @@ public interface ProductCollection extends AbstractEntityCollection<Product> {
public interface Operations {
- @Operation(name = "GetProductDetails",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection getProductDetails(
- @Parameter(name = "count", type = "Edm.Int32", nullable = true) Integer count
- );
-
- @Operation(name = "AddAccessRight",
+ @Operation(name = "Discount",
type = OperationType.ACTION,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel addAccessRight(
- @Parameter(name = "accessRight", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = true) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessRight
+ returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)")
+ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection discount(
+ @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) Integer percentage
);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
index 73183cb..8e847ea 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 ProductDetail
extends Serializable {
+
@Key
@Property(name = "ProductID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface ProductDetail
fcKeepInContent = false)
Integer getProductID();
- void setProductID(final Integer _productID);
+ void setProductID(final Integer _productID);
@Key
@Property(name = "ProductDetailID",
@@ -105,7 +105,7 @@ public interface ProductDetail
fcKeepInContent = false)
Integer getProductDetailID();
- void setProductDetailID(final Integer _productDetailID);
+ void setProductDetailID(final Integer _productDetailID);
@Property(name = "ProductName",
@@ -128,7 +128,7 @@ public interface ProductDetail
fcKeepInContent = false)
String getProductName();
- void setProductName(final String _productName);
+ void setProductName(final String _productName);
@Property(name = "Description",
@@ -151,7 +151,7 @@ public interface ProductDetail
fcKeepInContent = false)
String getDescription();
- void setDescription(final String _description);
+ void setDescription(final String _description);
@@ -188,4 +188,6 @@ public interface ProductDetail
}
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
index 7f96191..31b8c1b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 ProductDetailCollection extends AbstractEntityCollection<ProductDetail> {
- Operations operations();
-
- public interface Operations {
-
- @Operation(name = "GetRelatedProduct",
- type = OperationType.FUNCTION,
- isComposable = true,
- returnType = "Microsoft.Test.OData.Services.ODataWCFService.Product")
- org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product getRelatedProduct(
- );
-
-
- }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
index 47949e8..713ba99 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java
@@ -30,7 +30,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
index 61a0cf7..221cdf5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 ProductReview
extends Serializable {
+
@Key
@Property(name = "ProductID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface ProductReview
fcKeepInContent = false)
Integer getProductID();
- void setProductID(final Integer _productID);
+ void setProductID(final Integer _productID);
@Key
@Property(name = "ProductDetailID",
@@ -105,7 +105,7 @@ public interface ProductReview
fcKeepInContent = false)
Integer getProductDetailID();
- void setProductDetailID(final Integer _productDetailID);
+ void setProductDetailID(final Integer _productDetailID);
@Key
@Property(name = "ReviewTitle",
@@ -128,7 +128,7 @@ public interface ProductReview
fcKeepInContent = false)
String getReviewTitle();
- void setReviewTitle(final String _reviewTitle);
+ void setReviewTitle(final String _reviewTitle);
@Key
@Property(name = "RevisionID",
@@ -151,7 +151,7 @@ public interface ProductReview
fcKeepInContent = false)
Integer getRevisionID();
- void setRevisionID(final Integer _revisionID);
+ void setRevisionID(final Integer _revisionID);
@Property(name = "Comment",
@@ -174,7 +174,7 @@ public interface ProductReview
fcKeepInContent = false)
String getComment();
- void setComment(final String _comment);
+ void setComment(final String _comment);
@Property(name = "Author",
@@ -197,9 +197,11 @@ public interface ProductReview
fcKeepInContent = false)
String getAuthor();
- void setAuthor(final String _author);
+ void setAuthor(final String _author);
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
index a9d6eab..9825a70 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
index a9790c1..601b574 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java
@@ -30,7 +30,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
index 5612e20..f56fbd6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 PublicCompany
extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company {
+
@Key
@Property(name = "CompanyID",
type = "Edm.Int32",
@@ -83,7 +83,7 @@ public interface PublicCompany
fcKeepInContent = false)
Integer getCompanyID();
- void setCompanyID(final Integer _companyID);
+ void setCompanyID(final Integer _companyID);
@Property(name = "CompanyCategory",
@@ -106,7 +106,7 @@ public interface PublicCompany
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory getCompanyCategory();
- void setCompanyCategory(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
+ void setCompanyCategory(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory);
@Property(name = "Revenue",
@@ -129,7 +129,7 @@ public interface PublicCompany
fcKeepInContent = false)
Long getRevenue();
- void setRevenue(final Long _revenue);
+ void setRevenue(final Long _revenue);
@Property(name = "Name",
@@ -152,7 +152,7 @@ public interface PublicCompany
fcKeepInContent = false)
String getName();
- void setName(final String _name);
+ void setName(final String _name);
@Property(name = "Address",
@@ -175,8 +175,9 @@ public interface PublicCompany
fcKeepInContent = false)
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress();
- void setAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address);
+ void setAddress(final org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address);
org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address newAddress();
+
@Property(name = "StockExchange",
@@ -199,7 +200,7 @@ public interface PublicCompany
fcKeepInContent = false)
String getStockExchange();
- void setStockExchange(final String _stockExchange);
+ void setStockExchange(final String _stockExchange);
@@ -274,4 +275,6 @@ public interface PublicCompany
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
index 8b6cf9d..b90e82f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
index f776e62..7f93e51 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 Statement
extends Serializable {
+
@Key
@Property(name = "StatementID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface Statement
fcKeepInContent = false)
Integer getStatementID();
- void setStatementID(final Integer _statementID);
+ void setStatementID(final Integer _statementID);
@Property(name = "TransactionType",
@@ -105,7 +105,7 @@ public interface Statement
fcKeepInContent = false)
String getTransactionType();
- void setTransactionType(final String _transactionType);
+ void setTransactionType(final String _transactionType);
@Property(name = "TransactionDescription",
@@ -128,7 +128,7 @@ public interface Statement
fcKeepInContent = false)
String getTransactionDescription();
- void setTransactionDescription(final String _transactionDescription);
+ void setTransactionDescription(final String _transactionDescription);
@Property(name = "Amount",
@@ -151,9 +151,11 @@ public interface Statement
fcKeepInContent = false)
Double getAmount();
- void setAmount(final Double _amount);
+ void setAmount(final Double _amount);
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
index 4cb03c7..2f4c0a6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
index 524f024..aed937b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 StoredPI
extends Serializable {
+
@Key
@Property(name = "StoredPIID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface StoredPI
fcKeepInContent = false)
Integer getStoredPIID();
- void setStoredPIID(final Integer _storedPIID);
+ void setStoredPIID(final Integer _storedPIID);
@Property(name = "PIName",
@@ -105,7 +105,7 @@ public interface StoredPI
fcKeepInContent = false)
String getPIName();
- void setPIName(final String _pIName);
+ void setPIName(final String _pIName);
@Property(name = "PIType",
@@ -128,7 +128,7 @@ public interface StoredPI
fcKeepInContent = false)
String getPIType();
- void setPIType(final String _pIType);
+ void setPIType(final String _pIType);
@Property(name = "CreatedDate",
@@ -151,9 +151,11 @@ public interface StoredPI
fcKeepInContent = false)
Calendar getCreatedDate();
- void setCreatedDate(final Calendar _createdDate);
+ void setCreatedDate(final Calendar _createdDate);
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
index 171b1bf..ba7ab8f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
index eb4abb5..5c172cf 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java
@@ -34,7 +34,6 @@ import org.apache.olingo.client.api.edm.ConcurrencyMode;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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 Subscription
extends Serializable {
+
@Key
@Property(name = "SubscriptionID",
type = "Edm.Int32",
@@ -82,7 +82,7 @@ public interface Subscription
fcKeepInContent = false)
Integer getSubscriptionID();
- void setSubscriptionID(final Integer _subscriptionID);
+ void setSubscriptionID(final Integer _subscriptionID);
@Property(name = "TemplateGuid",
@@ -105,7 +105,7 @@ public interface Subscription
fcKeepInContent = false)
String getTemplateGuid();
- void setTemplateGuid(final String _templateGuid);
+ void setTemplateGuid(final String _templateGuid);
@Property(name = "Title",
@@ -128,7 +128,7 @@ public interface Subscription
fcKeepInContent = false)
String getTitle();
- void setTitle(final String _title);
+ void setTitle(final String _title);
@Property(name = "Category",
@@ -151,7 +151,7 @@ public interface Subscription
fcKeepInContent = false)
String getCategory();
- void setCategory(final String _category);
+ void setCategory(final String _category);
@Property(name = "CreatedDate",
@@ -174,9 +174,11 @@ public interface Subscription
fcKeepInContent = false)
Calendar getCreatedDate();
- void setCreatedDate(final Calendar _createdDate);
+ void setCreatedDate(final Calendar _createdDate);
+
+
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
index fccaadc..08393e7 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java
@@ -26,7 +26,6 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*;
import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*;
-// 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/v4/AbstractTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
index 7fe0837..c54e309 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
@@ -134,7 +134,11 @@ public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
assertNotNull(created);
assertEquals(2, created.getProperty("OrderShelfLifes").getCollectionValue().size());
- final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(created.getEditLink());
+ final URI deleteURI = created.getEditLink() == null
+ ? getClient().getURIBuilder(testStaticServiceRootURL).
+ appendEntitySetSegment("Orders").appendKeySegment(id).build()
+ : created.getEditLink();
+ final ODataDeleteRequest deleteReq = getClient().getCUDRequestFactory().getDeleteRequest(deleteURI);
final ODataDeleteResponse deleteRes = deleteReq.execute();
assertEquals(204, deleteRes.getStatusCode());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
index 3e66e1d..060351e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java
@@ -130,7 +130,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase {
newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Blue")));
product.getProperties().add(getClient().getObjectFactory().newCollectionProperty("CoverColors",
getClient().getObjectFactory().
- newCollectionValue("Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)")));
+ newCollectionValue("Microsoft.Test.OData.Services.ODataWCFService.ProductDetail")));
product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory().
newEnumValue("Microsoft.Test.OData.Services.ODataWCFService.Color", "Green"));
product.getProperty("CoverColors").getCollectionValue().add(getClient().getObjectFactory().
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
index b012485..ec82cca 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
@@ -53,7 +53,7 @@ import org.junit.Test;
*/
public class EntityRetrieveTestITCase extends AbstractTestITCase {
- private void withInlineEntry(final ODataClient client, final ODataPubFormat format) {
+ private void withInlineEntity(final ODataClient client, final ODataPubFormat format) {
final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customers").appendKeySegment(1).expand("Company");
@@ -68,10 +68,10 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
assertEquals("Microsoft.Test.OData.Services.ODataWCFService.Customer", entity.getTypeName().toString());
assertTrue(entity.getProperty("Home").hasPrimitiveValue());
assertEquals("Edm.GeographyPoint", entity.getProperty("Home").getPrimitiveValue().getTypeName());
- assertEquals(testStaticServiceRootURL + "/Customers(1)", entity.getEditLink().toASCIIString());
// In JSON with minimal metadata, links are not provided
if (format == ODataPubFormat.ATOM || format == ODataPubFormat.JSON_FULL_METADATA) {
+ assertEquals(testStaticServiceRootURL + "/Customers(1)", entity.getEditLink().toASCIIString());
assertEquals(3, entity.getNavigationLinks().size());
if (ODataPubFormat.ATOM == format) {
@@ -109,21 +109,21 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
}
@Test
- public void withInlineEntryFromAtom() {
- withInlineEntry(client, ODataPubFormat.ATOM);
+ public void withInlineEntityFromAtom() {
+ withInlineEntity(client, ODataPubFormat.ATOM);
}
@Test
- public void withInlineEntryFromFullJSON() {
- withInlineEntry(client, ODataPubFormat.JSON_FULL_METADATA);
+ public void withInlineEntityFromFullJSON() {
+ withInlineEntity(client, ODataPubFormat.JSON_FULL_METADATA);
}
@Test
- public void withInlineEntryFromJSON() {
- withInlineEntry(edmClient, ODataPubFormat.JSON);
+ public void withInlineEntityFromJSON() {
+ withInlineEntity(edmClient, ODataPubFormat.JSON);
}
- private void withInlineFeed(final ODataClient client, final ODataPubFormat format) {
+ private void withInlineEntitySet(final ODataClient client, final ODataPubFormat format) {
final URIBuilder uriBuilder = client.getURIBuilder(testStaticServiceRootURL).
appendEntitySetSegment("Customers").appendKeySegment(1).expand("Orders");
@@ -152,18 +152,18 @@ public class EntityRetrieveTestITCase extends AbstractTestITCase {
}
@Test
- public void withInlineFeedFromAtom() {
- withInlineFeed(client, ODataPubFormat.ATOM);
+ public void withInlineEntitySetFromAtom() {
+ withInlineEntitySet(client, ODataPubFormat.ATOM);
}
@Test
- public void withInlineFeedFromFullJSON() {
- withInlineFeed(client, ODataPubFormat.JSON_FULL_METADATA);
+ public void withInlineEntitySetFromFullJSON() {
+ withInlineEntitySet(client, ODataPubFormat.JSON_FULL_METADATA);
}
@Test
- public void withInlineFeedFromJSON() {
- withInlineFeed(edmClient, ODataPubFormat.JSON);
+ public void withInlineEntitySetFromJSON() {
+ withInlineEntitySet(edmClient, ODataPubFormat.JSON);
}
private void rawRequest(final ODataPubFormat format) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
index 37298b2..7ae5eda 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
@@ -55,8 +55,11 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
final ODataEntity entity = res.getBody();
assertNotNull(entity);
- assertFalse(entity.getEditLink().toASCIIString().contains("("));
- assertFalse(entity.getEditLink().toASCIIString().contains(")"));
+ // In JSON with minimal metadata, links are not provided
+ if (format == ODataPubFormat.ATOM || format == ODataPubFormat.JSON_FULL_METADATA) {
+ assertFalse(entity.getEditLink().toASCIIString().contains("("));
+ assertFalse(entity.getEditLink().toASCIIString().contains(")"));
+ }
}
@Test
@@ -76,7 +79,7 @@ public class KeyAsSegmentTestITCase extends AbstractTestITCase {
@Test
public void jsonCreateAndDelete() {
- createAndDeleteOrder(ODataPubFormat.JSON, 1001);
+ createAndDeleteOrder(ODataPubFormat.JSON_FULL_METADATA, 1001);
}
private void update(final ODataPubFormat format) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
index f49f50b..01f5a7c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
@@ -139,8 +139,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Single",
getClient().getObjectFactory().newPrimitiveValueBuilder().buildSingle(Float.MAX_VALUE)));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Short",
- getClient().getObjectFactory().newPrimitiveValueBuilder().
- setType(EdmPrimitiveTypeKind.Int16).setValue(Short.MAX_VALUE).build()));
+ getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt16(Short.MAX_VALUE)));
contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("Int",
getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(Integer.MAX_VALUE)));
getClient().getBinder().add(rowIndex,
@@ -157,12 +156,9 @@ public class OpenTypeTestITCase extends AbstractTestITCase {
appendEntitySetSegment("RowIndex").appendKeySegment(id);
rowIndex = read(format, builder.build());
assertNotNull(rowIndex);
- assertEquals(EdmPrimitiveTypeKind.Int32,
- rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind());
- assertEquals(EdmPrimitiveTypeKind.String,
- rowIndex.getProperty("aString").getPrimitiveValue().getTypeKind());
- assertEquals(EdmPrimitiveTypeKind.Boolean,
- rowIndex.getProperty("aBoolean").getPrimitiveValue().getTypeKind());
+ assertEquals(EdmPrimitiveTypeKind.Int32, rowIndex.getProperty("Id").getPrimitiveValue().getTypeKind());
+ assertEquals(EdmPrimitiveTypeKind.String, rowIndex.getProperty("aString").getPrimitiveValue().getTypeKind());
+ assertEquals(EdmPrimitiveTypeKind.Boolean, rowIndex.getProperty("aBoolean").getPrimitiveValue().getTypeKind());
assertTrue(rowIndex.getProperty("aDouble").hasPrimitiveValue());
assertTrue(rowIndex.getProperty("aByte").hasPrimitiveValue());
assertTrue(rowIndex.getProperty("aDate").hasPrimitiveValue());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
index e7bdfd0..3fb155d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
@@ -393,12 +393,12 @@ public class EdmClientImpl extends AbstractEdm {
} else {
for (EntityContainer entityContainer : schema.getEntityContainers()) {
@SuppressWarnings("unchecked")
- final List<FunctionImport> functionImports = (List<FunctionImport>) entityContainer.
- getFunctionImports(functionName.getName());
+ final List<FunctionImport> functionImports =
+ (List<FunctionImport>) entityContainer.getFunctionImports(functionName.getName());
boolean found = false;
for (final Iterator<FunctionImport> itor = functionImports.iterator(); itor.hasNext() && !found;) {
final FunctionImport functionImport = itor.next();
- if (!FunctionImportUtils.canProxyFunction(functionImport) && functionImport.isBindable()) {
+ if (FunctionImportUtils.canProxyFunction(functionImport) && functionImport.isBindable()) {
final EdmTypeInfo boundParam = new EdmTypeInfo.Builder().setEdm(this).
setTypeExpression(functionImport.getParameters().get(0).getType()).build();
if (bindingParameterTypeName.equals(boundParam.getFullQualifiedName())
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
index 61e5267..70009a5 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
@@ -34,7 +34,9 @@ import org.apache.olingo.client.api.edm.xml.v4.Annotations;
import org.apache.olingo.client.api.edm.xml.v4.Function;
import org.apache.olingo.client.api.edm.xml.v4.Term;
import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition;
+import org.apache.olingo.client.core.edm.v3.EdmActionProxy;
import org.apache.olingo.client.core.edm.v3.EdmFunctionProxy;
+import org.apache.olingo.client.core.edm.v3.FunctionImportUtils;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAction;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
@@ -186,6 +188,20 @@ public class EdmSchemaImpl extends AbstractEdmSchema {
actions.add(EdmActionImpl.getInstance(edm, new FullQualifiedName(namespace, action.getName()), action));
}
}
+ } else {
+ for (EntityContainer providerContainer : schema.getEntityContainers()) {
+ @SuppressWarnings("unchecked")
+ final List<FunctionImport> providerFunctions = (List<FunctionImport>) providerContainer.getFunctionImports();
+ if (providerFunctions != null) {
+ for (FunctionImport functionImport : providerFunctions) {
+ if (!FunctionImportUtils.canProxyFunction(functionImport)) {
+ actions.add(EdmActionProxy.getInstance(edm,
+ new FullQualifiedName(namespace, functionImport.getName()), functionImport));
+ }
+ }
+ }
+
+ }
}
return actions;
}
@@ -207,9 +223,11 @@ public class EdmSchemaImpl extends AbstractEdmSchema {
@SuppressWarnings("unchecked")
final List<FunctionImport> providerFunctions = (List<FunctionImport>) providerContainer.getFunctionImports();
if (providerFunctions != null) {
- for (FunctionImport function : providerFunctions) {
- functions.add(
- EdmFunctionProxy.getInstance(edm, new FullQualifiedName(namespace, function.getName()), function));
+ for (FunctionImport functionImport : providerFunctions) {
+ if (FunctionImportUtils.canProxyFunction(functionImport)) {
+ functions.add(EdmFunctionProxy.getInstance(edm,
+ new FullQualifiedName(namespace, functionImport.getName()), functionImport));
+ }
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java
index 9410bb5..477fc0d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java
@@ -68,14 +68,16 @@ public class EdmOperationProxy extends AbstractEdmOperation {
@Override
public FullQualifiedName getBindingParameterTypeFqn() {
- //Not relevant for V3
- return null;
+ return getParameterNames().isEmpty()
+ ? null
+ : getParameter(getParameterNames().get(0)).getType().getFullQualifiedName();
}
@Override
public Boolean isBindingParameterTypeCollection() {
- //Not relevant for V3
- return null;
+ return getParameterNames().isEmpty()
+ ? false
+ : getParameter(getParameterNames().get(0)).isCollection();
}
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java
index f6bcdb9..ecd261c 100644
--- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java
+++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java
@@ -113,6 +113,35 @@ public class MetadataTest extends AbstractTest {
assertTrue(sack.isBound());
assertEquals(1, sack.getParameterNames().size());
+ final EdmAction sack2 = edm.getBoundAction(
+ new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Sack"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Employee"),
+ true);
+ assertNull(sack2);
+
+ final EdmFunction sack3 = edm.getBoundFunction(
+ new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Sack"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Employee"),
+ false,
+ null);
+ assertNull(sack3);
+
+ boolean found = false;
+ for (EdmAction action : edm.getSchemas().get(0).getActions()) {
+ if ("Sack".equals(action.getName()) && action.isBound()) {
+ found = true;
+ }
+ }
+ assertTrue(found);
+
+ final EdmAction increaseSalaries = edm.getBoundAction(
+ new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "IncreaseSalaries"),
+ new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "Employee"),
+ true);
+ assertNotNull(increaseSalaries);
+ assertTrue(increaseSalaries.isBound());
+ assertEquals(2, increaseSalaries.getParameterNames().size());
+
// 4. EntityContainer
final EdmEntityContainer container = edm.getEntityContainer(
new FullQualifiedName("Microsoft.Test.OData.Services.AstoriaDefaultService", "DefaultContainer"));
@@ -273,10 +302,10 @@ public class MetadataTest extends AbstractTest {
final EdmEntityType computer = metadata.getEntityType(new FullQualifiedName(container.getNamespace(), "Computer"));
assertNotNull(computer);
- final EdmFunction getComputer = metadata.getBoundFunction(
+ final EdmAction getComputer = metadata.getBoundAction(
new FullQualifiedName(container.getNamespace(), "GetComputer"),
new FullQualifiedName(container.getNamespace(), computer.getName()),
- Boolean.FALSE, Arrays.asList("computer"));
+ false);
assertNotNull(getComputer);
assertEquals(computer, getComputer.getParameter("computer").getType());
assertEquals(computer, getComputer.getReturnType().getType());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json
index 88c7804..0d10982 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/ComputerDetail_-10.json
@@ -1 +1,28 @@
-{"odata.metadata":"http://192.168.43.55:8080/DefaultService.svc/$metadata#ComputerDetail/@Element","odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail","odata.id":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)","odata.editLink":"ComputerDetail(-10)","Computer@odata.navigationLinkUrl":"ComputerDetail(-10)/Computer","#DefaultContainer.ResetComputerDetailsSpecifications":{"title":"ResetComputerDetailsSpecifications","target":"http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"},"ComputerDetailId":-10,"Manufacturer":"sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk","Model":"usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix","Serial":null,"SpecificationsBag@odata.type":"Collection(Edm.String)","SpecificationsBag":["vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv","rbsejgfgelhsdahkoqlnzvbq","ssfvnnquahsczxlu\u00dfnssrhpssz
luundy\u00dfehyzjedssxom","xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx","eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee","\u30be\u3092\u4e5d\u30af\u305d"],"PurchaseDate@odata.type":"Edm.DateTime","PurchaseDate":"2020-12-15T01:33:35.8014568","Dimensions":{"odata.type":"Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions","Width@odata.type":"Edm.Decimal","Width":"-8917.92836319839","Height@odata.type":"Edm.Decimal","Height":"-79228162514264337593543950335","Depth@odata.type":"Edm.Decimal","Depth":"-79228162514264337593543950335"}}
+{
+ "odata.metadata": "http://192.168.43.55:8080/DefaultService.svc/$metadata#ComputerDetail/@Element",
+ "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail",
+ "odata.id": "http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)",
+ "odata.editLink": "ComputerDetail(-10)",
+ "Computer@odata.navigationLinkUrl": "ComputerDetail(-10)/Computer",
+ "#DefaultContainer.ResetComputerDetailsSpecifications": {
+ "title": "ResetComputerDetailsSpecifications",
+ "target": "http://192.168.43.55:8080/DefaultService.svc/ComputerDetail(-10)/ResetComputerDetailsSpecifications"
+ },
+ "ComputerDetailId": -10,
+ "Manufacturer": "sspayuqgmkizmvtxdeuitrnqcblxoipcsshhfvibxuzssatvjjhoftpk",
+ "Model": "usfvbkyxssojjebyzgvtnzkuik\u00dfuxrmllzyglnsssluyxf\u00dfssioyroouxafzbhbsabkrsslbyhghicjaplolzqss\u00dfhhfix",
+ "Serial": null,
+ "SpecificationsBag@odata.type": "Collection(Edm.String)",
+ "SpecificationsBag": ["vorjqalydmfuazkatkiydeicefrjhyuaupkfgbxiaehjrqhhqv", "rbsejgfgelhsdahkoqlnzvbq", "ssfvnnquahsczxlu\u00dfnssrhpsszluundy\u00dfehyzjedssxom", "xsqocvqrzbvzhdhtilugpvayirrnomupxinhihazfghqehqymeeaupuesseluinjgbedrarqluedjfx", "eekuucympfgkucszfuggbmfglpnxnjvhkhalymhtfuggfafulkzedqlksoduqeyukzzhbbasjmee", "\u30be\u3092\u4e5d\u30af\u305d"],
+ "PurchaseDate@odata.type": "Edm.DateTime",
+ "PurchaseDate": "2020-12-15T01:33:35.8014568",
+ "Dimensions": {
+ "odata.type": "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions",
+ "Width@odata.type": "Edm.Decimal",
+ "Width": -8917.92836319839,
+ "Height@odata.type": "Edm.Decimal",
+ "Height": -79228162514264337593543950335,
+ "Depth@odata.type": "Edm.Decimal",
+ "Depth": -79228162514264337593543950335
+ }
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json
----------------------------------------------------------------------
diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json
index 2be5aa8..1932f6c 100644
--- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json
+++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/Product_-10_Dimensions_Width.json
@@ -1 +1,4 @@
-{"odata.metadata":"http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Decimal","value":"-79228162514264337593543950335"}
\ No newline at end of file
+{
+ "odata.metadata": "http://192.168.0.160:8080/DefaultService.svc/$metadata#Edm.Decimal",
+ "value": -79228162514264337593543950335
+}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java
index f94ff68..33d8243 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java
@@ -180,21 +180,20 @@ abstract class AbstractJsonDeserializer<T> extends ODataJacksonDeserializer<ResW
EdmPrimitiveTypeKind kind = EdmPrimitiveTypeKind.String;
if (node.isShort()) {
kind = EdmPrimitiveTypeKind.Int16;
- } else if (node.isIntegralNumber()) {
+ } else if (node.isInt()) {
kind = EdmPrimitiveTypeKind.Int32;
} else if (node.isLong()) {
kind = EdmPrimitiveTypeKind.Int64;
- } else if (node.isBigDecimal()) {
- kind = EdmPrimitiveTypeKind.Decimal;
} else if (node.isBoolean()) {
kind = EdmPrimitiveTypeKind.Boolean;
} else if (node.isFloat()) {
kind = EdmPrimitiveTypeKind.Single;
} else if (node.isDouble()) {
kind = EdmPrimitiveTypeKind.Double;
+ } else if (node.isBigDecimal()) {
+ kind = EdmPrimitiveTypeKind.Decimal;
}
- typeInfo = new EdmTypeInfo.Builder().
- setTypeExpression(kind.getFullQualifiedName().toString()).build();
+ typeInfo = new EdmTypeInfo.Builder().setTypeExpression(kind.getFullQualifiedName().toString()).build();
} else if (node.isArray()) {
type = ODataPropertyType.COLLECTION;
} else if (node.isObject()) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ec30775b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java
index 395059c..2401a09 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java
@@ -49,7 +49,8 @@ abstract class AbstractJsonSerializer<T> extends ODataJacksonSerializer<T> {
private static final EdmPrimitiveTypeKind[] NUMBER_TYPES = {
EdmPrimitiveTypeKind.Byte, EdmPrimitiveTypeKind.SByte,
EdmPrimitiveTypeKind.Single, EdmPrimitiveTypeKind.Double,
- EdmPrimitiveTypeKind.Int16, EdmPrimitiveTypeKind.Int32, EdmPrimitiveTypeKind.Int64
+ EdmPrimitiveTypeKind.Int16, EdmPrimitiveTypeKind.Int32, EdmPrimitiveTypeKind.Int64,
+ EdmPrimitiveTypeKind.Decimal
};
private final JSONGeoValueSerializer geoSerializer = new JSONGeoValueSerializer();
@@ -202,7 +203,7 @@ abstract class AbstractJsonSerializer<T> extends ODataJacksonSerializer<T> {
if (value.isLinkedComplex()) {
links(value.asLinkedComplex(), jgen);
}
-
+
jgen.writeEndObject();
}
}