[OLINGO-1004] Remove microsoft from Apache Olingo package name

Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0063a300
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0063a300
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0063a300

Branch: refs/heads/master
Commit: 0063a3003fb4fc8a9a0bf6cad3586608b06ab4f9
Parents: 3a9961a
Author: Christian Amend <[email protected]>
Authored: Fri Aug 12 13:38:40 2016 +0200
Committer: Christian Amend <[email protected]>
Committed: Fri Aug 12 13:38:40 2016 +0200

----------------------------------------------------------------------
 .../olingo/fit/proxy/OpenTypeTestITCase.java    |  14 +-
 .../olingo/fit/proxy/opentype/Service.java      |  12 +-
 .../opentypesservice/DefaultContainer.java      |  61 -----
 .../odata/services/opentypesservice/Row.java    |  40 ---
 .../services/opentypesservice/RowIndex.java     |  40 ---
 .../services/opentypesservice/package-info.java |  20 --
 .../opentypesservice/types/AccountInfo.java     |  84 ------
 .../types/AccountInfoCollection.java            |  41 ---
 .../AccountInfoCollectionComposableInvoker.java |  32 ---
 .../types/AccountInfoComposableInvoker.java     |  66 -----
 .../services/opentypesservice/types/Color.java  |  44 ---
 .../opentypesservice/types/ContactDetails.java  | 273 -------------------
 .../types/ContactDetailsCollection.java         |  41 ---
 ...ntactDetailsCollectionComposableInvoker.java |  32 ---
 .../types/ContactDetailsComposableInvoker.java  | 213 ---------------
 .../opentypesservice/types/IndexedRow.java      |  87 ------
 .../types/IndexedRowCollection.java             |  41 ---
 .../IndexedRowCollectionComposableInvoker.java  |  32 ---
 .../types/IndexedRowComposableInvoker.java      |  53 ----
 .../services/opentypesservice/types/Row.java    |  68 -----
 .../opentypesservice/types/RowCollection.java   |  41 ---
 .../types/RowCollectionComposableInvoker.java   |  32 ---
 .../types/RowComposableInvoker.java             |  53 ----
 .../opentypesservice/types/RowIndex.java        |  82 ------
 .../types/RowIndexCollection.java               |  41 ---
 .../RowIndexCollectionComposableInvoker.java    |  32 ---
 .../types/RowIndexComposableInvoker.java        |  64 -----
 .../opentypesservice/types/package-info.java    |  20 --
 .../opentypesservice/DefaultContainer.java      |  61 +++++
 .../proxy/opentype/opentypesservice/Row.java    |  40 +++
 .../opentype/opentypesservice/RowIndex.java     |  40 +++
 .../opentype/opentypesservice/package-info.java |  20 ++
 .../opentypesservice/types/AccountInfo.java     |  84 ++++++
 .../types/AccountInfoCollection.java            |  41 +++
 .../AccountInfoCollectionComposableInvoker.java |  32 +++
 .../types/AccountInfoComposableInvoker.java     |  66 +++++
 .../opentype/opentypesservice/types/Color.java  |  44 +++
 .../opentypesservice/types/ContactDetails.java  | 273 +++++++++++++++++++
 .../types/ContactDetailsCollection.java         |  41 +++
 ...ntactDetailsCollectionComposableInvoker.java |  32 +++
 .../types/ContactDetailsComposableInvoker.java  | 213 +++++++++++++++
 .../opentypesservice/types/IndexedRow.java      |  87 ++++++
 .../types/IndexedRowCollection.java             |  41 +++
 .../IndexedRowCollectionComposableInvoker.java  |  32 +++
 .../types/IndexedRowComposableInvoker.java      |  53 ++++
 .../opentype/opentypesservice/types/Row.java    |  68 +++++
 .../opentypesservice/types/RowCollection.java   |  41 +++
 .../types/RowCollectionComposableInvoker.java   |  32 +++
 .../types/RowComposableInvoker.java             |  53 ++++
 .../opentypesservice/types/RowIndex.java        |  82 ++++++
 .../types/RowIndexCollection.java               |  41 +++
 .../RowIndexCollectionComposableInvoker.java    |  32 +++
 .../types/RowIndexComposableInvoker.java        |  64 +++++
 .../opentypesservice/types/package-info.java    |  20 ++
 54 files changed, 1646 insertions(+), 1646 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java 
b/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java
index 42626b5..04e152c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java
@@ -34,13 +34,13 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.format.ContentType;
 import org.apache.olingo.ext.proxy.api.annotations.EntityType;
 import org.apache.olingo.fit.proxy.opentype.Service;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.DefaultContainer;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.AccountInfo;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Color;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.DefaultContainer;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.AccountInfo;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Color;
+import 
org.apache.olingo.fit.proxy.opentype.opentypesservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.IndexedRow;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Row;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowIndex;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java
index d6e1c6e..04d5ef0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java
@@ -26,12 +26,12 @@ import org.apache.olingo.client.api.EdmEnabledODataClient;
 import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
 import org.apache.olingo.ext.proxy.AbstractService;
 import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.AccountInfo;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Color;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.AccountInfo;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Color;
+import 
org.apache.olingo.fit.proxy.opentype.opentypesservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.IndexedRow;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Row;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowIndex;
 
 public class Service<C extends EdmEnabledODataClient> extends 
AbstractService<C> {
 

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java
deleted file mode 100644
index 09bba09..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java
+++ /dev/null
@@ -1,61 +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.opentype.microsoft.test.odata.services.opentypesservice;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.io.InputStream;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-import java.io.Serializable;
-
-import org.apache.olingo.ext.proxy.api.ComplexCollection;
-import org.apache.olingo.ext.proxy.api.ComplexType;
-import org.apache.olingo.ext.proxy.api.EdmStreamValue;
-import org.apache.olingo.ext.proxy.api.EntityCollection;
-import org.apache.olingo.ext.proxy.api.EntityType;
-import org.apache.olingo.ext.proxy.api.PersistenceManager;
-import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
-
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = 
"DefaultContainer",
-    namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV4")
-public interface DefaultContainer extends PersistenceManager {
-
-  Row getRow();
-
-  RowIndex getRowIndex();
-
-  Operations operations();
-
-  public interface Operations extends 
org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  <NE extends EntityType<?>> NE newEntityInstance(Class<NE> ref);
-
-  <T extends EntityType<?>, NEC extends EntityCollection<T, ?, ?>> NEC 
newEntityCollection(Class<NEC> ref);
-
-  <NE extends ComplexType<?>> NE newComplexInstance(Class<NE> ref);
-
-  <T extends ComplexType<?>, NEC extends ComplexCollection<T, ?, ?>> NEC 
newComplexCollection(Class<NEC> ref);
-
-  <T extends Serializable, NEC extends PrimitiveCollection<T>> NEC 
newPrimitiveCollection(Class<T> ref);
-
-  EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java
deleted file mode 100644
index 6f230ff..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java
+++ /dev/null
@@ -1,40 +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.opentype.microsoft.test.odata.services.opentypesservice;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "Row",
-    container = 
"Microsoft.Test.OData.Services.OpenTypesServiceV4.DefaultContainer")
-public interface Row
-    extends
-    
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row,
 RowCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Row>,
-    
AbstractEntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row,
 java.util.UUID, RowCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java
deleted file mode 100644
index cdc20c1..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java
+++ /dev/null
@@ -1,40 +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.opentype.microsoft.test.odata.services.opentypesservice;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import 
org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndexCollection;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected](name = "RowIndex",
-    container = 
"Microsoft.Test.OData.Services.OpenTypesServiceV4.DefaultContainer")
-public interface RowIndex
-    extends
-    
org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex,
 RowIndexCollection>,
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<RowIndex>,
-    
AbstractEntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex,
 java.lang.Integer, RowIndexCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
deleted file mode 100644
index 55fb49b..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
+++ /dev/null
@@ -1,20 +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.opentype.microsoft.test.odata.services.opentypesservice;
-

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java
deleted file mode 100644
index 0c28783..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java
+++ /dev/null
@@ -1,84 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-import org.apache.olingo.ext.proxy.api.Annotatable;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = "AccountInfo",
-    isOpenType = true,
-    isAbstract = false)
-public interface AccountInfo
-    extends org.apache.olingo.ext.proxy.api.ComplexType<AccountInfo>,
-    org.apache.olingo.ext.proxy.api.StructuredQuery<AccountInfo>, 
AbstractOpenType {
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getFirstName();
-
-  void setFirstName(java.lang.String _firstName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getLastName();
-
-  void setLastName(java.lang.String _lastName);
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"FirstName",
-        type = "Edm.String")
-    Annotatable getFirstNameAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"LastName",
-        type = "Edm.String")
-    Annotatable getLastNameAnnotations();
-
-  }
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java
deleted file mode 100644
index 5c6abad..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java
+++ /dev/null
@@ -1,41 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface AccountInfoCollection
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<AccountInfoCollection>,
-org.apache.olingo.ext.proxy.api.ComplexCollection<AccountInfo, 
AccountInfoCollection, AccountInfoCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
deleted file mode 100644
index 746593c..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface AccountInfoCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<AccountInfoCollection,
 AccountInfoCollection.Operations> {
-
-  @Override
-  AccountInfoCollectionComposableInvoker select(String... select);
-
-  @Override
-  AccountInfoCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java
deleted file mode 100644
index d4e186f..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java
+++ /dev/null
@@ -1,66 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
-public interface AccountInfoComposableInvoker
-    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<AccountInfo, 
AccountInfo.Operations>
-    , AbstractOpenType {
-
-  @Override
-  AccountInfoComposableInvoker select(String... select);
-
-  @Override
-  AccountInfoComposableInvoker expand(String... expand);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "FirstName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getFirstName();
-
-  void setFirstName(java.lang.String _firstName);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastName",
-      type = "Edm.String",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.String getLastName();
-
-  void setLastName(java.lang.String _lastName);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java
deleted file mode 100644
index 0594588..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java
+++ /dev/null
@@ -1,44 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = "Color",
-    underlyingType = EdmPrimitiveTypeKind.Int32,
-    isFlags = false)
-public enum Color {
-  Red(1),
-  Green(2),
-  Blue(4);
-
-  private java.lang.Integer value;
-
-  public java.lang.Integer getValue() {
-    return value;
-  }
-
-  private Color(final java.lang.Integer value) {
-    this.value = value;
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java
deleted file mode 100644
index 3772b0f..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java
+++ /dev/null
@@ -1,273 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.Annotatable;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = 
"ContactDetails",
-    isOpenType = false,
-    isAbstract = false)
-public interface ContactDetails
-    extends org.apache.olingo.ext.proxy.api.ComplexType<ContactDetails>,
-    org.apache.olingo.ext.proxy.api.StructuredQuery<ContactDetails> {
-
-  @org.apache.olingo.ext.proxy.api.annotations.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(byte[] _firstContacted);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getLastContacted();
-
-  void setLastContacted(java.sql.Timestamp _lastContacted);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted",
-      type = "Edm.Date",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.Calendar getContacted();
-
-  void setContacted(java.util.Calendar _contacted);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID",
-      type = "Edm.Guid",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.UUID getGUID();
-
-  void setGUID(java.util.UUID _gUID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"PreferedContactTime",
-      type = "Edm.TimeOfDay",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.Calendar getPreferedContactTime();
-
-  void setPreferedContactTime(java.util.Calendar _preferedContactTime);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte",
-      type = "Edm.Byte",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getByte();
-
-  void setByte(java.lang.Short _byte);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte",
-      type = "Edm.SByte",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Byte getSignedByte();
-
-  void setSignedByte(java.lang.Byte _signedByte);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getDouble();
-
-  void setDouble(java.lang.Double _double);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single",
-      type = "Edm.Single",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Float getSingle();
-
-  void setSingle(java.lang.Float _single);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short",
-      type = "Edm.Int16",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getShort();
-
-  void setShort(java.lang.Short _short);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getInt();
-
-  void setInt(java.lang.Integer _int);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long",
-      type = "Edm.Int64",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Long getLong();
-
-  void setLong(java.lang.Long _long);
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"FirstContacted",
-        type = "Edm.Binary")
-    Annotatable getFirstContactedAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"LastContacted",
-        type = "Edm.DateTimeOffset")
-    Annotatable getLastContactedAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Contacted",
-        type = "Edm.Date")
-    Annotatable getContactedAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"GUID",
-        type = "Edm.Guid")
-    Annotatable getGUIDAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"PreferedContactTime",
-        type = "Edm.TimeOfDay")
-    Annotatable getPreferedContactTimeAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Byte",
-        type = "Edm.Byte")
-    Annotatable getByteAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"SignedByte",
-        type = "Edm.SByte")
-    Annotatable getSignedByteAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Double",
-        type = "Edm.Double")
-    Annotatable getDoubleAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Single",
-        type = "Edm.Single")
-    Annotatable getSingleAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Short",
-        type = "Edm.Int16")
-    Annotatable getShortAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Int",
-        type = "Edm.Int32")
-    Annotatable getIntAnnotations();
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Long",
-        type = "Edm.Int64")
-    Annotatable getLongAnnotations();
-
-  }
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java
deleted file mode 100644
index 035c118..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java
+++ /dev/null
@@ -1,41 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface ContactDetailsCollection
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<ContactDetailsCollection>,
-org.apache.olingo.ext.proxy.api.ComplexCollection<ContactDetails, 
ContactDetailsCollection, ContactDetailsCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
deleted file mode 100644
index d77451a..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface ContactDetailsCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<ContactDetailsCollection,
 ContactDetailsCollection.Operations> {
-
-  @Override
-  ContactDetailsCollectionComposableInvoker select(String... select);
-
-  @Override
-  ContactDetailsCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java
deleted file mode 100644
index c55eec1..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java
+++ /dev/null
@@ -1,213 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface ContactDetailsComposableInvoker
-    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<ContactDetails, 
ContactDetails.Operations>
-{
-
-  @Override
-  ContactDetailsComposableInvoker select(String... select);
-
-  @Override
-  ContactDetailsComposableInvoker expand(String... expand);
-
-  @org.apache.olingo.ext.proxy.api.annotations.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(byte[] _firstContacted);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "LastContacted",
-      type = "Edm.DateTimeOffset",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.sql.Timestamp getLastContacted();
-
-  void setLastContacted(java.sql.Timestamp _lastContacted);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Contacted",
-      type = "Edm.Date",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.Calendar getContacted();
-
-  void setContacted(java.util.Calendar _contacted);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "GUID",
-      type = "Edm.Guid",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.UUID getGUID();
-
-  void setGUID(java.util.UUID _gUID);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = 
"PreferedContactTime",
-      type = "Edm.TimeOfDay",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.Calendar getPreferedContactTime();
-
-  void setPreferedContactTime(java.util.Calendar _preferedContactTime);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Byte",
-      type = "Edm.Byte",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getByte();
-
-  void setByte(java.lang.Short _byte);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SignedByte",
-      type = "Edm.SByte",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Byte getSignedByte();
-
-  void setSignedByte(java.lang.Byte _signedByte);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Double",
-      type = "Edm.Double",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Double getDouble();
-
-  void setDouble(java.lang.Double _double);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Single",
-      type = "Edm.Single",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Float getSingle();
-
-  void setSingle(java.lang.Float _single);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Short",
-      type = "Edm.Int16",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Short getShort();
-
-  void setShort(java.lang.Short _short);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Int",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getInt();
-
-  void setInt(java.lang.Integer _int);
-
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Long",
-      type = "Edm.Int64",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Long getLong();
-
-  void setLong(java.lang.Long _long);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java
deleted file mode 100644
index f2618f2..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java
+++ /dev/null
@@ -1,87 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-import java.util.concurrent.Future;
-
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = "IndexedRow",
-    openType = true,
-    hasStream = false,
-    isAbstract = false,
-    baseType = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row")
-public interface IndexedRow extends Row {
-
-  @Override
-  IndexedRow load();
-
-  @Override
-  Future<? extends IndexedRow> loadAsync();
-
-  @Override
-  IndexedRow refs();
-
-  @Override
-  IndexedRow expand(String... expand);
-
-  @Override
-  IndexedRow select(String... select);
-
-  @Override
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
-      type = "Edm.Guid",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.UUID getId();
-
-  @Override
-  void setId(java.util.UUID _id);
-
-  @Override
-  Operations operations();
-
-  interface Operations extends
-          Row.Operations {
-    // No additional methods needed for now.
-  }
-
-  @Override
-  Annotations annotations();
-
-  interface Annotations extends
-          Row.Annotations {
-
-    @Override
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Id",
-        type = "Edm.Guid")
-    org.apache.olingo.ext.proxy.api.Annotatable getIdAnnotations();
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java
deleted file mode 100644
index 51ea58b..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java
+++ /dev/null
@@ -1,41 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface IndexedRowCollection
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<IndexedRowCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<IndexedRow, 
IndexedRowCollection, IndexedRowCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
deleted file mode 100644
index ee64c02..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface IndexedRowCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<IndexedRowCollection,
 IndexedRowCollection.Operations> {
-
-  @Override
-  IndexedRowCollectionComposableInvoker select(String... select);
-
-  @Override
-  IndexedRowCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java
deleted file mode 100644
index 56d9712..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-public interface IndexedRowComposableInvoker
-    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<IndexedRow, 
IndexedRow.Operations>
-    , AbstractOpenType {
-
-  @Override
-  IndexedRowComposableInvoker select(String... select);
-
-  @Override
-  IndexedRowComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
-      type = "Edm.Guid",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.UUID getId();
-
-  void setId(java.util.UUID _id);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java
deleted file mode 100644
index eb5a3cc..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java
+++ /dev/null
@@ -1,68 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = "Row",
-    openType = true,
-    hasStream = false,
-    isAbstract = false)
-public interface Row
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<Row>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<Row>,
-    AbstractOpenType {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
-      type = "Edm.Guid",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.UUID getId();
-
-  void setId(java.util.UUID _id);
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Id",
-        type = "Edm.Guid")
-    org.apache.olingo.ext.proxy.api.Annotatable getIdAnnotations();
-
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java
deleted file mode 100644
index c754aed..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java
+++ /dev/null
@@ -1,41 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface RowCollection
-    extends
-    org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<RowCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<Row, RowCollection, 
RowCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java
deleted file mode 100644
index c3713a7..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface RowCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<RowCollection,
 RowCollection.Operations> {
-
-  @Override
-  RowCollectionComposableInvoker select(String... select);
-
-  @Override
-  RowCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java
deleted file mode 100644
index f77f079..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-public interface RowComposableInvoker
-    extends org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<Row, 
Row.Operations>
-    , AbstractOpenType {
-
-  @Override
-  RowComposableInvoker select(String... select);
-
-  @Override
-  RowComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
-      type = "Edm.Guid",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.util.UUID getId();
-
-  void setId(java.util.UUID _id);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java
deleted file mode 100644
index eee12de..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java
+++ /dev/null
@@ -1,82 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = "RowIndex",
-    openType = true,
-    hasStream = false,
-    isAbstract = false)
-public interface RowIndex
-    extends org.apache.olingo.ext.proxy.api.Annotatable,
-    org.apache.olingo.ext.proxy.api.EntityType<RowIndex>, 
org.apache.olingo.ext.proxy.api.StructuredQuery<RowIndex>,
-    AbstractOpenType {
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getId();
-
-  void setId(java.lang.Integer _id);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"Rows",
-      type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row",
-      targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
-      targetContainer = "DefaultContainer",
-      targetEntitySet = "Row",
-      containsTarget = false)
-  Row getRows();
-
-  void
-      setRows(Row _rows);
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Annotations annotations();
-
-  interface Annotations {
-
-    @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = 
"Id",
-        type = "Edm.Int32")
-    org.apache.olingo.ext.proxy.api.Annotatable getIdAnnotations();
-
-    
@org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty(name
 = "Rows",
-        type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row")
-    org.apache.olingo.ext.proxy.api.Annotatable getRowsAnnotations();
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java
deleted file mode 100644
index c0dae50..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java
+++ /dev/null
@@ -1,41 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import java.util.Collection;
-// CHECKSTYLE:ON (Maven checkstyle)
-
-import org.apache.olingo.ext.proxy.api.AbstractTerm;
-
-public interface RowIndexCollection
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<RowIndexCollection>,
-org.apache.olingo.ext.proxy.api.EntityCollection<RowIndex, RowIndexCollection, 
RowIndexCollection> {
-
-  Operations operations();
-
-  interface Operations extends org.apache.olingo.ext.proxy.api.Operations {
-    // No additional methods needed for now.
-  }
-
-  Object getAnnotation(Class<? extends AbstractTerm> term);
-
-  Collection<Class<? extends AbstractTerm>> getAnnotationTerms();
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java
deleted file mode 100644
index cb4f23f..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java
+++ /dev/null
@@ -1,32 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-
-public interface RowIndexCollectionComposableInvoker
-    extends
-    
org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker<RowIndexCollection,
 RowIndexCollection.Operations> {
-
-  @Override
-  RowIndexCollectionComposableInvoker select(String... select);
-
-  @Override
-  RowIndexCollectionComposableInvoker expand(String... expand);
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java
deleted file mode 100644
index 52e3306..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java
+++ /dev/null
@@ -1,64 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-
-// CHECKSTYLE:OFF (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.AbstractOpenType;
-
-// CHECKSTYLE:ON (Maven checkstyle)
-import org.apache.olingo.ext.proxy.api.annotations.Key;
-
-public interface RowIndexComposableInvoker
-    extends 
org.apache.olingo.ext.proxy.api.StructuredComposableInvoker<RowIndex, 
RowIndex.Operations>
-    , AbstractOpenType {
-
-  @Override
-  RowIndexComposableInvoker select(String... select);
-
-  @Override
-  RowIndexComposableInvoker expand(String... expand);
-
-  @Key
-  @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Id",
-      type = "Edm.Int32",
-      nullable = false,
-      defaultValue = "",
-      maxLenght = Integer.MAX_VALUE,
-      fixedLenght = false,
-      precision = 0,
-      scale = 0,
-      unicode = true,
-      collation = "",
-      srid = "")
-  java.lang.Integer getId();
-
-  void setId(java.lang.Integer _id);
-
-  @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = 
"Rows",
-      type = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row",
-      targetSchema = "Microsoft.Test.OData.Services.OpenTypesServiceV4",
-      targetContainer = "DefaultContainer",
-      targetEntitySet = "Row",
-      containsTarget = false)
-  Row getRows();
-
-  void
-      setRows(Row _rows);
-
-}

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java
deleted file mode 100644
index 26254f9..0000000
--- 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java
+++ /dev/null
@@ -1,20 +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.opentype.microsoft.test.odata.services.opentypesservice.types;
-

http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0063a300/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/DefaultContainer.java
----------------------------------------------------------------------
diff --git 
a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/DefaultContainer.java
 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/DefaultContainer.java
new file mode 100644
index 0000000..8febe7e
--- /dev/null
+++ 
b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/DefaultContainer.java
@@ -0,0 +1,61 @@
+/*
+ * 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.opentype.opentypesservice;
+
+// CHECKSTYLE:OFF (Maven checkstyle)
+import java.io.InputStream;
+
+// CHECKSTYLE:ON (Maven checkstyle)
+import java.io.Serializable;
+
+import org.apache.olingo.ext.proxy.api.ComplexCollection;
+import org.apache.olingo.ext.proxy.api.ComplexType;
+import org.apache.olingo.ext.proxy.api.EdmStreamValue;
+import org.apache.olingo.ext.proxy.api.EntityCollection;
+import org.apache.olingo.ext.proxy.api.EntityType;
+import org.apache.olingo.ext.proxy.api.PersistenceManager;
+import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
+
[email protected]("Microsoft.Test.OData.Services.OpenTypesServiceV4")
[email protected](name = 
"DefaultContainer",
+    namespace = "Microsoft.Test.OData.Services.OpenTypesServiceV4")
+public interface DefaultContainer extends PersistenceManager {
+
+  Row getRow();
+
+  RowIndex getRowIndex();
+
+  Operations operations();
+
+  public interface Operations extends 
org.apache.olingo.ext.proxy.api.Operations {
+    // No additional methods needed for now.
+  }
+
+  <NE extends EntityType<?>> NE newEntityInstance(Class<NE> ref);
+
+  <T extends EntityType<?>, NEC extends EntityCollection<T, ?, ?>> NEC 
newEntityCollection(Class<NEC> ref);
+
+  <NE extends ComplexType<?>> NE newComplexInstance(Class<NE> ref);
+
+  <T extends ComplexType<?>, NEC extends ComplexCollection<T, ?, ?>> NEC 
newComplexCollection(Class<NEC> ref);
+
+  <T extends Serializable, NEC extends PrimitiveCollection<T>> NEC 
newPrimitiveCollection(Class<T> ref);
+
+  EdmStreamValue newEdmStreamValue(String contentType, InputStream stream);
+}

Reply via email to