From 5bcf4752b7ac934eb184a3a7614e1f9f3d2427a9 Mon Sep 17 00:00:00 2001 From: fmartelli Date: Thu, 15 May 2014 14:21:25 +0200 Subject: [PATCH] [OLINGO-260] opentypes full integrated onto the proxy --- .../olingo/ext/proxy/utils/CoreUtils.java | 62 ++++- .../fit/proxy/v3/OpenTypeTestITCase.java | 19 +- .../opentypesservice/DefaultContainer.java | 77 ------ .../odata/services/opentypesservice/Row.java | 55 ---- .../services/opentypesservice/RowIndex.java | 53 ---- .../opentypesservice/package-info.java | 21 -- .../types/ContactDetails.java | 136 --------- .../opentypesservice/types/IndexedRow.java | 92 ------- .../types/IndexedRowCollection.java | 47 ---- .../services/opentypesservice/types/Row.java | 91 ------ .../opentypesservice/types/RowCollection.java | 47 ---- .../opentypesservice/types/RowIndex.java | 101 ------- .../types/RowIndexCollection.java | 47 ---- .../opentypesservice/types/package-info.java | 21 -- .../fit/proxy/v4/OpenTypeTestITCase.java | 20 +- .../opentypesservice/DefaultContainer.java | 76 ----- .../odata/services/opentypesservice/Row.java | 55 ---- .../services/opentypesservice/RowIndex.java | 53 ---- .../opentypesservice/package-info.java | 21 -- .../opentypesservice/types/Color.java | 45 --- .../types/ContactDetails.java | 259 ------------------ .../opentypesservice/types/IndexedRow.java | 92 ------- .../types/IndexedRowCollection.java | 47 ---- .../services/opentypesservice/types/Row.java | 91 ------ .../opentypesservice/types/RowCollection.java | 47 ---- .../opentypesservice/types/RowIndex.java | 101 ------- .../types/RowIndexCollection.java | 47 ---- .../opentypesservice/types/package-info.java | 21 -- .../services/opentypesservicev4/Row.java | 2 +- .../services/opentypesservicev4/RowIndex.java | 2 +- .../olingo/fit/v3/OpenTypeTestITCase.java | 6 +- .../org.apache.olingo.ext.proxy.complex | 4 +- .../META-INF/org.apache.olingo.ext.proxy.enum | 2 +- 33 files changed, 86 insertions(+), 1774 deletions(-) delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/Row.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/package-info.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/Row.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/package-info.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java delete mode 100644 fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java index 498e58cc9..9125f07a5 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java @@ -34,8 +34,10 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; +import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonEdmEnabledODataClient; import org.apache.olingo.client.api.v3.UnsupportedInV3Exception; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataLink; @@ -248,14 +250,18 @@ public final class CoreUtils { if (Collection.class.isAssignableFrom(obj.getClass())) { final EdmTypeInfo type = guessPrimitiveType(client, ClassUtils.extractTypeArg(obj.getClass())); - return edmTypeInfo.setTypeExpression( - "Collection(" + type.getFullQualifiedName() + ")").build(); + return edmTypeInfo.setTypeExpression("Collection(" + type.getFullQualifiedName() + ")").build(); } else if (obj instanceof Proxy) { final Class typeRef = obj.getClass().getInterfaces()[0]; final String ns = typeRef.getAnnotation(Namespace.class).value(); final String name = typeRef.getAnnotation(ComplexType.class).name(); return edmTypeInfo.setTypeExpression(new FullQualifiedName(ns, name).toString()).build(); - } else { + } else if(obj.getClass().getAnnotation(EnumType.class)!=null){ + final Class typeRef = obj.getClass(); + final String ns = typeRef.getAnnotation(Namespace.class).value(); + final String name = typeRef.getAnnotation(EnumType.class).name(); + return edmTypeInfo.setTypeExpression(new FullQualifiedName(ns, name).toString()).build(); + }else{ return guessPrimitiveType(client, obj.getClass()); } } @@ -493,11 +499,16 @@ public final class CoreUtils { res = null; } else if (property.hasComplexValue()) { + if (typeRef == null) { + internalRef = getComplexTypeRef(property); + } + res = Proxy.newProxyInstance( Thread.currentThread().getContextClassLoader(), new Class[] {internalRef}, ComplexTypeInvocationHandler.getInstance( client, property.getValue().asComplex(), internalRef, entityHandler)); + } else if (property.hasCollectionValue()) { final ArrayList collection = new ArrayList(); @@ -519,6 +530,9 @@ public final class CoreUtils { res = collection; } else if (property instanceof ODataProperty && ((ODataProperty) property).hasEnumValue()) { + if (internalRef == null) { + internalRef = getEnumTypeRef(property); + } res = enumValueToObject(((ODataProperty) property).getEnumValue(), internalRef); } else { res = primitiveValueToObject(property.getPrimitiveValue(), internalRef); @@ -527,6 +541,48 @@ public final class CoreUtils { return res; } + private static Class getEnumTypeRef(final CommonODataProperty property) { + return getTypeRef(property, "META-INF/" + Constants.PROXY_ENUM_CLASS_LIST, EnumType.class); + } + + private static Class getComplexTypeRef(final CommonODataProperty property) { + return getTypeRef(property, "META-INF/" + Constants.PROXY_COMPLEX_CLASS_LIST, ComplexType.class); + } + + private static Class getTypeRef( + final CommonODataProperty property, + final String proxyClassListFile, + final Class annType) { + if (!annType.isAssignableFrom(EnumType.class) && !annType.isAssignableFrom(ComplexType.class)) { + throw new IllegalArgumentException("Invalid annotation type " + annType); + } + + try { + final List pkgs = IOUtils.readLines( + CoreUtils.class.getClassLoader().getResourceAsStream(proxyClassListFile), + Constants.UTF8); + + for (String pkg : pkgs) { + final Class clazz = Class.forName(pkg); + final Annotation ann = clazz.getAnnotation(annType); + final Namespace ns = clazz.getAnnotation(Namespace.class); + + if (ns != null && ann != null) { + if (property.getValue().getTypeName().equals( + new FullQualifiedName(ns.value(), annType.isAssignableFrom(EnumType.class) + ? EnumType.class.cast(ann).name() + : ComplexType.class.cast(ann).name()).toString())) { + return clazz; + } + } + } + } catch (Exception e) { + LOG.warn("Error retrieving proxy complex class list", e); + } + + throw new IllegalArgumentException("Provided property '" + property + "' is not complex"); + } + private static String firstValidEntityKey(final Class entityTypeRef) { for (Method method : entityTypeRef.getDeclaredMethods()) { if (method.getAnnotation(Key.class) != null) { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java index 95a1e9f9b..3cc863d54 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.fit.proxy.v3; - import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -33,10 +32,10 @@ import java.util.UUID; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.EntityContainerFactory; import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.DefaultContainer; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.Row; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex; +import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.DefaultContainer; +import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.ContactDetails; +import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.Row; +import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.RowIndex; import org.junit.BeforeClass; import org.junit.Test; @@ -97,7 +96,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { cal.setTime(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX").parse("2001-04-05T05:05:05.001+00:01")); contact.setLastContacted(cal); - + cal = Calendar.getInstance(); cal.clear(); cal.setTime(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").parse("2001-04-05T05:05:04.001")); @@ -112,7 +111,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { contact.setShort(Short.MAX_VALUE); contact.setInt(Integer.MAX_VALUE); rowIndex.addAdditionalProperty("aContact", contact); - + otcontainer.flush(); rowIndex = otcontainer.getRowIndex().get(id); @@ -122,13 +121,13 @@ public class OpenTypeTestITCase extends AbstractTestITCase { assertEquals(Byte.class, rowIndex.getAdditionalProperty("aByte").getClass()); assertEquals(Byte.MAX_VALUE, rowIndex.getAdditionalProperty("aByte")); assertTrue(Calendar.class.isAssignableFrom(rowIndex.getAdditionalProperty("aDate").getClass())); -// assertEquals(ContactDetails.class, rowIndex.getAdditionalProperty("aContact").getClass().getInterfaces()[0]); + assertEquals(ContactDetails.class, rowIndex.getAdditionalProperty("aContact").getClass().getInterfaces()[0]); entityContext.detachAll(); - + otcontainer.getRowIndex().delete(id); otcontainer.flush(); - + assertNull(otcontainer.getRowIndex().get(id)); } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java deleted file mode 100644 index 3fe922870..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityContainer; -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.annotations.Property; -import org.apache.olingo.ext.proxy.api.Container; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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; - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityContainer(name = "DefaultContainer", - namespace = "Microsoft.Test.OData.Services.OpenTypesService", - isDefaultEntityContainer = true) -public interface DefaultContainer extends Container { - - Row getRow(); - - RowIndex getRowIndex(); - - - - - - Operations operations(); - - public interface Operations { - - } - - ComplexFactory complexFactory(); - - interface ComplexFactory { - @Property(name = "ContactDetails", - type = "Microsoft.Test.OData.Services.OpenTypesService.ContactDetails") - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails newContactDetails(); - - } - } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/Row.java deleted file mode 100644 index 72c8cc0a2..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/Row.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice; - -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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; - - - -@EntitySet(name = "Row") -public interface Row - extends AbstractEntitySet { - - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.Row newRow(); - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.RowCollection newRowCollection(); - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow newIndexedRow(); - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRowCollection newIndexedRowCollection(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java deleted file mode 100644 index 1a2b22be5..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice; - -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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; - - - -@EntitySet(name = "RowIndex") -public interface RowIndex - extends AbstractEntitySet { - - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex newRowIndex(); - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndexCollection newRowIndexCollection(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/package-info.java deleted file mode 100644 index ecc81680e..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice; - diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java deleted file mode 100644 index 8e3a45824..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java +++ /dev/null @@ -1,136 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - -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.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@ComplexType(name = "ContactDetails") -public interface ContactDetails - extends Serializable { - - - @Property(name = "FirstContacted", type = "Edm.Binary", nullable = true) - byte[] getFirstContacted(); - - void setFirstContacted(final byte[] _firstContacted); - - - - @Property(name = "LastContacted", type = "Edm.DateTimeOffset", nullable = false) - Calendar getLastContacted(); - - void setLastContacted(final Calendar _lastContacted); - - - - @Property(name = "Contacted", type = "Edm.DateTime", nullable = false) - Calendar getContacted(); - - void setContacted(final Calendar _contacted); - - - - @Property(name = "GUID", type = "Edm.Guid", nullable = false) - UUID getGUID(); - - void setGUID(final UUID _gUID); - - - - @Property(name = "PreferedContactTime", type = "Edm.Time", nullable = false) - BigDecimal getPreferedContactTime(); - - void setPreferedContactTime(final BigDecimal _preferedContactTime); - - - - @Property(name = "Byte", type = "Edm.Byte", nullable = false) - Short getByte(); - - void setByte(final Short _byte); - - - - @Property(name = "SignedByte", type = "Edm.SByte", nullable = false) - Byte getSignedByte(); - - void setSignedByte(final Byte _signedByte); - - - - @Property(name = "Double", type = "Edm.Double", nullable = false) - Double getDouble(); - - void setDouble(final Double _double); - - - - @Property(name = "Single", type = "Edm.Single", nullable = false) - Float getSingle(); - - void setSingle(final Float _single); - - - - @Property(name = "Short", type = "Edm.Int16", nullable = false) - Short getShort(); - - void setShort(final Short _short); - - - - @Property(name = "Int", type = "Edm.Int32", nullable = false) - Integer getInt(); - - void setInt(final Integer _int); - - - - @Property(name = "Long", type = "Edm.Int64", nullable = false) - Long getLong(); - - void setLong(final Long _long); - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java deleted file mode 100644 index 32b9ce5f1..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -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.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityType(name = "IndexedRow", - openType = true, - hasStream = false, - isAbstract = false, - baseType = "Microsoft.Test.OData.Services.OpenTypesService.Row") -public interface IndexedRow - extends org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.Row { - - - @Key - @Property(name = "Id", - type = "Edm.Guid", - 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) - UUID getId(); - - void setId(final UUID _id); - - - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java deleted file mode 100644 index a334155f8..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -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.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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 IndexedRowCollection extends AbstractEntityCollection { -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java deleted file mode 100644 index d8e74b72a..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -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.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityType(name = "Row", - openType = true, - hasStream = false, - isAbstract = false) -public interface Row - extends AbstractOpenType { - - - @Key - @Property(name = "Id", - type = "Edm.Guid", - 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) - UUID getId(); - - void setId(final UUID _id); - - - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java deleted file mode 100644 index 8069b9052..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -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.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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 RowCollection extends AbstractEntityCollection { -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java deleted file mode 100644 index 33e44a930..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -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.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityType(name = "RowIndex", - openType = true, - hasStream = false, - isAbstract = false) -public interface RowIndex - extends AbstractOpenType { - - - @Key - @Property(name = "Id", - 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) - Integer getId(); - - void setId(final Integer _id); - - - - @NavigationProperty(name = "Rows", - type = "Microsoft.Test.OData.Services.OpenTypesService.IndexedRow", - targetSchema = "Microsoft.Test.OData.Services.OpenTypesService", - targetContainer = "DefaultContainer", - targetEntitySet = "Row") - org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRowCollection getRows(); - - void setRows(final org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRowCollection _rows); - - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java deleted file mode 100644 index eb6119ef6..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -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.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.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 RowIndexCollection extends AbstractEntityCollection { -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java deleted file mode 100644 index cad5bc978..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types; - diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java index 11f7d07d5..b1b61c8ea 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.fit.proxy.v4; + import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -28,7 +29,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.UUID; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; + import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.EntityContainerFactory; import org.apache.olingo.ext.proxy.api.annotations.EntityType; @@ -38,6 +39,7 @@ import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.ope import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row; import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex; import org.junit.BeforeClass; + import org.junit.Test; /** @@ -49,10 +51,8 @@ public class OpenTypeTestITCase extends AbstractTestITCase { @BeforeClass public static void initContainer() { - final EntityContainerFactory otcontainerFactory = - EntityContainerFactory.getV4(testOpenTypeServiceRootURL); - otcontainerFactory.getClient().getConfiguration(). - setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM); + final EntityContainerFactory otcontainerFactory = EntityContainerFactory.getV4(testOpenTypeServiceRootURL); + otcontainerFactory.getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM); otcontainer = otcontainerFactory.getEntityContainer(DefaultContainer.class); assertNotNull(otcontainer); } @@ -95,10 +95,10 @@ public class OpenTypeTestITCase extends AbstractTestITCase { Calendar cal = Calendar.getInstance(); cal.clear(); - cal.setTime(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").parse("2001-04-05T05:05:05.001")); + cal.setTime(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX").parse("2001-04-05T05:05:05.001+00:01")); contact.setLastContacted(cal); - + cal = Calendar.getInstance(); cal.clear(); cal.setTime(new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").parse("2001-04-05T05:05:04.001")); @@ -114,7 +114,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { contact.setInt(Integer.MAX_VALUE); rowIndex.addAdditionalProperty("aContact", contact); rowIndex.addAdditionalProperty("aColor", Color.Green); - + otcontainer.flush(); rowIndex = otcontainer.getRowIndex().get(id); @@ -129,10 +129,10 @@ public class OpenTypeTestITCase extends AbstractTestITCase { assertEquals(Color.Green, rowIndex.getAdditionalProperty("aColor")); entityContext.detachAll(); - + otcontainer.getRowIndex().delete(id); otcontainer.flush(); - + assertNull(otcontainer.getRowIndex().get(id)); } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java deleted file mode 100644 index 728be414b..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityContainer; -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.annotations.Property; -import org.apache.olingo.ext.proxy.api.Container; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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; - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityContainer(name = "DefaultContainer", - namespace = "Microsoft.Test.OData.Services.OpenTypesService", - isDefaultEntityContainer = true) -public interface DefaultContainer extends Container { - - Row getRow(); - - RowIndex getRowIndex(); - - - - - Operations operations(); - - public interface Operations { - - } - - ComplexFactory complexFactory(); - - interface ComplexFactory { - @Property(name = "ContactDetails", - type = "Microsoft.Test.OData.Services.OpenTypesService.ContactDetails") - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails newContactDetails(); - - } - } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/Row.java deleted file mode 100644 index 7dc677148..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/Row.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice; - -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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; - - - -@EntitySet(name = "Row", includeInServiceDocument = true) -public interface Row - extends AbstractEntitySet { - - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.Row newRow(); - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.RowCollection newRowCollection(); - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow newIndexedRow(); - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRowCollection newIndexedRowCollection(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java deleted file mode 100644 index c37b0c212..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice; - -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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; - - - -@EntitySet(name = "RowIndex", includeInServiceDocument = true) -public interface RowIndex - extends AbstractEntitySet { - - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex newRowIndex(); - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndexCollection newRowIndexCollection(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/package-info.java deleted file mode 100644 index c457768b2..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice; - diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java deleted file mode 100644 index 5ea10aaca..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EnumType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EnumType(name = "Color", - underlyingType = EdmPrimitiveTypeKind.Int32, - isFlags = false) -public enum Color { - Red(1), - Green(2), - Blue(4); - - private Integer value; - - public Integer getValue(){ - return this.value; - } - - private Color(final Integer value){ - this.value=value; - } -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java deleted file mode 100644 index 94a3c1420..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java +++ /dev/null @@ -1,259 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -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.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@ComplexType(name = "ContactDetails", - isOpenType = false, - isAbstract = false) -public interface ContactDetails - extends Serializable { - - - @Property(name = "FirstContacted", - type = "Edm.Binary", - nullable = true, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - byte[] getFirstContacted(); - - void setFirstContacted(final byte[] _firstContacted); - - - - @Property(name = "LastContacted", - type = "Edm.DateTimeOffset", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Calendar getLastContacted(); - - void setLastContacted(final Calendar _lastContacted); - - - - @Property(name = "Contacted", - type = "Edm.DateTime", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Calendar getContacted(); - - void setContacted(final Calendar _contacted); - - - - @Property(name = "GUID", - type = "Edm.Guid", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - UUID getGUID(); - - void setGUID(final UUID _gUID); - - - - @Property(name = "PreferedContactTime", - type = "Edm.Time", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - BigDecimal getPreferedContactTime(); - - void setPreferedContactTime(final BigDecimal _preferedContactTime); - - - - @Property(name = "Byte", - type = "Edm.Byte", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Short getByte(); - - void setByte(final Short _byte); - - - - @Property(name = "SignedByte", - type = "Edm.SByte", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Byte getSignedByte(); - - void setSignedByte(final Byte _signedByte); - - - - @Property(name = "Double", - type = "Edm.Double", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Double getDouble(); - - void setDouble(final Double _double); - - - - @Property(name = "Single", - type = "Edm.Single", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Float getSingle(); - - void setSingle(final Float _single); - - - - @Property(name = "Short", - type = "Edm.Int16", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Short getShort(); - - void setShort(final Short _short); - - - - @Property(name = "Int", - type = "Edm.Int32", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Integer getInt(); - - void setInt(final Integer _int); - - - - @Property(name = "Long", - type = "Edm.Int64", - nullable = false, - defaultValue = "", - maxLenght = Integer.MAX_VALUE, - fixedLenght = false, - precision = 0, - scale = 0, - unicode = true, - collation = "", - srid = "") - Long getLong(); - - void setLong(final Long _long); - - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java deleted file mode 100644 index e654481af..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -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.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityType(name = "IndexedRow", - openType = true, - hasStream = false, - isAbstract = false, - baseType = "Microsoft.Test.OData.Services.OpenTypesService.Row") -public interface IndexedRow - extends org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.Row { - - - @Key - @Property(name = "Id", - type = "Edm.Guid", - 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) - UUID getId(); - - void setId(final UUID _id); - - - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java deleted file mode 100644 index 2fa3c9bb8..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -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.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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 IndexedRowCollection extends AbstractEntityCollection { -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java deleted file mode 100644 index e12e8b2fd..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -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.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityType(name = "Row", - openType = true, - hasStream = false, - isAbstract = false) -public interface Row - extends AbstractOpenType { - - - @Key - @Property(name = "Id", - type = "Edm.Guid", - 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) - UUID getId(); - - void setId(final UUID _id); - - - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java deleted file mode 100644 index 2a9541aa3..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -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.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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 RowCollection extends AbstractEntityCollection { -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java deleted file mode 100644 index eed4dfa4d..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -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.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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; - - -@Namespace("Microsoft.Test.OData.Services.OpenTypesService") -@EntityType(name = "RowIndex", - openType = true, - hasStream = false, - isAbstract = false) -public interface RowIndex - extends AbstractOpenType { - - - @Key - @Property(name = "Id", - 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) - Integer getId(); - - void setId(final Integer _id); - - - - @NavigationProperty(name = "Rows", - type = "Microsoft.Test.OData.Services.OpenTypesService.Row", - targetSchema = "Microsoft.Test.OData.Services.OpenTypesService", - targetContainer = "DefaultContainer", - targetEntitySet = "Row") - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.Row getRows(); - - void setRows(final org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.Row _rows); - - - - -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java deleted file mode 100644 index 64a187051..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -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.v4.opentype.microsoft.test.odata.services.opentypesservice.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.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 RowIndexCollection extends AbstractEntityCollection { -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java deleted file mode 100644 index 7de3068d9..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * 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 - * - * 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 - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types; - diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java index 5c970acf3..0fa9886ba 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java @@ -44,7 +44,7 @@ import javax.xml.datatype.Duration; -@EntitySet(name = "Row") +@EntitySet(name = "Row", includeInServiceDocument = true) public interface Row extends AbstractEntitySet { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java index 22dee42f5..33b4eefe0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java @@ -44,7 +44,7 @@ import javax.xml.datatype.Duration; -@EntitySet(name = "RowIndex") +@EntitySet(name = "RowIndex", includeInServiceDocument = true) public interface RowIndex extends AbstractEntitySet { diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java index 25b50655d..b3490a0e6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java @@ -81,7 +81,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { final Integer id = 1426; ODataEntity rowIndex = getClient().getObjectFactory().newEntity( - new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesService.RowIndex")); + new FullQualifiedName("Microsoft.Test.OData.Services.OpenTypesServiceV3.RowIndex")); getClient().getBinder().add(rowIndex, getClient().getObjectFactory().newPrimitiveProperty("Id", getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(id))); @@ -106,7 +106,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { build())); final ODataComplexValue contactDetails = getClient().getObjectFactory().newComplexValue( - "Microsoft.Test.OData.Services.OpenTypesService.ContactDetails"); + "Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails"); contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("FirstContacted", getClient().getObjectFactory().newPrimitiveValueBuilder().buildBinary("text".getBytes()))); contactDetails.add(getClient().getObjectFactory().newPrimitiveProperty("LastContacted", @@ -161,7 +161,7 @@ public class OpenTypeTestITCase extends AbstractTestITCase { assertTrue(rowIndex.getProperty("aDate").hasPrimitiveValue()); assertEquals(EdmPrimitiveTypeKind.DateTime, rowIndex.getProperty("aDate").getPrimitiveValue().getTypeKind()); assertTrue(rowIndex.getProperty("aContact").hasComplexValue()); - assertEquals("Microsoft.Test.OData.Services.OpenTypesService.ContactDetails", + assertEquals("Microsoft.Test.OData.Services.OpenTypesServiceV3.ContactDetails", rowIndex.getProperty("aContact").getValue().getTypeName()); assertTrue(rowIndex.getProperty("aContact").getComplexValue().get("SignedByte").hasPrimitiveValue()); diff --git a/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.complex b/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.complex index c6d788fa8..3c43cdf66 100644 --- a/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.complex +++ b/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.complex @@ -13,9 +13,9 @@ org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.a org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.ComplexToCategory -org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails +org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.ContactDetails org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo -org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails +org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.ContactDetails diff --git a/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.enum b/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.enum index b8c585f63..16dbe683b 100644 --- a/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.enum +++ b/fit/src/test/resources/META-INF/org.apache.olingo.ext.proxy.enum @@ -1,4 +1,4 @@ org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory -org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservice.types.Color +org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Color