Return-Path: X-Original-To: apmail-olingo-commits-archive@minotaur.apache.org Delivered-To: apmail-olingo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9E43C110C1 for ; Wed, 16 Jul 2014 09:26:31 +0000 (UTC) Received: (qmail 15534 invoked by uid 500); 16 Jul 2014 09:26:26 -0000 Delivered-To: apmail-olingo-commits-archive@olingo.apache.org Received: (qmail 15493 invoked by uid 500); 16 Jul 2014 09:26:26 -0000 Mailing-List: contact commits-help@olingo.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@olingo.apache.org Delivered-To: mailing list commits@olingo.apache.org Received: (qmail 14843 invoked by uid 99); 16 Jul 2014 09:26:25 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 16 Jul 2014 09:26:25 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id CCB5E98E7B4; Wed, 16 Jul 2014 09:26:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: fmartelli@apache.org To: commits@olingo.apache.org Date: Wed, 16 Jul 2014 09:27:00 -0000 Message-Id: <35dfdab35f2440fe825214e8d7a6c020@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/58] [abbrv] Providing some refactoring in order to avoid multi-request retrieving entity info http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6587302a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java index 7572aa3..a6e6a91 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java @@ -1,253 +1,285 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.ext.proxy.api.Annotatable; +import org.apache.olingo.client.api.http.HttpMethod; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; +import org.apache.olingo.ext.proxy.api.annotations.Namespace; +import org.apache.olingo.ext.proxy.api.annotations.EntityType; +import org.apache.olingo.ext.proxy.api.annotations.EntitySet; import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.KeyRef; +import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; +import org.apache.olingo.ext.proxy.api.annotations.Property; +import org.apache.olingo.ext.proxy.api.annotations.Operation; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; + +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; +import org.apache.olingo.commons.api.edm.geo.MultiLineString; +import org.apache.olingo.commons.api.edm.geo.MultiPoint; +import org.apache.olingo.commons.api.edm.geo.MultiPolygon; +import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.geo.Polygon; + @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "ComputerDetail", - openType = false, - hasStream = false, - isAbstract = false) -public interface ComputerDetail - extends Annotatable, java.io.Serializable { - - @Key - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.Integer getComputerDetailId(); - - void setComputerDetailId(java.lang.Integer _computerDetailId); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.String getManufacturer(); - - void setManufacturer(java.lang.String _manufacturer); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.String getModel(); - - void setModel(java.lang.String _model); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.String getSerial(); - - void setSerial(java.lang.String _serial); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag", - type = "Edm.String", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.util.Collection getSpecificationsBag(); - - void setSpecificationsBag(java.util.Collection _specificationsBag); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate", - type = "Edm.DateTime", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.util.Calendar getPurchaseDate(); - - void setPurchaseDate(java.util.Calendar _purchaseDate); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions - getDimensions(); - - void - setDimensions( - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); - - @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer", - targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", - targetContainer = "DefaultContainer", - targetEntitySet = "Computer", - containsTarget = false) - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer - getComputer(); - - void - setComputer( - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer); - - ComplexFactory factory(); - - interface ComplexFactory { - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions") - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions - newDimensions(); - - } - - Annotations annotations(); - - interface Annotations { - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId", - type = "Edm.Int32") - Annotatable getComputerDetailIdAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer", - type = "Edm.String") - Annotatable getManufacturerAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model", - type = "Edm.String") - Annotatable getModelAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial", - type = "Edm.String") - Annotatable getSerialAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag", - type = "Edm.String") - Annotatable getSpecificationsBagAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate", - type = "Edm.DateTime") - Annotatable getPurchaseDateAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions") - Annotatable getDimensionsAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Computer", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer") - Annotatable getComputerAnnotations(); - } + openType = false, + hasStream = false, + isAbstract = false) +public interface ComputerDetail + extends org.apache.olingo.ext.proxy.api.StructuredType,org.apache.olingo.ext.proxy.api.Annotatable,org.apache.olingo.ext.proxy.api.SingleQuery { + + + + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerDetailId", + type = "Edm.Int32", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.Integer getComputerDetailId(); + + void setComputerDetailId(java.lang.Integer _computerDetailId); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Manufacturer", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.String getManufacturer(); + + void setManufacturer(java.lang.String _manufacturer); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Model", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.String getModel(); + + void setModel(java.lang.String _model); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Serial", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.String getSerial(); + + void setSerial(java.lang.String _serial); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SpecificationsBag", + type = "Edm.String", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.util.Collection getSpecificationsBag(); + + void setSpecificationsBag(java.util.Collection _specificationsBag); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PurchaseDate", + type = "Edm.DateTime", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.sql.Timestamp getPurchaseDate(); + + void setPurchaseDate(java.sql.Timestamp _purchaseDate); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions(); + + void setDimensions(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions _dimensions); + + + + @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Computer", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer", + targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", + targetContainer = "DefaultContainer", + targetEntitySet = "Computer", + containsTarget = false) + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(); + + void setComputer(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer); + + + + ComplexFactory factory(); + + interface ComplexFactory { + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Dimensions", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions") + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions newDimensions(); + + } + + Annotations annotations(); + + interface Annotations { + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerDetailId", + type = "Edm.Int32") + org.apache.olingo.ext.proxy.api.Annotatable getComputerDetailIdAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Manufacturer", + type = "Edm.String") + org.apache.olingo.ext.proxy.api.Annotatable getManufacturerAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Model", + type = "Edm.String") + org.apache.olingo.ext.proxy.api.Annotatable getModelAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Serial", + type = "Edm.String") + org.apache.olingo.ext.proxy.api.Annotatable getSerialAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "SpecificationsBag", + type = "Edm.String") + org.apache.olingo.ext.proxy.api.Annotatable getSpecificationsBagAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PurchaseDate", + type = "Edm.DateTime") + org.apache.olingo.ext.proxy.api.Annotatable getPurchaseDateAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Dimensions", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Dimensions") + org.apache.olingo.ext.proxy.api.Annotatable getDimensionsAnnotations(); + + + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "Computer", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer") + org.apache.olingo.ext.proxy.api.Annotatable getComputerAnnotations(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6587302a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java index 8a386ee..db2cf21 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java @@ -1,32 +1,50 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import java.util.Collection; - +import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Operation; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; + +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; +import org.apache.olingo.commons.api.edm.geo.MultiLineString; +import org.apache.olingo.commons.api.edm.geo.MultiPoint; +import org.apache.olingo.commons.api.edm.geo.MultiPolygon; +import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.geo.Polygon; +import java.math.BigDecimal; +import java.net.URI; +import java.util.UUID; +import java.io.Serializable; +import java.util.Collection; +import java.util.Calendar; +import javax.xml.datatype.Duration; -public interface ComputerDetailCollection - extends - AbstractEntityCollection { +public interface ComputerDetailCollection extends AbstractEntityCollection { Object getAnnotation(Class term); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6587302a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java index 891ad00..373a5c6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java @@ -1,41 +1,70 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; +import org.apache.olingo.ext.proxy.api.annotations.Namespace; +import org.apache.olingo.ext.proxy.api.annotations.ComplexType; +import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.ext.proxy.api.annotations.Property; +import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.ext.proxy.api.Annotatable; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; + +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; +import org.apache.olingo.commons.api.edm.geo.MultiLineString; +import org.apache.olingo.commons.api.edm.geo.MultiPoint; +import org.apache.olingo.commons.api.edm.geo.MultiPolygon; +import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.geo.Polygon; + + @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo") -public interface ConcurrencyInfo - extends java.io.Serializable { +public interface ConcurrencyInfo + extends org.apache.olingo.ext.proxy.api.StructuredType,org.apache.olingo.ext.proxy.api.SingleQuery { + + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true) + java.lang.String getToken(); + + void setToken(java.lang.String _token); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true) - java.lang.String getToken(); + - void setToken(java.lang.String _token); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", nullable = true) + java.sql.Timestamp getQueriedDateTime(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", - nullable = true) - java.util.Calendar getQueriedDateTime(); + void setQueriedDateTime(java.sql.Timestamp _queriedDateTime); - void setQueriedDateTime(java.util.Calendar _queriedDateTime); + - ComplexFactory factory(); + ComplexFactory factory(); - interface ComplexFactory {} + interface ComplexFactory { + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6587302a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java index 17dbc9b..904437f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java @@ -1,98 +1,114 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; +import org.apache.olingo.ext.proxy.api.annotations.Namespace; +import org.apache.olingo.ext.proxy.api.annotations.ComplexType; +import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.ext.proxy.api.annotations.Property; +import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.ext.proxy.api.Annotatable; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; + +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; +import org.apache.olingo.commons.api.edm.geo.MultiLineString; +import org.apache.olingo.commons.api.edm.geo.MultiPoint; +import org.apache.olingo.commons.api.edm.geo.MultiPolygon; +import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.geo.Polygon; + + @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails") -public interface ContactDetails - extends java.io.Serializable { +public interface ContactDetails + extends org.apache.olingo.ext.proxy.api.StructuredType,org.apache.olingo.ext.proxy.api.SingleQuery { + + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false) + java.util.Collection getEmailBag(); + + void setEmailBag(java.util.Collection _emailBag); + + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", nullable = false) + java.util.Collection getAlternativeNames(); + + void setAlternativeNames(java.util.Collection _alternativeNames); + + - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "EmailBag", type = "Edm.String", nullable = false) - java.util.Collection getEmailBag(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true) + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases getContactAlias(); - void setEmailBag(java.util.Collection _emailBag); + void setContactAlias(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AlternativeNames", type = "Edm.String", - nullable = false) - java.util.Collection getAlternativeNames(); + - void setAlternativeNames(java.util.Collection _alternativeNames); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true) + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getHomePhone(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases", nullable = true) - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases - getContactAlias(); + void setHomePhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone); - void - setContactAlias( - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases _contactAlias); + - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true) - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone - getHomePhone(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true) + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone getWorkPhone(); - void - setHomePhone( - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _homePhone); + void setWorkPhone(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = true) - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone - getWorkPhone(); + - void - setWorkPhone( - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone _workPhone); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false) + java.util.Collection getMobilePhoneBag(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone", nullable = false) - java.util.Collection - getMobilePhoneBag(); + void setMobilePhoneBag(java.util.Collection _mobilePhoneBag); - void - setMobilePhoneBag( - java.util.Collection _mobilePhoneBag); + - ComplexFactory factory(); + ComplexFactory factory(); - interface ComplexFactory { - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases") - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases - newContactAlias(); + interface ComplexFactory { + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContactAlias", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Aliases") + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Aliases newContactAlias(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone - newHomePhone(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "HomePhone", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newHomePhone(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone - newWorkPhone(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "WorkPhone", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newWorkPhone(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone - newMobilePhoneBag(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "MobilePhoneBag", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.Phone") + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Phone newMobilePhoneBag(); - } + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6587302a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java index 08c120d..55f9b6f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java @@ -1,251 +1,268 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.client.api.http.HttpMethod; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; +import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; +import org.apache.olingo.ext.proxy.api.annotations.Namespace; +import org.apache.olingo.ext.proxy.api.annotations.EntityType; +import org.apache.olingo.ext.proxy.api.annotations.EntitySet; import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.KeyRef; +import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; +import org.apache.olingo.ext.proxy.api.annotations.Property; +import org.apache.olingo.ext.proxy.api.annotations.Operation; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") -@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Contractor", - openType = false, - hasStream = false, - isAbstract = false, - baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person") -public interface Contractor - extends Annotatable, - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person { - - @Override - @Key - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.Integer getPersonId(); - - @Override - void setPersonId(java.lang.Integer _personId); - - @Override - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.String getName(); - - @Override - void setName(java.lang.String _name); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.Integer getContratorCompanyId(); - - void setContratorCompanyId(java.lang.Integer _contratorCompanyId); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.Integer getBillingRate(); - - void setBillingRate(java.lang.Integer _billingRate); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.Integer getTeamContactPersonId(); - - void setTeamContactPersonId(java.lang.Integer _teamContactPersonId); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "", - concurrencyMode = ConcurrencyMode.None, - fcSourcePath = "", - fcTargetPath = "", - fcContentKind = EdmContentKind.text, - fcNSPrefix = "", - fcNSURI = "", - fcKeepInContent = false) - java.lang.String getJobDescription(); - - void setJobDescription(java.lang.String _jobDescription); - - @Override - @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata", - targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", - targetContainer = "DefaultContainer", - targetEntitySet = "PersonMetadata", - containsTarget = false) - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection - getPersonMetadata(); - - @Override - void - setPersonMetadata( - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata); - - @Override - Operations operations(); - - interface Operations - extends - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations { - - @Override - @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo", - type = OperationType.ACTION) - void updatePersonInfo( - ); +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; +import org.apache.olingo.commons.api.edm.geo.MultiLineString; +import org.apache.olingo.commons.api.edm.geo.MultiPoint; +import org.apache.olingo.commons.api.edm.geo.MultiPolygon; +import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.geo.Polygon; - } - @Override - ComplexFactory factory(); - - interface ComplexFactory - extends - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory {} +@org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") +@org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Contractor", + openType = false, + hasStream = false, + isAbstract = false, + baseType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Person") +public interface Contractor + extends org.apache.olingo.ext.proxy.api.StructuredType,org.apache.olingo.ext.proxy.api.Annotatable,org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person { @Override - Annotations annotations(); - - interface Annotations - extends - org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations { - - @Override - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId", - type = "Edm.Int32") - Annotatable getPersonIdAnnotations(); - - @Override - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name", - type = "Edm.String") - Annotatable getNameAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ContratorCompanyId", - type = "Edm.Int32") - Annotatable getContratorCompanyIdAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate", - type = "Edm.Int32") - Annotatable getBillingRateAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId", - type = "Edm.Int32") - Annotatable getTeamContactPersonIdAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription", - type = "Edm.String") - Annotatable getJobDescriptionAnnotations(); - - @Override - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata") - Annotatable getPersonMetadataAnnotations(); - } + Contractor load(); + + + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "PersonId", + type = "Edm.Int32", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.Integer getPersonId(); + + void setPersonId(java.lang.Integer _personId); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Name", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.String getName(); + + void setName(java.lang.String _name); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ContratorCompanyId", + type = "Edm.Int32", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.Integer getContratorCompanyId(); + + void setContratorCompanyId(java.lang.Integer _contratorCompanyId); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "BillingRate", + type = "Edm.Int32", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.Integer getBillingRate(); + + void setBillingRate(java.lang.Integer _billingRate); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "TeamContactPersonId", + type = "Edm.Int32", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.Integer getTeamContactPersonId(); + + void setTeamContactPersonId(java.lang.Integer _teamContactPersonId); + + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "JobDescription", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "", + concurrencyMode = ConcurrencyMode.None, + fcSourcePath = "", + fcTargetPath = "", + fcContentKind = EdmContentKind.text, + fcNSPrefix = "", + fcNSURI = "", + fcKeepInContent = false) + java.lang.String getJobDescription(); + + void setJobDescription(java.lang.String _jobDescription); + + + + @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "PersonMetadata", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata", + targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", + targetContainer = "DefaultContainer", + targetEntitySet = "PersonMetadata", + containsTarget = false) + org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection getPersonMetadata(); + + void setPersonMetadata(org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.PersonMetadataCollection _personMetadata); + + + @Override + Operations operations(); + + interface Operations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Operations{ + + @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "UpdatePersonInfo", + type = OperationType.ACTION) + void updatePersonInfo( + ); + + } + + ComplexFactory factory(); + + interface ComplexFactory extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.ComplexFactory{ + } + + Annotations annotations(); + + interface Annotations extends org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Person.Annotations{ + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonId", + type = "Edm.Int32") + org.apache.olingo.ext.proxy.api.Annotatable getPersonIdAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name", + type = "Edm.String") + org.apache.olingo.ext.proxy.api.Annotatable getNameAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ContratorCompanyId", + type = "Edm.Int32") + org.apache.olingo.ext.proxy.api.Annotatable getContratorCompanyIdAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "BillingRate", + type = "Edm.Int32") + org.apache.olingo.ext.proxy.api.Annotatable getBillingRateAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "TeamContactPersonId", + type = "Edm.Int32") + org.apache.olingo.ext.proxy.api.Annotatable getTeamContactPersonIdAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "JobDescription", + type = "Edm.String") + org.apache.olingo.ext.proxy.api.Annotatable getJobDescriptionAnnotations(); + + + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "PersonMetadata", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.PersonMetadata") + org.apache.olingo.ext.proxy.api.Annotatable getPersonMetadataAnnotations(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/6587302a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java index 7ae9bf6..761b0fe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java @@ -1,32 +1,50 @@ -/* +/* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the + * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. */ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import java.util.Collection; - +import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Operation; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; + +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; +import org.apache.olingo.commons.api.edm.geo.MultiLineString; +import org.apache.olingo.commons.api.edm.geo.MultiPoint; +import org.apache.olingo.commons.api.edm.geo.MultiPolygon; +import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.geo.Polygon; +import java.math.BigDecimal; +import java.net.URI; +import java.util.UUID; +import java.io.Serializable; +import java.util.Collection; +import java.util.Calendar; +import javax.xml.datatype.Duration; -public interface ContractorCollection - extends - AbstractEntityCollection { +public interface ContractorCollection extends AbstractEntityCollection { Object getAnnotation(Class term);