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 D2849117C9 for ; Thu, 3 Jul 2014 07:16:00 +0000 (UTC) Received: (qmail 34063 invoked by uid 500); 3 Jul 2014 07:16:00 -0000 Delivered-To: apmail-olingo-commits-archive@olingo.apache.org Received: (qmail 34038 invoked by uid 500); 3 Jul 2014 07:16:00 -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 33314 invoked by uid 99); 3 Jul 2014 07:15:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Jul 2014 07:15:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 8938A99536E; Thu, 3 Jul 2014 07:15:59 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mibo@apache.org To: commits@olingo.apache.org Date: Thu, 03 Jul 2014 07:16:24 -0000 Message-Id: <5d83dbc3d11642ba8307d337608be728@git.apache.org> In-Reply-To: <6f251ace1c124d068b836c27e7ec6541@git.apache.org> References: <6f251ace1c124d068b836c27e7ec6541@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [27/55] [abbrv] [partial] [OLINGO-328] code cleanup and checkstyle issues http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java index 3d94ec0..30967c9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java @@ -1,50 +1,32 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; +import java.util.Collection; + 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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 BackOrderLine2Collection extends AbstractEntityCollection { +public interface BackOrderLine2Collection + extends + AbstractEntityCollection { Object getAnnotation(Class term); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java index cf9a4f9..84736d8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java @@ -1,50 +1,32 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; +import java.util.Collection; + 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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 BackOrderLineCollection extends AbstractEntityCollection { +public interface BackOrderLineCollection + extends + AbstractEntityCollection { Object getAnnotation(Class term); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java index 26deea3..5a334c8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java @@ -1,189 +1,154 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -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.Annotatable; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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 org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.Annotatable; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Car", - openType = false, - hasStream = true, - isAbstract = false) -public interface Car - extends Annotatable,java.io.Serializable { - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo", - type = "Edm.Stream", - 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.io.InputStream getPhoto(); - - void setPhoto(java.io.InputStream _photo); - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video", - type = "Edm.Stream", - 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.io.InputStream getVideo(); - - void setVideo(java.io.InputStream _video); - - @Key - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN", - 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 getVIN(); - - void setVIN(java.lang.Integer _vIN); - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description", - 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 getDescription(); - - void setDescription(java.lang.String _description); - - - - void setStream(java.io.InputStream stream); - - java.io.InputStream getStream(); - - - ComplexFactory factory(); - - interface ComplexFactory { - } - - Annotations annotations(); - - interface Annotations { - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo", - type = "Edm.Stream") - Annotatable getPhotoAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video", - type = "Edm.Stream") - Annotatable getVideoAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN", - type = "Edm.Int32") - Annotatable getVINAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description", - type = "Edm.String") - Annotatable getDescriptionAnnotations(); - - - } + openType = false, + hasStream = true, + isAbstract = false) +public interface Car + extends Annotatable, java.io.Serializable { + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo", + type = "Edm.Stream", + 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.io.InputStream getPhoto(); + + void setPhoto(java.io.InputStream _photo); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Video", + type = "Edm.Stream", + 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.io.InputStream getVideo(); + + void setVideo(java.io.InputStream _video); + + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "VIN", + 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 getVIN(); + + void setVIN(java.lang.Integer _vIN); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Description", + 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 getDescription(); + + void setDescription(java.lang.String _description); + + void setStream(java.io.InputStream stream); + + java.io.InputStream getStream(); + + ComplexFactory factory(); + + interface ComplexFactory {} + + Annotations annotations(); + + interface Annotations { + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Photo", + type = "Edm.Stream") + Annotatable getPhotoAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Video", + type = "Edm.Stream") + Annotatable getVideoAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "VIN", + type = "Edm.Int32") + Annotatable getVINAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Description", + type = "Edm.String") + Annotatable getDescriptionAnnotations(); + + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java index 7c42934..da2da9f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java @@ -1,50 +1,32 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; +import java.util.Collection; + 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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 CarCollection extends AbstractEntityCollection { +public interface CarCollection + extends + AbstractEntityCollection { Object getAnnotation(Class term); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java index d72cc08..5b1cf20 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java @@ -1,82 +1,45 @@ -/* +/* * 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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexToCategory") -public interface ComplexToCategory +public interface ComplexToCategory extends java.io.Serializable { + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true) + java.lang.String getTerm(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Term", type = "Edm.String", nullable = true) - java.lang.String getTerm(); - - void setTerm(java.lang.String _term); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true) - java.lang.String getScheme(); - - void setScheme(java.lang.String _scheme); + void setTerm(java.lang.String _term); - + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Scheme", type = "Edm.String", nullable = true) + java.lang.String getScheme(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true) - java.lang.String getLabel(); + void setScheme(java.lang.String _scheme); - void setLabel(java.lang.String _label); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Label", type = "Edm.String", nullable = true) + java.lang.String getLabel(); - + void setLabel(java.lang.String _label); - ComplexFactory factory(); + ComplexFactory factory(); - interface ComplexFactory { - } + interface ComplexFactory {} } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java index 16f7736..7ad8b63 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java @@ -1,159 +1,102 @@ -/* +/* * 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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexWithAllPrimitiveTypes") -public interface ComplexWithAllPrimitiveTypes +public interface ComplexWithAllPrimitiveTypes extends java.io.Serializable { + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Binary", type = "Edm.Binary", nullable = true) + byte[] getBinary(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Binary", type = "Edm.Binary", nullable = true) - byte[] getBinary(); - - void setBinary(byte[] _binary); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Boolean", type = "Edm.Boolean", nullable = false) - java.lang.Boolean getBoolean(); - - void setBoolean(java.lang.Boolean _boolean); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false) - java.lang.Short getByte(); - - void setByte(java.lang.Short _byte); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateTime", type = "Edm.DateTime", nullable = false) - java.util.Calendar getDateTime(); - - void setDateTime(java.util.Calendar _dateTime); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Decimal", type = "Edm.Decimal", nullable = false) - java.math.BigDecimal getDecimal(); - - void setDecimal(java.math.BigDecimal _decimal); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false) - java.lang.Double getDouble(); + void setBinary(byte[] _binary); - void setDouble(java.lang.Double _double); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Boolean", type = "Edm.Boolean", nullable = false) + java.lang.Boolean getBoolean(); - + void setBoolean(java.lang.Boolean _boolean); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int16", type = "Edm.Int16", nullable = false) - java.lang.Short getInt16(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte", type = "Edm.Byte", nullable = false) + java.lang.Short getByte(); - void setInt16(java.lang.Short _int16); + void setByte(java.lang.Short _byte); - + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "DateTime", type = "Edm.DateTime", nullable = false) + java.util.Calendar getDateTime(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int32", type = "Edm.Int32", nullable = false) - java.lang.Integer getInt32(); + void setDateTime(java.util.Calendar _dateTime); - void setInt32(java.lang.Integer _int32); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Decimal", type = "Edm.Decimal", nullable = false) + java.math.BigDecimal getDecimal(); - + void setDecimal(java.math.BigDecimal _decimal); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int64", type = "Edm.Int64", nullable = false) - java.lang.Long getInt64(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double", type = "Edm.Double", nullable = false) + java.lang.Double getDouble(); - void setInt64(java.lang.Long _int64); + void setDouble(java.lang.Double _double); - + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int16", type = "Edm.Int16", nullable = false) + java.lang.Short getInt16(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SByte", type = "Edm.SByte", nullable = false) - java.lang.Byte getSByte(); + void setInt16(java.lang.Short _int16); - void setSByte(java.lang.Byte _sByte); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int32", type = "Edm.Int32", nullable = false) + java.lang.Integer getInt32(); - + void setInt32(java.lang.Integer _int32); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "String", type = "Edm.String", nullable = true) - java.lang.String getString(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int64", type = "Edm.Int64", nullable = false) + java.lang.Long getInt64(); - void setString(java.lang.String _string); + void setInt64(java.lang.Long _int64); - + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SByte", type = "Edm.SByte", nullable = false) + java.lang.Byte getSByte(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false) - java.lang.Float getSingle(); + void setSByte(java.lang.Byte _sByte); - void setSingle(java.lang.Float _single); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "String", type = "Edm.String", nullable = true) + java.lang.String getString(); - + void setString(java.lang.String _string); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeographyPoint", type = "Edm.GeographyPoint", nullable = true) - org.apache.olingo.commons.api.edm.geo.Point getGeographyPoint(); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single", type = "Edm.Single", nullable = false) + java.lang.Float getSingle(); - void setGeographyPoint(org.apache.olingo.commons.api.edm.geo.Point _geographyPoint); + void setSingle(java.lang.Float _single); - + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeographyPoint", type = "Edm.GeographyPoint", + nullable = true) + org.apache.olingo.commons.api.edm.geo.Point getGeographyPoint(); - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeometryPoint", type = "Edm.GeometryPoint", nullable = true) - org.apache.olingo.commons.api.edm.geo.Point getGeometryPoint(); + void setGeographyPoint(org.apache.olingo.commons.api.edm.geo.Point _geographyPoint); - void setGeometryPoint(org.apache.olingo.commons.api.edm.geo.Point _geometryPoint); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GeometryPoint", type = "Edm.GeometryPoint", + nullable = true) + org.apache.olingo.commons.api.edm.geo.Point getGeometryPoint(); - + void setGeometryPoint(org.apache.olingo.commons.api.edm.geo.Point _geometryPoint); - ComplexFactory factory(); + ComplexFactory factory(); - interface ComplexFactory { - } + interface ComplexFactory {} } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java index 9874a32..8d074b0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java @@ -1,157 +1,128 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -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.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.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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 org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Computer", - openType = false, - hasStream = false, - isAbstract = false) -public interface Computer - extends Annotatable,java.io.Serializable { - - - @Key - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId", - 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 getComputerId(); - - void setComputerId(java.lang.Integer _computerId); - - - @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.NavigationProperty(name = "ComputerDetail", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail", - targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", - targetContainer = "DefaultContainer", - targetEntitySet = "ComputerDetail", - containsTarget = false) - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail getComputerDetail(); - - void setComputerDetail(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail); - - - Operations operations(); - - interface Operations { - - @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetComputer", - type = OperationType.ACTION, - returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer") - org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer( - ); - - } - - ComplexFactory factory(); - - interface ComplexFactory { - } - - Annotations annotations(); - - interface Annotations { - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId", - type = "Edm.Int32") - Annotatable getComputerIdAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name", - type = "Edm.String") - Annotatable getNameAnnotations(); - - - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail", - type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail") - Annotatable getComputerDetailAnnotations(); - } + openType = false, + hasStream = false, + isAbstract = false) +public interface Computer + extends Annotatable, java.io.Serializable { + + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ComputerId", + 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 getComputerId(); + + void setComputerId(java.lang.Integer _computerId); + + @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.NavigationProperty(name = "ComputerDetail", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail", + targetSchema = "Microsoft.Test.OData.Services.AstoriaDefaultService", + targetContainer = "DefaultContainer", + targetEntitySet = "ComputerDetail", + containsTarget = false) + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail + getComputerDetail(); + + void + setComputerDetail( + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail _computerDetail); + + Operations operations(); + + interface Operations { + + @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetComputer", + type = OperationType.ACTION, + returnType = "Microsoft.Test.OData.Services.AstoriaDefaultService.Computer") + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer + getComputer( + ); + + } + + ComplexFactory factory(); + + interface ComplexFactory {} + + Annotations annotations(); + + interface Annotations { + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ComputerId", + type = "Edm.Int32") + Annotatable getComputerIdAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Name", + type = "Edm.String") + Annotatable getNameAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "ComputerDetail", + type = "Microsoft.Test.OData.Services.AstoriaDefaultService.ComputerDetail") + Annotatable getComputerDetailAnnotations(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java index 577e16e..46fb209 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java @@ -1,50 +1,32 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; +import java.util.Collection; + 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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 ComputerCollection extends AbstractEntityCollection { +public interface ComputerCollection + extends + AbstractEntityCollection { Object getAnnotation(Class term); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java index ee4e989..6f69e43 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java @@ -1,297 +1,269 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -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.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.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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 org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions getDimensions(); - - void setDimensions(org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer getComputer(); - - void setComputer(org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer); - - - Operations operations(); - - interface Operations { - - @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetComputerDetailsSpecifications", - type = OperationType.ACTION) - void resetComputerDetailsSpecifications( - @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) java.util.Collection specifications, - @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) java.util.Calendar purchaseTime - ); - - } - - 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.staticservice.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 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions + getDimensions(); + + void + setDimensions( + org.apache.olingo.fit.proxy.v3.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer + getComputer(); + + void + setComputer( + org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer _computer); + + Operations operations(); + + interface Operations { + + @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetComputerDetailsSpecifications", + type = OperationType.ACTION) + void + resetComputerDetailsSpecifications( + @Parameter(name = "specifications", type = "Collection(Edm.String)", nullable = false) java.util.Collection specifications, + @Parameter(name = "purchaseTime", type = "Edm.DateTime", nullable = false) java.util.Calendar purchaseTime + ); + + } + + 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.staticservice.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(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java index d717ecf..9021bc1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java @@ -1,50 +1,32 @@ -/* +/* * 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; +import java.util.Collection; + 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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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/2ab4b2fd/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java index a5cdd20..6802b63 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java @@ -1,75 +1,41 @@ -/* +/* * 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.staticservice.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.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.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.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; - - @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 +public interface ConcurrencyInfo extends java.io.Serializable { + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Token", type = "Edm.String", nullable = true) + java.lang.String getToken(); - @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.util.Calendar getQueriedDateTime(); + void setToken(java.lang.String _token); - void setQueriedDateTime(java.util.Calendar _queriedDateTime); + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "QueriedDateTime", type = "Edm.DateTime", + nullable = true) + java.util.Calendar getQueriedDateTime(); - + void setQueriedDateTime(java.util.Calendar _queriedDateTime); - ComplexFactory factory(); + ComplexFactory factory(); - interface ComplexFactory { - } + interface ComplexFactory {} }