http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java index e75b499..3caa568 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java @@ -1,70 +1,69 @@ -/* +/* * 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.v4.demo.odatademo; -//CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.ext.proxy.api.PersistenceManager; -import org.apache.olingo.ext.proxy.api.OperationType; +// CHECKSTYLE:OFF (Maven checkstyle) +import java.io.InputStream; + +// CHECKSTYLE:ON (Maven checkstyle) +import java.io.Serializable; + import org.apache.olingo.ext.proxy.api.ComplexCollection; import org.apache.olingo.ext.proxy.api.ComplexType; +import org.apache.olingo.ext.proxy.api.EdmStreamValue; import org.apache.olingo.ext.proxy.api.EntityCollection; import org.apache.olingo.ext.proxy.api.EntityType; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.PersistenceManager; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; -import org.apache.olingo.ext.proxy.api.EdmStreamValue; -import java.io.Serializable; -import java.io.InputStream; -//CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DemoService", - namespace = "ODataDemo") + namespace = "ODataDemo") public interface DemoService extends PersistenceManager { - Products getProducts(); - - Advertisements getAdvertisements(); + Products getProducts(); - Persons getPersons(); + Advertisements getAdvertisements(); - Categories getCategories(); + Persons getPersons(); - PersonDetails getPersonDetails(); - - Suppliers getSuppliers(); - - ProductDetails getProductDetails(); + Categories getCategories(); + PersonDetails getPersonDetails(); + Suppliers getSuppliers(); + ProductDetails getProductDetails(); Operations operations(); public interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - - + @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "IncreaseSalaries", - type = OperationType.ACTION) + type = OperationType.ACTION) org.apache.olingo.ext.proxy.api.Invoker<Void> increaseSalaries( - @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage - ); - - } + @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "percentage", type = "Edm.Int32", + nullable = false) java.lang.Integer percentage + ); + + } <NE extends EntityType<?>> NE newEntityInstance(Class<NE> ref);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java index f6929a8..c0946c0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java @@ -1,38 +1,38 @@ -/* +/* * 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.v4.demo.odatademo; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -//CHECKSTYLE:ON (Maven checkstyle) - +// CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonDetails", container = "ODataDemo.DemoService") -public interface PersonDetails - extends org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection>, - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<PersonDetails>, - AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> { - +public interface PersonDetails + extends + org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection>, + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<PersonDetails>, + AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetailCollection> { - Operations operations(); + Operations operations(); - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - }} + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java index a33acb6..e1586b6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java @@ -1,38 +1,38 @@ -/* +/* * 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.v4.demo.odatademo; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -//CHECKSTYLE:ON (Maven checkstyle) - +// CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Persons", container = "ODataDemo.DemoService") -public interface Persons - extends org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection>, - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Persons>, - AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> { - +public interface Persons + extends + org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection>, + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Persons>, + AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonCollection> { - Operations operations(); + Operations operations(); - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - }} + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java index 931db8a..79bce3a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java @@ -1,38 +1,38 @@ -/* +/* * 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.v4.demo.odatademo; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -//CHECKSTYLE:ON (Maven checkstyle) - +// CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails", container = "ODataDemo.DemoService") -public interface ProductDetails - extends org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection>, - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ProductDetails>, - AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection> { - +public interface ProductDetails + extends + org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection>, + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ProductDetails>, + AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetailCollection> { - Operations operations(); + Operations operations(); - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - }} + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java index b7c293f..4daf4dd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java @@ -1,38 +1,38 @@ -/* +/* * 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.v4.demo.odatademo; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -//CHECKSTYLE:ON (Maven checkstyle) - +// CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products", container = "ODataDemo.DemoService") -public interface Products - extends org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection>, - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Products>, - AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> { - +public interface Products + extends + org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection>, + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Products>, + AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection> { - Operations operations(); + Operations operations(); - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - }} + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java index eeb9b8b..6e2ee44 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java @@ -1,38 +1,38 @@ -/* +/* * 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.v4.demo.odatademo; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -//CHECKSTYLE:ON (Maven checkstyle) - +// CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Suppliers", container = "ODataDemo.DemoService") -public interface Suppliers - extends org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection>, - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Suppliers>, - AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection> { - +public interface Suppliers + extends + org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection>, + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Suppliers>, + AbstractEntitySet<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier, java.lang.Integer, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.SupplierCollection> { - Operations operations(); + Operations operations(); - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - }} + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } +} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java index b08e914..259416f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java @@ -1,18 +1,18 @@ -/* +/* * 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. */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java index f05b99c..24ac91e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java @@ -1,156 +1,140 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.Annotatable; -//CHECKSTYLE:ON (Maven checkstyle) +// CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Address", - isOpenType = false, - isAbstract = false) -public interface Address - extends org.apache.olingo.ext.proxy.api.ComplexType<Address>, org.apache.olingo.ext.proxy.api.StructuredQuery<Address> { - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getStreet(); - - void setStreet(java.lang.String _street); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getCity(); - - void setCity(java.lang.String _city); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "State", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getState(); - - void setState(java.lang.String _state); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ZipCode", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getZipCode(); - - void setZipCode(java.lang.String _zipCode); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getCountry(); - - void setCountry(java.lang.String _country); - - - - - Annotations annotations(); - - interface Annotations { - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street", - type = "Edm.String") - Annotatable getStreetAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City", - type = "Edm.String") - Annotatable getCityAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "State", - type = "Edm.String") - Annotatable getStateAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ZipCode", - type = "Edm.String") - Annotatable getZipCodeAnnotations(); - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country", - type = "Edm.String") - Annotatable getCountryAnnotations(); - - - } - - - - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - } + isOpenType = false, + isAbstract = false) +public interface Address + extends org.apache.olingo.ext.proxy.api.ComplexType<Address>, + org.apache.olingo.ext.proxy.api.StructuredQuery<Address> { + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getStreet(); + + void setStreet(java.lang.String _street); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getCity(); + + void setCity(java.lang.String _city); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "State", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getState(); + + void setState(java.lang.String _state); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ZipCode", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getZipCode(); + + void setZipCode(java.lang.String _zipCode); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getCountry(); + + void setCountry(java.lang.String _country); + + Annotations annotations(); + + interface Annotations { + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street", + type = "Edm.String") + Annotatable getStreetAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "City", + type = "Edm.String") + Annotatable getCityAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "State", + type = "Edm.String") + Annotatable getStateAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ZipCode", + type = "Edm.String") + Annotatable getZipCodeAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Country", + type = "Edm.String") + Annotatable getCountryAnnotations(); + + } + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java index 86e20d7..669a86c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java @@ -1,38 +1,40 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.ext.proxy.api.AbstractTerm; +// CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; -//CHECKSTYLE:ON (Maven checkstyle) +// CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.AbstractTerm; -public interface AddressCollection extends +public interface AddressCollection + extends org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection>, - org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection> { +org.apache.olingo.ext.proxy.api.ComplexCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection> { + + Operations operations(); - Operations operations(); + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - } Object getAnnotation(Class<? extends AbstractTerm> term); Collection<Class<? extends AbstractTerm>> getAnnotationTerms(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java index 20bceca..98b0741 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java @@ -1,27 +1,27 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) - -public interface AddressCollectionComposableInvoker extends +public interface AddressCollectionComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AddressCollection.Operations> { @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java index 0be3fb8..5a142e4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java @@ -1,29 +1,28 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) - -public interface AddressComposableInvoker - extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Address, Address.Operations> - { +public interface AddressComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Address, Address.Operations> +{ @Override AddressComposableInvoker select(String... select); @@ -31,93 +30,79 @@ public interface AddressComposableInvoker @Override AddressComposableInvoker expand(String... expand); - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getStreet(); - - void setStreet(java.lang.String _street); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getCity(); - - void setCity(java.lang.String _city); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "State", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getState(); - - void setState(java.lang.String _state); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ZipCode", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getZipCode(); - - void setZipCode(java.lang.String _zipCode); - - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country", - type = "Edm.String", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.String getCountry(); - - void setCountry(java.lang.String _country); - - - - - + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getStreet(); + + void setStreet(java.lang.String _street); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "City", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getCity(); + + void setCity(java.lang.String _city); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "State", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getState(); + + void setState(java.lang.String _state); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ZipCode", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getZipCode(); + + void setZipCode(java.lang.String _zipCode); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Country", + type = "Edm.String", + nullable = true, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.String getCountry(); + + void setCountry(java.lang.String _country); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java index 019d014..ee6a8ac 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java @@ -1,130 +1,123 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) + +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; -//CHECKSTYLE:ON (Maven checkstyle) +// CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Advertisement", - openType = false, - hasStream = true, - isAbstract = false) -public interface Advertisement - extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.ext.proxy.api.EntityType<Advertisement>, org.apache.olingo.ext.proxy.api.StructuredQuery<Advertisement> { - - - - - @Key - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", - type = "Edm.Guid", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.util.UUID getID(); - - void setID(java.util.UUID _iD); - - - @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 = "") - java.lang.String getName(); - - void setName(java.lang.String _name); - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AirDate", - type = "Edm.DateTimeOffset", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.sql.Timestamp getAirDate(); - - void setAirDate(java.sql.Timestamp _airDate); - - - @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "FeaturedProduct", - type = "ODataDemo.FeaturedProduct", - targetSchema = "ODataDemo", - targetContainer = "DemoService", - targetEntitySet = "Products", - containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct(); - - void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct); - - void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream); - - org.apache.olingo.ext.proxy.api.EdmStreamValue loadStream(); - - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - } - Annotations annotations(); - - interface Annotations { - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID", - type = "Edm.Guid") - org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations(); - - @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 = "AirDate", - type = "Edm.DateTimeOffset") - org.apache.olingo.ext.proxy.api.Annotatable getAirDateAnnotations(); - - - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "FeaturedProduct", - type = "ODataDemo.FeaturedProduct") - org.apache.olingo.ext.proxy.api.Annotatable getFeaturedProductAnnotations(); - } + openType = false, + hasStream = true, + isAbstract = false) +public interface Advertisement + extends org.apache.olingo.ext.proxy.api.Annotatable, + org.apache.olingo.ext.proxy.api.EntityType<Advertisement>, + org.apache.olingo.ext.proxy.api.StructuredQuery<Advertisement> { + + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", + type = "Edm.Guid", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.util.UUID getID(); + + void setID(java.util.UUID _iD); + + @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 = "") + java.lang.String getName(); + + void setName(java.lang.String _name); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AirDate", + type = "Edm.DateTimeOffset", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.sql.Timestamp getAirDate(); + + void setAirDate(java.sql.Timestamp _airDate); + + @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "FeaturedProduct", + type = "ODataDemo.FeaturedProduct", + targetSchema = "ODataDemo", + targetContainer = "DemoService", + targetEntitySet = "Products", + containsTarget = false) + org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct(); + + void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct); + + void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream); + + org.apache.olingo.ext.proxy.api.EdmStreamValue loadStream(); + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Annotations annotations(); + + interface Annotations { + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID", + type = "Edm.Guid") + org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations(); + + @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 = "AirDate", + type = "Edm.DateTimeOffset") + org.apache.olingo.ext.proxy.api.Annotatable getAirDateAnnotations(); + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name = "FeaturedProduct", + type = "ODataDemo.FeaturedProduct") + org.apache.olingo.ext.proxy.api.Annotatable getFeaturedProductAnnotations(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java index 3376e9c..ae63639 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java @@ -1,38 +1,40 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.ext.proxy.api.AbstractTerm; +// CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; -//CHECKSTYLE:ON (Maven checkstyle) +// CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.AbstractTerm; -public interface AdvertisementCollection extends +public interface AdvertisementCollection + extends org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection>, - org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> { +org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection> { + + Operations operations(); - Operations operations(); + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - } Object getAnnotation(Class<? extends AbstractTerm> term); Collection<Class<? extends AbstractTerm>> getAnnotationTerms(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java index e776893..184d5b8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java @@ -1,27 +1,27 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) - -public interface AdvertisementCollectionComposableInvoker extends +public interface AdvertisementCollectionComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.AdvertisementCollection.Operations> { @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java index b4c5f19..6c7cd86 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java @@ -1,29 +1,31 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) + +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; -//CHECKSTYLE:ON (Maven checkstyle) -public interface AdvertisementComposableInvoker - extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Advertisement, Advertisement.Operations> - { +// CHECKSTYLE:ON (Maven checkstyle) + +public interface AdvertisementComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Advertisement, Advertisement.Operations> +{ @Override AdvertisementComposableInvoker select(String... select); @@ -31,70 +33,64 @@ public interface AdvertisementComposableInvoker @Override AdvertisementComposableInvoker expand(String... expand); - - - @Key - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", - type = "Edm.Guid", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.util.UUID getID(); - - void setID(java.util.UUID _iD); - - - @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 = "") - java.lang.String getName(); - - void setName(java.lang.String _name); - - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AirDate", - type = "Edm.DateTimeOffset", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.sql.Timestamp getAirDate(); - - void setAirDate(java.sql.Timestamp _airDate); - - - @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "FeaturedProduct", - type = "ODataDemo.FeaturedProduct", - targetSchema = "ODataDemo", - targetContainer = "DemoService", - targetEntitySet = "Products", - containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct(); - - void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct); - - void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream); - - org.apache.olingo.ext.proxy.api.EdmStreamValue loadStream(); + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", + type = "Edm.Guid", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.util.UUID getID(); + + void setID(java.util.UUID _iD); + + @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 = "") + java.lang.String getName(); + + void setName(java.lang.String _name); + + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "AirDate", + type = "Edm.DateTimeOffset", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.sql.Timestamp getAirDate(); + + void setAirDate(java.sql.Timestamp _airDate); + + @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "FeaturedProduct", + type = "ODataDemo.FeaturedProduct", + targetSchema = "ODataDemo", + targetContainer = "DemoService", + targetEntitySet = "Products", + containsTarget = false) + org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct(); + + void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct); + + void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream); + + org.apache.olingo.ext.proxy.api.EdmStreamValue loadStream(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java index aa04c8b..b854543 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java @@ -1,108 +1,100 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -//CHECKSTYLE:ON (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +// CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") @org.apache.olingo.ext.proxy.api.annotations.EntityType(name = "Category", - openType = true, - hasStream = false, - isAbstract = false) -public interface Category - extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.ext.proxy.api.EntityType<Category>, org.apache.olingo.ext.proxy.api.StructuredQuery<Category> ,AbstractOpenType { - - - - - @Key - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.Integer getID(); - - void setID(java.lang.Integer _iD); - - - @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 = "") - java.lang.String getName(); - - void setName(java.lang.String _name); - - - @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products", - type = "ODataDemo.Product", - targetSchema = "ODataDemo", - targetContainer = "DemoService", - targetEntitySet = "Products", - containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); - - void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); - - - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - } - Annotations annotations(); - - interface Annotations { - - @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID", - type = "Edm.Int32") - org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations(); - - @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.AnnotationsForNavigationProperty(name = "Products", - type = "ODataDemo.Product") - org.apache.olingo.ext.proxy.api.Annotatable getProductsAnnotations(); - } + openType = true, + hasStream = false, + isAbstract = false) +public interface Category + extends org.apache.olingo.ext.proxy.api.Annotatable, + org.apache.olingo.ext.proxy.api.EntityType<Category>, org.apache.olingo.ext.proxy.api.StructuredQuery<Category>, + AbstractOpenType { + + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", + type = "Edm.Int32", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.Integer getID(); + + void setID(java.lang.Integer _iD); + + @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 = "") + java.lang.String getName(); + + void setName(java.lang.String _name); + + @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products", + type = "ODataDemo.Product", + targetSchema = "ODataDemo", + targetContainer = "DemoService", + targetEntitySet = "Products", + containsTarget = false) + org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); + + void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Annotations annotations(); + + interface Annotations { + + @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID", + type = "Edm.Int32") + org.apache.olingo.ext.proxy.api.Annotatable getIDAnnotations(); + + @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.AnnotationsForNavigationProperty(name = "Products", + type = "ODataDemo.Product") + org.apache.olingo.ext.proxy.api.Annotatable getProductsAnnotations(); + } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java index 6185e73..e915d36 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java @@ -1,38 +1,40 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.ext.proxy.api.AbstractTerm; +// CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; -//CHECKSTYLE:ON (Maven checkstyle) +// CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.AbstractTerm; -public interface CategoryCollection extends +public interface CategoryCollection + extends org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection>, - org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> { +org.apache.olingo.ext.proxy.api.EntityCollection<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection> { + + Operations operations(); - Operations operations(); + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } - interface Operations extends org.apache.olingo.ext.proxy.api.Operations{ - //No additional methods needed for now. - } Object getAnnotation(Class<? extends AbstractTerm> term); Collection<Class<? extends AbstractTerm>> getAnnotationTerms(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java index 94e9355..11abe78 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java @@ -1,27 +1,27 @@ -/* +/* * 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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) +// CHECKSTYLE:OFF (Maven checkstyle) - -public interface CategoryCollectionComposableInvoker extends +public interface CategoryCollectionComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection, org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection.Operations> { @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d1507449/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java index cd08705..ae60a27 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java @@ -1,30 +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.v4.demo.odatademo.types; -//CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.ext.proxy.api.annotations.Key; + +// CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; -//CHECKSTYLE:ON (Maven checkstyle) -public interface CategoryComposableInvoker - extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Category, Category.Operations> - ,AbstractOpenType { +// CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.ext.proxy.api.annotations.Key; + +public interface CategoryComposableInvoker + extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Category, Category.Operations> + , AbstractOpenType { @Override CategoryComposableInvoker select(String... select); @@ -32,51 +34,45 @@ public interface CategoryComposableInvoker @Override CategoryComposableInvoker expand(String... expand); - + @Key + @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", + type = "Edm.Int32", + nullable = false, + defaultValue = "", + maxLenght = Integer.MAX_VALUE, + fixedLenght = false, + precision = 0, + scale = 0, + unicode = true, + collation = "", + srid = "") + java.lang.Integer getID(); - @Key - - @org.apache.olingo.ext.proxy.api.annotations.Property(name = "ID", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - java.lang.Integer getID(); + void setID(java.lang.Integer _iD); - void setID(java.lang.Integer _iD); - - - @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 = "") - java.lang.String getName(); + @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 = "") + java.lang.String getName(); - void setName(java.lang.String _name); - + void setName(java.lang.String _name); - @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products", - type = "ODataDemo.Product", - targetSchema = "ODataDemo", - targetContainer = "DemoService", - targetEntitySet = "Products", - containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); + @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Products", + type = "ODataDemo.Product", + targetSchema = "ODataDemo", + targetContainer = "DemoService", + targetEntitySet = "Products", + containsTarget = false) + org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); - void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); - + void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); }
